[jbossws-commits] JBossWS SVN: r16160 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/binding and 13 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Apr 13 07:55:00 EDT 2012
Author: ropalka
Date: 2012-04-13 07:54:57 -0400 (Fri, 13 Apr 2012)
New Revision: 16160
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/XMLFragment.java
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/UnboundHeader.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentAccess.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/SAAJUtils.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/DOMTypes.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
Log:
[JBWS-3486] slim down native SAAJ impl. dependencies (WIP)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -52,7 +52,6 @@
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPBodyElementDoc;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
import org.jboss.ws.core.soap.SOAPBodyImpl;
@@ -92,7 +91,6 @@
/** A constant representing the identity of the SOAP 1.2 over HTTP binding. */
public static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
/** The SOAP encoded Array name */
- private static final Name SOAP_ARRAY_NAME = new NameImpl("Array", Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC);
public CommonSOAPBinding()
{
@@ -141,7 +139,7 @@
if (style == Style.RPC)
{
QName opQName = opMetaData.getQName();
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ Name opName = SOAPUtils.newName(namespaceRegistry.registerQName(opQName), soapEnvelope);
if (debugEnabled)
log.debug("Create RPC body element: " + opName);
@@ -172,7 +170,7 @@
else
{
SOAPElement soapElement = paramMetaData.isInHeader() ? (SOAPElement)soapHeader : soapBodyElement;
- addParameterToMessage(paramMetaData, value, soapElement);
+ addParameterToMessage(paramMetaData, value, soapElement, soapEnvelope);
}
}
@@ -264,7 +262,7 @@
if (!isHeader)
numParameters++;
- SOAPContentElement value = getParameterFromMessage(paramMetaData, element, false);
+ SOAPContentElement value = getParameterFromMessage(paramMetaData, element, false, soapEnvelope);
epInv.setRequestParamValue(xmlName, value);
}
}
@@ -339,8 +337,7 @@
if (style == Style.RPC)
{
QName opQName = opMetaData.getResponseName();
-
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ Name opName = SOAPUtils.newName(namespaceRegistry.registerQName(opQName), soapEnvelope);
soapBodyElement = new SOAPBodyElementRpc(opName);
soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
@@ -371,7 +368,7 @@
}
else
{
- SOAPContentElement soapElement = addParameterToMessage(retMetaData, value, soapBodyElement);
+ SOAPContentElement soapElement = addParameterToMessage(retMetaData, value, soapBodyElement, soapEnvelope);
epInv.setReturnValue(soapElement);
soapElement.setObjectValue(value);
}
@@ -391,11 +388,11 @@
{
if (paramMetaData.isInHeader())
{
- addParameterToMessage(paramMetaData, value, soapHeader);
+ addParameterToMessage(paramMetaData, value, soapHeader, soapEnvelope);
}
else
{
- addParameterToMessage(paramMetaData, value, soapBodyElement);
+ addParameterToMessage(paramMetaData, value, soapBodyElement, soapEnvelope);
}
}
}
@@ -468,7 +465,7 @@
}
else
{
- SOAPContentElement value = getParameterFromMessage(retMetaData, soapElement, false);
+ SOAPContentElement value = getParameterFromMessage(retMetaData, soapElement, false, soapEnvelope);
epInv.setReturnValue(value);
}
}
@@ -484,7 +481,7 @@
else
{
SOAPElement element = paramMetaData.isInHeader() ? soapHeader : soapElement;
- SOAPContentElement value = getParameterFromMessage(paramMetaData, element, false);
+ SOAPContentElement value = getParameterFromMessage(paramMetaData, element, false, soapEnvelope);
epInv.setResponseParamValue(xmlName, value);
}
}
@@ -594,7 +591,7 @@
}
/** Marshall the given parameter and add it to the SOAPMessage */
- private SOAPContentElement addParameterToMessage(ParameterMetaData paramMetaData, Object value, SOAPElement soapElement) throws SOAPException, BindingException
+ private SOAPContentElement addParameterToMessage(ParameterMetaData paramMetaData, Object value, SOAPElement soapElement, SOAPEnvelope soapEnvelope) throws SOAPException, BindingException
{
QName xmlName = paramMetaData.getXmlName();
Class javaType = paramMetaData.getJavaType();
@@ -614,7 +611,7 @@
xmlName = namespaceRegistry.registerQName(xmlName);
}
- Name soapName = new NameImpl(xmlName.getLocalPart(), xmlName.getPrefix(), xmlName.getNamespaceURI());
+ Name soapName = SOAPUtils.newName(xmlName, soapEnvelope);
SOAPContentElement contentElement;
if (soapElement instanceof SOAPHeader)
@@ -651,9 +648,11 @@
}
/** Unmarshall a message element and add it to the parameter list */
- private SOAPContentElement getParameterFromMessage(ParameterMetaData paramMetaData, SOAPElement soapElement, boolean optional) throws BindingException
+ private SOAPContentElement getParameterFromMessage(ParameterMetaData paramMetaData, SOAPElement soapElement, boolean optional, SOAPEnvelope soapEnvelope) throws BindingException, SOAPException
{
- Name xmlName = new NameImpl(paramMetaData.getXmlName());
+ QName soapArrayQName = new QName(Constants.URI_SOAP11_ENC, "Array", Constants.PREFIX_SOAP11_ENC);
+ Name SOAP_ARRAY_NAME = SOAPUtils.newName(soapArrayQName, soapEnvelope);
+ Name xmlName = SOAPUtils.newName(paramMetaData.getXmlName(), soapEnvelope);
SOAPContentElement soapContentElement = null;
Iterator childElements = soapElement.getChildElements();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -32,8 +32,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
-import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.soap.utils.SOAPElementWriter;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.w3c.dom.Element;
/**
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -26,8 +26,6 @@
import javax.xml.rpc.encoding.Deserializer;
import javax.xml.rpc.encoding.DeserializerFactory;
-import org.jboss.util.NotImplementedException;
-
/**
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
@@ -38,11 +36,11 @@
public Deserializer getDeserializerAs(String mechanismType)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
public Iterator getSupportedMechanismTypes()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -26,8 +26,6 @@
import javax.xml.rpc.encoding.Serializer;
import javax.xml.rpc.encoding.SerializerFactory;
-import org.jboss.util.NotImplementedException;
-
/**
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
@@ -38,11 +36,11 @@
public Serializer getSerializerAs(String mechanismType)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
public Iterator getSupportedMechanismTypes()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -29,7 +29,6 @@
import javax.xml.transform.dom.DOMSource;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMUtils;
import org.jboss.ws.common.DOMWriter;
@@ -118,6 +117,6 @@
public String getMechanismType()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -29,7 +29,6 @@
import javax.xml.rpc.encoding.Serializer;
import javax.xml.transform.Result;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.Normalizer;
import org.jboss.ws.core.soap.SOAPContentElement;
@@ -150,7 +149,7 @@
public String getMechanismType()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -30,7 +30,6 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
@@ -180,6 +179,6 @@
*/
public void setSupportedEncodings(String[] encodingStyleURIs)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -21,12 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc;
-
import javax.activation.DataHandler;
import javax.mail.internet.MimeMultipart;
import javax.xml.soap.SOAPElement;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.ElementDeserializerFactory;
@@ -93,6 +91,6 @@
*/
public void setSupportedEncodings(String[] encodingStyleURIs)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -58,10 +58,9 @@
import org.jboss.ws.core.binding.DeserializerSupport;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.SerializerSupport;
-import org.jboss.ws.core.soap.NameImpl;
-import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
import org.jboss.ws.core.soap.utils.SOAPUtils;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -101,7 +100,8 @@
/** Factory method for FaultException for a given SOAPFault */
public static SOAPFaultException getSOAPFaultException(SOAPFault soapFault)
{
- QName faultCode = ((NameImpl)soapFault.getFaultCodeAsName()).toQName();
+ Name faultCodeName = soapFault.getFaultCodeAsName();
+ QName faultCode = new QName(faultCodeName.getURI(), faultCodeName.getLocalName(), faultCodeName.getPrefix());
String faultString = soapFault.getFaultString();
String faultActor = soapFault.getFaultActor();
Detail detail = soapFault.getDetail();
@@ -248,7 +248,8 @@
faultCode = nsRegistry.registerQName(faultCode);
String faultString = getValidFaultString(faultEx);
- SOAPFault soapFault = soapBody.addFault(new NameImpl(faultCode), faultString);
+ Name faultCodeName = SOAPUtils.newName(faultCode, soapEnvelope);
+ SOAPFault soapFault = soapBody.addFault(faultCodeName, faultString);
String faultActor = faultEx.getFaultActor();
if (faultActor != null)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -29,7 +29,6 @@
import javax.xml.rpc.encoding.TypeMapping;
import javax.xml.rpc.encoding.TypeMappingRegistry;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.binding.TypeMappingImpl;
@@ -83,7 +82,7 @@
*/
public void registerDefault(TypeMapping mapping)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -92,7 +91,7 @@
*/
public TypeMapping createTypeMapping()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -128,7 +127,7 @@
*/
public TypeMapping register(String encodingStyleURI, TypeMapping mapping)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -139,7 +138,7 @@
*/
public TypeMapping unregisterTypeMapping(String encodingStyleURI)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -154,7 +153,7 @@
*/
public boolean removeTypeMapping(TypeMapping mapping)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/** Assert the literal encoding style */
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -36,9 +36,8 @@
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.core.binding.TypeMappingImpl;
-import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
-import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.util.xml.BufferedStreamResult;
import org.w3c.dom.NamedNodeMap;
@@ -124,7 +123,7 @@
if (JavaUtils.isPrimitive(value.getClass()))
value = JavaUtils.getWrapperValueArray(value);
- String nodeName = new NameImpl(compXmlName).getQualifiedName();
+ String nodeName = getQualifiedName(compXmlName);
buffer = new StringBuilder("<" + nodeName + " xmlns:" + Constants.PREFIX_SOAP11_ENC + "='" + Constants.URI_SOAP11_ENC + "' ");
@@ -171,6 +170,15 @@
}
}
+ private String getQualifiedName(QName qname)
+ {
+ String prefix = qname.getPrefix();
+ if (prefix.length() > 0)
+ return prefix + ":" + qname.getLocalPart();
+ else
+ return qname.getLocalPart();
+ }
+
private void serializeArrayComponents(QName xmlName, QName xmlType, SerializationContext serContext, Object[] objArr) throws BindingException
{
for (Object compValue : objArr)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -25,7 +25,6 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.SerializerSupport;
@@ -61,7 +60,7 @@
if ("base64Binary".equals(typeName))
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
else
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -30,7 +30,6 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.JavaUtils;
@@ -159,7 +158,7 @@
*/
public void marshal(Object obj, ContentHandler handler)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -167,7 +166,7 @@
*/
public void marshal(Object obj, Node node)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -208,7 +207,7 @@
*/
public Node getNode(Object contentTree)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -30,7 +30,6 @@
import javax.xml.rpc.ServiceFactory;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
/**
* Service class acts as a factory for:
@@ -58,7 +57,7 @@
*/
public Service loadService(Class serviceInterface) throws ServiceException
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -75,7 +74,7 @@
*/
public Service loadService(URL wsdlDocumentLocation, Class serviceInterface, Properties props) throws ServiceException
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
@@ -92,7 +91,7 @@
*/
public Service loadService(URL wsdlDocumentLocation, QName serviceName, Properties props) throws ServiceException
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -23,11 +23,11 @@
import java.util.ResourceBundle;
-import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.core.soap.utils.XMLFragment;
/**
* Represents the DOM_VALID state of an {@link SOAPContentElement}.<br>
@@ -40,8 +40,6 @@
private static final ResourceBundle bundle = BundleUtils.getBundle(DOMContent.class);
private static Logger log = Logger.getLogger(DOMContent.class);
- private Source payload;
-
protected DOMContent(SOAPContentElement container)
{
super(container);
@@ -91,19 +89,6 @@
return next;
}
- public Source getPayload()
- {
- return new DOMSource(container);
- }
-
- public void setPayload(Source source)
- {
- if (!(source instanceof DOMSource))
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "DOMSOURCE_EXPECTED", source));
-
- this.payload = source;
- }
-
public XMLFragment getXMLFragment()
{
throw new IllegalStateException(BundleUtils.getMessage(bundle, "XMLFRAGMENT_NOT_AVAILABLE"));
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -45,6 +45,7 @@
import org.jboss.ws.common.DOMUtils;
import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.soap.utils.Style;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-04-13 11:54:57 UTC (rev 16160)
@@ -71,11 +71,6 @@
NO_HTTP_RESONSE_CODE=No HTTP resonse code, assuming: SC_OK
INVALID_HTTP_SERVER_RESPONSE=Invalid HTTP server response [{0}] - {1}
CANNOT_UNMARSHALL_SOAPMESSAGE=Cannot unmarshall SOAPMessage
-UNSUPPORTED_RESULT_TYPE=Unsupported result type: {0}
-STREAMSOURCE_ALREADY_EXHAUSTED=StreamSource already exhausted
-CANNOT_FIND_END_INSTRUCTION=Cannot find end of XML processing instruction
-UNSUPPORTED_SOURCE_TYPE=Unsupported source type: {0}
-STREAMSOURCE_WAS_PREVIOUSLY_ACCESSED=StreamSource was previously accessed from
FAULTCODE_MUST_BE_NS_QUALIFIED=Fault code '{0}' must be namespace qualified
NOT_SUPPORT_SUBCODE=SOAP 1.1 Fault does not support the concept of Subcode
SUBCODE_MUST_BE_NAMESPACE_QUALIFIED=subcode must be namespace qualified: {0}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -26,7 +26,6 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
-import javax.xml.transform.Source;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -40,6 +39,7 @@
import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
@@ -101,16 +101,6 @@
return next;
}
- public Source getPayload()
- {
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "PAYLOAD_NOT_AVAILABLE"));
- }
-
- public void setPayload(Source source)
- {
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "PAYLOAD_CANNOT_BE_SET_ON_OBJECT_CONTENT"));
- }
-
public XMLFragment getXMLFragment()
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentAccess.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentAccess.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentAccess.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.soap;
-import javax.xml.transform.Source;
+import org.jboss.ws.core.soap.utils.XMLFragment;
/**
* @author Heiko.Braun at jboss.org
@@ -29,8 +29,6 @@
*/
public interface SOAPContentAccess
{
- Source getPayload();
-
XMLFragment getXMLFragment();
void setXMLFragment(XMLFragment xmlFragment);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -30,7 +30,6 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
@@ -39,6 +38,7 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.SOAPContent.State;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
@@ -151,14 +151,6 @@
/** Get the payload as source.
*/
- public Source getPayload()
- {
- if (soapContent.getState() == State.OBJECT_VALID)
- transitionTo(State.DOM_VALID);
-
- return soapContent.getPayload();
- }
-
public XMLFragment getXMLFragment()
{
transitionTo(State.XML_VALID);
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/UnboundHeader.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/UnboundHeader.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/UnboundHeader.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.soap;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ParameterMetaData;
-
-/**
- * Represents an unbound SOAPHeaderElement
- *
- * @author Thomas.Diesler at jboss.org
- * @since 04-Jan-2005
- */
-public class UnboundHeader
-{
- private QName xmlName;
- private QName xmlType;
- private Class javaType;
- private ParameterMode mode;
- private Object headerValue;
-
- public UnboundHeader(QName xmlName, QName xmlType, Class javaType, ParameterMode mode)
- {
- this.xmlName = xmlName;
- this.xmlType = xmlType;
- this.javaType = javaType;
- this.mode = mode;
- }
-
- public QName getXmlName()
- {
- return xmlName;
- }
-
- public QName getXmlType()
- {
- return xmlType;
- }
-
- public Class getJavaType()
- {
- return javaType;
- }
-
- public ParameterMode getMode()
- {
- return mode;
- }
-
- public Object getHeaderValue()
- {
- return headerValue;
- }
-
- public void setHeaderValue(Object headerValue)
- {
- this.headerValue = headerValue;
- }
-
- public ParameterMetaData toParameterMetaData(OperationMetaData opMetaData)
- {
- ParameterMetaData paramMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaType.getName());
- paramMetaData.setInHeader(true);
- return paramMetaData;
- }
-
- public String toString()
- {
- StringBuilder buffer = new StringBuilder("\nUnboundHeader:");
- buffer.append("\n xmlName=" + getXmlName());
- buffer.append("\n xmlType=" + getXmlType());
- buffer.append("\n javaType=" + getJavaType().getName());
- buffer.append("\n mode=" + getMode());
- return buffer.toString();
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -42,6 +41,7 @@
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.w3c.dom.Comment;
@@ -111,16 +111,6 @@
return next;
}
- public Source getPayload()
- {
- return xmlFragment.getSource();
- }
-
- public void setPayload(Source source)
- {
- xmlFragment = new XMLFragment(source);
- }
-
public XMLFragment getXMLFragment()
{
return xmlFragment;
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -1,288 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.soap;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ResourceBundle;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.DOMWriter;
-import org.jboss.ws.util.xml.BufferedStreamResult;
-import org.jboss.ws.util.xml.BufferedStreamSource;
-import org.w3c.dom.Element;
-
-/**
- * A XMLFragment represent an XML {@link Source}.
- *
- * The basic idea is that any {@link SOAPContentElement} XML_VALID state
- * (either before unmarshalling or after marshalling) is represented through a single interface.<br>
- *
- * @see SOAPContentElement
- * @see XMLContent
- *
- * @author Heiko.Braun at jboss.org
- * @author Thomas.Diesler at jboss.org
- * @since 05-Feb-2007
- */
-public class XMLFragment
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(XMLFragment.class);
- // provide logging
- private static Logger log = Logger.getLogger(XMLFragment.class);
-
- private Source source;
-
- private final static String XML_PROC = "<?xml";
-
- // An exception that is created when a client
- // accesses a StreamSource that can only be read once
- private RuntimeException streamSourceAccessMarker;
-
- public XMLFragment(Source source)
- {
- this.source = source;
- }
-
- public XMLFragment(String xmlString)
- {
- source = new BufferedStreamSource(xmlString.getBytes());
- }
-
- public XMLFragment(Result result)
- {
- if (result instanceof DOMResult)
- {
- DOMResult domResult = (DOMResult)result;
- source = new DOMSource(domResult.getNode());
- }
- else if (result instanceof BufferedStreamResult)
- {
- BufferedStreamResult br = (BufferedStreamResult)result;
- ByteArrayOutputStream baos = (ByteArrayOutputStream)br.getOutputStream();
- source = new BufferedStreamSource(baos.toByteArray());
- }
- else
- {
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_RESULT_TYPE", result));
- }
- }
-
- public Source getSource()
- {
- source = beginSourceAccess(source);
- endSourceAccess();
- return source;
- }
-
- /** Transform the Source to an XML string
- */
- public String toXMLString()
- {
- try
- {
- StringWriter strWriter = new StringWriter(1024);
- writeSourceInternal(strWriter);
- return strWriter.toString();
- }
- catch (IOException ex)
- {
- throw new WSException(ex);
- }
- }
-
- /** Transform the Source to an Element
- */
- public Element toElement()
- {
- Element retElement = null;
- try
- {
- source = beginSourceAccess(source);
- retElement = DOMUtils.sourceToElement(source);
- endSourceAccess();
- }
- catch (IOException ex)
- {
- handleSourceAccessException(ex);
- }
- return retElement;
- }
-
- public void writeTo(Writer writer) throws IOException
- {
- writeSourceInternal(writer);
- }
-
- public void writeTo(OutputStream out) throws IOException
- {
- PrintWriter printWriter = new PrintWriter(out);
- writeSourceInternal(printWriter);
- printWriter.flush();
- printWriter.close();
- }
-
- /**
- * Should only be called with <code>jbossws.SOAPMessage==TRACE</code>
- */
- private void writeSourceInternal(Writer writer) throws IOException
- {
- try
- {
- source = beginSourceAccess(source);
-
- if (source instanceof DOMSource)
- {
- DOMSource domSource = (DOMSource)source;
- new DOMWriter(writer).print(domSource.getNode());
- }
- else if (source instanceof StreamSource || source instanceof SAXSource)
- {
- StreamSource streamSource = (StreamSource)source;
- boolean newReader = false;
-
- Reader reader = streamSource.getReader();
- InputStream is = streamSource.getInputStream();
- {
- if (reader == null)
- {
- if (is != null)
- {
- reader = new InputStreamReader(is, "UTF-8");
- newReader = true;
- }
- else return;
- }
- }
-
- char[] cbuf = new char[1024];
- int len = reader.read(cbuf);
- int off = 0;
-
- if (len == -1)
- throw new IOException(BundleUtils.getMessage(bundle, "STREAMSOURCE_ALREADY_EXHAUSTED"));
-
- // Remove XML processing instruction
- String xmlProc = new String(cbuf, 0, XML_PROC.length());
- if (XML_PROC.equals(xmlProc))
- {
- off = XML_PROC.length();
- while (cbuf[off] != '>' && off < len)
- off++;
-
- if (cbuf[off] != '>')
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_FIND_END_INSTRUCTION"));
-
- off++;
- len -= off;
- }
-
- while (len > 0)
- {
- writer.write(cbuf, off, len);
- len = reader.read(cbuf);
- off = 0;
- }
-
- if (newReader)
- reader.close();
- }
- else
- {
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_SOURCE_TYPE", source));
- }
-
- endSourceAccess();
- }
- catch (IOException ex)
- {
- handleSourceAccessException(ex);
- }
- }
-
- private Source beginSourceAccess(Source source)
- {
- // no need to buffer those
- if (source instanceof BufferedStreamSource || source instanceof DOMSource)
- return source;
-
- // Buffer the source content
- if (source instanceof StreamSource)
- {
- source = new BufferedStreamSource((StreamSource)source);
- }
- else
- {
- try
- {
- Element element = DOMUtils.sourceToElement(source);
- source = element != null ? new DOMSource(element) : new DOMSource();
- }
- catch (IOException ex)
- {
- WSException.rethrow(ex);
- }
- }
-
- return source;
- }
-
- private void endSourceAccess()
- {
- // Create the marker exception
- if (source instanceof StreamSource)
- {
- streamSourceAccessMarker = new RuntimeException();
- }
- }
-
- private void handleSourceAccessException(IOException ex)
- {
- if (source instanceof StreamSource && streamSourceAccessMarker != null)
- {
- log.error(BundleUtils.getMessage(bundle, "STREAMSOURCE_WAS_PREVIOUSLY_ACCESSED"), streamSourceAccessMarker);
- }
- WSException.rethrow(ex);
- }
-
- public String toString()
- {
- return "[source=" + source + "]";
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/Message.properties 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/Message.properties 2012-04-13 11:54:57 UTC (rev 16160)
@@ -1,2 +1,7 @@
UNSUPPORTED_ENCODING_STYLE=Unsupported encoding style: {0}
UNSUPPORTED_STYLE=Unsupported style: {0}
+UNSUPPORTED_RESULT_TYPE=Unsupported result type: {0}
+STREAMSOURCE_ALREADY_EXHAUSTED=StreamSource already exhausted
+CANNOT_FIND_END_INSTRUCTION=Cannot find end of XML processing instruction
+UNSUPPORTED_SOURCE_TYPE=Unsupported source type: {0}
+STREAMSOURCE_WAS_PREVIOUSLY_ACCESSED=StreamSource was previously accessed from
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.soap.utils;
+import javax.xml.namespace.QName;
+import javax.xml.soap.Name;
import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPFactory;
@@ -84,4 +87,7 @@
return false;
}
+ public static Name newName(final QName faultCode, final SOAPEnvelope soapEnvelope) throws SOAPException {
+ return soapEnvelope.createName(faultCode.getLocalPart(), faultCode.getPrefix(), faultCode.getNamespaceURI());
+ }
}
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/XMLFragment.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/XMLFragment.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/XMLFragment.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -0,0 +1,288 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.soap.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ResourceBundle;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.DOMUtils;
+import org.jboss.ws.common.DOMWriter;
+import org.jboss.ws.util.xml.BufferedStreamResult;
+import org.jboss.ws.util.xml.BufferedStreamSource;
+import org.w3c.dom.Element;
+
+/**
+ * A XMLFragment represent an XML {@link Source}.
+ *
+ * The basic idea is that any {@link SOAPContentElement} XML_VALID state
+ * (either before unmarshalling or after marshalling) is represented through a single interface.<br>
+ *
+ * @see SOAPContentElement
+ * @see XMLContent
+ *
+ * @author Heiko.Braun at jboss.org
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-Feb-2007
+ */
+public class XMLFragment
+{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(XMLFragment.class);
+ // provide logging
+ private static Logger log = Logger.getLogger(XMLFragment.class);
+
+ private Source source;
+
+ private final static String XML_PROC = "<?xml";
+
+ // An exception that is created when a client
+ // accesses a StreamSource that can only be read once
+ private RuntimeException streamSourceAccessMarker;
+
+ public XMLFragment(Source source)
+ {
+ this.source = source;
+ }
+
+ public XMLFragment(String xmlString)
+ {
+ source = new BufferedStreamSource(xmlString.getBytes());
+ }
+
+ public XMLFragment(Result result)
+ {
+ if (result instanceof DOMResult)
+ {
+ DOMResult domResult = (DOMResult)result;
+ source = new DOMSource(domResult.getNode());
+ }
+ else if (result instanceof BufferedStreamResult)
+ {
+ BufferedStreamResult br = (BufferedStreamResult)result;
+ ByteArrayOutputStream baos = (ByteArrayOutputStream)br.getOutputStream();
+ source = new BufferedStreamSource(baos.toByteArray());
+ }
+ else
+ {
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_RESULT_TYPE", result));
+ }
+ }
+
+ public Source getSource()
+ {
+ source = beginSourceAccess(source);
+ endSourceAccess();
+ return source;
+ }
+
+ /** Transform the Source to an XML string
+ */
+ public String toXMLString()
+ {
+ try
+ {
+ StringWriter strWriter = new StringWriter(1024);
+ writeSourceInternal(strWriter);
+ return strWriter.toString();
+ }
+ catch (IOException ex)
+ {
+ throw new WSException(ex);
+ }
+ }
+
+ /** Transform the Source to an Element
+ */
+ public Element toElement()
+ {
+ Element retElement = null;
+ try
+ {
+ source = beginSourceAccess(source);
+ retElement = DOMUtils.sourceToElement(source);
+ endSourceAccess();
+ }
+ catch (IOException ex)
+ {
+ handleSourceAccessException(ex);
+ }
+ return retElement;
+ }
+
+ public void writeTo(Writer writer) throws IOException
+ {
+ writeSourceInternal(writer);
+ }
+
+ public void writeTo(OutputStream out) throws IOException
+ {
+ PrintWriter printWriter = new PrintWriter(out);
+ writeSourceInternal(printWriter);
+ printWriter.flush();
+ printWriter.close();
+ }
+
+ /**
+ * Should only be called with <code>jbossws.SOAPMessage==TRACE</code>
+ */
+ private void writeSourceInternal(Writer writer) throws IOException
+ {
+ try
+ {
+ source = beginSourceAccess(source);
+
+ if (source instanceof DOMSource)
+ {
+ DOMSource domSource = (DOMSource)source;
+ new DOMWriter(writer).print(domSource.getNode());
+ }
+ else if (source instanceof StreamSource || source instanceof SAXSource)
+ {
+ StreamSource streamSource = (StreamSource)source;
+ boolean newReader = false;
+
+ Reader reader = streamSource.getReader();
+ InputStream is = streamSource.getInputStream();
+ {
+ if (reader == null)
+ {
+ if (is != null)
+ {
+ reader = new InputStreamReader(is, "UTF-8");
+ newReader = true;
+ }
+ else return;
+ }
+ }
+
+ char[] cbuf = new char[1024];
+ int len = reader.read(cbuf);
+ int off = 0;
+
+ if (len == -1)
+ throw new IOException(BundleUtils.getMessage(bundle, "STREAMSOURCE_ALREADY_EXHAUSTED"));
+
+ // Remove XML processing instruction
+ String xmlProc = new String(cbuf, 0, XML_PROC.length());
+ if (XML_PROC.equals(xmlProc))
+ {
+ off = XML_PROC.length();
+ while (cbuf[off] != '>' && off < len)
+ off++;
+
+ if (cbuf[off] != '>')
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_FIND_END_INSTRUCTION"));
+
+ off++;
+ len -= off;
+ }
+
+ while (len > 0)
+ {
+ writer.write(cbuf, off, len);
+ len = reader.read(cbuf);
+ off = 0;
+ }
+
+ if (newReader)
+ reader.close();
+ }
+ else
+ {
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_SOURCE_TYPE", source));
+ }
+
+ endSourceAccess();
+ }
+ catch (IOException ex)
+ {
+ handleSourceAccessException(ex);
+ }
+ }
+
+ private Source beginSourceAccess(Source source)
+ {
+ // no need to buffer those
+ if (source instanceof BufferedStreamSource || source instanceof DOMSource)
+ return source;
+
+ // Buffer the source content
+ if (source instanceof StreamSource)
+ {
+ source = new BufferedStreamSource((StreamSource)source);
+ }
+ else
+ {
+ try
+ {
+ Element element = DOMUtils.sourceToElement(source);
+ source = element != null ? new DOMSource(element) : new DOMSource();
+ }
+ catch (IOException ex)
+ {
+ WSException.rethrow(ex);
+ }
+ }
+
+ return source;
+ }
+
+ private void endSourceAccess()
+ {
+ // Create the marker exception
+ if (source instanceof StreamSource)
+ {
+ streamSourceAccessMarker = new RuntimeException();
+ }
+ }
+
+ private void handleSourceAccessException(IOException ex)
+ {
+ if (source instanceof StreamSource && streamSourceAccessMarker != null)
+ {
+ log.error(BundleUtils.getMessage(bundle, "STREAMSOURCE_WAS_PREVIOUSLY_ACCESSED"), streamSourceAccessMarker);
+ }
+ WSException.rethrow(ex);
+ }
+
+ public String toString()
+ {
+ return "[source=" + source + "]";
+ }
+}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/SAAJUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/SAAJUtils.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/SAAJUtils.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -80,7 +80,7 @@
* @param nsURI the URI of the namespace to search for
* @return the prefix of the namespace or <code>null</code> if not found
*/
- public static String getNamespacePrefix(SOAPElement element, String nsURI)
+ private static String getNamespacePrefix(SOAPElement element, String nsURI)
{
Iterator it = element.getVisibleNamespacePrefixes();
while (it.hasNext())
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -32,7 +32,6 @@
import javax.xml.rpc.ParameterMode;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.JavaUtils;
@@ -413,8 +412,7 @@
public void eagerInitialize()
{
- // Call eagerInitialize(List<Method> unsynchronizedMethods) instead
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
/**
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/DOMTypes.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/DOMTypes.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/DOMTypes.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.util.NotImplementedException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -56,6 +55,6 @@
public QName getXMLType(QName name)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -32,7 +32,6 @@
import org.apache.xerces.xs.XSNamedMap;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.api.util.BundleUtils;
/**
@@ -243,6 +242,6 @@
public XSObjectList getAnnotations()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -55,7 +55,6 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
@@ -754,6 +753,6 @@
public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0)
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -28,7 +28,6 @@
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSModelGroup;
import org.apache.xerces.xs.XSObjectList;
-import org.jboss.util.NotImplementedException;
/**
* Implements a ModelGroup of the Xerces Schema API
@@ -109,6 +108,6 @@
public XSObjectList getAnnotations()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -25,7 +25,6 @@
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSParticle;
import org.apache.xerces.xs.XSTerm;
-import org.jboss.util.NotImplementedException;
/**
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
@@ -137,6 +136,6 @@
public XSObjectList getAnnotations()
{
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -33,7 +33,6 @@
import javax.wsdl.Definition;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
@@ -107,7 +106,7 @@
}
else
{
- throw new NotImplementedException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WSDL20"));
+ throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WSDL20"));
}
}
catch (RuntimeException rte)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -23,8 +23,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -44,7 +42,6 @@
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -37,8 +37,8 @@
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.SOAPElementImpl;
-import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.soap.utils.Style;
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2012-04-13 10:58:22 UTC (rev 16159)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2012-04-13 11:54:57 UTC (rev 16160)
@@ -22,7 +22,8 @@
package org.jboss.test.ws.common.soap;
import junit.framework.TestCase;
-import org.jboss.ws.core.soap.XMLFragment;
+
+import org.jboss.ws.core.soap.utils.XMLFragment;
import org.jboss.ws.common.DOMUtils;
import org.jboss.ws.common.DOMWriter;
import org.w3c.dom.Element;
More information about the jbossws-commits
mailing list