[Hyperic-hq-discuss] hq r9979 - trunk/src/org/hyperic/hq/bizapp/agent/client

[<tk...@hy...>]

Author: tkeeney
Date: 2008-07-02 13:37:33 -0700 (Wed, 02 Jul 2008)
New Revision: 9979
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=9979

Modified:
   trunk/src/org/hyperic/hq/bizapp/agent/client/AgentClient.java
Log:
Don't need agent.mode property anymore - the agent is now always started in "threqd" mode.

Modified: trunk/src/org/hyperic/hq/bizapp/agent/client/AgentClient.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/agent/client/AgentClient.java	2008-07-02 20:02:27 UTC (rev 9978)
+++ trunk/src/org/hyperic/hq/bizapp/agent/client/AgentClient.java	2008-07-02 20:37:33 UTC (rev 9979)
@@ -99,10 +99,8 @@
     private static final String QPROP_RESETUPTOK = QPROP_PRE + "resetupTokens";
     private static final String QPROP_TIMEOUT    = QPROP_PRE + "serverTimeout";
 
-    private static final String PROP_MODE       = "agent.mode";
     private static final String PROP_LOGFILE    = "agent.logFile";
-    private static final String PROP_STARTUP_TIMEOUT =
-        "agent.startupTimeOut";
+    private static final String PROP_STARTUP_TIMEOUT = "agent.startupTimeOut";
 
     private static final String AGENT_CLASS   = 
         "org.hyperic.hq.agent.server.AgentDaemon";
@@ -979,7 +977,7 @@
         ServerSocket startupSock;
         ProviderInfo providerInfo;
         Properties bootProps;
-        String mode, logFile;
+        String logFile;
 
         // Try to ping the agent one time to see if the agent is already up
         try {
@@ -998,15 +996,6 @@
             throw new AgentInvokeException(PROP_LOGFILE + " is undefined");
         }
 
-        mode =
-            bootProps.getProperty(PROP_MODE,
-                                  System.getProperty(PROP_MODE));
-        if (mode.equals("process")) {
-            // deprecated mode
-            throw new AgentInvokeException("Running agent in process mode has been " 
-                    + "deprecated");
-        }
-
         try {
             int iSleepTime = getStartupTimeout(bootProps);
 
@@ -1024,7 +1013,7 @@
 
         System.setProperty(CommandsAPIInfo.PROP_UP_PORT,
                 String.valueOf(startupSock.getLocalPort()));
-        Thread t = new Thread(new AgentDaemon.RunnableAgent(false));
+        Thread t = new Thread(new AgentDaemon.RunnableAgent());
         t.start();
         SYSTEM_OUT.println("- Agent thread running");