[jboss-cvs] JBossAS SVN: r96598 - in branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite: imports/sections and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 19 17:37:51 EST 2009
Author: rachmatowicz at jboss.com
Date: 2009-11-19 17:37:51 -0500 (Thu, 19 Nov 2009)
New Revision: 96598
Modified:
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/old-test-jars.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/sections/webservice.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml
Log:
Fixes to the URLs of a number of test cases (JBPAPP-2997).
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/old-test-jars.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/old-test-jars.xml 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/old-test-jars.xml 2009-11-19 22:37:51 UTC (rev 96598)
@@ -5383,7 +5383,7 @@
<include name="**/*"/>
</fileset>
<filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="jbosstest.host.name" value="${node0.url}"/>
</filterset>
</copy>
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/sections/webservice.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/sections/webservice.xml 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/sections/webservice.xml 2009-11-19 22:37:51 UTC (rev 96598)
@@ -12,7 +12,7 @@
<include name="**/*.xml"/>
</fileset>
<filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="jbosstest.host.name" value="${node0.url}"/>
</filterset>
</copy>
<!-- Copy binary files -->
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-11-19 22:37:51 UTC (rev 96598)
@@ -141,7 +141,7 @@
getLog().debug("Created serverSocket: "+serverSocket);
int port = serverSocket.getLocalPort();
InetAddress addr = serverSocket.getInetAddress();
- httpsURL = "https://" + getServerHost() + ":" + port + '/';
+ httpsURL = "https://" + getServerHostForURL() + ":" + port + '/';
AcceptThread thread = new AcceptThread(serverSocket, getLog(), httpsURL);
synchronized( httpsURL )
{
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2009-11-19 22:37:51 UTC (rev 96598)
@@ -40,8 +40,7 @@
*/
public class WebProgrammaticLoginTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost()
- + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
private HttpClient httpConn = new HttpClient();
public WebProgrammaticLoginTestCase(String name)
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2009-11-19 22:37:51 UTC (rev 96598)
@@ -37,8 +37,8 @@
*/
public class SSLUnitTestCase extends JBossTestCase
{
- private String baseHttpNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
- private String baseHttpsNoAuth = "https://" + getServerHost() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
+ private String baseHttpNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private String baseHttpsNoAuth = "https://" + getServerHostForURL() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
public SSLUnitTestCase(String name)
{
@@ -64,7 +64,7 @@
log.info("+++ testHttpRedirectSecurityDomain");
int port = Integer.getInteger("web.port", 8080).intValue();
port += 1000;
- String httpNoAuth = "http://" + getServerHost() + ":" + port + "/";
+ String httpNoAuth = "http://" + getServerHostForURL() + ":" + port + "/";
doHttpRedirect(httpNoAuth);
}
@@ -83,7 +83,7 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1000;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
@@ -96,7 +96,7 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1500;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2009-11-19 22:37:51 UTC (rev 96598)
@@ -6,7 +6,7 @@
<ejb-name>SessionA</ejb-name>
<ejb-ref>
<ejb-ref-name>ejb/SessionB</ejb-ref-name>
- <jndi-name>jnp://${jboss.bind.address:localhost}:1099/SessionB</jndi-name>
+ <jndi-name>jnp://${jboss.bind.url.address:localhost}:1099/SessionB</jndi-name>
</ejb-ref>
</session>
</enterprise-beans>
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml 2009-11-19 21:20:09 UTC (rev 96597)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml 2009-11-19 22:37:51 UTC (rev 96598)
@@ -91,7 +91,7 @@
<!-- Expose the jmx invoker service interface via HTTP -->
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory">
- <attribute name="InvokerURL">http://${jboss.bind.address:localhost}:8080/invoker/JMXInvokerServlet</attribute>
+ <attribute name="InvokerURL">http://${jboss.bind.url.address:localhost}:8080/invoker/JMXInvokerServlet</attribute>
<!-- The target MBean is the InvokerAdaptorService configured below -->
<depends optional-attribute-name="InvokerName">jboss.jmx:type=adaptor,name=Invoker</depends>
<attribute name="ExportedInterface">org.jboss.jmx.adaptor.rmi.RMIAdaptorExt</attribute>
More information about the jboss-cvs-commits
mailing list