[jboss-cvs] JBossAS SVN: r67560 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/test/org/jboss/ejb3/test/clusteredjms/unit and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 28 10:08:29 EST 2007
Author: bstansberry at jboss.com
Date: 2007-11-28 10:08:29 -0500 (Wed, 28 Nov 2007)
New Revision: 67560
Modified:
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
Log:
[JBPAPP-455] EJB3 tests should not assume server is bound to localhost
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2007-11-28 15:08:29 UTC (rev 67560)
@@ -3462,6 +3462,7 @@
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
<!-- properties needed for clustering -->
@@ -3555,6 +3556,7 @@
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
<!-- properties needed for clustering -->
@@ -3609,6 +3611,7 @@
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
<classpath>
<pathelement location="${build.classes}"/>
@@ -4575,7 +4578,7 @@
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="${test}"/>
<param name="test.extension" value="jacorb"/>
- <param name="test.jndi.url" value="corbaloc::localhost:3528/JBoss/Naming/root"/>
+ <param name="test.jndi.url" value="corbaloc::${node0}:3528/JBoss/Naming/root"/>
<!-- using jacorb -->
<param name="jvmargs" value="${debugFlags}
-Djava.security.manager
@@ -4584,7 +4587,7 @@
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
- -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root
+ -DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root
-Djacorb.log.default.verbosity=10
-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
</antcall>
@@ -4599,7 +4602,7 @@
<param name="test" value="${test}"/>
<param name="test.extension" value="sunorb"/>
<!-- using sun jdk -->
- <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
+ <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
</antcall>
</target>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -124,7 +124,7 @@
Properties env = new Properties();
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- env.put(Context.PROVIDER_URL, "localhost:1100");
+ env.put(Context.PROVIDER_URL, getServerHost() + ":1100");
return new InitialContext(env);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -46,8 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -68,7 +68,7 @@
{
Properties props = new Properties();
props.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
- props.put("java.naming.provider.url", "corbaloc::localhost:3528/NameService");
+ props.put("java.naming.provider.url", "corbaloc::"+ getServerHost() + ":3528/NameService");
props.put("java.naming.factory.object", "org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory");
props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client:org.jnp.interfaces");
props.put("j2ee.clientName", "iiop-unit-test");
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -50,7 +50,7 @@
{
// Properties props = new Properties();
// props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- // props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
+ // props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
// props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
// InitialContext jndiContext = new InitialContext(props);
InitialContext jndiContext = new InitialContext();
@@ -67,7 +67,7 @@
// Properties props = new Properties();
// props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- // props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
+ // props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
// props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
// InitialContext jndiContext = new InitialContext(props);
InitialContext jndiContext = new InitialContext();
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -46,8 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2007-11-28 13:54:47 UTC (rev 67559)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2007-11-28 15:08:29 UTC (rev 67560)
@@ -46,8 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -63,7 +64,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@localhost:"
+ String url = "http://"+username+":"+password+"@" + serverHost + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
More information about the jboss-cvs-commits
mailing list