svn commit: r1605378 - in /tomee/tomee/trunk/arquillian: arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/

[an...@apache.org]

Author: andygumbrecht
Date: Wed Jun 25 13:01:47 2014
New Revision: 1605378

URL: http://svn.apache.org/r1605378
Log:
Formatting

Modified:
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
    tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1605378&r1=1605377&r2=1605378&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Wed Jun 25 13:01:47 2014
@@ -58,14 +58,15 @@ public class Setup {
     }
 
     public static void exportProperties(final File tomeeHome, final TomEEConfiguration c, final boolean defaultMem) {
-        System.setProperty("java.naming.provider.url", "http://" + c.getHost() + ":" + c.getHttpPort() + "/tomee/ejb");
+        final int httpPort = c.getHttpPort();
+        System.setProperty("java.naming.provider.url", "http://" + c.getHost() + ":" + httpPort + "/tomee/ejb");
         System.setProperty("connect.tries", "90");
-        System.setProperty("server.http.port", String.valueOf(c.getHttpPort()));
+        System.setProperty("server.http.port", String.valueOf(httpPort));
         System.setProperty("server.shutdown.port", String.valueOf(c.getStopPort()));
         if (defaultMem) {
-            System.setProperty("java.opts", DEFAULT_MEM_CONFIG + " -Dtomee.httpPort=" + c.getHttpPort());
+            System.setProperty("java.opts", DEFAULT_MEM_CONFIG + " -Dtomee.httpPort=" + httpPort);
         } else {
-            System.setProperty("java.opts", "-Dtomee.httpPort=" + c.getHttpPort());
+            System.setProperty("java.opts", "-Dtomee.httpPort=" + httpPort);
         }
         System.setProperty("openejb.home", tomeeHome.getAbsolutePath());
         System.setProperty("tomee.home", tomeeHome.getAbsolutePath());

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1605378&r1=1605377&r2=1605378&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Wed Jun 25 13:01:47 2014
@@ -24,6 +24,7 @@ import org.jboss.arquillian.container.sp
 import java.util.ArrayList;
 import java.util.List;
 
+@SuppressWarnings("UnusedDeclaration")
 public class TomEEConfiguration implements ContainerConfiguration {
 
     protected boolean exportConfAsSystemProperty;
@@ -180,7 +181,7 @@ public class TomEEConfiguration implemen
     }
 
     public String getStopCommand() {
-        return stopCommand +  Character.toString((char) 0); // last char to avoid warning/error log message
+        return stopCommand + Character.toString((char) 0); // last char to avoid warning/error log message
     }
 
     public void setStopCommand(final String stopCommand) {

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1605378&r1=1605377&r2=1605378&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Wed Jun 25 13:01:47 2014
@@ -244,9 +244,9 @@ public class RemoteTomEEContainer extend
         final File conf = new File(configuration.getConf());
 
         return !(conf.exists()
-                    && (new File(conf, "logging.properties").exists()
-                        || new File(conf, "log4j.properties").exists()
-                        || new File(conf, "log4j.xml").exists()));
+            && (new File(conf, "logging.properties").exists()
+            || new File(conf, "log4j.properties").exists()
+            || new File(conf, "log4j.xml").exists()));
     }
 
     @Override