[jbossws-commits] JBossWS SVN: r16092 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/client and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 4 06:56:57 EDT 2012
Author: ropalka
Date: 2012-04-04 06:56:53 -0400 (Wed, 04 Apr 2012)
New Revision: 16092
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
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/CommonClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.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/ws/core/soap/MessageFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-3474] trim down jaxws-api dependencies
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:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -23,7 +23,6 @@
import java.util.Observable;
-import javax.xml.ws.EndpointReference;
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
@@ -86,11 +85,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/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/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:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -58,13 +58,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 +79,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)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -39,8 +39,6 @@
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,14 +107,10 @@
private Use use;
// The SOAPBinding parameter style
private Boolean wrappedParameterStyle;
- // The JAXWS ServiceMode
- private Mode serviceMode;
// 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();
@@ -283,16 +277,6 @@
this.wrappedParameterStyle = value;
}
- public Mode getServiceMode()
- {
- return serviceMode;
- }
-
- public void setServiceMode(Mode serviceMode)
- {
- this.serviceMode = serviceMode;
- }
-
public String getAuthMethod()
{
return authMethod;
@@ -315,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);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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 at 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/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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());
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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 at jboss.com
- * @author <a href="mailto:ropalka at 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/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:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -363,9 +363,7 @@
}
else
{
- msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
- msgFactory.setFeatures(sepMetaData.getFeatures());
reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream);
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-04 10:56:53 UTC (rev 16092)
@@ -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 at jboss.com
- * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
- */
-public final class WebServiceContextFactoryImpl extends WebServiceContextFactory
-{
- @Override
- public ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext)
- {
- return new WebServiceContextAdapter(new NativeWebServiceContext(messageContext));
- }
-}
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-04 10:19:40 UTC (rev 16091)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-04 10:56:53 UTC (rev 16092)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl
\ No newline at end of file
More information about the jbossws-commits
mailing list