You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/06/01 18:49:54 UTC
svn commit: r1599007 -
/tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Author: rmannibucau
Date: Sun Jun 1 16:49:54 2014
New Revision: 1599007
URL: http://svn.apache.org/r1599007
Log:
ensuring we setup port correctly for tcks
Modified:
tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Modified: tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1599007&r1=1599006&r2=1599007&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java (original)
+++ tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java Sun Jun 1 16:49:54 2014
@@ -44,19 +44,13 @@ public class ContainersImplTomEE extends
private Exception exception;
private AppInfo appInfo;
private File currentFile = null;
- private int port = 8080;
+ private int port = Integer.getInteger("server.http.port", 8080);
private Deployer lookup() {
final Options options = new Options(System.getProperties());
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
- String port = System.getProperty("server.http.port");
- if (port != null) {
- props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/tomee/ejb"));
- this.port = Integer.parseInt(port);
- } else {
- throw new OpenEJBTCKRuntimeException("Please set the tomee port using the system property 'server.http.port'");
- }
+ props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/tomee/ejb"));
final String deployerJndi = System.getProperty("openejb.deployer.jndiname", "openejb/DeployerBusinessRemote");