12:42 p.m.
Author: heiko.braun(a)jboss.com
Date: 2007-07-13 06:42:45 -0400 (Fri, 13 Jul 2007)
New Revision: 3875
Modified:
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java
branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
Log:
Remove dependencies on jbossws-native from webserviceref tests.
Modified:
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
===================================================================
---
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-07-13
10:13:30 UTC (rev 3874)
+++
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-07-13
10:42:45 UTC (rev 3875)
@@ -23,6 +23,7 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -31,8 +32,6 @@
import junit.framework.Test;
import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -48,15 +47,17 @@
public static Test suite()
{
+ System.out.println("FIXME: Verif if stub properties may used across stacks,
otherwise this test needs to be moved");
+
return new JBossWSTestSetup(StubPropertyTestCase.class,
"jaxws-samples-webserviceref-secure.jar,
jaxws-samples-webserviceref-secure-client.jar");
}
- public void testWSDLAccess() throws MalformedURLException
+ public void testWSDLAccess() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
+ InputStream inputStream = wsdlURL.openStream();
+ assertNotNull(inputStream);
+ inputStream.close();
}
public void testDynamicProxy() throws Exception
Modified:
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java
===================================================================
---
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-07-13
10:13:30 UTC (rev 3874)
+++
branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-07-13
10:42:45 UTC (rev 3875)
@@ -33,7 +33,7 @@
import javax.xml.ws.WebServiceRefs;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.ConfigProvider;
+//import org.jboss.ws.core.ConfigProvider;
//Test on type
@WebServiceRef(name = "Service1")
@@ -103,7 +103,7 @@
Service service = (Service)iniCtx.lookup("java:comp/env/Service2");
TestEndpoint port = service.getPort(TestEndpoint.class);
- verifyConfig((ConfigProvider)port);
+ //verifyConfig((ConfigProvider)port);
return port.echo(reqStr);
}
@@ -131,11 +131,11 @@
{
TestEndpoint port = service4.getTestEndpointPort();
String resStr1 = port.echo(reqStr);
- verifyConfig((ConfigProvider)port);
+ //verifyConfig((ConfigProvider)port);
TestEndpointService service =
(TestEndpointService)iniCtx.lookup("java:comp/env/Service4");
port = service.getTestEndpointPort();
- verifyConfig((ConfigProvider)port);
+ //verifyConfig((ConfigProvider)port);
String resStr2 = port.echo(reqStr);
@@ -148,7 +148,7 @@
public String testPort1(String reqStr) throws Exception
{
TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port1");
- verifyConfig((ConfigProvider)port);
+ //verifyConfig((ConfigProvider)port);
return port.echo(reqStr);
}
@@ -158,11 +158,11 @@
*/
public String testPort2(String reqStr) throws Exception
{
- verifyConfig((ConfigProvider)port2);
+ //verifyConfig((ConfigProvider)port2);
String resStr1 = port2.echo(reqStr);
TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port2");
- verifyConfig((ConfigProvider)port);
+ //verifyConfig((ConfigProvider)port);
String resStr2 = port.echo(reqStr);
@@ -196,12 +196,12 @@
throw new RuntimeException("Invalid password: " + password);
}
- private void verifyConfig(ConfigProvider cp)
+ /*private void verifyConfig(ConfigProvider cp)
{
if ("Custom Client".equals(cp.getConfigName()) == false)
throw new RuntimeException("Invalid config name: " +
cp.getConfigName());
if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) ==
false)
throw new RuntimeException("Invalid config file: " +
cp.getConfigFile());
- }
+ } */
}
Modified:
branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
===================================================================
---
branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2007-07-13
10:13:30 UTC (rev 3874)
+++
branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2007-07-13
10:42:45 UTC (rev 3875)
@@ -18,6 +18,7 @@
-->
<service-ref>
<service-ref-name>service2</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -26,6 +27,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -34,6 +36,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -42,6 +45,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -50,6 +54,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -58,6 +63,7 @@
-->
<service-ref>
<service-ref-name>port1</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -66,6 +72,7 @@
-->
<service-ref>
<service-ref-name>Port2</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -74,6 +81,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name>
+
<service-qname>{http://org.jboss.ws/wsref/}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>