[jbossws-commits] JBossWS SVN: r16093 - in stack/native/trunk: modules/core and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 4 08:41:52 EDT 2012
Author: ropalka
Date: 2012-04-04 08:41:50 -0400 (Wed, 04 Apr 2012)
New Revision: 16093
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.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/jaxrpc/SOAPFaultHelperJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3474] removing jaxws-api dependencies
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/pom.xml 2012-04-04 12:41:50 UTC (rev 16093)
@@ -13,13 +13,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
- </properties>
-
<!-- Dependencies -->
<dependencies>
-
+
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -74,12 +70,8 @@
<artifactId>xercesImpl</artifactId>
<scope>provided</scope>
</dependency>
- <!-- transitve dependencies -->
+ <!-- transitive dependencies -->
<dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -112,37 +104,6 @@
<!-- Build -->
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -23,8 +23,6 @@
import java.util.Observable;
-import javax.xml.ws.soap.SOAPBinding;
-
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC;
import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC;
@@ -41,7 +39,16 @@
public class CommonBindingProvider implements Configurable
{
private static Logger log = Logger.getLogger(CommonBindingProvider.class);
+ /**
+ * A constant representing the identity of the SOAP 1.1 over HTTP binding.
+ */
+ private static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http";
+ /**
+ * A constant representing the identity of the SOAP 1.2 over HTTP binding.
+ */
+ private static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
+
protected EndpointMetaData epMetaData;
protected CommonBinding binding;
@@ -70,11 +77,11 @@
protected void initBinding(String bindingId)
{
- if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
+ if (SOAP11HTTP_BINDING.equals(bindingId))
{
binding = new SOAP11BindingJAXRPC();
}
- else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ else if (SOAP12HTTP_BINDING.equals(bindingId))
{
binding = new SOAP12BindingJAXRPC();
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -23,7 +23,6 @@
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.ResourceBundle;
@@ -32,7 +31,6 @@
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
@@ -64,12 +62,9 @@
// The Message in this message context
private MessageAbstraction message;
// The map of scoped properties
- protected Map<String, ScopedProperty> scopedProps = new HashMap<String, ScopedProperty>();
- // The current property scope
- protected Scope currentScope = Scope.APPLICATION;
+ protected Map<String, Object> props = new HashMap<String, Object>();
private boolean isModified;
- private Throwable currentException;
public CommonMessageContext()
{
@@ -82,30 +77,9 @@
this.opMetaData = msgContext.opMetaData;
this.message = msgContext.message;
this.serContext = msgContext.serContext;
- this.scopedProps = new HashMap<String, ScopedProperty>(msgContext.scopedProps);
- this.currentScope = msgContext.currentScope;
+ this.props = new HashMap<String, Object>(msgContext.props);
}
- public Throwable getCurrentException()
- {
- return currentException;
- }
-
- public void setCurrentException(Throwable t)
- {
- this.currentException = t;
- }
-
- public Scope getCurrentScope()
- {
- return currentScope;
- }
-
- public void setCurrentScope(Scope currentScope)
- {
- this.currentScope = currentScope;
- }
-
public EndpointMetaData getEndpointMetaData()
{
if (epMetaData == null && opMetaData != null)
@@ -174,73 +148,62 @@
return getSerializationContext().getNamespaceRegistry();
}
+ public boolean isModified()
+ {
+ return isModified;
+ }
+
+ /**
+ * Mark a message as 'modified' when the SAAJ model becomes stale.
+ * This may be the case when:
+ * <ul>
+ * <li>the complete message is replaced at MessageContext level
+ * <li>the payload is set on a LogicalMessage
+ * <li>The SAAJ model is changed though the DOM or SAAJ API (handler)
+ * </ul>
+ *
+ * In any of these cases another 'unbind' invocation is required.
+ */
+ public void setModified(boolean modified)
+ {
+ isModified = modified;
+ }
+
// Map interface
public int size()
{
- return scopedProps.size();
+ return props.size();
}
public boolean isEmpty()
{
- return scopedProps.isEmpty();
+ return props.isEmpty();
}
public boolean containsKey(Object key)
{
- ScopedProperty prop = scopedProps.get(key);
- return isValidInScope(prop);
+ return props.containsKey(key);
}
public boolean containsValue(Object value)
{
- boolean valueFound = false;
- for (ScopedProperty prop : scopedProps.values())
- {
- if (prop.getValue().equals(value) && isValidInScope(prop))
- {
- valueFound = true;
- break;
- }
- }
- return valueFound;
+ return props.containsValue(value);
}
public Object get(Object key)
{
- Object value = null;
-
- ScopedProperty scopedProp = scopedProps.get(key);
- if (log.isTraceEnabled())
- log.trace("get(" + key + "): " + scopedProp);
-
- if (isValidInScope(scopedProp))
- value = scopedProp.getValue();
-
- return value;
+ return props.get(key);
}
public Object put(String key, Object value)
{
- ScopedProperty prevProp = scopedProps.get(key);
- if (prevProp != null && !isValidInScope(prevProp))
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_SET_VALUE_FOR_HANDLER_SCOPED_PROPERTY", key));
-
- ScopedProperty newProp = new ScopedProperty(key, value, currentScope);
- if (log.isTraceEnabled())
- log.trace("put: " + newProp);
-
- scopedProps.put(key, newProp);
- return prevProp != null ? prevProp.getValue() : null;
+ return props.put(key, value);
}
public Object remove(Object key)
{
- ScopedProperty prevProp = scopedProps.get(key);
- if (prevProp != null && !isValidInScope(prevProp))
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_SET_REMOVE_FOR_HANDLER_SCOPED_PROPERTY", key));
-
- return scopedProps.remove(key);
+ return props.remove(key);
}
public void putAll(Map<? extends String, ? extends Object> srcMap)
@@ -262,75 +225,23 @@
public void clear()
{
- scopedProps.clear();
+ props.clear();
}
-
- public boolean isModified()
- {
- return isModified;
- }
-
- /**
- * Mark a message as 'modified' when the SAAJ model becomes stale.
- * This may be the case when:
- * <ul>
- * <li>the complete message is replaced at MessageContext level
- * <li>the payload is set on a LogicalMessage
- * <li>The SAAJ model is changed though the DOM or SAAJ API (handler)
- * </ul>
- *
- * In any of these cases another 'unbind' invocation is required.
- */
- public void setModified(boolean modified)
- {
- isModified = modified;
- }
-
public Set<String> keySet()
{
- Set<String> keys = new HashSet<String>(scopedProps.size());
- for (ScopedProperty prop : scopedProps.values())
- {
- if (isValidInScope(prop))
- keys.add(prop.getName());
- }
- return keys;
+ return props.keySet();
}
public Collection<Object> values()
{
- Collection<Object> values = new HashSet<Object>(scopedProps.size());
- for (ScopedProperty prop : scopedProps.values())
- {
- if (isValidInScope(prop))
- values.add(prop.getValue());
- }
- return values;
+ return props.values();
}
public Set<Entry<String, Object>> entrySet()
{
- Set<Entry<String, Object>> entries = new HashSet<Entry<String, Object>>();
- for (ScopedProperty prop : scopedProps.values())
- {
- if (isValidInScope(prop))
- {
- String name = prop.getName();
- Object value = prop.getValue();
- Entry<String, Object> entry = new ImmutableEntry<String, Object>(name, value);
- entries.add(entry);
- }
- }
- return entries;
+ return props.entrySet();
}
- private boolean isValidInScope(ScopedProperty prop)
- {
- // A property of scope APPLICATION is always visible
- boolean valid = (prop != null && (prop.getScope() == Scope.APPLICATION || currentScope == Scope.HANDLER));
- return valid;
- }
-
public static void cleanupAttachments(CommonMessageContext messageContext)
{
// cleanup attachments
@@ -357,65 +268,4 @@
}
}
}
-
- private static class ImmutableEntry<K, V> implements Map.Entry<K, V>
- {
- final K k;
- final V v;
-
- ImmutableEntry(K key, V value)
- {
- k = key;
- v = value;
- }
-
- public K getKey()
- {
- return k;
- }
-
- public V getValue()
- {
- return v;
- }
-
- public V setValue(V value)
- {
- throw new UnsupportedOperationException();
- }
- }
-
- public static class ScopedProperty
- {
- private Scope scope;
- private String name;
- private Object value;
-
- public ScopedProperty(String name, Object value, Scope scope)
- {
- this.scope = scope;
- this.name = name;
- this.value = value;
- }
-
- public String getName()
- {
- return name;
- }
-
- public Scope getScope()
- {
- return scope;
- }
-
- public Object getValue()
- {
- return value;
- }
-
- public String toString()
- {
- return scope + ":" + name + "=" + value;
- }
- }
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -1,33 +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;
-
-/**
- * A generic HTTP message
- *
- * @author Thomas.Diesler at jboss.com
- * @since 02-Apr-2007
- */
-public interface HTTPMessageAbstraction extends MessageAbstraction
-{
-
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -1,120 +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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.soap.XMLFragment;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * A generic HTTP message
- *
- * @author Thomas.Diesler at jboss.com
- * @since 02-Apr-2007
- */
-public class HTTPMessageImpl implements HTTPMessageAbstraction
-{
- private MimeHeaders mimeHeaders;
- private XMLFragment xmlFragment;
-
- public HTTPMessageImpl(MimeHeaders mimeHeaders, InputStream inputStream)
- {
- this.mimeHeaders = mimeHeaders;
- this.xmlFragment = new XMLFragment(new StreamSource(inputStream));
- }
-
- public HTTPMessageImpl(Source source)
- {
- this.mimeHeaders = new MimeHeaders();
- this.xmlFragment = new XMLFragment(source);
-
- initDefaultMimeHeaders();
- }
-
- public HTTPMessageImpl(Result result)
- {
- this.mimeHeaders = new MimeHeaders();
- this.xmlFragment = new XMLFragment(result);
-
- initDefaultMimeHeaders();
- }
-
- // TCL requirement
- public boolean doValidate()
- {
- this.xmlFragment.toElement();
- return true;
- }
-
- private void initDefaultMimeHeaders()
- {
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_XML_UTF8);
- }
-
- public XMLFragment getXmlFragment()
- {
- return xmlFragment;
- }
-
- public void setXmlFragment(XMLFragment xmlFragment)
- {
- this.xmlFragment = xmlFragment;
- }
-
- public MimeHeaders getMimeHeaders()
- {
- if (mimeHeaders == null)
- mimeHeaders = new MimeHeaders();
-
- return mimeHeaders;
- }
-
- public void setMimeHeaders(MimeHeaders mimeHeaders)
- {
- this.mimeHeaders = mimeHeaders;
- }
-
- public void writeTo(OutputStream outputStream) throws IOException
- {
- xmlFragment.writeTo(outputStream);
- }
-
- public boolean isFaultMessage()
- {
- return false;
- }
-
- public void addAttachmentPart(AttachmentPart part)
- {
- throw new NotImplementedException();
- }
-}
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-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -73,13 +73,6 @@
msgLog.error(BundleUtils.getMessage(bundle, "CANNOT_TRACE_SOAPMESSAGE"), ex);
}
}
- else if (message instanceof HTTPMessageImpl)
- {
- HTTPMessageImpl httpMessage = (HTTPMessageImpl)message;
- Element root = httpMessage.getXmlFragment().toElement();
- String xmlString = DOMWriter.printNode(root, true);
- msgLog.trace(messagePrefix + "\n" + xmlString);
- }
else if (message instanceof byte[])
{
Element root = new XMLFragment(new StreamSource(new ByteArrayInputStream((byte[])message))).toElement();
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-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -41,7 +41,6 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -79,6 +78,10 @@
private static final ResourceBundle bundle = BundleUtils.getBundle(SOAPFaultHelperJAXRPC.class);
// provide logging
private static Logger log = Logger.getLogger(SOAPFaultHelperJAXRPC.class);
+ /**
+ * A constant representing the identity of the SOAP 1.2 over HTTP binding.
+ */
+ private static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
private static List<QName> allowedFaultCodes = new ArrayList<QName>();
static
@@ -326,7 +329,7 @@
{
EndpointMetaData emd = msgContext.getEndpointMetaData();
String bindingId = emd.getBindingId();
- if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ if (SOAP12HTTP_BINDING.equals(bindingId))
{
return true;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -33,7 +33,6 @@
import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.http.HTTPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
@@ -357,51 +356,39 @@
{
OperationMetaData opMetaData;
- String bindingID = epMetaData.getBindingId();
- if (HTTPBinding.HTTP_BINDING.equals(bindingID))
- {
- if (epMetaData.getOperations().size() != 1)
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "MULTIPLE_OPERATIONS_NOT_SUPPORTED"));
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)reqMessage;
+ opMetaData = soapMessage.getOperationMetaData(epMetaData);
+ SOAPHeader soapHeader = soapMessage.getSOAPHeader();
- opMetaData = epMetaData.getOperations().get(0);
- }
- else
+ // Report a MustUnderstand fault
+ if (opMetaData == null)
{
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)reqMessage;
+ String faultString;
- opMetaData = soapMessage.getOperationMetaData(epMetaData);
- SOAPHeader soapHeader = soapMessage.getSOAPHeader();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ if (soapBodyElement != null)
+ {
+ Name soapName = soapBodyElement.getElementName();
+ faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName;
+ }
+ else
+ {
+ faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for empty soap body";
+ }
- // Report a MustUnderstand fault
- if (opMetaData == null)
- {
- String faultString;
-
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
- if (soapBodyElement != null)
- {
- Name soapName = soapBodyElement.getElementName();
- faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName;
- }
- else
- {
- faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for empty soap body";
- }
-
- // R2724 If an INSTANCE receives a message that is inconsistent with its WSDL description, it SHOULD generate a soap:Fault
- // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated.
- if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext())
- {
- QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND;
- throw new CommonSOAPFaultException(faultCode, faultString);
- }
- else
- {
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new CommonSOAPFaultException(faultCode, faultString);
- }
- }
+ // R2724 If an INSTANCE receives a message that is inconsistent with its WSDL description, it SHOULD generate a soap:Fault
+ // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated.
+ if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext())
+ {
+ QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND;
+ throw new CommonSOAPFaultException(faultCode, faultString);
+ }
+ else
+ {
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, faultString);
+ }
}
return opMetaData;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-04 12:41:50 UTC (rev 16093)
@@ -43,7 +43,6 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
-import javax.xml.ws.http.HTTPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -55,7 +54,6 @@
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPFaultException;
-import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.core.binding.BindingException;
@@ -356,18 +354,9 @@
MessageAbstraction reqMessage;
- String bindingID = sepMetaData.getBindingId();
- if (HTTPBinding.HTTP_BINDING.equals(bindingID))
- {
- reqMessage = new HTTPMessageImpl(headers, inputStream);
- }
- else
- {
- msgFactory.setStyle(sepMetaData.getStyle());
+ msgFactory.setStyle(sepMetaData.getStyle());
+ reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream);
- reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream);
- }
-
// Associate current message with message context
msgContext.setMessageAbstraction(reqMessage);
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-04 12:41:50 UTC (rev 16093)
@@ -84,17 +84,6 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-shared-testsuite:jar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>test</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<includes>
<include>org.codehaus.woodstox:wstx-lgpl:jar</include>
@@ -105,16 +94,6 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
- <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
- <includes>
- <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
- </includes>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
<outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
<includes>
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-04 12:41:50 UTC (rev 16093)
@@ -35,7 +35,6 @@
<module name="javax.wsdl4j.api" />
<module name="javax.xml.stream.api" />
<module name="javax.xml.rpc.api" />
- <module name="javax.xml.ws.api" />
<module name="org.apache.xerces" services="import"/>
<module name="org.javassist" />
<module name="org.jboss.netty" />
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-04-04 10:56:53 UTC (rev 16092)
+++ stack/native/trunk/pom.xml 2012-04-04 12:41:50 UTC (rev 16093)
@@ -68,7 +68,6 @@
<ejb.api.version>1.0.1.Final</ejb.api.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.15.0-GA</javassist.version>
- <jaxws.api.version>2.0.0.Final</jaxws.api.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<saaj.api.version>1.0.1.Final</saaj.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
@@ -173,11 +172,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>${jaxws.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
<version>${ejb.api.version}</version>
@@ -266,13 +260,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <type>zip</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -408,29 +395,6 @@
</profile>
<!--
- Name: smoketest
- Descr: Executes the smoke tests
- -->
- <profile>
- <id>smoketest</id>
- <modules>
- <module>modules/testsuite</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/jboss/test/ws/jaxws/samples/**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: testsuite
Descr: Executes the testsuite
-->
More information about the jbossws-commits
mailing list