JBossWS SVN: r11428 - stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-18 03:56:20 -0500 (Mon, 18 Jan 2010)
New Revision: 11428
Added:
stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
Log:
[JBWS-2850] adding missing SOAPConnectionFactory configuration property
Added: stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
===================================================================
--- stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (rev 0)
+++ stack/native/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-01-18 08:56:20 UTC (rev 11428)
@@ -0,0 +1 @@
+org.jboss.ws.core.soap.SOAPConnectionFactoryImpl
\ No newline at end of file
14 years, 4 months
JBossWS SVN: r11427 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-17 20:26:51 -0500 (Sun, 17 Jan 2010)
New Revision: 11427
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/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
[JBWS-2810] applying "UnifiedMetaData uses thread context loader ..." fix again + solving issue with Dispatch causing failures
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 2010-01-17 23:57:23 UTC (rev 11426)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-18 01:26:51 UTC (rev 11427)
@@ -148,7 +148,8 @@
}
else
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
+ ClassLoader cl = serviceClass.getClassLoader();
+ UnifiedMetaData wsMetaData = cl == null ? new UnifiedMetaData(vfsRoot) : new UnifiedMetaData(vfsRoot, cl);
serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
}
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 2010-01-17 23:57:23 UTC (rev 11426)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-18 01:26:51 UTC (rev 11427)
@@ -66,9 +66,13 @@
*/
public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder
{
-
public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot)
{
+ return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null);
+ }
+
+ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
+ {
if (wsdlURL == null)
throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL);
@@ -76,7 +80,7 @@
log.debug("START buildMetaData: [service=" + serviceName + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
+ UnifiedMetaData wsMetaData = classLoader != null ? new UnifiedMetaData(vfsRoot, classLoader) : new UnifiedMetaData(vfsRoot);
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-17 23:57:23 UTC (rev 11426)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-18 01:26:51 UTC (rev 11427)
@@ -78,11 +78,16 @@
public UnifiedMetaData(UnifiedVirtualFile vfsRoot)
{
+ this(vfsRoot, SecurityActions.getContextClassLoader());
+ }
+
+ public UnifiedMetaData(UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
+ {
if (vfsRoot == null)
throw new IllegalArgumentException("VFS root cannot be null");
this.vfsRoot = vfsRoot;
- this.classLoader = SecurityActions.getContextClassLoader();
+ this.classLoader = classLoader;
}
public ClassLoader getClassLoader()
14 years, 4 months
JBossWS SVN: r11426 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: jaxws/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-17 18:57:23 -0500 (Sun, 17 Jan 2010)
New Revision: 11426
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.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/spi/ServiceDelegateImpl.java
Log:
[JBWS-2888] ClassCastException when using Dispatch with WebServiceFeature: add a new interface for getting the EndpointMetadata
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java 2010-01-17 23:57:23 UTC (rev 11426)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core;
+
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+
+/**
+ *
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 18-Jan-2010
+ */
+public interface EndpointMetadataProvider
+{
+ /**
+ * Get the endpoint meta data for this stub/dispatch
+ */
+ EndpointMetaData getEndpointMetaData();
+}
Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2010-01-17 23:53:55 UTC (rev 11425)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2010-01-17 23:57:23 UTC (rev 11426)
@@ -27,15 +27,13 @@
import javax.xml.rpc.ParameterMode;
import javax.xml.soap.AttachmentPart;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
/**
* An extension of the standard JAXRPC/JAXWS stubs.
*
* @author Thomas.Diesler(a)jboss.org
* @since 17-Jan-2007
*/
-public interface StubExt extends ConfigProvider
+public interface StubExt extends ConfigProvider, EndpointMetadataProvider
{
/** ClientTimeout property: org.jboss.ws.timeout */
static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout";
@@ -75,11 +73,6 @@
static final String PROPERTY_CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize";
/**
- * Get the endpoint meta data for this stub
- */
- EndpointMetaData getEndpointMetaData();
-
- /**
* Add a header that is not bound to an input parameter.
* A propriatory extension, that is not part of JAXRPC.
*
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 2010-01-17 23:53:55 UTC (rev 11425)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-01-17 23:57:23 UTC (rev 11426)
@@ -55,6 +55,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.ConfigProvider;
+import org.jboss.ws.core.EndpointMetadataProvider;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.client.EndpointInfo;
import org.jboss.ws.core.client.HTTPProtocolConnection;
@@ -88,7 +89,7 @@
* @author Thomas.Diesler(a)jboss.com
* @since 04-Jul-2006
*/
-public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider
+public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider, EndpointMetadataProvider
{
// provide logging
private final Logger log = Logger.getLogger(DispatchImpl.class);
@@ -639,4 +640,9 @@
log.debug("Cannot find the right operation metadata!");
return opMetaData;
}
+
+ public EndpointMetaData getEndpointMetaData()
+ {
+ return epMetaData;
+ }
}
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 2010-01-17 23:53:55 UTC (rev 11425)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-17 23:57:23 UTC (rev 11426)
@@ -52,6 +52,7 @@
import javax.xml.ws.spi.ServiceDelegate;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.EndpointMetadataProvider;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ClientFeatureProcessor;
import org.jboss.ws.core.jaxws.client.ClientImpl;
@@ -552,7 +553,7 @@
{
if (features != null)
{
- EndpointMetaData epMetaData = ((StubExt)stub).getEndpointMetaData();
+ EndpointMetaData epMetaData = ((EndpointMetadataProvider)stub).getEndpointMetaData();
for (WebServiceFeature feature : features)
{
ClientFeatureProcessor.processFeature(feature, epMetaData, stub);
14 years, 4 months
JBossWS SVN: r11425 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-17 18:53:55 -0500 (Sun, 17 Jan 2010)
New Revision: 11425
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java
Log:
[JBWS-2888] Adding testcase
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java 2010-01-15 16:26:15 UTC (rev 11424)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java 2010-01-17 23:53:55 UTC (rev 11425)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, 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.
*
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.endpointReference;
-import java.net.InetAddress;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -31,8 +30,9 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.Service.Mode;
+import javax.xml.ws.soap.AddressingFeature;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import junit.framework.Test;
@@ -84,10 +84,23 @@
public void testDispatch() throws Exception
{
+ innerTestDispatch();
+ }
+
+ private void innerTestDispatch(WebServiceFeature... features) throws Exception
+ {
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/endpointReference", "EndpointService");
Service service = Service.create(wsdlURL, serviceName);
- Dispatch<Source> dispatch = service.createDispatch(new QName("http://org.jboss.ws/endpointReference", "EndpointPort"), Source.class, Mode.PAYLOAD);
+ Dispatch<Source> dispatch = null;
+ if (features != null && features.length > 0) //test both createDispatch methods
+ {
+ dispatch = service.createDispatch(new QName("http://org.jboss.ws/endpointReference", "EndpointPort"), Source.class, Mode.PAYLOAD, features);
+ }
+ else
+ {
+ dispatch = service.createDispatch(new QName("http://org.jboss.ws/endpointReference", "EndpointPort"), Source.class, Mode.PAYLOAD);
+ }
BindingProvider bp = (BindingProvider)dispatch;
assertEndpointReference(bp.getEndpointReference());
@@ -103,6 +116,11 @@
}
}
+ public void testDispatchWithFeatures() throws Exception
+ {
+ innerTestDispatch(new AddressingFeature(false, false));
+ }
+
private void assertEndpointReference(EndpointReference epr) throws Exception
{
assertEquals(W3CEndpointReference.class.getName(), epr.getClass().getName());
14 years, 4 months
JBossWS SVN: r11424 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-15 11:26:15 -0500 (Fri, 15 Jan 2010)
New Revision: 11424
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/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
[JBWS-2810] rollback UnifiedMetaData uses thread context loader fix
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 2010-01-15 16:10:16 UTC (rev 11423)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-15 16:26:15 UTC (rev 11424)
@@ -147,7 +147,7 @@
}
else
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot, serviceClass.getClassLoader());
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
}
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 2010-01-15 16:10:16 UTC (rev 11423)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-15 16:26:15 UTC (rev 11424)
@@ -66,13 +66,9 @@
*/
public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder
{
+
public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot)
{
- return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null);
- }
-
- public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
- {
if (wsdlURL == null)
throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL);
@@ -80,7 +76,7 @@
log.debug("START buildMetaData: [service=" + serviceName + "]");
try
{
- UnifiedMetaData wsMetaData = classLoader != null ? new UnifiedMetaData(vfsRoot, classLoader) : new UnifiedMetaData(vfsRoot);
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName);
wsMetaData.addService(serviceMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15 16:10:16 UTC (rev 11423)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15 16:26:15 UTC (rev 11424)
@@ -78,16 +78,11 @@
public UnifiedMetaData(UnifiedVirtualFile vfsRoot)
{
- this(vfsRoot, SecurityActions.getContextClassLoader());
- }
-
- public UnifiedMetaData(UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
- {
if (vfsRoot == null)
throw new IllegalArgumentException("VFS root cannot be null");
this.vfsRoot = vfsRoot;
- this.classLoader = classLoader;
+ this.classLoader = SecurityActions.getContextClassLoader();
}
public ClassLoader getClassLoader()
14 years, 4 months
JBossWS SVN: r11423 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-15 11:10:16 -0500 (Fri, 15 Jan 2010)
New Revision: 11423
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
fixing NPE in EndpointServlet
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2010-01-15 13:08:16 UTC (rev 11422)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2010-01-15 16:10:16 UTC (rev 11423)
@@ -94,7 +94,6 @@
}
}
this.preDestroyRegistry.clear();
- this.preDestroyRegistry = null;
}
super.destroy();
}
14 years, 4 months
JBossWS SVN: r11422 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-15 08:08:16 -0500 (Fri, 15 Jan 2010)
New Revision: 11422
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
[JBWS-2810] Reduce code duplication in UnifiedMetaData
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15 12:46:09 UTC (rev 11421)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15 13:08:16 UTC (rev 11422)
@@ -78,11 +78,7 @@
public UnifiedMetaData(UnifiedVirtualFile vfsRoot)
{
- if (vfsRoot == null)
- throw new IllegalArgumentException("VFS root cannot be null");
-
- this.vfsRoot = vfsRoot;
- this.classLoader = SecurityActions.getContextClassLoader();
+ this(vfsRoot, SecurityActions.getContextClassLoader());
}
public UnifiedMetaData(UnifiedVirtualFile vfsRoot, ClassLoader classLoader)
14 years, 4 months
JBossWS SVN: r11421 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-15 07:46:09 -0500 (Fri, 15 Jan 2010)
New Revision: 11421
Modified:
stack/native/trunk/pom.xml
Log:
[JBWS-2754][JBWS-2755] upgrading to JAX-WS 2.2 and JAXB 2.2
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-01-15 09:35:02 UTC (rev 11420)
+++ stack/native/trunk/pom.xml 2010-01-15 12:46:09 UTC (rev 11421)
@@ -59,12 +59,12 @@
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
- <jaxws.api.version>2.1</jaxws.api.version>
+ <jaxws.api.version>2.2</jaxws.api.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<saaj.api.version>1.3</saaj.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.12</jaxb.impl.version>
+ <jaxb.api.version>2.2</jaxb.api.version>
+ <jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
14 years, 4 months
JBossWS SVN: r11420 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-15 04:35:02 -0500 (Fri, 15 Jan 2010)
New Revision: 11420
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
Log:
[JBWS-2856] Prevent wsprovide from failing with @WebServiceProvider annotated classes
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2010-01-15 09:29:07 UTC (rev 11419)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2010-01-15 09:35:02 UTC (rev 11420)
@@ -27,6 +27,9 @@
import java.net.URL;
import java.net.URLClassLoader;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -80,6 +83,12 @@
messageStream.println("Output directory: " + outputDir.getAbsolutePath());
messageStream.println("Source directory: " + sourceDir.getAbsolutePath());
+
+ if (!endpointClass.isAnnotationPresent(WebService.class) && endpointClass.isAnnotationPresent(WebServiceProvider.class))
+ {
+ messageStream.println("@WebServiceProvider endpoint specified.");
+ return;
+ }
// Create a dummy classloader to catch generated classes
ClassLoader loader = new URLClassLoader(new URL[0], this.loader);
14 years, 4 months