JBossWS SVN: r9038 - in stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-14 14:00:47 -0500 (Wed, 14 Jan 2009)
New Revision: 9038
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
Log:
[JBWS-2448] MTOMFeature & @MTOM
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2009-01-14 17:36:22 UTC (rev 9037)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2009-01-14 19:00:47 UTC (rev 9038)
@@ -27,6 +27,8 @@
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
@@ -45,11 +47,12 @@
public static <T> void processFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
{
epMetaData.addFeature(feature);
- processWSAddressingFeature(feature, epMetaData, stub);
+ processAddressingFeature(feature, epMetaData, stub);
+ processMTOMFeature(feature, epMetaData, stub);
}
@SuppressWarnings("unchecked")
- private static <T> void processWSAddressingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
+ private static <T> void processAddressingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
{
if (feature instanceof AddressingFeature && feature.isEnabled())
{
@@ -59,5 +62,14 @@
bindingExt.setHandlerChain(handlers, HandlerType.POST);
}
}
+
+ private static <T> void processMTOMFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
+ {
+ if (feature instanceof MTOMFeature)
+ {
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)stub).getBinding();
+ binding.setMTOMEnabled(feature.isEnabled());
+ }
+ }
}
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 17:36:22 UTC (rev 9037)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 19:00:47 UTC (rev 9038)
@@ -27,7 +27,11 @@
import javax.xml.ws.soap.Addressing;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.MTOM;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
+import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.JsonEncoding;
@@ -51,6 +55,8 @@
*/
public class EndpointFeatureProcessor
{
+ private static final Logger log = Logger.getLogger(EndpointFeatureProcessor.class);
+
protected void processEndpointFeatures(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass)
{
for (Annotation an : sepClass.getAnnotations())
@@ -61,6 +67,12 @@
AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required());
sepMetaData.addFeature(feature);
}
+ else if (an.annotationType() == MTOM.class)
+ {
+ MTOM anFeature = sepClass.getAnnotation(MTOM.class);
+ MTOMFeature feature = new MTOMFeature(anFeature.enabled(), anFeature.threshold());
+ sepMetaData.addFeature(feature);
+ }
else if (an.annotationType() == SchemaValidation.class)
{
processSchemaValidation(dep, sepMetaData, sepClass);
@@ -83,6 +95,7 @@
protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData)
{
setupAddressingFeature(sepMetaData);
+ setupMTOMFeature(sepMetaData);
}
private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData)
@@ -90,6 +103,7 @@
AddressingFeature addressingFeature = sepMetaData.getFeature(AddressingFeature.class);
if (addressingFeature != null && addressingFeature.isEnabled())
{
+ log.debug("AddressingFeature found, installing WS-Addressing post-handler");
HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(HandlerType.POST);
hmd.setEndpointMetaData(sepMetaData);
hmd.setHandlerClassName(WSAddressingServerHandler.class.getName());
@@ -98,6 +112,25 @@
sepMetaData.addHandler(hmd);
}
}
+
+ private static void setupMTOMFeature(ServerEndpointMetaData sepMetaData)
+ {
+ MTOMFeature mtomFeature = sepMetaData.getFeature(MTOMFeature.class);
+ if (mtomFeature != null && mtomFeature.isEnabled())
+ {
+ String bindingId = sepMetaData.getBindingId();
+ if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
+ {
+ log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP11HTTP_MTOM_BINDING);
+ sepMetaData.setBindingId(SOAPBinding.SOAP11HTTP_MTOM_BINDING);
+ }
+ else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ {
+ log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ sepMetaData.setBindingId(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ }
+ }
+ }
private void processSchemaValidation(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass)
{
15 years, 5 months
JBossWS SVN: r9037 - stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-14 12:36:22 -0500 (Wed, 14 Jan 2009)
New Revision: 9037
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBWS-2446] Removing stale warnings
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-01-14 17:34:35 UTC (rev 9036)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-01-14 17:36:22 UTC (rev 9037)
@@ -462,9 +462,6 @@
@Override
public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Mode mode, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
Dispatch<T> dispatch = createDispatch(portName, type, mode);
initWebserviceFeatures(dispatch, features);
return dispatch;
@@ -473,9 +470,6 @@
@Override
public <T> Dispatch<T> createDispatch(EndpointReference epr, Class<T> type, Mode mode, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
QName portName = null;
if (epr instanceof W3CEndpointReference)
{
@@ -492,9 +486,6 @@
@Override
public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Mode mode, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
Dispatch<Object> dispatch = createDispatch(portName, context, mode);
initWebserviceFeatures(dispatch, features);
return dispatch;
@@ -503,9 +494,6 @@
@Override
public Dispatch<Object> createDispatch(EndpointReference epr, JAXBContext context, Mode mode, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
QName portName = null;
if (epr instanceof W3CEndpointReference)
{
@@ -522,9 +510,6 @@
@Override
public <T> T getPort(QName portName, Class<T> sei, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
T port = getPort(portName, sei);
initWebserviceFeatures(port, features);
return port;
@@ -533,9 +518,6 @@
@Override
public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
T port = getPort(sei);
initAddressingProperties((BindingProvider)port, epr);
initWebserviceFeatures(port, features);
@@ -545,9 +527,6 @@
@Override
public <T> T getPort(Class<T> sei, WebServiceFeature... features)
{
- if (features != null)
- log.warn("WebServiceFeature not implemented");
-
T port = getPort(sei);
initWebserviceFeatures(port, features);
return port;
15 years, 5 months
JBossWS SVN: r9036 - in stack/native/branches/jaxws21/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-14 12:34:35 -0500 (Wed, 14 Jan 2009)
New Revision: 9036
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
Log:
[JBWS-2447] Removing useless imports
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 17:27:29 UTC (rev 9035)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 17:34:35 UTC (rev 9036)
@@ -32,13 +32,10 @@
import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.JsonEncoding;
import org.jboss.ws.annotation.SchemaValidation;
-import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
Modified: stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
===================================================================
--- stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2009-01-14 17:27:29 UTC (rev 9035)
+++ stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2009-01-14 17:34:35 UTC (rev 9036)
@@ -76,7 +76,6 @@
bindingProvider = (BindingProvider)port2;
List<Handler> customHandlerChain2 = new ArrayList<Handler>();
customHandlerChain2.add(new ClientHandler());
-// customHandlerChain2.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain2);
}
15 years, 5 months
JBossWS SVN: r9035 - in stack/native/branches/jaxws21/modules: core/src/main/java/org/jboss/ws/core/jaxws/spi and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-14 12:27:29 -0500 (Wed, 14 Jan 2009)
New Revision: 9035
Added:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
Log:
[JBWS-2446][JBWS-2447] Enable WS-Addressing using @Addressing and AddressingFeature
Added: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java (rev 0)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -0,0 +1,63 @@
+/*
+ * 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.jaxws.client;
+
+import java.util.List;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.soap.AddressingFeature;
+
+import org.jboss.ws.core.jaxws.binding.BindingExt;
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+
+/**
+ * Process WebServiceFeature provided on client side
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 14-Jan-2009
+ *
+ */
+public class ClientFeatureProcessor
+{
+ public static <T> void processFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
+ {
+ epMetaData.addFeature(feature);
+ processWSAddressingFeature(feature, epMetaData, stub);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> void processWSAddressingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub)
+ {
+ if (feature instanceof AddressingFeature && feature.isEnabled())
+ {
+ BindingExt bindingExt = (BindingExt)((BindingProvider)stub).getBinding();
+ List<Handler> handlers = bindingExt.getHandlerChain(HandlerType.POST);
+ handlers.add(new WSAddressingClientHandler());
+ bindingExt.setHandlerChain(handlers, HandlerType.POST);
+ }
+ }
+
+}
Property changes on: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-01-14 17:25:35 UTC (rev 9034)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -54,6 +54,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.jaxws.client.ClientFeatureProcessor;
import org.jboss.ws.core.jaxws.client.ClientImpl;
import org.jboss.ws.core.jaxws.client.ClientProxy;
import org.jboss.ws.core.jaxws.client.DispatchImpl;
@@ -559,7 +560,7 @@
EndpointMetaData epMetaData = ((StubExt)stub).getEndpointMetaData();
for (WebServiceFeature feature : features)
{
- epMetaData.addFeature(feature);
+ ClientFeatureProcessor.processFeature(feature, epMetaData, stub);
}
}
}
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 17:25:35 UTC (rev 9034)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -25,16 +25,25 @@
import java.lang.annotation.Annotation;
import java.net.URL;
+import javax.xml.ws.soap.Addressing;
+import javax.xml.ws.soap.AddressingFeature;
+
import org.jboss.ws.WSException;
import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.JsonEncoding;
import org.jboss.ws.annotation.SchemaValidation;
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
+import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.JsonEncodingFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
+import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.xml.sax.ErrorHandler;
/**
@@ -49,8 +58,14 @@
{
for (Annotation an : sepClass.getAnnotations())
{
- if (an.annotationType() == SchemaValidation.class)
+ if (an.annotationType() == Addressing.class)
{
+ Addressing anFeature = sepClass.getAnnotation(Addressing.class);
+ AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required());
+ sepMetaData.addFeature(feature);
+ }
+ else if (an.annotationType() == SchemaValidation.class)
+ {
processSchemaValidation(dep, sepMetaData, sepClass);
}
else if (an.annotationType() == FastInfoset.class)
@@ -67,6 +82,25 @@
}
}
}
+
+ protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData)
+ {
+ setupAddressingFeature(sepMetaData);
+ }
+
+ private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData)
+ {
+ AddressingFeature addressingFeature = sepMetaData.getFeature(AddressingFeature.class);
+ if (addressingFeature != null && addressingFeature.isEnabled())
+ {
+ HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(HandlerType.POST);
+ hmd.setEndpointMetaData(sepMetaData);
+ hmd.setHandlerClassName(WSAddressingServerHandler.class.getName());
+ hmd.setHandlerName("WSAddressing Handler");
+ hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP_MTOM");
+ sepMetaData.addHandler(hmd);
+ }
+ }
private void processSchemaValidation(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass)
{
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-01-14 17:25:35 UTC (rev 9034)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -186,6 +186,9 @@
processHandlerChain(sepMetaData, sepClass);
else if (seiClass.isAnnotationPresent(HandlerChain.class))
processHandlerChain(sepMetaData, seiClass);
+
+ //setup web service feature contributions
+ epFeatureProcessor.setupEndpointFeatures(sepMetaData);
// process webservices.xml contributions
processWSDDContribution(sepMetaData);
Modified: stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
===================================================================
--- stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2009-01-14 17:25:35 UTC (rev 9034)
+++ stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -29,6 +29,7 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
+import javax.xml.ws.soap.AddressingFeature;
import junit.framework.Test;
@@ -71,11 +72,11 @@
bindingProvider.getBinding().setHandlerChain(customHandlerChain);
Service service2 = Service.create(wsdlURL, serviceName);
- port2 = (StatefulEndpoint)service2.getPort(StatefulEndpoint.class);
+ port2 = (StatefulEndpoint)service2.getPort(StatefulEndpoint.class, new AddressingFeature(true, true));
bindingProvider = (BindingProvider)port2;
List<Handler> customHandlerChain2 = new ArrayList<Handler>();
customHandlerChain2.add(new ClientHandler());
- customHandlerChain2.add(new WSAddressingClientHandler());
+// customHandlerChain2.add(new WSAddressingClientHandler());
bindingProvider.getBinding().setHandlerChain(customHandlerChain2);
}
Modified: stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
===================================================================
--- stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2009-01-14 17:25:35 UTC (rev 9034)
+++ stack/native/branches/jaxws21/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2009-01-14 17:27:29 UTC (rev 9035)
@@ -34,9 +34,9 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.Addressing;
import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
/**
* WS-Addressing stateful service endpoint
@@ -45,7 +45,7 @@
* @since 24-Nov-2005
*/
@WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService")
-@EndpointConfig(configName = "Standard WSAddressing Endpoint")
+@Addressing
@HandlerChain(file = "jaxws-handlers.xml")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class StatefulEndpointImpl implements StatefulEndpoint
15 years, 5 months
JBossWS SVN: r9034 - stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/config/binding.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-14 12:25:35 -0500 (Wed, 14 Jan 2009)
New Revision: 9034
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
Log:
Typo
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-01-14 17:23:45 UTC (rev 9033)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-01-14 17:25:35 UTC (rev 9034)
@@ -41,7 +41,7 @@
import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
/**
- * ObjectModelFactory for JAXRPC configurations.
+ * ObjectModelFactory for JAXWS configurations.
*
* @author Thomas.Diesler(a)jboss.org
* @author Heiko.Braun(a)jboss.org
15 years, 5 months
JBossWS SVN: r9033 - in common: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-14 12:23:45 -0500 (Wed, 14 Jan 2009)
New Revision: 9033
Added:
common/tags/jbossws-common-1.0.0.GA_CP03/
Removed:
common/branches/jbossws-common-1.0.0.GA_CP03/
Log:
[JBWS-1440] Tag jbossws-common-1.0.0.GA_CP03
Copied: common/tags/jbossws-common-1.0.0.GA_CP03 (from rev 9032, common/branches/jbossws-common-1.0.0.GA_CP03)
15 years, 5 months
JBossWS SVN: r9032 - common/branches/jbossws-common-1.0.0.GA_CP03.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-14 12:23:04 -0500 (Wed, 14 Jan 2009)
New Revision: 9032
Modified:
common/branches/jbossws-common-1.0.0.GA_CP03/version.properties
Log:
[JBPAPP-1440] Set version for JBossWS Common to 1.0.0.GA_CP03.
Modified: common/branches/jbossws-common-1.0.0.GA_CP03/version.properties
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP03/version.properties 2009-01-14 17:19:43 UTC (rev 9031)
+++ common/branches/jbossws-common-1.0.0.GA_CP03/version.properties 2009-01-14 17:23:04 UTC (rev 9032)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.0.GA_CP-SNAPSHOT
-repository.id=1.0.0.GA_CP-SNAPSHOT
+version.id=1.0.0.GA_CP03
+repository.id=1.0.0.GA_CP03
implementation.title=JBoss Web Services - Common
implementation.url=http://www.jboss.org/products/jbossws
15 years, 5 months
JBossWS SVN: r9031 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-14 12:19:43 -0500 (Wed, 14 Jan 2009)
New Revision: 9031
Added:
common/branches/jbossws-common-1.0.0.GA_CP03/
Log:
[JBPAPP-1440] Branch ready to tag.
Copied: common/branches/jbossws-common-1.0.0.GA_CP03 (from rev 9030, common/branches/jbossws-common-1.0.0.GA_CP)
15 years, 5 months
JBossWS SVN: r9030 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-14 12:10:55 -0500 (Wed, 14 Jan 2009)
New Revision: 9030
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
[JBPAPP-1291] JAX-WS Deployments Fail For AOP Instrumented Endpoints.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-01-14 16:33:25 UTC (rev 9029)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-01-14 17:10:55 UTC (rev 9030)
@@ -553,6 +553,10 @@
{
String javaName = method.getName();
+ // Methods added by JBoss AOP will be marked as synthetic and should be skipped.
+ if (method.isSynthetic() == true)
+ return;
+
// skip asnyc methods, they dont need meta data representation
if (method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX))
return;
15 years, 5 months