modules/enterprise/agent/src/etc/rhq-agent.bat | 2 +-
modules/enterprise/remoting/cli/src/etc/rhq-cli.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 583e8cd1f9bc75211e2d5a339e34a2a02d7b49cc
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Oct 28 10:03:58 2013 -0400
Bug 1022989 - Unable to start JON/RHQ agent on windows due error in rhq_agent.bat
Fix agent bat script and similar issue in cli bat script
Cherry-pick master: 93cbc9c4426363db4d63b4270ba49ba20f7ebe16
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat
b/modules/enterprise/agent/src/etc/rhq-agent.bat
index f7980b3..46ef0b9 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -192,7 +192,7 @@ if not defined RHQ_AGENT_MAINCLASS (
rem note - currently not using custom Java Prefs as the default, use commented command
line to activate. If installing
rem note - the agent as a windows service, you must also uncomment lines in
wrapper/rhq-agent-wrapper.conf.
rem set CMD="%RHQ_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT%
%_JAVA_LIBRARY_PATH_OPT% %_JAVA_PREFERENCES_FACTORY_OPT% %RHQ_AGENT_JAVA_OPTS%
%RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%"
%RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
-set CMD="%RHQ_AGENT_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT%
%_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
%_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+set CMD="%RHQ_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT%
%_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS%
%_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
if not defined _SETENV_ONLY (
rem log4j 1.2.8 does not create the directory for us (later versions do)
diff --git a/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
b/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
index b7992c5..96d59bc 100644
--- a/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
+++ b/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
@@ -149,7 +149,7 @@ if defined RHQ_CLI_DEBUG (
set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml
)
-set CMD="%RHQ_CLI_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT%
%_JAVA_LIBRARY_PATH_OPT% %RHQ_CLI_JAVA_OPTS% %RHQ_CLI_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG%
-cp "%CLASSPATH%" org.rhq.enterprise.client.ClientMain %RHQ_CLI_CMDLINE_OPTS%
+set CMD="%RHQ_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT%
%_JAVA_LIBRARY_PATH_OPT% %RHQ_CLI_JAVA_OPTS% %RHQ_CLI_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG%
-cp "%CLASSPATH%" org.rhq.enterprise.client.ClientMain %RHQ_CLI_CMDLINE_OPTS%
rem log4j 1.2.8 does not create the directory for us (later versions do)
if not exist "%RHQ_CLI_HOME%\logs" (
Show replies by date