JBossWS SVN: r11369 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-08 07:17:30 -0500 (Fri, 08 Jan 2010)
New Revision: 11369
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
Log:
[JBPAPP-3358] WSException: Malformed URL when deploying to AS bound to IPv6 address.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-08 11:11:26 UTC (rev 11368)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-08 12:17:30 UTC (rev 11369)
@@ -226,33 +226,39 @@
ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
String host = config.getWebServiceHost();
- String port = "";
+
+ int port;
if ("https".equals(uriScheme))
{
- int portNo = config.getWebServiceSecurePort();
- if (portNo != 443)
- {
- port = ":" + portNo;
- }
-
+ port = config.getWebServiceSecurePort();
}
else
{
- int portNo = config.getWebServicePort();
- if (portNo != 80)
- {
- port = ":" + portNo;
- }
+ port = config.getWebServicePort();
+ }
+
+ // Reset port if using the default for the scheme.
+ if (("http".equals(uriScheme) && port == 80) || ("https".equals(uriScheme) && port == 443))
+ {
+ port = -1;
}
- String urlStr = uriScheme + "://" + host + port + servicePath;
+ URL url = null;
try
{
- return new URL(urlStr).toExternalForm();
+ if (port > -1)
+ {
+ url = new URL(uriScheme, host, port, servicePath);
+ }
+ else
+ {
+ url = new URL(uriScheme, host, servicePath);
+ }
+ return url.toExternalForm();
}
catch (MalformedURLException e)
{
- throw new WSException("Malformed URL: " + urlStr);
+ throw new WSException("Malformed URL: uriScheme={" + uriScheme + "} host={" + host + "} port={" + port + "} servicePath={" + servicePath + "}", e);
}
}
14 years, 4 months
JBossWS SVN: r11368 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-08 06:11:26 -0500 (Fri, 08 Jan 2010)
New Revision: 11368
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
Log:
[JBPAPP-3358] WSException: Malformed URL when deploying to AS bound to IPv6 address.
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-07 17:32:01 UTC (rev 11367)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-08 11:11:26 UTC (rev 11368)
@@ -223,33 +223,39 @@
ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
String host = config.getWebServiceHost();
- String port = "";
+
+ int port;
if ("https".equals(uriScheme))
{
- int portNo = config.getWebServiceSecurePort();
- if (portNo != 443)
- {
- port = ":" + portNo;
- }
-
+ port = config.getWebServiceSecurePort();
}
else
{
- int portNo = config.getWebServicePort();
- if (portNo != 80)
- {
- port = ":" + portNo;
- }
+ port = config.getWebServicePort();
+ }
+
+ // Reset port if using the default for the scheme.
+ if (("http".equals(uriScheme) && port == 80) || ("https".equals(uriScheme) && port == 443))
+ {
+ port = -1;
}
- String urlStr = uriScheme + "://" + host + port + servicePath;
+ URL url = null;
try
{
- return new URL(urlStr).toExternalForm();
+ if (port > -1)
+ {
+ url = new URL(uriScheme, host, port, servicePath);
+ }
+ else
+ {
+ url = new URL(uriScheme, host, servicePath);
+ }
+ return url.toExternalForm();
}
catch (MalformedURLException e)
{
- throw new WSException("Malformed URL: " + urlStr);
+ throw new WSException("Malformed URL: uriScheme={" + uriScheme + "} host={" + host + "} port={" + port + "} servicePath={" + servicePath + "}", e);
}
}
14 years, 4 months
JBossWS SVN: r11367 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-01-07 12:32:01 -0500 (Thu, 07 Jan 2010)
New Revision: 11367
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
Log:
[JBWS-2883] WSException: Malformed URL when deploying to AS bound to IPv6 address.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-04 11:27:11 UTC (rev 11366)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-07 17:32:01 UTC (rev 11367)
@@ -236,40 +236,42 @@
ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
String host = config.getWebServiceHost();
- String port = "";
- if (servicePort != -1)
+
+ int port = servicePort;
+ if (servicePort == -1)
{
- port = ":" + servicePort;
- }
- else
- {
if ("https".equals(uriScheme))
{
- int portNo = config.getWebServiceSecurePort();
- if (portNo != 443)
- {
- port = ":" + portNo;
- }
-
+ port = config.getWebServiceSecurePort();
}
else
{
- int portNo = config.getWebServicePort();
- if (portNo != 80)
- {
- port = ":" + portNo;
- }
+ port = config.getWebServicePort();
}
}
- String urlStr = uriScheme + "://" + host + port + servicePath;
+ // Reset port if using the default for the scheme.
+ if (("http".equals(uriScheme) && port == 80) || ("https".equals(uriScheme) && port == 443))
+ {
+ port = -1;
+ }
+
+ URL url = null;
try
{
- return new URL(urlStr).toExternalForm();
+ if (port > -1)
+ {
+ url = new URL(uriScheme, host, port, servicePath);
+ }
+ else
+ {
+ url = new URL(uriScheme, host, servicePath);
+ }
+ return url.toExternalForm();
}
catch (MalformedURLException e)
{
- throw new WSException("Malformed URL: " + urlStr);
+ throw new WSException("Malformed URL: uriScheme={" + uriScheme + "} host={" + host + "} port={" + port + "} servicePath={" + servicePath + "}", e);
}
}
14 years, 4 months
JBossWS SVN: r11366 - stack/native/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 06:27:11 -0500 (Mon, 04 Jan 2010)
New Revision: 11366
Modified:
stack/native/trunk/modules/testsuite/framework-tests/
Log:
fixing ignores
Property changes on: stack/native/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
wsprovide
work
wsconsume
transaction.log
+ target
wsprovide
work
wsconsume
*.log
*.txt
14 years, 4 months
JBossWS SVN: r11365 - stack/native/trunk/modules/testsuite/native-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 06:26:27 -0500 (Mon, 04 Jan 2010)
New Revision: 11365
Modified:
stack/native/trunk/modules/testsuite/native-tests/
Log:
fixing ignores
Property changes on: stack/native/trunk/modules/testsuite/native-tests
___________________________________________________________________
Name: svn:ignore
- target
tools
wstools
transaction.log
+ target
tools
wstools
*.log
*.txt
14 years, 4 months
JBossWS SVN: r11364 - in stack/native/trunk/modules/testsuite: native-tests and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 06:25:19 -0500 (Mon, 04 Jan 2010)
New Revision: 11364
Modified:
stack/native/trunk/modules/testsuite/framework-tests/
stack/native/trunk/modules/testsuite/native-tests/
Log:
fixing svn ignores
Property changes on: stack/native/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
wsprovide
work
wsconsume
+ target
wsprovide
work
wsconsume
transaction.log
Property changes on: stack/native/trunk/modules/testsuite/native-tests
___________________________________________________________________
Name: svn:ignore
- target
tools
wstools
+ target
tools
wstools
transaction.log
14 years, 4 months
JBossWS SVN: r11363 - in stack/native/trunk/modules/testsuite/native-tests/src/test: java/org/jboss/test/ws/jaxrpc/jbws1427 and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 06:22:04 -0500 (Mon, 04 Jan 2010)
New Revision: 11363
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml
Log:
[JBWS-2838] fixing native test suite
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -110,7 +110,7 @@
try
{
ServiceFactory serviceFactory = ServiceFactory.newInstance();
- Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloEJB?wsdl"), SERVICE_NAME);
+ Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloSLSB?wsdl"), SERVICE_NAME);
Call call = (Call)service.createCall(new QName(NAMESPACE, "HelloPort"), "sayHello");
String retstr = (String)call.invoke(new Object[] { "Hello" });
assertEquals("'Hello' to you too!", retstr);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -40,7 +40,7 @@
/**
* [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
- *
+ *
* http://jira.jboss.org/jira/browse/JBWS-1427
*
* @author Thomas.Diesler(a)jboss.com
@@ -49,7 +49,7 @@
public class JBWS1427TestCase extends JBossWSTest
{
private static RequestService port;
-
+
public static Test suite()
{
return new JBossWSTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar");
@@ -66,7 +66,7 @@
QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim");
Service service = factory.createService(wsdlURL, serviceName , mappingURL);
port = (RequestService)service.getPort(RequestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/SubmitRequestEJB");
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/RequestServiceEJB");
}
}
@@ -75,7 +75,7 @@
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
File wsdlFile = getResourceFile("jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl");
assertTrue("File exists: " + wsdlFile, wsdlFile.exists());
-
+
factory.parse(wsdlFile.toURL());
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -40,7 +40,7 @@
/**
* Tests <context-root> and <port-component-root> elements in EJB endpoints
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 10-Jun-2005
*/
@@ -54,7 +54,7 @@
public void testNone() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-none/HelloEJB?wsdl");
URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceNone");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
@@ -62,11 +62,11 @@
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
}
-
+
public void testPortComponentURIOne() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl");
-
+
URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
@@ -75,11 +75,11 @@
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
}
-
+
public void testPortComponentURITwo() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl");
-
+
URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
@@ -88,10 +88,10 @@
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
}
-
+
public void testContextRoot() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Context/HelloContextRoot?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Context/HelloEJB?wsdl");
URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceCtxRoot");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
@@ -99,7 +99,7 @@
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
}
-
+
public void testBoth() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Both/Explicit/Path?wsdl");
@@ -110,4 +110,5 @@
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
}
+
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -33,9 +33,9 @@
/**
* EAR deployment of ejb.jar + ws-ejb.jar
- *
+ *
* http://jira.jboss.com/jira/browse/JBWS-331
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 30-Nov-2005
*/
@@ -51,7 +51,7 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
Hello endpoint = (Hello)service.getPort(Hello.class);
-
+
String retStr = endpoint.hello("Hello Server");
assertEquals("Hello Server", retStr);
}
@@ -61,7 +61,7 @@
InitialContext iniCtx = getInitialContext();
HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/Hello");
HelloRemote slsb = home.create();
-
+
String retStr = slsb.hello("Hello Server");
assertEquals("Hello Server", retStr);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -29,11 +29,9 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-
-
/**
* Web services deployment can fail when deploying multiple EJB JARs
- *
+ *
* http://jira.jboss.com/jira/browse/JBWS-772
*
* @author Thomas.Diesler(a)jboss.org
@@ -52,17 +50,17 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
Hello port = (Hello)service.getPort(Hello.class);
-
+
String resStr = port.sayHello("Hello");
assertEquals("'Hello' to you too!", resStr);
}
-
+
public void testRemoteAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/HelloEJBTwo");
HelloRemote remote = home.create();
-
+
String resStr = remote.sayHello("Hello");
assertEquals("'Hello' to you too!", resStr);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -55,7 +55,7 @@
public void testSimple() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
Service service = Service.create(wsdlURL, serviceName);
TestEndpoint port = service.getPort(TestEndpoint.class);
@@ -66,7 +66,7 @@
public void testEndpointReference() throws Exception
{
- String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl";
+ String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint";
URL wsdlURL = new URL(address + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
@@ -86,7 +86,7 @@
public void testEndpointReferenceFromSource() throws Exception
{
- String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl";
+ String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint";
URL wsdlURL = new URL(address + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -33,7 +33,7 @@
/**
* [JBWS-1909] RequestHandler.handlerWSDLResquest has dependency on Servlet API
- *
+ *
* http://jira.jboss.org/jira/browse/JBWS-1909
*
* @author Thomas.Diesler(a)jboss.com
@@ -48,7 +48,7 @@
public void testWSDLSchema() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpointImpl?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpoint?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws1909", "TestEndpointService");
Service service = Service.create(wsdlURL, serviceName);
TestEndpoint port = service.getPort(TestEndpoint.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-01-04 11:22:04 UTC (rev 11363)
@@ -33,12 +33,12 @@
/**
* [JBWS-2565] Wrong WebContext authMethod or transportGuarantee annotatoin field values are not detected at deploy time.
- *
+ *
* @author richard.opalka(a)jboss.com
*/
public final class JBWS2565TestCase extends JBossWSTest
{
-
+
public static Test suite()
{
return new JBossWSTestSetup(JBWS2565TestCase.class, "jaxws-jbws2565.ear");
@@ -49,13 +49,13 @@
final ServiceFactory factory = ServiceFactory.newInstance();
final Service service = factory.createService(new QName("http://my.services.web", "MyWebServiceName"));
final Call call = service.createCall(new QName("http://my.services.web", "MyWebServicePort"));
- call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebServiceBean?wsdl");
+ call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebService?wsdl");
call.setOperationName(new QName("http://my.services.web", "doStuff"));
final QName QNAME_TYPE_STRING = new QName("http://www.w3.org/2001/XMLSchema", "string");
call.setReturnType(QNAME_TYPE_STRING);
final String[] serviceArgs = {};
final String result = (String) call.invoke(serviceArgs);
assertEquals("i've done stuff", result);
- }
-
+ }
+
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2010-01-04 11:22:04 UTC (rev 11363)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-enventry/TestService?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-enventry/EnvEntryBeanEJB?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2010-01-04 11:22:04 UTC (rev 11363)
@@ -4,10 +4,10 @@
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
-
+
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws331/HelloBean?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws331/HelloEndpoint?wsdl</wsdl-override>
</service-ref>
-
+
</jboss-client>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2010-01-04 10:20:31 UTC (rev 11362)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2010-01-04 11:22:04 UTC (rev 11363)
@@ -11,10 +11,10 @@
<ejb-ref-name>ejb/HelloEJBTwo</ejb-ref-name>
<jndi-name>HelloEJBTwo</jndi-name>
</ejb-ref>
-
+
<service-ref>
<service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws772/HelloEJBOne?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws772/HelloSLSB?wsdl</wsdl-override>
</service-ref>
</jboss-client>
14 years, 4 months
JBossWS SVN: r11362 - stack/cxf/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 05:20:31 -0500 (Mon, 04 Jan 2010)
New Revision: 11362
Modified:
stack/cxf/trunk/modules/testsuite/framework-tests/
Log:
updating ignores
Property changes on: stack/cxf/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
org
+ target
org
transaction.log
14 years, 4 months
JBossWS SVN: r11361 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 05:19:50 -0500 (Mon, 04 Jan 2010)
New Revision: 11361
Modified:
stack/cxf/trunk/
Log:
updating ignores
Property changes on: stack/cxf/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
clipboard.*
target
.settings
profiles.xml
target.properties
+ ant.properties
clipboard.*
target
.settings
profiles.xml
target.properties
transaction.log
14 years, 4 months
JBossWS SVN: r11360 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: samples/jaxbintros and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-04 05:14:26 -0500 (Mon, 04 Jan 2010)
New Revision: 11360
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java
Log:
[JBWS-2838] fixing common test suite
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2010-01-04 10:13:25 UTC (rev 11359)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2010-01-04 10:14:26 UTC (rev 11360)
@@ -36,10 +36,11 @@
import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource;
/**
- *
+ *
*/
public class JBWS2000TestCase extends JBossWSTest
{
+
private FileTransferService port;
public static Test suite()
@@ -48,11 +49,11 @@
}
protected void setUp() throws Exception
- {
+ {
if (port == null)
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2000/FileTransferServiceImpl?wsdl");
- QName serviceName = new QName("http://service.mtom.test.net/", "FileTransferServiceImplService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2000/FileTransfer?wsdl");
+ QName serviceName = new QName("http://service.mtom.test.net/", "FileTransferServiceImplService");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(FileTransferService.class);
@@ -69,5 +70,5 @@
boolean success = port.transferFile("JBWS2000.data", dh);
assertTrue("Failed to transfer file", success);
}
-
+
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2010-01-04 10:13:25 UTC (rev 11359)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2010-01-04 10:14:26 UTC (rev 11360)
@@ -44,13 +44,14 @@
*/
public class JAXBIntroTestCase extends JBossWSTest
{
- private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-jaxbintros/EndpointBean";
-
+
+ private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-jaxbintros/EndpointService";
+
public static Test suite()
{
return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-samples-jaxbintros.jar");
}
-
+
@SuppressWarnings("unchecked")
public void testWSDLAccess() throws Exception
{
@@ -69,10 +70,10 @@
}
assertTrue("<xs:attribute name=\"string\" ..> not found in wsdl", attributeFound);
}
-
+
/**
* Client side uses the annotated user type class, server side uses the plain one but has jaxbintros in place
- *
+ *
* @throws Exception
*/
public void testAnnotatedUserEndpoint() throws Exception
@@ -89,5 +90,6 @@
AnnotatedUserType result = port.echo(user);
assertEquals("Foo", result.getString());
assertEquals(qname, result.getQname());
- }
+ }
+
}
14 years, 4 months