svn commit: r1405556 - /openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java

[db...@apache.org]

Author: dblevins
Date: Sun Nov  4 15:22:39 2012
New Revision: 1405556

URL: http://svn.apache.org/viewvc?rev=1405556&view=rev
Log:
s/openejbHome/tomeeHome/

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

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1405556&r1=1405555&r2=1405556&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Sun Nov  4 15:22:39 2012
@@ -47,7 +47,7 @@ public class RemoteTomEEContainer extend
 
     private RemoteServer container;
     private boolean shutdown = false;
-    private File openejbHome;
+    private File tomeeHome;
 
     @Override
     public void start() throws LifecycleException {
@@ -80,7 +80,7 @@ public class RemoteTomEEContainer extend
             }
             container = new RemoteServer();
 
-            container.setAdditionalClasspath(addOneLineFormatter(openejbHome));
+            container.setAdditionalClasspath(addOneLineFormatter(tomeeHome));
             container.start(args(), "start", true);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Unable to start remote container", e);
@@ -161,32 +161,32 @@ public class RemoteTomEEContainer extend
         Files.readable(workingDirectory);
         Files.writable(workingDirectory);
 
-        openejbHome = Setup.findHome(workingDirectory);
+        tomeeHome = Setup.findHome(workingDirectory);
 
-        if (openejbHome == null) {
-            openejbHome = Setup.downloadAndUnpack(workingDirectory, configuration.getArtifactName());
+        if (tomeeHome == null) {
+            tomeeHome = Setup.downloadAndUnpack(workingDirectory, configuration.getArtifactName());
 
-            logger.log(Level.INFO, "Downloaded container to: " + openejbHome);
+            logger.log(Level.INFO, "Downloaded container to: " + tomeeHome);
         }
 
-        Files.assertDir(openejbHome);
-        Files.readable(openejbHome);
-        Files.writable(openejbHome);
+        Files.assertDir(tomeeHome);
+        Files.readable(tomeeHome);
+        Files.writable(tomeeHome);
 
-        Setup.configureServerXml(openejbHome, configuration);
+        Setup.configureServerXml(tomeeHome, configuration);
 
-        Setup.synchronizeFolder(openejbHome, configuration.getConf(), "conf");
-        Setup.synchronizeFolder(openejbHome, configuration.getBin(), "bin");
-        Setup.synchronizeFolder(openejbHome, configuration.getLib(), "lib");
+        Setup.synchronizeFolder(tomeeHome, configuration.getConf(), "conf");
+        Setup.synchronizeFolder(tomeeHome, configuration.getBin(), "bin");
+        Setup.synchronizeFolder(tomeeHome, configuration.getLib(), "lib");
 
-        Setup.configureSystemProperties(openejbHome, configuration);
+        Setup.configureSystemProperties(tomeeHome, configuration);
 
         final String opts = configuration.getCatalina_opts();
-        Setup.exportProperties(openejbHome, configuration, opts == null || (!opts.contains("-Xm") && !opts.matches(".*-XX:[^=]*Size=.*")));
-        Setup.installArquillianBeanDiscoverer(openejbHome);
+        Setup.exportProperties(tomeeHome, configuration, opts == null || (!opts.contains("-Xm") && !opts.matches(".*-XX:[^=]*Size=.*")));
+        Setup.installArquillianBeanDiscoverer(tomeeHome);
 
         if (configuration.isRemoveUnusedWebapps()) {
-            Setup.removeUselessWebapps(openejbHome);
+            Setup.removeUselessWebapps(tomeeHome);
         }
 
         if (configuration.isSimpleLog()) {
@@ -201,7 +201,7 @@ public class RemoteTomEEContainer extend
             if (doIt) {
                 FileWriter writer = null;
                 try {
-                    writer = new FileWriter(new File(openejbHome, "conf/logging.properties"));
+                    writer = new FileWriter(new File(tomeeHome, "conf/logging.properties"));
                     writer.write("handlers = java.util.logging.ConsoleHandler\n" +
                             ".handlers = java.util.logging.ConsoleHandler\n" +
                             "java.util.logging.ConsoleHandler.level = INFO\n" +
@@ -226,7 +226,7 @@ public class RemoteTomEEContainer extend
     public void stop() throws LifecycleException {
         // only stop the container if we started it
         if (shutdown) {
-            Setup.removeArquillianBeanDiscoverer(openejbHome);
+            Setup.removeArquillianBeanDiscoverer(tomeeHome);
             container.stop();
         }
     }