JBossWS SVN: r7812 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-10 09:14:45 -0400 (Thu, 10 Jul 2008)
New Revision: 7812
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
fix client classpath
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-07-10 12:18:50 UTC (rev 7811)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-10 13:14:45 UTC (rev 7812)
@@ -355,24 +355,24 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500x</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -387,6 +387,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jboss-client.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -405,24 +408,24 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500x</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -437,6 +440,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
17 years, 9 months
JBossWS SVN: r7811 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-10 08:18:50 -0400 (Thu, 10 Jul 2008)
New Revision: 7811
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
fix AS trunk
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-07-10 09:05:51 UTC (rev 7810)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-07-10 12:18:50 UTC (rev 7811)
@@ -493,7 +493,8 @@
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
<additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jboss-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
17 years, 9 months
JBossWS SVN: r7810 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-10 05:05:51 -0400 (Thu, 10 Jul 2008)
New Revision: 7810
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
fix hudson regression
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-07-09 14:27:03 UTC (rev 7809)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-07-10 09:05:51 UTC (rev 7810)
@@ -416,10 +416,15 @@
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -434,6 +439,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jboss-client.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -461,10 +469,15 @@
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -479,6 +492,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jboss-client.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
17 years, 9 months
JBossWS SVN: r7809 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/samples/exception and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-09 10:27:03 -0400 (Wed, 09 Jul 2008)
New Revision: 7809
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.java
Modified:
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
Log:
Testing exception handling both with JSE and EJB3 endpoints
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-07-09 12:42:27 UTC (rev 7808)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-07-09 14:27:03 UTC (rev 7809)
@@ -87,6 +87,7 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/exception/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/>
@@ -94,6 +95,17 @@
<include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
</classes>
</war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-exception.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
+ </fileset>
+ </jar>
<!-- jaxws-samples-handlerchain -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2008-07-09 14:27:03 UTC (rev 7809)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.samples.exception;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.jaxws.samples.exception.client.ExceptionEndpoint;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test JAX-WS exception handling with EJB3 endpoints
+ *
+ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @author alessio.soldano(a)jboss.com
+ * @version $Revision:1370 $
+ */
+public class ExceptionEJB3TestCase extends ExceptionTestCase
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(ExceptionEJB3TestCase.class, "jaxws-samples-exception.jar");
+ }
+
+ @Override
+ protected ExceptionEndpoint getProxy() throws Exception
+ {
+ QName serviceName = new QName(targetNS, "ExceptionEndpointEJB3ImplService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-exception/ExceptionEndpointEJB3Impl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ return service.getPort(ExceptionEndpoint.class);
+ }
+}
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2008-07-09 12:42:27 UTC (rev 7808)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2008-07-09 14:27:03 UTC (rev 7809)
@@ -44,26 +44,22 @@
*/
public class ExceptionTestCase extends JBossWSTest
{
- private String targetNS = "http://server.exception.samples.jaxws.ws.test.jboss.org/";
- private ExceptionEndpoint proxy;
+ protected String targetNS = "http://server.exception.samples.jaxws.ws.test.jboss.org/";
public static Test suite()
{
return new JBossWSTestSetup(ExceptionTestCase.class, "jaxws-samples-exception.war");
}
- @Override
- protected void setUp() throws Exception
+ protected ExceptionEndpoint getProxy() throws Exception
{
- super.setUp();
-
QName serviceName = new QName(targetNS, "ExceptionEndpointImplService");
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-exception/ExceptionEndpointService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- proxy = service.getPort(ExceptionEndpoint.class);
+ return service.getPort(ExceptionEndpoint.class);
}
-
+
/*
* 10.2.2.3
*
@@ -85,7 +81,7 @@
{
try
{
- proxy.throwRuntimeException();
+ getProxy().throwRuntimeException();
fail("Expected SOAPFaultException");
}
catch (SOAPFaultException e)
@@ -99,7 +95,7 @@
{
try
{
- proxy.throwSoapFaultException();
+ getProxy().throwSoapFaultException();
fail("Expected SOAPFaultException");
}
catch (SOAPFaultException e)
@@ -116,7 +112,7 @@
{
try
{
- proxy.throwApplicationException();
+ getProxy().throwApplicationException();
fail("Expected UserException");
}
catch (UserException_Exception e)
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.java 2008-07-09 14:27:03 UTC (rev 7809)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.samples.exception.server;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.ws.soap.SOAPFaultException;
+
+public class EndpointImpl
+{
+ public void throwRuntimeException()
+ {
+ throw new RuntimeException("oh no, a runtime exception occured.");
+ }
+
+ public void throwSoapFaultException()
+ {
+ // This should be thrown as-is
+ try
+ {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode"));
+ fault.setFaultActor("mr.actor");
+ fault.addDetail().addChildElement("test");
+ throw new SOAPFaultException(fault);
+ }
+ catch (SOAPException s)
+ {
+ throw new RuntimeException(s);
+ }
+ }
+
+ public void throwApplicationException() throws UserException
+ {
+ throw new UserException("validation", 123, "Some validation error");
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.java 2008-07-09 14:27:03 UTC (rev 7809)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.samples.exception.server;
+
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint")
+@HandlerChain(file = "jaxws-handlers-server.xml")
+public class ExceptionEndpointEJB3Impl extends EndpointImpl implements ExceptionEndpoint
+{
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2008-07-09 12:42:27 UTC (rev 7808)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2008-07-09 14:27:03 UTC (rev 7809)
@@ -23,41 +23,10 @@
import javax.jws.HandlerChain;
import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.soap.SOAPFaultException;
-
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint")
@HandlerChain(file = "jaxws-handlers-server.xml")
-public class ExceptionEndpointImpl implements ExceptionEndpoint
+public class ExceptionEndpointImpl extends EndpointImpl implements ExceptionEndpoint
{
- public void throwRuntimeException()
- {
- throw new RuntimeException("oh no, a runtime exception occured.");
- }
-
- public void throwSoapFaultException()
- {
- // This should be thrown as-is
- try
- {
- SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode"));
- fault.setFaultActor("mr.actor");
- fault.addDetail().addChildElement("test");
- throw new SOAPFaultException(fault);
- }
- catch (SOAPException s)
- {
- throw new RuntimeException(s);
- }
- }
-
- public void throwApplicationException() throws UserException
- {
- throw new UserException("validation", 123, "Some validation error");
- }
+
}
17 years, 9 months
JBossWS SVN: r7808 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-09 08:42:27 -0400 (Wed, 09 Jul 2008)
New Revision: 7808
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
fix hudson distro regression
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-07-09 11:22:36 UTC (rev 7807)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-07-09 12:42:27 UTC (rev 7808)
@@ -242,11 +242,13 @@
<pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss.lib}/jboss-container.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
<pathelement location="${jboss.server.lib}/jnpserver.jar"/>
<pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
17 years, 9 months
JBossWS SVN: r7807 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-09 07:22:36 -0400 (Wed, 09 Jul 2008)
New Revision: 7807
Modified:
stack/cxf/trunk/pom.xml
Log:
switch to framework snapshot
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-07-09 11:21:46 UTC (rev 7806)
+++ stack/cxf/trunk/pom.xml 2008-07-09 11:22:36 UTC (rev 7807)
@@ -47,7 +47,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.5.GA</jbossws.common.version>
- <jbossws.framework.version>3.0.2.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.4.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
17 years, 9 months
JBossWS SVN: r7806 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-09 07:21:46 -0400 (Wed, 09 Jul 2008)
New Revision: 7806
Modified:
stack/native/trunk/pom.xml
Log:
switch to framework snapshot
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-07-09 11:11:34 UTC (rev 7805)
+++ stack/native/trunk/pom.xml 2008-07-09 11:21:46 UTC (rev 7806)
@@ -52,7 +52,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.5.GA</jbossws.common.version>
- <jbossws.framework.version>3.0.2.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.4.GA</jbossws.spi.version>
<jbossws.jboss421.version>3.0.2.GA</jbossws.jboss421.version>
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
17 years, 9 months
JBossWS SVN: r7805 - in stack/metro/trunk/modules/server: src/main/java/org/jboss/wsf/stack/metro and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-09 07:11:34 -0400 (Wed, 09 Jul 2008)
New Revision: 7805
Modified:
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
Log:
[JBWS-2087] Fixing invocation exception handling for EJB3 endpoints
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2008-07-09 11:09:08 UTC (rev 7804)
+++ stack/metro/trunk/modules/server/pom.xml 2008-07-09 11:11:34 UTC (rev 7805)
@@ -97,6 +97,11 @@
<artifactId>jboss-common</artifactId>
</dependency>
<dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-07-09 11:09:08 UTC (rev 7804)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-07-09 11:11:34 UTC (rev 7805)
@@ -26,7 +26,9 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import javax.ejb.EJBException;
import javax.xml.ws.Provider;
+import javax.xml.ws.WebFault;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
@@ -105,12 +107,24 @@
private void handleException(Exception ex)
throws InvocationTargetException, IllegalAccessException
{
+ //Unwrap EJBException
+ if (ex instanceof EJBException)
+ ex = ((EJBException)ex).getCausedByException();
+
if (ex instanceof InvocationTargetException)
throw (InvocationTargetException)ex;
if (ex instanceof IllegalAccessException)
throw (IllegalAccessException)ex;
-
+
+ //check if this is a declared fault; Metro expects an InvocationTargetException
+ //for declared faults also when calling an EJB3 endpoint
+ if (ex.getClass().isAnnotationPresent(WebFault.class))
+ throw new InvocationTargetException(ex);
+
+ if (ex instanceof WebServiceException)
+ throw (WebServiceException)ex;
+
throw new WebServiceException(ex);
}
}
\ No newline at end of file
17 years, 9 months
JBossWS SVN: r7804 - in stack/metro/trunk/modules/testsuite/metro-tests: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-09 07:09:08 -0400 (Wed, 09 Jul 2008)
New Revision: 7804
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestException.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestFaultInfo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestPortType.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
Log:
[JBWS-2087] Adding test case
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-07-09 10:45:48 UTC (rev 7803)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-07-09 11:09:08 UTC (rev 7804)
@@ -38,6 +38,21 @@
</classes>
</war>
+ <!-- jbws2087 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2087.jar" >
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2087/**/*"/>
+ </fileset>
+ </jar>
+
+ <!-- jbws2206 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2206.jar" >
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2206/**/*"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2206/META-INF"/>
+ </jar>
+
<!-- wsit-rm -->
<war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -51,13 +66,6 @@
<include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
</webinf>
</war>
-
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2206.jar" >
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2206/**/*"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2206/META-INF"/>
- </jar>
</target>
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java 2008-07-09 11:09:08 UTC (rev 7804)
@@ -0,0 +1,60 @@
+/*
+ * 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.test.ws.jaxws.jbws2087;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS2087TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2087TestCase.class, "jaxws-jbws2087.jar");
+ }
+
+ public void testClientProxy() throws Exception
+ {
+ Service service = Service.create(
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws2087/MetroTestServiceBean?wsdl"),
+ new QName("http://com.acme.metroexceptiontest/", "MetroTestService")
+ );
+ MetroTestPortType port = service.getPort(MetroTestPortType.class);
+
+ try
+ {
+ port.helloWorld();
+ fail("A MetroTestException should have been thrown.");
+ }
+ catch (MetroTestException e)
+ {
+ assertEquals("My message", e.getMessage());
+ assertEquals("My detail", e.getFaultInfo().getDetail());
+ }
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestException.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestException.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestException.java 2008-07-09 11:09:08 UTC (rev 7804)
@@ -0,0 +1,19 @@
+package org.jboss.test.ws.jaxws.jbws2087;
+
+import javax.xml.ws.WebFault;
+
+@WebFault(name="MetroTestFault", targetNamespace="http://com.acme.metroexceptiontest/")
+public class MetroTestException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ private MetroTestFaultInfo faultInfo;
+
+ public MetroTestException(String message, MetroTestFaultInfo faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ public MetroTestFaultInfo getFaultInfo() {
+ return faultInfo;
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestFaultInfo.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestFaultInfo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestFaultInfo.java 2008-07-09 11:09:08 UTC (rev 7804)
@@ -0,0 +1,32 @@
+package org.jboss.test.ws.jaxws.jbws2087;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+ name = "MetroTestFaultInfo",
+ namespace="http://com.acme.metroexceptiontest/",
+ propOrder = { "detail" }
+)
+public class MetroTestFaultInfo {
+ protected String detail;
+
+ public MetroTestFaultInfo() {
+ }
+
+ public MetroTestFaultInfo(String detail) {
+ this.detail = detail;
+ }
+
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestFaultInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestPortType.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestPortType.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestPortType.java 2008-07-09 11:09:08 UTC (rev 7804)
@@ -0,0 +1,15 @@
+package org.jboss.test.ws.jaxws.jbws2087;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(
+ name = "MetroTestPortType",
+ targetNamespace = "http://com.acme.metroexceptiontest/")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface MetroTestPortType {
+
+ @WebMethod
+ public String helloWorld() throws MetroTestException;
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestPortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java 2008-07-09 11:09:08 UTC (rev 7804)
@@ -0,0 +1,17 @@
+package org.jboss.test.ws.jaxws.jbws2087;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+@Stateless
+@WebService(
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2087.MetroTestPortType",
+ name="MetroTestService",
+ targetNamespace = "http://com.acme.metroexceptiontest/",
+ serviceName = "MetroTestService")
+public class MetroTestServiceBean implements MetroTestPortType {
+
+ public String helloWorld() throws MetroTestException {
+ throw new MetroTestException("My message", new MetroTestFaultInfo("My detail"));
+ }
+}
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
JBossWS SVN: r7803 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/tools/jbpapp921 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-09 06:45:48 -0400 (Wed, 09 Jul 2008)
New Revision: 7803
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml
Log:
[JBPAPP-921] fix test
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-09 09:03:45 UTC (rev 7802)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-09 10:45:48 UTC (rev 7803)
@@ -26,6 +26,7 @@
</classpath>
</taskdef>
+ <macro-wstools dest="tools/jbpapp921" config="tools/jbpapp921/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-09 09:03:45 UTC (rev 7802)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-09 10:45:48 UTC (rev 7803)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.tools.jbpapp921;
import java.io.File;
+import java.util.Arrays;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
@@ -30,21 +31,21 @@
public class JBPAPP921TestCase extends JBossWSTest
{
+ private static final String resourceDir = "tools/jbpapp921";
+ private static final String toolsDir = "target/wstools/jbpapp921/output";
- private static final String resourceDir = "resources/tools/jbpapp921";
- private static final String toolsDir = "tools/jbpapp921";
-
public void testGenerate() throws Exception
{
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ String realResourceDir = getResourceFile("tools/jbpapp921").getAbsolutePath();
+ String[] args = new String[] { "-dest", toolsDir, "-config", realResourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
compareSource("Models_ServiceIM_ServiceProxyService.java");
compareSource("ValidationEvent_test.java");
}
- private static void compareSource(final String fileName) throws Exception
+ private void compareSource(final String fileName) throws Exception
{
- File expected = new File(resourceDir + "/" + fileName);
+ File expected = getResourceFile(resourceDir + "/" + fileName);
File generated = new File(toolsDir + "/org/jboss/test/ws/jbpapp921/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-09 09:03:45 UTC (rev 7802)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-09 10:45:48 UTC (rev 7803)
@@ -1,4 +1,4 @@
<configuration>
- <wsdl-java location="resources/tools/jbpapp921/test.wsdl">
+ <wsdl-java location="@test.resources.directory(a)/tools/jbpapp921/test.wsdl">
</wsdl-java>
</configuration>
\ No newline at end of file
17 years, 9 months