JBossWS SVN: r11419 - 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-15 04:29:07 -0500 (Fri, 15 Jan 2010)
New Revision: 11419
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] UnifiedMetaData uses thread context loader to find classes, this can lead to javassist.NotFoundException; applying fix, need to run tck to verify everything is still fine.
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-14 16:11:30 UTC (rev 11418)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-01-15 09:29:07 UTC (rev 11419)
@@ -147,7 +147,7 @@
}
else
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot, serviceClass.getClassLoader());
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-14 16:11:30 UTC (rev 11418)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-01-15 09:29:07 UTC (rev 11419)
@@ -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-14 16:11:30 UTC (rev 11418)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2010-01-15 09:29:07 UTC (rev 11419)
@@ -85,6 +85,15 @@
this.classLoader = 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;
+ }
+
public ClassLoader getClassLoader()
{
if (classLoader == null)
14 years, 4 months
JBossWS SVN: r11418 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-14 11:11:30 -0500 (Thu, 14 Jan 2010)
New Revision: 11418
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
Log:
[JBPAPP-3175] Service.create(java.net.URL, javax.xml.namespace.QName) should throw javax.xml.ws.WebServiceException not org.jboss.ws.metadata.wsdl.WSDLException
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 15:47:28 UTC (rev 11417)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 16:11:30 UTC (rev 11418)
@@ -31,6 +31,7 @@
import javax.xml.transform.Source;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.spi.Provider;
@@ -59,9 +60,16 @@
@Override
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass)
{
- ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
- DOMUtils.clearThreadLocals();
- return delegate;
+ try
+ {
+ ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
+ DOMUtils.clearThreadLocals();
+ return delegate;
+ }
+ catch (RuntimeException e)
+ {
+ throw new WebServiceException(e);
+ }
}
@Override
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846 (from rev 11417, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:47:28 UTC (rev 11417)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 16:11:30 UTC (rev 11418)
@@ -1,60 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws2846;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should
- * throw javax.xml.ws.WebServiceException not
- * org.jboss.ws.metadata.wsdl.WSDLException
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 14th January 2010
- * @see https://jira.jboss.org/jira/browse/JBWS-2846
- */
-public class JBWS2846TestCase extends JBossWSTest {
-
- // This endpoint is not deployed so the attempt to retrieve the WSDL will fail.
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/";
-
- public void testCreate() throws Exception {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws2846",
- "EndpointImplService");
-
- try {
- Service service = Service.create(wsdlURL, serviceName);
- fail("Expected WebServiceException not thrown.");
- } catch (WebServiceException expected) {
- // Expected so ignore.
- }
-
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (from rev 11417, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 16:11:30 UTC (rev 11418)
@@ -0,0 +1,60 @@
+/*
+ * 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.test.ws.jaxws.jbws2846;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should
+ * throw javax.xml.ws.WebServiceException not
+ * org.jboss.ws.metadata.wsdl.WSDLException
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 14th January 2010
+ * @see https://jira.jboss.org/jira/browse/JBWS-2846
+ */
+public class JBWS2846TestCase extends JBossWSTest {
+
+ // This endpoint is not deployed so the attempt to retrieve the WSDL will fail.
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/";
+
+ public void testCreate() throws Exception {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2846",
+ "EndpointImplService");
+
+ try {
+ Service service = Service.create(wsdlURL, serviceName);
+ fail("Expected WebServiceException not thrown.");
+ } catch (WebServiceException expected) {
+ // Expected so ignore.
+ }
+
+ }
+
+}
14 years, 4 months
JBossWS SVN: r11417 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-14 10:47:28 -0500 (Thu, 14 Jan 2010)
New Revision: 11417
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
Log:
[JBPAPP-3175] Service.create(java.net.URL, javax.xml.namespace.QName) should throw javax.xml.ws.WebServiceException not org.jboss.ws.metadata.wsdl.WSDLException
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 15:30:10 UTC (rev 11416)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 15:47:28 UTC (rev 11417)
@@ -60,9 +60,16 @@
@Override
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass)
{
- ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
- DOMUtils.clearThreadLocals();
- return delegate;
+ try
+ {
+ ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
+ DOMUtils.clearThreadLocals();
+ return delegate;
+ }
+ catch (RuntimeException e)
+ {
+ throw new WebServiceException(e);
+ }
}
@Override
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846 (from rev 11416, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:30:10 UTC (rev 11416)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:47:28 UTC (rev 11417)
@@ -1,60 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws2846;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should
- * throw javax.xml.ws.WebServiceException not
- * org.jboss.ws.metadata.wsdl.WSDLException
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 14th January 2010
- * @see https://jira.jboss.org/jira/browse/JBWS-2846
- */
-public class JBWS2846TestCase extends JBossWSTest {
-
- // This endpoint is not deployed so the attempt to retrieve the WSDL will fail.
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/";
-
- public void testCreate() throws Exception {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws2846",
- "EndpointImplService");
-
- try {
- Service service = Service.create(wsdlURL, serviceName);
- fail("Expected WebServiceException not thrown.");
- } catch (WebServiceException expected) {
- // Expected so ignore.
- }
-
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (from rev 11416, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:47:28 UTC (rev 11417)
@@ -0,0 +1,60 @@
+/*
+ * 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.test.ws.jaxws.jbws2846;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should
+ * throw javax.xml.ws.WebServiceException not
+ * org.jboss.ws.metadata.wsdl.WSDLException
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 14th January 2010
+ * @see https://jira.jboss.org/jira/browse/JBWS-2846
+ */
+public class JBWS2846TestCase extends JBossWSTest {
+
+ // This endpoint is not deployed so the attempt to retrieve the WSDL will fail.
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/";
+
+ public void testCreate() throws Exception {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2846",
+ "EndpointImplService");
+
+ try {
+ Service service = Service.create(wsdlURL, serviceName);
+ fail("Expected WebServiceException not thrown.");
+ } catch (WebServiceException expected) {
+ // Expected so ignore.
+ }
+
+ }
+
+}
14 years, 4 months
JBossWS SVN: r11416 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-14 10:30:10 -0500 (Thu, 14 Jan 2010)
New Revision: 11416
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
Log:
[JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should throw javax.xml.ws.WebServiceException not org.jboss.ws.metadata.wsdl.WSDLException
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 09:27:05 UTC (rev 11415)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 15:30:10 UTC (rev 11416)
@@ -105,12 +105,20 @@
}
// @Override TODO: comment out override on switch to JAX-WS 2.2
- public ServiceDelegate createServiceDelegate(final URL wsdlLocation, final QName serviceName, final Class serviceClass,
+ // TODO - If this createServiceDelegate is removed from a future version the exception wrapping should be retained.
+ public ServiceDelegate createServiceDelegate(final URL wsdlLocation, final QName serviceName, final Class serviceClass,
final WebServiceFeature... features)
{
- ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass, features);
- DOMUtils.clearThreadLocals();
- return delegate;
+ try
+ {
+ ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass, features);
+ DOMUtils.clearThreadLocals();
+ return delegate;
+ }
+ catch (RuntimeException e)
+ {
+ throw new WebServiceException(e);
+ }
}
// @Override TODO: comment out override on switch to JAX-WS 2.2
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:30:10 UTC (rev 11416)
@@ -0,0 +1,60 @@
+/*
+ * 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.test.ws.jaxws.jbws2846;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should
+ * throw javax.xml.ws.WebServiceException not
+ * org.jboss.ws.metadata.wsdl.WSDLException
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 14th January 2010
+ * @see https://jira.jboss.org/jira/browse/JBWS-2846
+ */
+public class JBWS2846TestCase extends JBossWSTest {
+
+ // This endpoint is not deployed so the attempt to retrieve the WSDL will fail.
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/";
+
+ public void testCreate() throws Exception {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2846",
+ "EndpointImplService");
+
+ try {
+ Service service = Service.create(wsdlURL, serviceName);
+ fail("Expected WebServiceException not thrown.");
+ } catch (WebServiceException expected) {
+ // Expected so ignore.
+ }
+
+ }
+
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
14 years, 4 months
JBossWS SVN: r11415 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-14 04:27:05 -0500 (Thu, 14 Jan 2010)
New Revision: 11415
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-3017] Merging jbossws-native-3.1.2.SP3-patch02 changes + fixing the build
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-01-14 06:40:00 UTC (rev 11414)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-01-14 09:27:05 UTC (rev 11415)
@@ -47,13 +47,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ <version>1.1.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -93,7 +95,7 @@
<version>1.0.0.SP2</version>
</dependency>
<dependency>
- <groupId>xalan</groupId>
+ <groupId>apache-xalan</groupId>
<artifactId>xalan</artifactId>
<scope>provided</scope>
</dependency>
@@ -109,11 +111,11 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
@@ -133,7 +135,7 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-01-14 06:40:00 UTC (rev 11414)
+++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-01-14 09:27:05 UTC (rev 11415)
@@ -21,9 +21,14 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-01-14 06:40:00 UTC (rev 11414)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-01-14 09:27:05 UTC (rev 11415)
@@ -24,7 +24,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
- <jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <jboss.javaee.version>5.0.1.GA</jboss.javaee.version>
</properties>
<!-- Modules -->
@@ -95,6 +95,12 @@
<version>${jboss.jaxr.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-01-14 06:40:00 UTC (rev 11414)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-01-14 09:27:05 UTC (rev 11415)
@@ -56,25 +56,25 @@
<jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
+ <codehaus.jettison.version>1.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <javassist.version>3.6.0.GA</javassist.version>
- <jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.9</jaxb.impl.version>
+ <javassist.version>3.9.0.GA</javassist.version>
+ <jaxb.api.version>2.1.9.patch01</jaxb.api.version>
+ <jaxb.impl.version>2.1.9.patch01</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
- <jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.remoting.version>2.5.2</jboss.remoting.version>
- <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
- <apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>0.9RC4</juddi.version>
- <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
+ <jboss.logging.version>2.1.0.GA</jboss.logging.version>
+ <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <apache.scout.version>1.1.1</apache.scout.version>
+ <juddi.version>2.0.1</juddi.version>
+ <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
- <woodstox.version>3.2.6</woodstox.version>
- <wsdl4j.version>1.6.1</wsdl4j.version>
+ <woodstox.version>3.2.8</woodstox.version>
+ <wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
- <xalan.version>2.7.0</xalan.version>
- <xerces.version>2.8.1</xerces.version>
+ <xalan.version>2.7.1.patch02</xalan.version>
+ <xerces.version>2.9.1</xerces.version>
</properties>
<!-- DependencyManagement -->
@@ -147,6 +147,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -209,17 +214,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.impl.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb.impl.version}</version>
</dependency>
@@ -233,6 +238,54 @@
<artifactId>juddi-service</artifactId>
<version>${jboss.jaxr.version}</version>
<type>sar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-saaj</artifactId>
+ </exclusion>
+ <!--
+ <exclusion>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </exclusion>
+ -->
+ </exclusions>
</dependency>
<dependency>
<groupId>apache-scout</groupId>
@@ -265,7 +318,7 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>xalan</groupId>
+ <groupId>apache-xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-01-14 06:40:00 UTC (rev 11414)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-01-14 09:27:05 UTC (rev 11415)
@@ -33,9 +33,9 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
- <include>javax.xml.bind:jaxb-api:jar</include>
- <include>com.sun.xml.bind:jaxb-impl:jar</include>
- <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>sun-jaxb:jaxb-api:jar</include>
+ <include>sun-jaxb:jaxb-impl:jar</include>
+ <include>sun-jaxb:jaxb-xjc:jar</include>
<include>com.sun.xml.ws:jaxws-tools:jar</include>
<include>com.sun.xml.ws:jaxws-rt:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
14 years, 4 months
JBossWS SVN: r11414 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1581 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-14 01:40:00 -0500 (Thu, 14 Jan 2010)
New Revision: 11414
Removed:
framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl
framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml
Log:
refactoring archive names
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-14 06:40:00 UTC (rev 11414)
@@ -236,7 +236,7 @@
</jar>
<!-- jaxws-jbws1581 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
@@ -247,14 +247,13 @@
</war>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear">
<fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws1581.war"/>
+ <include name="jaxws-jbws1581-pojo.war"/>
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF">
- <include name="application.xml"/>
<include name="jboss-app.xml"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581-ejb3.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2010-01-14 06:40:00 UTC (rev 11414)
@@ -43,16 +43,16 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar");
+ return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar");
}
public void testWSDLAccess() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl");
Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
assertNotNull("wsdl expected", wsdl);
}
-
+
public void testEJBVehicle() throws Exception
{
EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2010-01-14 06:40:00 UTC (rev 11414)
@@ -43,16 +43,16 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar");
+ return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar");
}
public void testWSDLAccess() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl");
Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
assertNotNull("wsdl expected", wsdl);
}
-
+
public void testEJBVehicle() throws Exception
{
EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote");
Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml 2010-01-14 06:40:00 UTC (rev 11414)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
- version="1.4">
-
- <module>
- <web>
- <web-uri>jaxws-jbws1581.war</web-uri>
- <context-root>jaxws-jbws1581</context-root>
- </web>
- </module>
-
-</application>
\ No newline at end of file
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2010-01-14 06:40:00 UTC (rev 11414)
@@ -3,7 +3,7 @@
<!DOCTYPE jboss-app
PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-
+
<jboss-app>
<loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.ear</loader-repository>
</jboss-app>
\ No newline at end of file
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2010-01-14 06:40:00 UTC (rev 11414)
@@ -27,7 +27,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBeanBinding' name='EndpointBeanPort'>
- <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1581'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1581-pojo'/>
</port>
</service>
</definitions>
\ No newline at end of file
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2010-01-14 06:40:00 UTC (rev 11414)
@@ -3,10 +3,10 @@
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
-
+
<class-loading>
- <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.war</loader-repository>
+ <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581-pojo.war</loader-repository>
</class-loading>
-
+
</jboss-web>
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml 2010-01-13 22:08:59 UTC (rev 11413)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml 2010-01-14 06:40:00 UTC (rev 11414)
@@ -2,15 +2,15 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
+
<servlet>
<servlet-name>EndpointBean</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.jbws1581.EndpointBean</servlet-class>
</servlet>
-
+
<servlet-mapping>
<servlet-name>EndpointBean</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
-
+
</web-app>
\ No newline at end of file
14 years, 4 months
JBossWS SVN: r11413 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-13 17:08:59 -0500 (Wed, 13 Jan 2010)
New Revision: 11413
Modified:
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
Log:
refactoring archive names
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-01-13 21:26:37 UTC (rev 11412)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-01-13 22:08:59 UTC (rev 11413)
@@ -55,7 +55,7 @@
</jar>
<!-- jaxws-samples-eardeployment -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
</classes>
@@ -64,7 +64,7 @@
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-ejb3.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/>
</fileset>
@@ -74,8 +74,8 @@
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear">
<fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-eardeployment.jar"/>
- <include name="jaxws-samples-eardeployment.war"/>
+ <include name="jaxws-samples-eardeployment-ejb3.jar"/>
+ <include name="jaxws-samples-eardeployment-pojo.war"/>
</fileset>
</jar>
14 years, 4 months
JBossWS SVN: r11412 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxrpc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-13 16:26:37 -0500 (Wed, 13 Jan 2010)
New Revision: 11412
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
Log:
[JBWS-1762] removing obsolete test - it was intended for AS 4x series
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2010-01-13 21:20:57 UTC (rev 11411)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2010-01-13 21:26:37 UTC (rev 11412)
@@ -2607,77 +2607,6 @@
</metainf>
</jar>
- <!-- jaxrpc-jbws1762 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="ejb-jar.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/packaged">
- <include name="jboss.xml"/>
- </metainf>
- </jar>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
- <unjar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
- <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar/META-INF"
- file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" overwrite="true"/>
-
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1762/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
- <unwar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
-
- <ear jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.ear"
- appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/packaged/application.xml">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws1762-packaged.jar"/>
- <include name="jaxrpc-jbws1762-packaged.war"/>
- </fileset>
- </ear>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear"/>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
- <copy file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/exploded/application.xml"
- todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/>
- <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war">
- <fileset dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
- </copy>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/>
- <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar">
- <fileset dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
- </copy>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws1762-packaged.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar"/>
- <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
- <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/META-INF"
- file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/>
- <unwar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war"
- dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
-
<!-- jaxrpc-jbws1792 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
14 years, 4 months
JBossWS SVN: r11411 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-13 16:20:57 -0500 (Wed, 13 Jan 2010)
New Revision: 11411
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/
framework/trunk/testsuite/test/resources/jaxws/jbws1762/
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-1762] removing obsolete test - it was intended for AS 4x series
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-13 19:39:39 UTC (rev 11410)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-13 21:20:57 UTC (rev 11411)
@@ -310,53 +310,6 @@
</classes>
</war>
- <!-- jaxws-jbws1762 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.class"/>
- </fileset>
- </jar>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/>
- <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/>
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/>
- <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws1762-packaged.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar"/>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws1762-packaged.jar"/>
- <include name="jaxws-jbws1762-packaged.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/packaged">
- <include name="application.xml"/>
- </metainf>
- </jar>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear"/>
- <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
- <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
-
<!-- jaxws-jbws1797 -->
<war destfile="${tests.output.dir}/test-libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1797/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
14 years, 4 months