svn commit: r422012 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent: TMCAgent.java util/ProcessFactory.java

[to...@apache.org]

Author: toback
Date: Fri Jul 14 13:13:56 2006
New Revision: 422012

URL: http://svn.apache.org/viewvc?rev=422012&view=rev
Log:
small correction with spelling

Modified:
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.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/TMCAgent.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java?rev=422012&r1=422011&r2=422012&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/TMCAgent.java Fri Jul 14 13:13:56 2006
@@ -20,6 +20,7 @@
 import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.lokahi.core.agent.runnable.JobScheduler;
 import org.apache.lokahi.core.agent.runnable.ReportingThread;
+import org.apache.lokahi.core.agent.util.ProcessFactory;
 import org.apache.lokahi.core.common.database.DerbyBroker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
 
@@ -92,9 +93,18 @@
     int port = 5665;
     System.out.println("Log4j configured");
     try {
-      PropertiesFile.load(new FileInputStream(new File("agent.properties")));
+	PropertiesFile.load(new FileInputStream(new File("agent.properties")));
     } catch (FileNotFoundException e) {
-      logger.info("File not found Exception (might be the first time the agent is started.):" + e.getMessage());
+       if (logger.isInfoEnabled()) {
+        logger.info("File not found Exception: agent.properties (might be the first time the agent is started.):" + e.getMessage());       }
+    }
+    try {
+      ProcessFactory.loadProperties(new FileInputStream(new File("./jvm.conf")));
+      System.out.println("Loading configuration file: jvm.conf");
+    } catch (FileNotFoundException e) {
+       if (logger.isInfoEnabled()) {
+        logger.info("File not found Exception: jvm.conf (make sure you push out the Tomcat config files):" + e.getMessage());
+      }
     }
     SimpleAxisServer sas = new SimpleAxisServer();
 //    ServerSocketFactory sf = SSLServerSocketFactory.getDefault();

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=422012&r1=422011&r2=422012&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 Fri Jul 14 13:13:56 2006
@@ -106,7 +106,7 @@
       t = new HttpTomcat();
     }
     t.setName(tomcatProps.getProperty(port + ".tomcat.name"));
-    t.setJavaOptions(tomcatProps.getProperty(port + ".java.para.options"));
+    t.setJavaOptions(tomcatProps.getProperty(port + ".java.param.options"));
     t.setEnvironment(tomcatProps.getProperty(port + ".java.param.env"));
     t.setJavaHome(tomcatProps.getProperty(port + ".java.home"));
     t.setStartClass(tomcatProps.getProperty(port + ".tomcat.startclass"));