[jbossws-commits] JBossWS SVN: r16140 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 18 other directories.

Author: ropalka Date: 2012-04-10 05:54:01 -0400 (Tue, 10 Apr 2012) New Revision: 16140 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1179/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8668] Merged revisions 16091-16093,16095,16103 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16091 | ropalka | 2012-04-04 12:19:40 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] removing javax.jws dependency ....... r16092 | ropalka | 2012-04-04 12:56:53 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] trim down jaxws-api dependencies ....... r16093 | ropalka | 2012-04-04 14:41:50 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] removing jaxws-api dependencies ....... r16095 | ropalka | 2012-04-04 15:05:15 +0200 (Wed, 04 Apr 2012) | 1 line removing tests that will never be fixed ....... r16103 | ropalka | 2012-04-05 10:34:35 +0200 (Thu, 05 Apr 2012) | 1 line [JBWS-3474] fixing regression ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -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,16 +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>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -116,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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -23,9 +23,6 @@ import java.util.Observable; -import javax.xml.ws.EndpointReference; -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; @@ -42,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; @@ -71,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(); } @@ -86,11 +92,6 @@ return binding; } - public EndpointReference getEndpointReference() - { - throw new UnsupportedOperationException(); - } - public void update(Observable observable, Object object) { if(log.isDebugEnabled()) log.debug("Update config: " + object); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -35,8 +35,6 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPException; -import javax.xml.ws.ProtocolException; -import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -312,13 +310,9 @@ if (maintainSession) addSessionInfo(reqMessage, callProps); - propagateRequestHeaders(reqMessage, msgContext); - RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo); MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway); - propagateResponseHeaders(callProps, msgContext); - if (maintainSession) saveSessionInfo(callProps, requestCtx); @@ -374,25 +368,16 @@ } catch (Exception ex) { - Boolean isOutbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (oneway && isOutbound && ex instanceof ProtocolException) - { - //swallow the outbound SOAPException threw in hanlders - return null; - } - else - { - log.error(BundleUtils.getMessage(bundle, "EXCEPTION_CAUGHT_WHILE_(PREPARING_FOR)_PERFORMING_THE_INVOCATION"), ex); - // Reverse the message direction - processPivotInternal(msgContext, direction); - if (faultType[2] != null) - callFaultHandlerChain(portName, faultType[2], ex); - if (faultType[1] != null) - callFaultHandlerChain(portName, faultType[1], ex); - if (faultType[0] != null) - callFaultHandlerChain(portName, faultType[0], ex); - throw ex; - } + log.error(BundleUtils.getMessage(bundle, "EXCEPTION_CAUGHT_WHILE_(PREPARING_FOR)_PERFORMING_THE_INVOCATION"), ex); + // Reverse the message direction + processPivotInternal(msgContext, direction); + if (faultType[2] != null) + callFaultHandlerChain(portName, faultType[2], ex); + if (faultType[1] != null) + callFaultHandlerChain(portName, faultType[1], ex); + if (faultType[0] != null) + callFaultHandlerChain(portName, faultType[0], ex); + throw ex; } finally { @@ -402,11 +387,6 @@ } } - private void propagateResponseHeaders(Map<String, Object> remotingMetadata, Map<String, Object> responseContext) - { - responseContext.put(MessageContext.HTTP_RESPONSE_HEADERS, remotingMetadata.get(NettyClient.RESPONSE_HEADERS)); - } - @SuppressWarnings({"unchecked", "rawtypes"}) private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext) { @@ -463,35 +443,6 @@ } } - @SuppressWarnings("unchecked") - private void propagateRequestHeaders(MessageAbstraction reqMessage, CommonMessageContext callProperties) - { - Map<String, List<String>> requestHeaders = (Map<String, List<String>>)callProperties.get(MessageContext.HTTP_REQUEST_HEADERS); - if (requestHeaders != null) - { - for (Map.Entry<String, List<String>> header : requestHeaders.entrySet()) - { - final String key = header.getKey(); - final List<String> values = header.getValue(); - - if (key != null) - { - final StringBuilder sb = new StringBuilder(); - for (int i = 0; i < values.size(); i++) - { - boolean addLWS = (i != (values.size() - 1)); - sb.append(values.get(i)); - if (addLWS) - { - sb.append("\r\n "); - } - } - reqMessage.getMimeHeaders().addHeader(key, sb.toString()); - } - } - } - } - private CommonMessageContext processPivotInternal(CommonMessageContext msgContext, DirectionHolder direction) { if (direction.getDirection() == Direction.OutBound) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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(a)jboss.com - * @since 02-Apr-2007 - */ -public interface HTTPMessageAbstraction extends MessageAbstraction -{ - -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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(a)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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -25,10 +25,7 @@ import java.util.Map; import java.util.Properties; -import javax.xml.ws.WebServiceFeature; - import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FeatureSet; /** A wrapper object that associates the target address with some metadata * @@ -39,11 +36,9 @@ { private String targetAddress; private Map<String, Object> properties; - private FeatureSet features; public EndpointInfo(EndpointMetaData epMetaData, String targetAddress, Map<String, Object> callProps) { - this.features = epMetaData.getFeatures(); this.targetAddress = this.lowerCaseProtocol(targetAddress); this.properties = callProps; @@ -84,11 +79,6 @@ return targetAddress; } - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - return features.isFeatureEnabled(key); - } - public boolean equals(Object obj) { if (!(obj instanceof EndpointInfo)) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -38,7 +38,6 @@ import javax.net.ssl.SSLEngine; import javax.xml.rpc.Stub; -import javax.xml.ws.BindingProvider; import org.jboss.logging.Logger; import org.jboss.netty.buffer.ChannelBuffer; @@ -398,11 +397,6 @@ authType = StubExt.PROPERTY_AUTH_TYPE_BASIC; String username = (String)callProps.get(Stub.USERNAME_PROPERTY); String password = (String)callProps.get(Stub.PASSWORD_PROPERTY); - if (username == null || password == null) - { - username = (String)callProps.get(BindingProvider.USERNAME_PROPERTY); - password = (String)callProps.get(BindingProvider.PASSWORD_PROPERTY); - } if (username != null && password != null) { if (authType.equals(StubExt.PROPERTY_AUTH_TYPE_BASIC)) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-10 09:54:01 UTC (rev 16140) @@ -3,7 +3,7 @@ INVALID_NAMESPACE_FOR_TYPE=Invalid namespace for type: {0} MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available UNEXPECTED_STYLE=Unexpected style: {0} -UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style: {0} +UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style CANNOT_WRAP_REQUEST_STRUCTURE=Cannot wrap request structure: {0} REQUEST_STRUCT_CANNOT_BE_NULL=Request struct cannot be null CANNOT_UNWRAP_REQUEST_STRUCTURE=Cannot unwrap request structure: {0} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -35,7 +35,6 @@ import javassist.LoaderClassPath; import javassist.Modifier; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import org.jboss.logging.Logger; @@ -73,8 +72,8 @@ if (opMetaData.getStyle() != Style.DOCUMENT) throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_STYLE", opMetaData.getStyle())); - if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED) - throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE", opMetaData.getParameterStyle())); + if (!opMetaData.isWrappedParameterStyle()) + throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE")); } private static Object holderValue(Object holder) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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; @@ -58,13 +57,10 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** An implementation handles invocations on the endpoint @@ -82,14 +78,6 @@ protected CommonBindingProvider bindingProvider; protected ServerHandlerDelegate delegate; - private WebServiceContextFactory contextFactory; - - public ServiceEndpointInvoker() - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - contextFactory = spiProvider.getSPI(WebServiceContextFactory.class); - } - /** Initialize the service endpoint */ public void init(Endpoint endpoint) { @@ -368,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/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -38,8 +38,6 @@ import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.WebServiceFeature; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -48,7 +46,6 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder; -import org.jboss.ws.metadata.umdm.FeatureSet; /** * MessageFactory implementation @@ -63,12 +60,8 @@ // The envelope namespace used by the MessageFactory private String envNamespace; - // The JAXWS ServiceMode - private Mode serviceMode; // The style used by this MessageFactory private Style style; - // The features used by this MessageFactory - private FeatureSet features = new FeatureSet(); // Used if the style is dynamic private boolean dynamic; @@ -127,26 +120,6 @@ this.style = style; } - public Mode getServiceMode() - { - return serviceMode; - } - - public void setServiceMode(Mode serviceMode) - { - this.serviceMode = serviceMode; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.addFeature(feature); - } - - public void setFeatures(FeatureSet features) - { - this.features = features; - } - /** * Creates a new SOAPMessage object with the default SOAPPart, SOAPEnvelope, * SOAPBody, and SOAPHeader objects. Profile-specific message factories can Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -55,13 +55,6 @@ OperationMetaData opMetaData = null; boolean debugEnabled = log.isDebugEnabled(); - // Dispatch to JAXWS Provider - if (opMetaData == null && epMetaData.getServiceMode() != null) - { - QName xmlName = new QName(epMetaData.getPortName().getNamespaceURI(), "invoke"); - opMetaData = epMetaData.getOperation(xmlName); - } - // Dispatch based on SOAPBodyElement name if (opMetaData == null) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -22,7 +22,6 @@ package org.jboss.ws.core.utils; import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; @@ -72,7 +71,7 @@ /** True if the given type is a holder. */ public static boolean isHolderType(Class javaType) { - return javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType) || javax.xml.ws.Holder.class.isAssignableFrom(javaType); + return javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType); } /** True if the given type is a holder. */ @@ -154,13 +153,9 @@ Class holderClass = JavaUtils.erasure(holderType); boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass); - boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass); - if (!jaxrpcHolder && !jaxwsHolder) + if (!jaxrpcHolder) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holderClass.getName())); - if (jaxwsHolder) - return JavaUtils.erasure(getGenericValueType(holderType)); - // Holder is supposed to have a public value field. Field field; try @@ -186,14 +181,9 @@ public static Class getValueType(Class holderClass) { boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass); - boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass); - if (!jaxrpcHolder && !jaxwsHolder) + if (!jaxrpcHolder) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holderClass.getName())); - // No generic info - if (jaxwsHolder) - return Object.class; - // Holder is supposed to have a public value field. Field field; try @@ -219,7 +209,7 @@ if (holder == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "ILLEGAL_NULL_PARAMETER")); - if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder)) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holder)); try @@ -251,7 +241,7 @@ if (holder == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "HOLDER_INSTANCE_WAS_NULL")); - if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder)) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holder)); Class valueType = getValueType(holder.getClass()); @@ -279,24 +269,6 @@ } /** - * Gets the generic value type of a JAX-WS Holder. - * If there is no generic information, Object.class will be returned - * - * @param holder JAX-WS holder type - * @return generic value type - */ - public static Type getGenericValueType(Type holder) - { - // For some reason the JDK 4 bytecode verifier trips up on this function if you use the ternary operator - // The only difference between it and the working form here is the use of a goto instruction. JDK bug perhaps? - if (holder instanceof ParameterizedType) - return ((ParameterizedType)holder).getActualTypeArguments()[0]; - - return Object.class; - } - - - /** * Creates a JAX-WS or JAX-RPC holder instance. * * @param value the value instance Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -27,7 +27,6 @@ import java.util.Map; import java.util.ResourceBundle; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMappingRegistry; @@ -590,7 +589,7 @@ // Check if we need to wrap the parameters boolean isWrapped = isWrapped(seiMethodMapping, javaTypeName); - operation.getEndpointMetaData().setParameterStyle(isWrapped ? ParameterStyle.WRAPPED : ParameterStyle.BARE); + operation.getEndpointMetaData().setWrappedParameterStyle(Boolean.valueOf(isWrapped)); ParameterMetaData inMetaData = new ParameterMetaData(operation, xmlName, xmlType, javaTypeName); operation.addParameter(inMetaData); @@ -852,7 +851,7 @@ else { // Set the default to bare in case there isn't an input object, revisit this - opMetaData.getEndpointMetaData().setParameterStyle(ParameterStyle.BARE); + opMetaData.getEndpointMetaData().setWrappedParameterStyle(Boolean.FALSE); } if (wsdlOperation.getOutputs().length > 0) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -37,11 +37,8 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.WebServiceFeature; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -109,15 +106,11 @@ // The SOAPBinding use private Use use; // The SOAPBinding parameter style - private ParameterStyle parameterStyle; - // The JAXWS ServiceMode - private Mode serviceMode; + private Boolean wrappedParameterStyle; // The list of service meta data private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - // The features defined for this endpoint - private FeatureSet features = new FeatureSet(); private ConfigObservable configObservable = new ConfigObservable(); @@ -267,37 +260,23 @@ this.style = value; } - public ParameterStyle getParameterStyle() + public boolean isWrappedParameterStyle() { - if (parameterStyle == null) + if (wrappedParameterStyle == null) { - parameterStyle = ParameterStyle.WRAPPED; - if (log.isDebugEnabled()) - log.debug("Using default parameter style: " + parameterStyle); + wrappedParameterStyle = Boolean.TRUE; } - return parameterStyle; + return wrappedParameterStyle; } - public void setParameterStyle(ParameterStyle value) + public void setWrappedParameterStyle(final Boolean value) { - if (value != null && parameterStyle != null && !parameterStyle.equals(value)) + if (value != null && wrappedParameterStyle != null && !wrappedParameterStyle.equals(value)) throw new WSException(BundleUtils.getMessage(bundle, "MIXED_SOAP_PARAMETER_STYLES_NOT_SUPPORTED")); - if (log.isDebugEnabled()) - log.debug("setParameterStyle: " + value); - this.parameterStyle = value; + this.wrappedParameterStyle = value; } - public Mode getServiceMode() - { - return serviceMode; - } - - public void setServiceMode(Mode serviceMode) - { - this.serviceMode = serviceMode; - } - public String getAuthMethod() { return authMethod; @@ -320,26 +299,6 @@ this.properties = properties; } - public <T extends WebServiceFeature> T getFeature(Class<T> key) - { - return features.getFeature(key); - } - - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - return features.isFeatureEnabled(key); - } - - public FeatureSet getFeatures() - { - return features; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.addFeature(feature); - } - public List<OperationMetaData> getOperations() { return new ArrayList<OperationMetaData>(operations); @@ -523,6 +482,7 @@ { TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); List<TypeMappingMetaData> typeMappings = serviceMetaData.getTypesMetaData().getTypeMappings(); + List<Class> registeredTypes = new ArrayList<Class>(typeMappings.size()); for (TypeMappingMetaData tmMetaData : typeMappings) { String javaTypeName = tmMetaData.getJavaTypeName(); @@ -531,27 +491,44 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); - try + // TODO: Clarification. In which cases is the type already registered? + boolean registered = false; + for (Class current : types) { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + if (current.getName().equals(javaTypeName)) + { + registeredTypes.add(current); + registered = true; + break; + } + } - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); - - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + if (registered == false) + { + try { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); + + registeredTypes.add(javaType); + + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + } + else + { + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + } } - else + catch (ClassNotFoundException e) { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); } } - catch (ClassNotFoundException e) - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); - } } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -28,7 +28,6 @@ import java.util.ResourceBundle; import javax.xml.namespace.QName; -import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -228,7 +227,7 @@ } catch (InstantiationException e) { - throw new WebServiceException(BundleUtils.getMessage(bundle, "FAULT_BEAN_CLASS_IS_NOT_INSTANTIABLE"), e); + throw new WSException(BundleUtils.getMessage(bundle, "FAULT_BEAN_CLASS_IS_NOT_INSTANTIABLE"), e); } // copy the properties from the service exception to the fault bean @@ -247,11 +246,11 @@ } catch (IllegalAccessException e) { - throw new WebServiceException(e); + throw new WSException(e); } catch (InvocationTargetException e) { - throw new WebServiceException(e.getTargetException()); + throw new WSException(e.getTargetException()); } return faultBeanInstance; } @@ -288,15 +287,15 @@ } catch (InstantiationException e) { - throw new WebServiceException(BundleUtils.getMessage(bundle, "EXCEPTION_IS_NOT_INSTANTIABLE"), e); + throw new WSException(BundleUtils.getMessage(bundle, "EXCEPTION_IS_NOT_INSTANTIABLE"), e); } catch (IllegalAccessException e) { - throw new WebServiceException(e); + throw new WSException(e); } catch (InvocationTargetException e) { - throw new WebServiceException(e.getTargetException()); + throw new WSException(e.getTargetException()); } return serviceException; } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,79 +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.metadata.umdm; - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.ws.WebServiceFeature; - -/** - * A component that maintains a set of web service features - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class FeatureSet -{ - // The features defined for this endpoint - private Set<WebServiceFeature> features = new HashSet<WebServiceFeature>(); - - public <T extends WebServiceFeature> boolean hasFeature(Class<T> key) - { - return getFeature(key) != null; - } - - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - T feature = getFeature(key); - return (feature != null ? feature.isEnabled() : false); - } - - public <T extends WebServiceFeature> T getFeature(Class<T> key) - { - for (WebServiceFeature feature : features) - { - if (key == feature.getClass()) - return (T)feature; - } - return null; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.add(feature); - } - - public WebServiceFeature[] getFeatures() - { - final WebServiceFeature[] retVal = new WebServiceFeature[this.features.size()]; - - int i = 0; - for (final WebServiceFeature feature : this.features) - { - retVal[i++] = feature; - } - - return retVal; - } - -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -28,7 +28,6 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; @@ -63,7 +62,6 @@ private Method javaMethod; private boolean oneWay; private String soapAction; - private ParameterStyle parameterStyle; private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); private ParameterMetaData returnParam; @@ -125,16 +123,11 @@ return epMetaData.getEncodingStyle(); } - public ParameterStyle getParameterStyle() + public boolean isWrappedParameterStyle() { - return (parameterStyle != null) ? parameterStyle : epMetaData.getParameterStyle(); + return epMetaData.isWrappedParameterStyle(); } - public void setParameterStyle(ParameterStyle parameterStyle) - { - this.parameterStyle = parameterStyle; - } - public boolean isRPCLiteral() { return getStyle() == Style.RPC && getUse() == Use.LITERAL; @@ -145,14 +138,9 @@ return getStyle() == Style.RPC && getUse() == Use.ENCODED; } - public boolean isDocumentBare() - { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE; - } - public boolean isDocumentWrapped() { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.WRAPPED; + return getStyle() == Style.DOCUMENT && isWrappedParameterStyle(); } public void setJavaName(String javaName) @@ -414,33 +402,6 @@ } } - public void assertDocumentBare() - { - if (isDocumentBare()) - { - int in = 0; - int out = 0; - - for (ParameterMetaData paramMetaData : parameters) - { - if (paramMetaData.isInHeader()) - continue; - - ParameterMode mode = paramMetaData.getMode(); - if (mode != ParameterMode.OUT) - in++; - if (mode != ParameterMode.IN) - out++; - } - - if (returnParam != null && !returnParam.isInHeader()) - out++; - - if (in > 1 || out > (oneWay ? 0 : 1)) - throw new WSException(BundleUtils.getMessage(bundle, "DOC_LIT_BARE_REQUIRE", new Object[]{javaName, in, out})); - } - } - public void validate() { for (ParameterMetaData parameter : parameters) @@ -502,10 +463,6 @@ buffer.append("\n qname=" + qname); buffer.append("\n javaName=" + javaName); buffer.append("\n style=" + getStyle() + "/" + getUse()); - if (getStyle() == Style.DOCUMENT) - { - buffer.append("/" + getParameterStyle()); - } buffer.append("\n oneWay=" + oneWay); buffer.append("\n soapAction=" + soapAction); for (ParameterMetaData param : parameters) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -202,7 +202,6 @@ buffer.append("\n linkName=").append(getLinkName()); buffer.append("\n implName=").append(getServiceEndpointImplName()); buffer.append("\n seiName=").append(getServiceEndpointInterfaceName()); - buffer.append("\n serviceMode=").append(getServiceMode()); buffer.append("\n portComponentName=").append(getPortComponentName()); buffer.append("\n contextRoot=").append(getContextRoot()); buffer.append("\n urlPattern=").append(getURLPattern()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -40,8 +40,6 @@ import java.util.StringTokenizer; import javax.ejb.SessionBean; -import javax.jws.WebMethod; -import javax.jws.WebService; import javax.xml.namespace.QName; import javax.xml.rpc.holders.BigDecimalHolder; import javax.xml.rpc.holders.BigIntegerHolder; @@ -96,7 +94,6 @@ private final Map primitiveMap = new HashMap(); private final static Map<String, Class> schemaBasicTypes = new HashMap<String, Class>(); - private final static Map<Class, Class> holderTypes = new HashMap<Class, Class>(); private final static Map<Class, Class> reverseHolderTypes = new HashMap<Class, Class>(); @@ -276,52 +273,6 @@ } /** - * The public, non-static or non-final methods that satisfy one of the following conditions: - * 1. They are annotated with the javax.jws.WebMethod annotation with the exclude element set to - * false or missing (since false is the default for this annotation element). - * 2. They are not annotated with the javax.jws.WebMethod annotation but their declaring class has a - * javax.jws.WebService annotation. - * @param method to process - * @return true if webmethod, false otherwise - */ - public static boolean isWebMethod(final Method method, final boolean definedInInterface) - { - if (!isWebMethodCandidate(method)) - return false; - - final WebMethod webMethodAnnotation = method.getAnnotation(WebMethod.class); - - if (webMethodAnnotation != null) - { - return !webMethodAnnotation.exclude(); - } - if (definedInInterface) - { - return true; - } - else - { - return method.getDeclaringClass().getAnnotation(WebService.class) != null; - } - } - - /** - * Only public, non-static and non-final methods are web method candidates. - * - * @param method to process - * @return true if satisfies modifier requirements, false otherwise - */ - private static boolean isWebMethodCandidate(final Method method) - { - final int modifiers = method.getModifiers(); - final boolean isPublic = Modifier.isPublic(modifiers); - final boolean isNotStatic = !Modifier.isStatic(modifiers); - final boolean isNotFinal = !Modifier.isFinal(modifiers); - - return isPublic && isNotStatic && isNotFinal; - } - - /** * Chop "PortType" at the end of the String * @param name * @return Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,67 +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.wsf.stack.jbws; - -import java.security.Principal; - -import javax.xml.ws.EndpointReference; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.w3c.dom.Element; - -/** - * A WebServiceContext implementing the getEndpointReference jaxws methods. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class NativeWebServiceContext extends ExtensibleWebServiceContext -{ - public NativeWebServiceContext(final MessageContext messageContext) - { - super(messageContext); - } - - public EndpointReference getEndpointReference(final Element... referenceParameters) - { - return this.getEndpointReference(W3CEndpointReference.class, referenceParameters); - } - - public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) - { - throw new UnsupportedOperationException(); - } - - @Override - public Principal getUserPrincipal() - { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isUserInRole(String role) - { - throw new UnsupportedOperationException(); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -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,20 +354,9 @@ MessageAbstraction reqMessage; - String bindingID = sepMetaData.getBindingId(); - if (HTTPBinding.HTTP_BINDING.equals(bindingID)) - { - reqMessage = new HTTPMessageImpl(headers, inputStream); - } - else - { - msgFactory.setServiceMode(sepMetaData.getServiceMode()); - msgFactory.setStyle(sepMetaData.getStyle()); - msgFactory.setFeatures(sepMetaData.getFeatures()); + 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); Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,43 +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.wsf.stack.jbws; - -import javax.xml.ws.handler.MessageContext; - -import org.jboss.ws.common.invocation.WebServiceContextAdapter; -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; - -/** - * Web service context factory implementation. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WebServiceContextFactoryImpl extends WebServiceContextFactory -{ - @Override - public ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext) - { - return new WebServiceContextAdapter(new NativeWebServiceContext(messageContext)); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -34,7 +34,6 @@ <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.native:jbossws-native-core</include> - <include>javax.jws:jsr181-api:jar</include> <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> @@ -73,17 +72,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> @@ -94,16 +82,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/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -31,12 +31,10 @@ <dependencies> <module name="javax.api" /> <module name="javax.servlet.api" /> - <module name="javax.jws.api" /> <module name="javax.mail.api" /> <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" /> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-10 09:54:01 UTC (rev 16140) @@ -1 +0,0 @@ -org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl \ No newline at end of file Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -1030,53 +1030,6 @@ </fileset> </jar> - <!-- jaxrpc-jbws331 --> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/EJB-META-INF"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws331-ejb.jar"/> - <include name="jaxrpc-jbws331-ws.jar"/> - <include name="jaxrpc-jbws331-client.jar"/> - </fileset> - </ear> - <!-- jaxrpc-jbws349 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -1114,48 +1067,6 @@ </fileset> </jar> - <!-- jaxrpc-jbws358 --> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws358-appclient.jar"/> - </fileset> - </jar> - <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> - <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/> - <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear"> - <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358"> - <include name="META-INF/application.xml"/> - </fileset> - </copy> - <!-- jaxrpc-jbws377 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws377/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2198,49 +2109,6 @@ </metainf> </jar> - <!-- jaxrpc-jws772 --> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-endpoint.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-remote.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-TWO"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws772-endpoint.jar"/> - <include name="jaxrpc-jbws772-remote.jar"/> - <include name="jaxrpc-jbws772-client.jar"/> - </fileset> - </ear> - <!-- jaxrpc-jws775 --> <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws775/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2693,32 +2561,6 @@ </fileset> </jar> - <!-- jbossws-jbws1179 --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <!-- jbossws-jbws1186 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -381,11 +381,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>jbosssx-client</artifactId> - <version>3.0.0.CR2</version> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </dependency> @@ -438,14 +433,6 @@ <excludes> <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - - <!-- # exploaded EAR deployment failure - should JBoss AS7 support it? --> - <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> - - <!-- # TODO: rewrite tests using AS6 internals --> - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> </excludes> </configuration> </plugin> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -66,10 +66,8 @@ <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> - <jsr181.api.version>1.0-MR1</jsr181.api.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <netty.version>3.2.6.Final</netty.version> @@ -161,16 +159,6 @@ <version>${commons.logging.version}</version> </dependency> <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>${jsr181.api.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> @@ -259,13 +247,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> @@ -390,29 +371,6 @@ <!-- - 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 -->