You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/10 14:47:37 UTC

svn commit: r420549 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent: callable/tomcat/UpdateTomcatCallable.java util/ProcessFactory.java

Author: toback
Date: Mon Jul 10 07:47:37 2006
New Revision: 420549

URL: http://svn.apache.org/viewvc?rev=420549&view=rev
Log:
Added routine to load the property file for jvm settings.

Modified:
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/tomcat/UpdateTomcatCallable.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/tomcat/UpdateTomcatCallable.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/tomcat/UpdateTomcatCallable.java?rev=420549&r1=420548&r2=420549&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/tomcat/UpdateTomcatCallable.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/tomcat/UpdateTomcatCallable.java Mon Jul 10 07:47:37 2006
@@ -15,7 +15,11 @@
 */
 package org.apache.lokahi.core.agent.callable.tomcat;
 
+import org.apache.lokahi.core.agent.util.ProcessFactory;
+
 import java.util.concurrent.Callable;
+import java.io.File;
+import java.io.FileInputStream;
 
 /**
  * @author Stephen Toback
@@ -27,7 +31,7 @@
   }
 
   public Boolean call() throws Exception {
-    //todo load the file
+    ProcessFactory.loadProperties(new FileInputStream(new File("./jvm.conf")));
     return true;
   }
 }

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java?rev=420549&r1=420548&r2=420549&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java Mon Jul 10 07:47:37 2006
@@ -43,6 +43,7 @@
   }
 
   public static void loadProperties(InputStream in) {
+    tomcatProps.clear();
     try {
       tomcatProps.load(in);
     } catch (IOException e) {