[jbossws-commits] JBossWS SVN: r16077 - in stack/native/trunk/modules/core/src/main/java/org/jboss: ws/core/jaxrpc/binding and 9 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 2 07:30:31 EDT 2012
Author: ropalka
Date: 2012-04-02 07:30:27 -0400 (Mon, 02 Apr 2012)
New Revision: 16077
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/netty/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareEndpointMetaData.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.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/ServerEndpointMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-3474] trim down jbossws-api dependencies
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -1,48 +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.binding;
-
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-
-/**
- * A Deserializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeDeserializer extends DeserializerSupport
-{
-
- protected BindingCustomization getBindingCustomization()
- {
- BindingCustomization bindingCustomization = null;
- EndpointMetaData epMetaData = MessageContextAssociation.peekMessageContext().getEndpointMetaData();
- if(epMetaData instanceof ServerEndpointMetaData)
- {
- bindingCustomization = ((ServerEndpointMetaData)epMetaData).getEndpoint().getAttachment(BindingCustomization.class);
- }
- return bindingCustomization;
- }
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -1,47 +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.binding;
-
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-
-/**
- * A Serializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeSerializer extends SerializerSupport
-{
- protected BindingCustomization getBindingCustomization()
- {
- BindingCustomization bindingCustomization = null;
- EndpointMetaData epMetaData = MessageContextAssociation.peekMessageContext().getEndpointMetaData();
- if(epMetaData instanceof ServerEndpointMetaData)
- {
- bindingCustomization = ((ServerEndpointMetaData)epMetaData).getEndpoint().getAttachment(BindingCustomization.class);
- }
- return bindingCustomization;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -29,7 +29,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.ComplexTypeDeserializer;
+import org.jboss.ws.core.binding.DeserializerSupport;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
@@ -43,7 +43,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
*/
-public class JBossXBDeserializer extends ComplexTypeDeserializer
+public class JBossXBDeserializer extends DeserializerSupport
{
// provide logging
private static final Logger log = Logger.getLogger(JBossXBDeserializer.class);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -25,18 +25,16 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamResult;
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.ComplexTypeSerializer;
import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshaller;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.util.xml.BufferedStreamResult;
import org.w3c.dom.NamedNodeMap;
@@ -47,7 +45,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
*/
-public class JBossXBSerializer extends ComplexTypeSerializer
+public class JBossXBSerializer extends SerializerSupport
{
// provide logging
private static final Logger log = Logger.getLogger(JBossXBSerializer.class);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -21,9 +21,6 @@
*/
package org.jboss.ws.core.jaxws;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Collection;
import java.util.ResourceBundle;
@@ -32,15 +29,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.api.binding.JAXBBindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
import com.sun.xml.bind.api.JAXBRIContext;
import com.sun.xml.bind.api.TypeReference;
-import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader;
/**
* The default factory checks if a {@link JAXBBindingCustomization} exists
@@ -73,14 +65,9 @@
{
try
{
- BindingCustomization bcust = getCustomization();
+ JAXBContext jaxbCtx = JAXBContext.newInstance(clazzes);
+ jaxbCtx = createContext(clazzes);
- JAXBContext jaxbCtx;
- if (null == bcust)
- jaxbCtx = JAXBContext.newInstance(clazzes);
- else
- jaxbCtx = createContext(clazzes, bcust);
-
incrementContextCount();
return jaxbCtx;
}
@@ -90,73 +77,12 @@
}
}
- public JAXBContext createContext(final Class[] clazzes, final BindingCustomization bcust) throws WSException
+ public JAXBRIContext createContext(Class[] classes, Collection<TypeReference> refs, String defaultNS, boolean c14n)
{
- JAXBContext jaxbCtx = null;
try
{
- jaxbCtx = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
- public JAXBContext run() throws PrivilegedActionException
- {
- try
- {
- return JAXBContext.newInstance(clazzes, bcust);
- }
- catch (JAXBException e)
- {
- throw new PrivilegedActionException(e);
- }
- }
- });
+ JAXBRIContext jaxbCtx = JAXBRIContext.newInstance(classes, refs, null, defaultNS, c14n, null);
incrementContextCount();
- }
- catch (Exception e)
- {
- if (bcust != null && bcust.get("com.sun.xml.bind.defaultNamespaceRemap") != null)
- {
- String dns = (String) bcust.get("com.sun.xml.bind.defaultNamespaceRemap");
- bcust.remove("com.sun.xml.bind.defaultNamespaceRemap");
- bcust.put("com.sun.xml.internal.bind.defaultNamespaceRemap", dns);
- try
- {
- jaxbCtx = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
- public JAXBContext run() throws PrivilegedActionException
- {
- try
- {
- return JAXBContext.newInstance(clazzes, bcust);
- }
- catch (JAXBException e)
- {
- throw new PrivilegedActionException(e);
- }
- }
- });
- incrementContextCount();
- }
- catch (Exception ex)
- {
- throw new WSException(BundleUtils.getMessage(bundle, "FAILED_TO_CREATE_JAXBCONTEXT"), ex);
- }
- }
- else
- {
- throw new WSException(BundleUtils.getMessage(bundle, "FAILED_TO_CREATE_JAXBCONTEXT"), e);
- }
- }
- return jaxbCtx;
- }
-
- public JAXBRIContext createContext(Class[] classes, Collection<TypeReference> refs, String defaultNS, boolean c14n, BindingCustomization bcust)
- {
- try
- {
- RuntimeAnnotationReader anReader = null;
- if (bcust != null)
- anReader = (RuntimeAnnotationReader)bcust.get(JAXBRIContext.ANNOTATION_READER);
-
- JAXBRIContext jaxbCtx = JAXBRIContext.newInstance(classes, refs, null, defaultNS, c14n, anReader);
- incrementContextCount();
return jaxbCtx;
}
catch (JAXBException e)
@@ -164,10 +90,4 @@
throw new WSException(BundleUtils.getMessage(bundle, "FAILED_TO_CREATE_JAXBCONTEXT"), e);
}
}
-
- private BindingCustomization getCustomization()
- {
- Endpoint ep = EndpointAssociation.getEndpoint();
- return ep != null ? ep.getAttachment(BindingCustomization.class) : null;
- }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -26,7 +26,6 @@
import javax.xml.bind.JAXBContext;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.ServiceLoader;
import com.sun.xml.bind.api.JAXBRIContext;
@@ -44,14 +43,11 @@
private static ThreadLocal<Integer> threadContextCount = new ThreadLocal<Integer>();
- public abstract JAXBContext createContext(Class[] clazzes, BindingCustomization bindingCustomization) throws WSException;
-
public abstract JAXBContext createContext(Class[] clazzes) throws WSException;
public abstract JAXBContext createContext(Class clazz) throws WSException;
- public abstract JAXBRIContext createContext(Class[] classes, Collection<TypeReference> typeReferences, String defaultNamespaceRemap, boolean c14nSupport,
- BindingCustomization bindingCustomization);
+ public abstract JAXBRIContext createContext(Class[] classes, Collection<TypeReference> typeReferences, String defaultNamespaceRemap, boolean c14nSupport);
protected void incrementContextCount()
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -21,28 +21,20 @@
*/
package org.jboss.ws.core.jaxws;
-import java.lang.reflect.Method;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.ComplexTypeDeserializer;
+import org.jboss.ws.core.binding.DeserializerSupport;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.TypeMappingImpl;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.api.binding.JAXBBindingCustomization;
/**
* A Deserializer that can handle complex types by delegating to JAXB.
@@ -50,7 +42,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
*/
-public class JAXBDeserializer extends ComplexTypeDeserializer
+public class JAXBDeserializer extends DeserializerSupport
{
// provide logging
private static final Logger log = Logger.getLogger(JAXBDeserializer.class);
@@ -109,32 +101,7 @@
JAXBContext context = cache.get(types);
if(null==context)
{
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- String defaultNS = epMetaData.getPortTypeName().getNamespaceURI();
- BindingCustomization bindingCustomization = getBindingCustomization();
- for (Class<?> clz : types)
- {
- if (clz.getName().endsWith("ObjectFactory"))
- {
- for (Method meth : clz.getMethods())
- {
- XmlElementDecl elementDecl = meth.getAnnotation(XmlElementDecl.class);
- if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope())
- && elementDecl.namespace() != null && elementDecl.namespace().length() > 0)
- {
- defaultNS = null;
- }
- }
- }
- }
- if (defaultNS != null)
- {
- if (bindingCustomization == null)
- bindingCustomization = new JAXBBindingCustomization();
- bindingCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNS);
- }
- context = JAXBContextFactory.newInstance().createContext(types, bindingCustomization);
+ context = JAXBContextFactory.newInstance().createContext(types);
cache.add(types, context);
}
return context;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -21,29 +21,22 @@
*/
package org.jboss.ws.core.jaxws;
-import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.ComplexTypeSerializer;
import org.jboss.ws.core.binding.SerializationContext;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.util.xml.BufferedStreamResult;
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.api.binding.JAXBBindingCustomization;
import org.w3c.dom.NamedNodeMap;
/**
@@ -52,7 +45,7 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Dec-2004
*/
-public class JAXBSerializer extends ComplexTypeSerializer
+public class JAXBSerializer extends SerializerSupport
{
// provide logging
private static final Logger log = Logger.getLogger(JAXBSerializer.class);
@@ -123,32 +116,7 @@
JAXBContext context = cache.get(types);
if(null == context)
{
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- String defaultNS = epMetaData.getPortTypeName().getNamespaceURI();
- BindingCustomization bindingCustomization = getBindingCustomization();
- for (Class<?> clz : types)
- {
- if (clz.getName().endsWith("ObjectFactory"))
- {
- for (Method meth : clz.getMethods())
- {
- XmlElementDecl elementDecl = meth.getAnnotation(XmlElementDecl.class);
- if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope())
- && elementDecl.namespace() != null && elementDecl.namespace().length() > 0)
- {
- defaultNS = null;
- }
- }
- }
- }
- if (defaultNS != null)
- {
- if (bindingCustomization == null)
- bindingCustomization = new JAXBBindingCustomization();
- bindingCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNS);
- }
- context = JAXBContextFactory.newInstance().createContext(types, bindingCustomization);
+ context = JAXBContextFactory.newInstance().createContext(types);
cache.add(types, context);
}
return context;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -35,7 +35,6 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.handler.MessageContext;
@@ -59,10 +58,9 @@
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter;
-import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -72,13 +70,13 @@
* @author Thomas.Diesler at jboss.org
* @since 04-Jul-2006
*/
-public class ClientImpl extends CommonClient implements BindingProvider, FeatureAwareEndpointMetaData
+public class ClientImpl extends CommonClient implements BindingProvider
{
private static final ResourceBundle bundle = BundleUtils.getBundle(ClientImpl.class);
private static Logger log = Logger.getLogger(ClientImpl.class);
// the associated endpoint meta data
- private final FeatureAwareClientEndpointMetaDataAdapter epMetaData;
+ private final ClientEndpointMetaData epMetaData;
private EndpointConfigMetaData epConfigMetaData;
// Keep a handle on the resolver so that updateConfig calls may revisit the associated chains
@@ -92,7 +90,7 @@
super(epMetaData);
setTargetEndpointAddress(epMetaData.getEndpointAddress());
- this.epMetaData = (FeatureAwareClientEndpointMetaDataAdapter)epMetaData;
+ this.epMetaData = (ClientEndpointMetaData)epMetaData;
this.epConfigMetaData = epMetaData.getEndpointConfigMetaData();
if (handlerResolver instanceof HandlerResolverImpl)
@@ -455,20 +453,4 @@
return Boolean.TRUE.equals(bool);
}
- //////////////////////////////////////////
- // FeatureAwareEndpointMetaData support //
- //////////////////////////////////////////
-
- @Override
- public <T extends WebServiceFeature> T getFeature(Class<T> key)
- {
- return this.epMetaData.getFeature(key);
- }
-
- @Override
- public void setFeature(WebServiceFeature feature)
- {
- this.epMetaData.setFeature(feature);
- }
-
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -51,7 +51,6 @@
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
/**
@@ -94,7 +93,6 @@
this.executor = executor;
this.stubMethods = new ArrayList(Arrays.asList(BindingProvider.class.getMethods()));
this.stubMethods.addAll(Arrays.asList(StubExt.class.getMethods()));
- this.stubMethods.addAll(Arrays.asList(FeatureAwareEndpointMetaData.class.getMethods()));
this.objectMethods = Arrays.asList(Object.class.getMethods());
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -47,7 +47,6 @@
import javax.xml.ws.Response;
import javax.xml.ws.Service.Mode;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.PortInfo;
@@ -75,8 +74,6 @@
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter;
-import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.w3c.dom.Node;
@@ -89,7 +86,7 @@
* @author Thomas.Diesler at jboss.com
* @since 04-Jul-2006
*/
-public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider, EndpointMetadataProvider, FeatureAwareEndpointMetaData
+public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider, EndpointMetadataProvider
{
private static final ResourceBundle bundle = BundleUtils.getBundle(DispatchImpl.class);
// provide logging
@@ -97,7 +94,7 @@
private BindingProvider bindingProvider;
private HandlerResolverImpl handlerResolver;
- private FeatureAwareClientEndpointMetaDataAdapter epMetaData;
+ private EndpointMetaData epMetaData;
private JAXBContext jaxbContext;
private ExecutorService executor;
private String securityConfig;
@@ -109,7 +106,7 @@
public DispatchImpl(ExecutorService executor, EndpointMetaData epMetaData, Class<T> type, Mode mode)
{
this.bindingProvider = new BindingProviderImpl(epMetaData);
- this.epMetaData = (FeatureAwareClientEndpointMetaDataAdapter)epMetaData;
+ this.epMetaData = epMetaData;
this.executor = executor;
this.type = type;
this.mode = mode;
@@ -119,7 +116,7 @@
public DispatchImpl(ExecutorService executor, EndpointMetaData epMetaData, JAXBContext jbc, Mode mode)
{
this.bindingProvider = new BindingProviderImpl(epMetaData);
- this.epMetaData = (FeatureAwareClientEndpointMetaDataAdapter)epMetaData;
+ this.epMetaData = epMetaData;
this.executor = executor;
this.type = Object.class;
this.jaxbContext = jbc;
@@ -158,11 +155,6 @@
handlerResolver.initHandlerChain(ecmd, HandlerType.PRE, true);
handlerResolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true);
handlerResolver.initHandlerChain(ecmd, HandlerType.POST, true);
-
- PortInfo portInfo = epMetaData.getPortInfo();
- this.appendHandlers(HandlerType.PRE, portInfo, binding);
- this.appendHandlers(HandlerType.ENDPOINT, portInfo, binding);
- this.appendHandlers(HandlerType.POST, portInfo, binding);
}
retObj = invokeInternalSOAP(obj);
@@ -644,21 +636,4 @@
{
return epMetaData;
}
-
- //////////////////////////////////////////
- // FeatureAwareEndpointMetaData support //
- //////////////////////////////////////////
-
- @Override
- public <T extends WebServiceFeature> T getFeature(Class<T> key)
- {
- return this.epMetaData.getFeature(key);
- }
-
- @Override
- public void setFeature(WebServiceFeature feature)
- {
- this.epMetaData.setFeature(feature);
- }
-
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -39,8 +39,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.handler.GenericHandler;
-import org.jboss.ws.api.handler.GenericSOAPHandler;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.injection.InjectionHelper;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
@@ -156,21 +154,12 @@
private void addHandler(ClassLoader classLoader, HandlerType type, HandlerMetaData handlerMetaData)
{
HandlerMetaDataJAXWS jaxwsMetaData = (HandlerMetaDataJAXWS)handlerMetaData;
- String handlerName = jaxwsMetaData.getHandlerName();
String className = jaxwsMetaData.getHandlerClassName();
- Set<QName> soapHeaders = jaxwsMetaData.getSoapHeaders();
try
{
// Load the handler class using the deployments top level CL
Handler<?> handler = getInstance(classLoader, className);
-
- if (handler instanceof GenericHandler)
- ((GenericHandler)handler).setHandlerName(handlerName);
-
- if (handler instanceof GenericSOAPHandler)
- ((GenericSOAPHandler<?>)handler).setHeaders(soapHeaders);
-
addHandler(jaxwsMetaData, handler, type);
}
catch (RuntimeException rte)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -22,7 +22,6 @@
package org.jboss.ws.core.jaxws.spi;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,7 +33,6 @@
import javax.xml.ws.Binding;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointReference;
-import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.WebServicePermission;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -42,14 +40,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
-import org.jboss.ws.core.jaxws.spi.http.HttpContext;
-import org.jboss.ws.core.jaxws.spi.http.HttpServer;
-import org.jboss.ws.core.jaxws.spi.http.NettyHttpServerFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Element;
/**
@@ -70,9 +61,7 @@
private List<Source> metadata;
private BindingProviderImpl bindingProvider;
private Map<String, Object> properties = new HashMap<String, Object>();
- private HttpContext serverContext;
private boolean isPublished;
- private boolean isDestroyed;
private URI address;
private Deployment dep;
@@ -109,25 +98,7 @@
@Override
public void publish(final String addr)
{
- log.debug("publish: " + addr);
-
- try
- {
- this.address = new URI(addr);
- }
- catch (URISyntaxException e)
- {
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_ADDRESS", addr));
- }
-
- // Check with the security manager
- this.checkPublishEndpointPermission();
-
- // Get HTTP server
- final HttpServer httpServer = NettyHttpServerFactory.getHttpServer();
- final HttpContext context = httpServer.createContext(this.getContextRoot());
-
- this.publish(context);
+ throw new UnsupportedOperationException();
}
/**
@@ -140,76 +111,12 @@
@Override
public void publish(Object context)
{
- if (context == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NULL_CONTEXT"));
-
- if (log.isDebugEnabled())
- log.debug("publishing endpoint " + this + " to " + context);
-
- if (isDestroyed)
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ENDPOINT_ALREADY_DESTROYED"));
-
- // Check with the security manager
- checkPublishEndpointPermission();
-
- if (context instanceof HttpContext)
- {
- this.serverContext = (HttpContext)context;
- if (this.address == null)
- {
- this.address = getAddressFromConfigAndContext(serverContext); // TODO: is it necessary?
- }
- HttpServer httpServer = this.serverContext.getHttpServer();
- httpServer.publish(this.serverContext, this);
- this.isPublished = true;
- }
- else
- {
- throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_HANDLE_CONTEXTS", context));
- }
+ throw new UnsupportedOperationException();
}
- private static URI getAddressFromConfigAndContext(HttpContext context)
- {
- try
- {
- SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
- ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
- ServerConfig serverConfig = spi.getServerConfig();
- String host = serverConfig.getWebServiceHost();
- int port = serverConfig.getWebServicePort();
- String hostAndPort = host + (port > 0 ? ":" + port : "");
- return new URI("http://" + hostAndPort + context.getContextRoot());
- }
- catch (URISyntaxException e)
- {
- throw new WebServiceException(BundleUtils.getMessage(bundle, "ERROR_GETTING_ENDPOINT_ADDRESS"), e);
- }
- }
-
@Override
public void stop()
{
- log.debug("stop");
-
- if (serverContext == null || isPublished == false)
- log.error(BundleUtils.getMessage(bundle, "ENDPOINT_NOT_PUBLISHED"));
-
- try
- {
- if (serverContext != null)
- {
- HttpServer httpServer = serverContext.getHttpServer();
- httpServer.destroy(serverContext, this);
- }
- }
- catch (Exception ex)
- {
- log.error(BundleUtils.getMessage(bundle, "CANNOT_STOP_ENDPOINT"), ex);
- }
-
- isPublished = false;
- isDestroyed = true;
}
@Override
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -56,7 +56,6 @@
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ClientImpl;
import org.jboss.ws.core.jaxws.client.ClientProxy;
-import org.jboss.ws.core.jaxws.client.DispatchImpl;
import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS;
import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl;
import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder;
@@ -64,8 +63,6 @@
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter;
-import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -266,21 +263,13 @@
@Override
public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Mode mode)
{
- ExecutorService executor = (ExecutorService)getExecutor();
- EndpointMetaData epMetaData = getEndpointMetaData(portName);
- FeatureAwareClientEndpointMetaDataAdapter clientMetaDataAdapter = new FeatureAwareClientEndpointMetaDataAdapter((ClientEndpointMetaData)epMetaData);
-
- return new DispatchImpl(executor, clientMetaDataAdapter, type, mode);
+ throw new UnsupportedOperationException();
}
@Override
public Dispatch<Object> createDispatch(QName portName, JAXBContext jbc, Mode mode)
{
- ExecutorService executor = (ExecutorService)getExecutor();
- EndpointMetaData epMetaData = getEndpointMetaData(portName);
- FeatureAwareClientEndpointMetaDataAdapter clientMetaDataAdapter = new FeatureAwareClientEndpointMetaDataAdapter((ClientEndpointMetaData)epMetaData);
-
- return new DispatchImpl(executor, clientMetaDataAdapter, jbc, mode);
+ throw new UnsupportedOperationException();
}
private EndpointMetaData getEndpointMetaData(QName portName)
@@ -376,8 +365,7 @@
try
{
ExecutorService executor = (ExecutorService)getExecutor();
- FeatureAwareClientEndpointMetaDataAdapter clientMetaDataAdapter = new FeatureAwareClientEndpointMetaDataAdapter((ClientEndpointMetaData)epMetaData);
- ClientProxy handler = new ClientProxy(executor, new ClientImpl(clientMetaDataAdapter, handlerResolver));
+ ClientProxy handler = new ClientProxy(executor, new ClientImpl(epMetaData, handlerResolver));
ClassLoader cl = epMetaData.getClassLoader();
try
{
@@ -392,7 +380,7 @@
T proxy;
try
{
- proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class, FeatureAwareEndpointMetaData.class }, handler);
+ proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class }, handler);
}
catch (RuntimeException rte)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -34,7 +34,6 @@
import javax.xml.ws.RespectBindingFeature;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.ResourceLoaderAdapter;
@@ -258,7 +257,6 @@
processSOAPBinding(epMetaData, wsClass);
// process config, this will as well setup the handler
- processEndpointConfig(epMetaData, wsClass);
epMetaData.initEndpointConfig();
// Process @WebMethod
@@ -283,18 +281,4 @@
if (log.isDebugEnabled())
log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData());
}
-
- /**
- * Process config contribution through service endpoint interfaces
- * @param epMetaData
- * @param wsClass - the service endpoint interface
- */
- private void processEndpointConfig(EndpointMetaData epMetaData, Class<?> wsClass)
- {
- if (wsClass.isAnnotationPresent(EndpointConfig.class))
- {
- EndpointConfig anConfig = wsClass.getAnnotation(EndpointConfig.class);
- epMetaData.setConfigName(anConfig.configName(), anConfig.configFile());
- }
- }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -57,7 +57,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.JavaUtils;
@@ -74,7 +73,6 @@
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.TypeMappingMetaData;
import org.jboss.ws.metadata.umdm.TypesMetaData;
import org.jboss.ws.metadata.umdm.WrappedParameter;
@@ -87,7 +85,6 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation;
import org.jboss.ws.metadata.wsdl.WSDLMIMEPart;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaDataParser;
@@ -886,16 +883,7 @@
JAXBContextFactory factory = JAXBContextFactory.newInstance();
- // JAXBIntros may mofiy the WSDL being generated
- // only true for server side invocation, tooling (WSProvide) doesnt support this
- BindingCustomization bindingCustomization = null;
- if (epMetaData instanceof ServerEndpointMetaData)
- {
- Endpoint endpoint = ((ServerEndpointMetaData)epMetaData).getEndpoint();
- bindingCustomization = endpoint != null ? endpoint.getAttachment(BindingCustomization.class) : null;
- }
-
- jaxbCtx = factory.createContext(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false, bindingCustomization);
+ jaxbCtx = factory.createContext(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false);
}
catch (WSException ex)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -142,9 +142,6 @@
// process config
processEndpointConfig(dep, sepMetaData, sepClass, linkName);
- // Set the endpoint address
- processWebContext(dep, sepClass, linkName, sepMetaData);
-
// Init the endpoint address
initEndpointAddress(dep, sepMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -21,17 +21,10 @@
*/
package org.jboss.ws.metadata.builder.jaxws;
-import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment;
-
-import java.util.ResourceBundle;
-
import javax.jws.WebService;
import javax.xml.ws.RespectBindingFeature;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.ws.api.annotation.EndpointConfig;
-import org.jboss.ws.api.annotation.WebContext;
-import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -56,7 +49,6 @@
*/
public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(JAXWSServerMetaDataBuilder.class);
static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, Class<?> beanClass, String beanName) throws Exception
{
if (beanClass.isAnnotationPresent(WebService.class))
@@ -76,16 +68,6 @@
String configName = null;
String configFile = null;
- EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
- if (anEndpointConfig != null)
- {
- if (anEndpointConfig.configName().length() > 0)
- configName = anEndpointConfig.configName();
-
- if (anEndpointConfig.configFile().length() > 0)
- configFile = anEndpointConfig.configFile();
- }
-
JSEArchiveMetaData jseMetaData = dep.getAttachment(JSEArchiveMetaData.class);
if (jseMetaData != null)
{
@@ -108,78 +90,6 @@
sepMetaData.setConfigName(configName, configFile);
}
- protected void processWebContext(Deployment dep, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
- {
- WebContext anWebContext = wsClass.getAnnotation(WebContext.class);
-
- if (anWebContext == null)
- return;
-
- boolean isJSEEndpoint = isJaxwsJseDeployment(dep);
-
- // context-root
- if (anWebContext.contextRoot().length() > 0)
- {
- if (isJSEEndpoint)
- {
- log.warn(BundleUtils.getMessage(bundle, "CONTEXTROOT_IS_ONLY_VALID_ON_EJB_ENDPOINTS"));
- }
- else
- {
- String contextRoot = anWebContext.contextRoot();
- if (contextRoot.startsWith("/") == false)
- contextRoot = "/" + contextRoot;
-
- sepMetaData.setContextRoot(contextRoot);
- }
- }
-
- // url-pattern
- if (anWebContext.urlPattern().length() > 0)
- {
- if (isJSEEndpoint)
- {
- log.warn(BundleUtils.getMessage(bundle, "URLPATTERN_IS_ONLY_VALID_ON_EJB_ENDPOINTS"));
- }
- else
- {
- String urlPattern = anWebContext.urlPattern();
- sepMetaData.setURLPattern(urlPattern);
- }
- }
-
- // auth-method
- if (anWebContext.authMethod().length() > 0)
- {
- if (isJSEEndpoint)
- {
- log.warn(BundleUtils.getMessage(bundle, "AUTHMETHOD_IS_ONLY_VALID_ON_EJB_ENDPOINTS"));
- }
- else
- {
- String authMethod = anWebContext.authMethod();
- sepMetaData.setAuthMethod(authMethod);
- }
- }
-
- // transport-guarantee
- if (anWebContext.transportGuarantee().length() > 0)
- {
- if (isJSEEndpoint)
- {
- log.warn(BundleUtils.getMessage(bundle, "TRANSPORTGUARANTEE_IS_ONLY_VALID_ON_EJB_ENDPOINTS"));
- }
- else
- {
- String transportGuarantee = anWebContext.transportGuarantee();
- sepMetaData.setTransportGuarantee(transportGuarantee);
- }
- }
-
- // secure wsdl access
- sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess());
- }
-
/**
* With JAX-WS the use of webservices.xml is optional since the annotations can be used
* to specify most of the information specified in this deployment descriptor file.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -128,9 +128,6 @@
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel);
- // Note, that @WebContext needs to be defined on the endpoint not the SEI
- processWebContext(dep, sepClass, linkName, sepMetaData);
-
// setup handler chain from config
sepMetaData.initEndpointConfig();
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-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -27,7 +27,6 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -41,7 +40,6 @@
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.Service.Mode;
@@ -49,8 +47,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.api.binding.JAXBBindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.JavaUtils;
@@ -149,8 +145,6 @@
private JAXBContextCache jaxbCache = new JAXBContextCache();
- private List<BindingCustomization> bindingCustomization = new ArrayList<BindingCustomization>();
-
EndpointMetaData()
{
}
@@ -334,11 +328,6 @@
return type;
}
- public Collection<BindingCustomization> getBindingCustomizations()
- {
- return bindingCustomization;
- }
-
public String getAuthMethod()
{
return authMethod;
@@ -680,37 +669,10 @@
if ("true".equalsIgnoreCase(System.getProperty(Constants.EAGER_INITIALIZE_JAXB_CONTEXT_CACHE)))
{
log.debug("Initializing JAXBContext cache...");
- BindingCustomization bindingCustomization = null;
- if (this instanceof ServerEndpointMetaData)
- {
- bindingCustomization = ((ServerEndpointMetaData)this).getEndpoint().getAttachment(BindingCustomization.class);
- }
try
{
Class[] classes = getRegisteredTypes().toArray(new Class[0]);
- String defaultNS = portTypeName.getNamespaceURI();
- for (Class<?> clz : classes)
- {
- if (clz.getName().endsWith("ObjectFactory"))
- {
- for (Method method : clz.getMethods())
- {
- XmlElementDecl elementDecl = method.getAnnotation(XmlElementDecl.class);
- if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope())
- && elementDecl.namespace() != null && elementDecl.namespace().length() > 0)
- {
- defaultNS = null;
- }
- }
- }
- }
- if (defaultNS != null)
- {
- if (bindingCustomization == null)
- bindingCustomization = new JAXBBindingCustomization();
- bindingCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNS);
- }
- JAXBContext context = JAXBContextFactory.newInstance().createContext(classes, bindingCustomization);
+ JAXBContext context = JAXBContextFactory.newInstance().createContext(classes);
jaxbCache.add(classes, context);
}
catch (Exception e)
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -1,482 +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.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.handler.PortInfo;
-
-import org.jboss.ws.core.jaxws.JAXBContextCache;
-import org.jboss.ws.core.soap.Style;
-import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.metadata.config.Configurable;
-import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.metadata.config.CommonConfig;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-
-/**
- * Feature aware client endpoint meta data adapter.
- *
- * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
- */
-public final class FeatureAwareClientEndpointMetaDataAdapter extends ClientEndpointMetaData implements FeatureAwareEndpointMetaData
-{
-
- private final ClientEndpointMetaData delegee;
- private final Set<WebServiceFeature> features = new HashSet<WebServiceFeature>();
-
- public FeatureAwareClientEndpointMetaDataAdapter(final ClientEndpointMetaData delegee)
- {
- this.delegee = delegee;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <T extends WebServiceFeature> T getFeature(Class<T> key)
- {
- for (WebServiceFeature feature : this.features)
- {
- if (key == feature.getClass())
- {
- return (T)feature;
- }
- }
-
- return this.delegee.getFeature(key);
- }
-
- @Override
- public void setFeature(WebServiceFeature feature)
- {
- this.features.add(feature);
- }
-
- @Override
- public FeatureSet getFeatures()
- {
- final FeatureSet retVal = this.delegee.getFeatures();
-
- for (WebServiceFeature feature : this.features)
- {
- retVal.addFeature(feature);
- }
-
- return retVal;
- }
-
- @Override
- public void addFeature(WebServiceFeature feature)
- {
- this.setFeature(feature);
- }
-
- @Override
- public <T extends WebServiceFeature> boolean isFeatureEnabled(final Class<T> key)
- {
- final T feature = this.getFeature(key);
-
- return (feature != null ? feature.isEnabled() : false);
- }
-
- // ********************************************
- // just delegate to non feature related methods
- // ********************************************
-
- @Override
- public EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile)
- {
- return this.delegee.createEndpointConfigMetaData(configName, configFile);
- }
-
- @Override
- public String getEndpointAddress()
- {
- return this.delegee.getEndpointAddress();
- }
-
- @Override
- public PortInfo getPortInfo()
- {
- return this.delegee.getPortInfo();
- }
-
- @Override
- public void setEndpointAddress(String endpointAddress)
- {
- this.delegee.setEndpointAddress(endpointAddress);
- }
-
- @Override
- public String toString()
- {
- return this.delegee.toString();
- }
-
- @Override
- public void addHandler(HandlerMetaData handler)
- {
- this.delegee.addHandler(handler);
- }
-
- @Override
- public void addHandlers(List<HandlerMetaData> configHandlers)
- {
- this.delegee.addHandlers(configHandlers);
- }
-
- @Override
- public void addOperation(OperationMetaData opMetaData)
- {
- this.delegee.addOperation(opMetaData);
- }
-
- @Override
- public void clearHandlers()
- {
- this.delegee.clearHandlers();
- }
-
- @Override
- public void clearOperations()
- {
- this.delegee.clearOperations();
- }
-
- @Override
- public void configure(Configurable configurable)
- {
- this.delegee.configure(configurable);
- }
-
- @Override
- public void eagerInitialize()
- {
- this.delegee.eagerInitialize();
- }
-
- @Override
- public String getAuthMethod()
- {
- return this.delegee.getAuthMethod();
- }
-
- @Override
- public Collection<BindingCustomization> getBindingCustomizations()
- {
- return this.delegee.getBindingCustomizations();
- }
-
- @Override
- public String getBindingId()
- {
- return this.delegee.getBindingId();
- }
-
- @Override
- public ClassLoader getClassLoader()
- {
- return this.delegee.getClassLoader();
- }
-
- @Override
- public CommonConfig getConfig()
- {
- return this.delegee.getConfig();
- }
-
- @Override
- public String getConfigFile()
- {
- return this.delegee.getConfigFile();
- }
-
- @Override
- public String getConfigName()
- {
- return this.delegee.getConfigName();
- }
-
- @Override
- public Use getEncodingStyle()
- {
- return this.delegee.getEncodingStyle();
- }
-
- @Override
- public EndpointConfigMetaData getEndpointConfigMetaData()
- {
- return this.delegee.getEndpointConfigMetaData();
- }
-
- @Override
- public List<HandlerMetaData> getHandlerMetaData(HandlerType type)
- {
- return this.delegee.getHandlerMetaData(type);
- }
-
- @Override
- public JAXBContextCache getJaxbCache()
- {
- return this.delegee.getJaxbCache();
- }
-
- @Override
- public OperationMetaData getOperation(QName xmlName)
- {
- return this.delegee.getOperation(xmlName);
- }
-
- @Override
- public OperationMetaData getOperation(Method method)
- {
- return this.delegee.getOperation(method);
- }
-
- @Override
- public List<OperationMetaData> getOperations()
- {
- return this.delegee.getOperations();
- }
-
- @Override
- public ParameterStyle getParameterStyle()
- {
- return this.delegee.getParameterStyle();
- }
-
- @Override
- public QName getPortName()
- {
- return this.delegee.getPortName();
- }
-
- @Override
- public QName getPortTypeName()
- {
- return this.delegee.getPortTypeName();
- }
-
- @Override
- public Properties getProperties()
- {
- return this.delegee.getProperties();
- }
-
- @Override
- public List<Class> getRegisteredTypes()
- {
- return this.delegee.getRegisteredTypes();
- }
-
- @Override
- public UnifiedVirtualFile getRootFile()
- {
- return this.delegee.getRootFile();
- }
-
- @Override
- public Class getServiceEndpointInterface()
- {
- return this.delegee.getServiceEndpointInterface();
- }
-
- @Override
- public String getServiceEndpointInterfaceName()
- {
- return this.delegee.getServiceEndpointInterfaceName();
- }
-
- @Override
- public ServiceMetaData getServiceMetaData()
- {
- return this.delegee.getServiceMetaData();
- }
-
- @Override
- public Mode getServiceMode()
- {
- return this.delegee.getServiceMode();
- }
-
- @Override
- public List<UnifiedPortComponentRefMetaData> getServiceRefContrib()
- {
- return this.delegee.getServiceRefContrib();
- }
-
- @Override
- public Style getStyle()
- {
- return this.delegee.getStyle();
- }
-
- @Override
- public Type getType()
- {
- return this.delegee.getType();
- }
-
- @Override
- public void initEndpointConfig()
- {
- this.delegee.initEndpointConfig();
- }
-
- @Override
- public boolean isHandlersInitialized()
- {
- return this.delegee.isHandlersInitialized();
- }
-
- @Override
- public boolean matches(UnifiedPortComponentRefMetaData pcRef)
- {
- return this.delegee.matches(pcRef);
- }
-
- @Override
- public void registerConfigObserver(Configurable observer)
- {
- this.delegee.registerConfigObserver(observer);
- }
-
- @Override
- public void setAuthMethod(String authMethod)
- {
- this.delegee.setAuthMethod(authMethod);
- }
-
- @Override
- public void setBindingId(String bindingId)
- {
- this.delegee.setBindingId(bindingId);
- }
-
- @Override
- public void setConfigName(String configName)
- {
- this.delegee.setConfigName(configName);
- }
-
- @Override
- public void setConfigName(String configName, String configFile)
- {
- this.delegee.setConfigName(configName, configFile);
- }
-
- @Override
- public void setEncodingStyle(Use value)
- {
- this.delegee.setEncodingStyle(value);
- }
-
- @Override
- public void setHandlersInitialized(boolean flag)
- {
- this.delegee.setHandlersInitialized(flag);
- }
-
- @Override
- public void setParameterStyle(ParameterStyle value)
- {
- this.delegee.setParameterStyle(value);
- }
-
- @Override
- public void setPortName(QName portName)
- {
- this.delegee.setPortName(portName);
- }
-
- @Override
- public void setProperties(Properties properties)
- {
- this.delegee.setProperties(properties);
- }
-
- @Override
- public void setServiceEndpointInterfaceName(String seiName)
- {
- this.delegee.setServiceEndpointInterfaceName(seiName);
- }
-
- @Override
- public void setServiceMode(Mode serviceMode)
- {
- this.delegee.setServiceMode(serviceMode);
- }
-
- @Override
- public void setStyle(Style value)
- {
- this.delegee.setStyle(value);
- }
-
- @Override
- public void validate()
- {
- this.delegee.validate();
- }
-
- @Override
- public void addExtension(MetaDataExtension ext)
- {
- this.delegee.addExtension(ext);
- }
-
- @Override
- public MetaDataExtension getExtension(String namespace)
- {
- return this.delegee.getExtension(namespace);
- }
-
- @Override
- public Map<String, MetaDataExtension> getExtensions()
- {
- return this.delegee.getExtensions();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- return this.delegee.equals(obj);
- }
-
- @Override
- public int hashCode()
- {
- return this.delegee.hashCode();
- }
-
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareEndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareEndpointMetaData.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareEndpointMetaData.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -1,35 +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 javax.xml.ws.WebServiceFeature;
-
-/**
- * Wrapper over endpoint meta data to enable feature overriding.
- *
- * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
- */
-public interface FeatureAwareEndpointMetaData
-{
- void setFeature(WebServiceFeature feature);
- <T extends WebServiceFeature> T getFeature(Class<T> key);
-}
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-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -21,16 +21,12 @@
*/
package org.jboss.ws.metadata.umdm;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
import java.util.ResourceBundle;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -200,21 +196,6 @@
endpoint.setAddress(endpointAddress);
}
- /**
- * Will be set through a deployment aspect
- * @return List<BindingCustomization> of available customizations
- */
- public Collection<BindingCustomization> getBindingCustomizations()
- {
- List<BindingCustomization> list = new ArrayList<BindingCustomization>();
- for (Object att : endpoint.getAttachments())
- {
- if (att instanceof BindingCustomization)
- list.add((BindingCustomization)att);
- }
- return list;
- }
-
public String toString()
{
StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:");
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-04-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -33,7 +33,6 @@
import javax.xml.namespace.QName;
import org.jboss.ws.WSException;
-import org.jboss.ws.api.addressing.AddressingConstants;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.DOMUtils;
@@ -347,7 +346,6 @@
protected void appendPortOperations(StringBuilder buffer, WSDLInterface intf)
{
String prefix = wsdl.getPrefix(intf.getName().getNamespaceURI());
- String wsamPrefix = wsdl.getPrefix(AddressingConstants.Metadata.NS);
WSDLInterfaceOperation[] operations = intf.getSortedOperations();
for (int i = 0; i < operations.length; i++)
@@ -374,10 +372,6 @@
{
buffer.append("<input message='" + msgEl + "'>").append("</input>");
}
- else
- {
- buffer.append("<input message='" + msgEl + "' " + wsamPrefix + ":" + AddressingConstants.Metadata.Attributes.ACTION + "='" + inputAction + "'/>");
- }
if (! Constants.WSDL20_PATTERN_IN_ONLY.equals(operation.getPattern()))
{
@@ -386,10 +380,6 @@
{
buffer.append("<output message='" + msgEl + "Response'>").append("</output>");
}
- else
- {
- buffer.append("<output message='" + msgEl + "Response' " + wsamPrefix + ":" + AddressingConstants.Metadata.Attributes.ACTION + "='" + outputAction + "'/>");
- }
}
//Append the Faults
@@ -402,12 +392,6 @@
buffer.append("<fault message='" + prefix + ":" + element.getLocalPart());
buffer.append("' name='" + element.getLocalPart() + "'/>");
}
- else
- {
- buffer.append("<fault message='" + prefix + ":" + element.getLocalPart());
- buffer.append("' name='" + element.getLocalPart() + "' ");
- buffer.append(wsamPrefix + ":" + AddressingConstants.Metadata.Attributes.ACTION + "='" + faultAction + "'/>");
- }
}
buffer.append("</operation>");
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-02 10:32:07 UTC (rev 16076)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-02 11:30:27 UTC (rev 16077)
@@ -65,7 +65,6 @@
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
-import org.jboss.ws.core.jaxws.spi.http.AbstractNettyMessage;
import org.jboss.ws.core.server.MimeHeaderSource;
import org.jboss.ws.core.server.ServiceEndpointInvoker;
import org.jboss.ws.core.server.ServletHeaderSource;
@@ -268,7 +267,6 @@
// Set servlet specific properties
HttpServletResponse httpResponse = null;
ServletHeaderSource headerSource = null;
- AbstractNettyMessage nettyMessage = this.getNettyHeadersSource(invContext);
if (invContext instanceof ServletRequestContext)
{
ServletRequestContext reqContext = (ServletRequestContext)invContext;
@@ -302,7 +300,7 @@
try
{
msgContext.setEndpointMetaData(sepMetaData);
- MessageAbstraction resMessage = processRequest(endpoint, nettyMessage == null ? headerSource : nettyMessage, invContext, inStream);
+ MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream);
CommonMessageContext reqMsgContext = msgContext;
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -323,10 +321,6 @@
{
httpResponse.setStatus(code.intValue());
}
- else if (nettyMessage != null)
- {
- nettyMessage.setStatus(code.intValue());
- }
}
boolean isFault = false;
@@ -349,10 +343,6 @@
{
httpResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
- else if (nettyMessage != null)
- {
- nettyMessage.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- }
}
}
@@ -377,11 +367,6 @@
}
}
- private AbstractNettyMessage getNettyHeadersSource(final InvocationContext invContext)
- {
- return (AbstractNettyMessage)invContext.getProperty(Constants.NETTY_MESSAGE);
- }
-
private void sendResponse(Endpoint endpoint, OutputStream output, boolean isFault) throws SOAPException, IOException
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
More information about the jbossws-commits
mailing list