JBossWS SVN: r15224 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-09 07:55:29 -0500 (Wed, 09 Nov 2011)
New Revision: 15224
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-09 12:53:39 UTC (rev 15223)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-09 12:55:29 UTC (rev 15224)
@@ -1314,7 +1314,6 @@
<!-- ////////////////////////// -->
<!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
@@ -1337,8 +1336,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- TODO: JSR109 w/ jaxrpc, remote JNDI support -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
13 years, 1 month
JBossWS SVN: r15223 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-09 07:53:39 -0500 (Wed, 09 Nov 2011)
New Revision: 15223
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling tests
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2011-11-09 12:53:39 UTC (rev 15223)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109ejb;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class DocEJBTestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109ejb";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109ejb-doc";
private static JaxRpcTestService endpoint;
public static Test suite()
@@ -50,12 +55,16 @@
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
- endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ endpoint = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
@@ -72,4 +81,5 @@
Object retObj = endpoint.echoSimpleUserType(hello, userType);
assertEquals(userType, retObj);
}
+
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2011-11-09 12:53:39 UTC (rev 15223)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109ejb;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class RpcEJBTestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109ejb";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109ejb-rpc";
private static JaxRpcTestService port;
public static Test suite()
@@ -50,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2011-11-09 12:53:39 UTC (rev 15223)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109pojo;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class DocJSETestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109pojo";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-doc";
private static JaxRpcTestService port;
public static Test suite()
@@ -50,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2011-11-09 12:53:39 UTC (rev 15223)
@@ -21,17 +21,14 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109pojo;
-import java.io.File;
import java.net.URL;
-import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -43,6 +40,8 @@
*/
public class RpcJSETestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109pojo";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-rpc";
private static JaxRpcTestService port;
public static Test suite()
@@ -56,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 12:51:00 UTC (rev 15222)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 12:53:39 UTC (rev 15223)
@@ -1029,8 +1029,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
<!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
@@ -1149,8 +1147,6 @@
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
<!-- # webservices-description in jboss-web.xml / jboss.xml -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
13 years, 1 month
JBossWS SVN: r15222 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples: jsr109pojo and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-09 07:51:00 -0500 (Wed, 09 Nov 2011)
New Revision: 15222
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
Log:
JNDI -> URL based tests
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2011-11-09 12:04:39 UTC (rev 15221)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109ejb;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class DocEJBTestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109ejb";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109ejb-doc";
private static JaxRpcTestService endpoint;
public static Test suite()
@@ -50,12 +55,16 @@
if (endpoint == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
- endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ endpoint = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
@@ -72,4 +81,5 @@
Object retObj = endpoint.echoSimpleUserType(hello, userType);
assertEquals(userType, retObj);
}
+
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2011-11-09 12:04:39 UTC (rev 15221)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109ejb;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class RpcEJBTestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109ejb";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109ejb-rpc";
private static JaxRpcTestService port;
public static Test suite()
@@ -50,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2011-11-09 12:04:39 UTC (rev 15221)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109pojo;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class DocJSETestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109pojo";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-doc";
private static JaxRpcTestService port;
public static Test suite()
@@ -50,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2011-11-09 12:04:39 UTC (rev 15221)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2011-11-09 12:51:00 UTC (rev 15222)
@@ -21,8 +21,11 @@
*/
package org.jboss.test.ws.jaxrpc.samples.jsr109pojo;
-import javax.naming.InitialContext;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import junit.framework.Test;
@@ -37,6 +40,8 @@
*/
public class RpcJSETestCase extends JBossWSTest
{
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109pojo";
+ private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-rpc";
private static JaxRpcTestService port;
public static Test suite()
@@ -50,12 +55,16 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
- port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ port = getService(JaxRpcTestService.class, "TestService", "JaxRpcTestServicePort");
}
}
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
+
public void testEchoString() throws Exception
{
String hello = "Hello";
13 years, 1 month
JBossWS SVN: r15221 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxrpc/samples/swa and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-09 07:04:39 -0500 (Wed, 09 Nov 2011)
New Revision: 15221
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
Log:
Fixing swa/mtom failures w/ native stack & AS7
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-11-09 11:57:03 UTC (rev 15220)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-11-09 12:04:39 UTC (rev 15221)
@@ -350,6 +350,9 @@
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common,javax.mail.api services export,javax.activation.api services export"/>
+ </manifest>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/META-INF">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2011-11-09 11:57:03 UTC (rev 15220)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2011-11-09 12:04:39 UTC (rev 15221)
@@ -23,15 +23,15 @@
import java.awt.Image;
import java.awt.Toolkit;
-import java.io.File;
import java.io.FileInputStream;
import java.net.URL;
import javax.activation.DataHandler;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
-import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
import javax.xml.transform.stream.StreamSource;
import junit.framework.Test;
@@ -48,6 +48,8 @@
*/
public class AttachmentProxyTestCase extends JBossWSTest
{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-swa";
+ private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/swa";
private static Attachment port;
/** Deploy the test ear */
@@ -62,11 +64,15 @@
if (port == null)
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService");
- port = (Attachment)service.getPort(Attachment.class);
+ port = getService(Attachment.class, "Attachment", "AttachmentPort");
}
}
+
+ protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+ Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+ return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), clazz);
+ }
/** Send a multipart message with a text/plain attachment part
*/
13 years, 1 month
JBossWS SVN: r15220 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-09 06:57:03 -0500 (Wed, 09 Nov 2011)
New Revision: 15220
Modified:
stack/native/trunk/pom.xml
Log:
upgrade logging
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-11-09 11:27:00 UTC (rev 15219)
+++ stack/native/trunk/pom.xml 2011-11-09 11:57:03 UTC (rev 15220)
@@ -65,7 +65,7 @@
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
- <jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
+ <jboss.logging.version>3.1.0.Beta3</jboss.logging.version>
<jboss.jaxr.version>2.0.3</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
13 years, 1 month
JBossWS SVN: r15219 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-09 06:27:00 -0500 (Wed, 09 Nov 2011)
New Revision: 15219
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Updating 710 version
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 11:24:33 UTC (rev 15218)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 11:27:00 UTC (rev 15219)
@@ -916,7 +916,7 @@
<profile>
<id>jboss710</id>
<properties>
- <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version>
+ <jboss.version>7.1.0.Alpha2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss710</jbossws.integration.target>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
13 years, 1 month
JBossWS SVN: r15218 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-09 06:24:33 -0500 (Wed, 09 Nov 2011)
New Revision: 15218
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Updating jboss710 version
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-09 10:14:55 UTC (rev 15217)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-09 11:24:33 UTC (rev 15218)
@@ -1140,7 +1140,7 @@
<profile>
<id>jboss710</id>
<properties>
- <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version>
+ <jboss.version>7.1.0.Alpha2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss710</jbossws.integration.target>
</properties>
<dependencies>
13 years, 1 month
JBossWS SVN: r15217 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-09 05:14:55 -0500 (Wed, 09 Nov 2011)
New Revision: 15217
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Enabling some tests
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 10:14:18 UTC (rev 15216)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-09 10:14:55 UTC (rev 15217)
@@ -1164,12 +1164,6 @@
<!-- # unpackaged EAR deployment failure -->
<exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude>
- <!-- # [AS7-2550] javax.activation.api module needs access to jbossws-native data content handlers -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase*</exclude>
-
</excludes>
</configuration>
</plugin>
13 years, 1 month
JBossWS SVN: r15216 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-09 05:14:18 -0500 (Wed, 09 Nov 2011)
New Revision: 15216
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Enabling some tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-08 20:57:52 UTC (rev 15215)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-09 10:14:18 UTC (rev 15216)
@@ -1343,10 +1343,6 @@
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
- <!-- [AS7-2550] javax.activation.api module needs access to jbossws-native data content handlers -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
-
</excludes>
</configuration>
</plugin>
13 years, 1 month
JBossWS SVN: r15215 - in stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499: modules/core and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-11-08 15:57:52 -0500 (Tue, 08 Nov 2011)
New Revision: 15215
Added:
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
Removed:
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
Modified:
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/
Log:
[JBPAPP-7499] One-off patch for JBPAPP-7498 - JBPAPP-5450 breaks with default namespace on SOAP Envelope
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2:15206
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/core:15206
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-08 19:48:02 UTC (rev 15214)
+++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-11-08 20:57:52 UTC (rev 15215)
@@ -185,7 +185,7 @@
DOMUtils.copyAttributes(soapHeader, domHeader);
- if (!soapHeader.getPrefix().equals(domHeader.getPrefix()))
+ if (!checkEquals(soapHeader.getPrefix(), domHeader.getPrefix()))
{
soapHeader.setPrefix(domHeader.getPrefix());
}
@@ -226,7 +226,7 @@
DOMUtils.copyAttributes(soapBody, domBody);
- if (!soapBody.getPrefix().equals(domBody.getPrefix()))
+ if (!checkEquals(soapBody.getPrefix(), domBody.getPrefix()))
{
soapBody.setPrefix(domBody.getPrefix());
}
@@ -435,4 +435,16 @@
String nodeValue = child.getNodeValue();
soapElement.addTextNode(nodeValue);
}
+
+ private boolean checkEquals(final String lhs, final String rhs)
+ {
+ if (lhs == null)
+ {
+ return (rhs == null);
+ }
+ else
+ {
+ return (lhs.equals(rhs));
+ }
+ }
}
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:15206
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
Deleted: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 10:13:47 UTC (rev 15206)
+++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 20:57:52 UTC (rev 15215)
@@ -1,56 +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.jbws3380;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-3380] NPE when dealing with default namespace on SOAP Envelope
- *
- * @author alessio.soldano(a)jboss.com
- */
-public class JBWS3380TestCase extends JBossWSTest
-{
- private final String requestMessage = "<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:rep=\"http://jbws3380.jaxws.ws.test.jboss.org/\">"
- + " <Header/>"
- + " <Body>"
- + " <rep:helloWorld>"
- + " <!--Optional:-->"
- + " <name>?</name>"
- + " </rep:helloWorld>"
- + " </Body>"
- + "</Envelope>";
-
- public void testParseRequestMessage() throws SOAPException, IOException
- {
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(requestMessage.getBytes()));
- assertNotNull(reqMsg);
- }
-}
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java (from rev 15206, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-7499/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3380/JBWS3380TestCase.java 2011-11-08 20:57:52 UTC (rev 15215)
@@ -0,0 +1,56 @@
+/*
+ * 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.jbws3380;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-3380] NPE when dealing with default namespace on SOAP Envelope
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class JBWS3380TestCase extends JBossWSTest
+{
+ private final String requestMessage = "<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:rep=\"http://jbws3380.jaxws.ws.test.jboss.org/\">"
+ + " <Header/>"
+ + " <Body>"
+ + " <rep:helloWorld>"
+ + " <!--Optional:-->"
+ + " <name>?</name>"
+ + " </rep:helloWorld>"
+ + " </Body>"
+ + "</Envelope>";
+
+ public void testParseRequestMessage() throws SOAPException, IOException
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(requestMessage.getBytes()));
+ assertNotNull(reqMsg);
+ }
+}
\ No newline at end of file
13 years, 1 month