modules/enterprise/agent/ant-run.xml
| 2
modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.inc
| 19 ++++
modules/enterprise/agent/src/etc/rhq-agent-env.bat
| 10 +-
modules/enterprise/agent/src/etc/rhq-agent.bat
| 12 +-
modules/enterprise/remoting/cli/src/etc/rhq-cli-env.bat
| 26 ++---
modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
| 45 +++++-----
modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat
| 12 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat
| 12 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat
| 12 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat
| 12 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat
| 12 +-
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
| 14 +--
modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc
| 19 ++++
modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env
| 25 ++++-
modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.inc
| 19 ++++
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
| 12 ++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 2
modules/plugins/OpenShift-support/pom.xml
| 1
18 files changed, 172 insertions(+), 94 deletions(-)
New commits:
commit 6d87af2dd0ffaa7ecad1e1ed6d67ac7f0ff45129
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Oct 25 14:17:27 2013 -0400
Bug 1022620 - Windows 2008 - Upgrade to JON3.2.ER3 fails when using oracle jdk7-32b
The 64bit Java distribution assumes that it will run a '-server' JVM, which
is required by RHQ (in part because the underlying AS7 also requires it but
also because it should run as a server). The 32bit distribution still makes
a distinction between a client JVM (optimized to be lightweight) and a server
JVM (optimized to perform). Only the 32bit JDK supplies the server JVM, so
for 32 Java bit we require the JDK.
By default the 32bit distribution installs under 'c:\Program Files
(x86)\Java\'.
Unfortunately, our scripts failed when RHQ_JAVA_HOME was set to this
directory, because the parentheses cause issues with the script conditionals,
which (by brilliant M$ design) use parens for grouping. So, fix #1 in this
check-in is to enable and delayed expansion of variables in the scripts, in our
logic determining where the java exe is.
On Windows we install RHQ into three windows services, one for storage, server
and agent. By default, the (non--user) local system account runs the services.
Unfortunately, when using the 32bit distribution the java.io.tmpdir then
resolves to a locked-down temp directory under windows/system32, which
subsequently stops things from working. The workaround is to use a user
account via RUN_AS[_ME] or to redefined java.io.tmpdir to be a valid
directory. The latter choice is somewhat involved as you need to update
the property in all three service wrapper configurations. This was not
as easily supported as it could be, so fix #2 is to add wrapper.inc files
for all of the components and beef up some commenting in several of our
script/conf files.
Also in this commit:
- fix the CLI scripts to use the new RHQ_JAVA_HOME and RHQ_JAVA_EXE_FILE_PATH
properties. This had been previously missed.
- make the dev version of rhq-server-wrapper.inc apply lower mem settings.
ToDo: Wiki doco around 32bit distribution.
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index 4816e1c..d6ebbfb 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -186,7 +186,7 @@ Ant Script that provides ways to package the Agent.
<copy todir="${agent.distro.dir}/bin/wrapper">
<fileset dir="${basedir}/src/etc/java-service-wrapper"
- includes="rhq-agent-wrapper.conf"/>
+ includes="rhq-agent-wrapper.*"/>
</copy>
<copy todir="${agent.distro.dir}/bin/wrapper/windows-x86_32">
diff --git a/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.inc
b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.inc
new file mode 100644
index 0000000..cd22661
--- /dev/null
+++ b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.inc
@@ -0,0 +1,19 @@
+#*****************************************************************************
+# RHQ Agent Java Service Wrapper Settings Include File
+#
+# This file specifies a set of additional environment variables that will be
+# applied to the RHQ Agent JVM. This file will likely be empty.
+#
+# If adding additional Java properties note that the properties must follow
+# a strict number ordering (that continues from rhq-agent-wrapper.conf)
+# and currently must start with:
+#
+# wrapper.java.additional.9=
+#
+# For example, to set a non-default temp directory for Java:
+# Note: use forward slashes for directories:
+#
+# wrapper.java.additional.9="-Djava.io.tmpdir=c:/temp"
+#
+#*****************************************************************************
+
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
index bfa2c9a..56485a1 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
@@ -30,7 +30,7 @@ rem RHQ_JAVA_EXE_FILE_PATH is set.
rem If this and RHQ_JAVA_EXE_FILE_PATH are
rem not set, JAVA_HOME will be used.
rem
-rem set RHQ_JAVA_HOME=C:\opt\java
+rem set RHQ_JAVA_HOME=
rem RHQ_JAVA_EXE_FILE_PATH - Defines the full path to the Java
rem executable to use. If this is set,
@@ -41,11 +41,13 @@ rem is used. If this and
rem RHQ_JAVA_HOME are not set, then
rem JAVA_HOME will be used.
rem
-rem set RHQ_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
+rem set RHQ_JAVA_EXE_FILE_PATH=
rem ===========================================================================
-rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT
-rem THESE ARE NOT USED/IGNORED BY rhq-agent-wrapper.bat SCRIPT
+rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent.bat SCRIPT,
+rem THEY ARE IGNORED BY rhq-agent-wrapper.bat SCRIPT. See the
+rem rhq-agent-wrapper.conf and rhq-agent-wrapper.inc for more
+rem on setting Java options.
rem RHQ_AGENT_JAVA_OPTS - Java VM command line options to be
rem passed into the agent's VM. If this is not defined
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat
b/modules/enterprise/agent/src/etc/rhq-agent.bat
index 59b2e3c..f7980b3 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -19,7 +19,7 @@ rem If the embedded JRE is to be used but is not available, the
fallback
rem JRE to be used will be determined by the JAVA_HOME environment variable.
rem ===========================================================================
-setlocal
+setlocal enabledelayedexpansion
if "%1"=="_SETENV_ONLY" (
set _SETENV_ONLY=true
@@ -78,23 +78,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_AGENT_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_AGENT_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_AGENT_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_AGENT_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_AGENT_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_AGENT_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
%JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_AGENT_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
!JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_AGENT_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git a/modules/enterprise/remoting/cli/src/etc/rhq-cli-env.bat
b/modules/enterprise/remoting/cli/src/etc/rhq-cli-env.bat
index 8ef3b68..d5d1189 100644
--- a/modules/enterprise/remoting/cli/src/etc/rhq-cli-env.bat
+++ b/modules/enterprise/remoting/cli/src/etc/rhq-cli-env.bat
@@ -16,22 +16,18 @@ rem directory of the directory where this script
lives.
rem
rem set RHQ_CLI_HOME=C:\opt\rhq-cli
-rem RHQ_CLI_JAVA_HOME - The location of the JRE that the CLI will
-rem use. This will be ignored if
-rem RHQ_CLI_JAVA_EXE_FILE_PATH is set.
-rem If this and RHQ_CLI_JAVA_EXE_FILE_PATH are
-rem not set, the CLI will default to JAVA_HOME.
-rem
-rem set RHQ_CLI_JAVA_HOME=
+rem RHQ_JAVA_HOME - The location of the JRE that the server will use. This
+rem will be ignored if RHQ_JAVA_EXE_FILE_PATH is set.
+rem If this and RHQ_JAVA_EXE_FILE_PATH are not set, then
+rem JAVA_HOME will be used.
+rem set RHQ_JAVA_HOME=
-rem RHQ_CLI_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-rem executable to use. If this is set,
-rem RHQ_CLI_JAVA_HOME is ignored.
-rem If this is not set, then
-rem %RHQ_CLI_JAVA_HOME%\bin\java.exe
-rem is used.
-rem
-rem set RHQ_CLI_JAVA_EXE_FILE_PATH=C:\WINDOWS\system32\java.exe
+rem RHQ_JAVA_EXE_FILE_PATH - Defines the full path to the Java executable to
+rem use. If this is set, RHQ_JAVA_HOME is ignored.
+rem If this is not set, then $RHQ_JAVA_HOME/bin/java
+rem is used. If this and RHQ_JAVA_HOME are not set,
+rem then $JAVA_HOME/bin/java will be used.
+rem set RHQ_JAVA_EXE_FILE_PATH=
rem RHQ_CLI_JAVA_OPTS - Java VM command line options to be
rem passed into the CLI's VM. If this is not defined
diff --git a/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
b/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
index 0d80d3e..b7992c5 100644
--- a/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
+++ b/modules/enterprise/remoting/cli/src/etc/rhq-cli.bat
@@ -11,7 +11,7 @@ rem are described in comments in rhq-cli-env.bat. The variables can also
be
rem set via rhq-cli-env.bat, which is sourced by this script.
rem ===========================================================================
-setlocal
+setlocal enabledelayedexpansion
title RHQ CLI
@@ -56,22 +56,36 @@ if defined RHQ_CLI_DEBUG echo RHQ_CLI_HOME: %RHQ_CLI_HOME%
rem ----------------------------------------------------------------------
rem Find the Java executable and verify we have a VM available
+rem Note that RHQ_CLI_JAVA_* props are still handled for back compat
rem ----------------------------------------------------------------------
-if not defined RHQ_CLI_JAVA_EXE_FILE_PATH (
- if not defined RHQ_CLI_JAVA_HOME call :prepare_embedded_jre
+if not defined RHQ_JAVA_EXE_FILE_PATH (
+ if defined RHQ_CLI_JAVA_EXE_FILE_PATH (
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_CLI_JAVA_EXE_FILE_PATH!
+ )
+)
+if not defined RHQ_JAVA_HOME (
+ if defined RHQ_CLI_JAVA_HOME (
+ set RHQ_JAVA_HOME=!RHQ_CLI_JAVA_HOME!
+ )
)
-if not defined RHQ_CLI_JAVA_EXE_FILE_PATH (
- set RHQ_CLI_JAVA_EXE_FILE_PATH=%RHQ_CLI_JAVA_HOME%\bin\java.exe
+if not defined RHQ_JAVA_EXE_FILE_PATH (
+ if not defined RHQ_JAVA_HOME (
+ if defined RHQ_CLI_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
!JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
+ )
+)
+if not defined RHQ_JAVA_EXE_FILE_PATH (
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
-if defined RHQ_CLI_DEBUG echo RHQ_CLI_JAVA_HOME: %RHQ_CLI_JAVA_HOME%
-if defined RHQ_CLI_DEBUG echo RHQ_CLI_JAVA_EXE_FILE_PATH: %RHQ_CLI_JAVA_EXE_FILE_PATH%
+if defined RHQ_CLI_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
+if defined RHQ_CLI_DEBUG echo RHQ_JAVA_EXE_FILE_PATH: %RHQ_JAVA_EXE_FILE_PATH%
-if not exist "%RHQ_CLI_JAVA_EXE_FILE_PATH%" (
+if not exist "%RHQ_JAVA_EXE_FILE_PATH%" (
echo There is no JVM available.
- echo Please set RHQ_CLI_JAVA_HOME or RHQ_CLI_JAVA_EXE_FILE_PATH appropriately.
+ echo Please set RHQ_JAVA_HOME or RHQ_JAVA_EXE_FILE_PATH appropriately.
exit /B 1
)
@@ -163,19 +177,6 @@ if not defined CLASSPATH (
goto :eof
rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_CLI_JAVA_HOME=%RHQ_CLI_HOME%\jre
-if defined RHQ_CLI_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_CLI_JAVA_HOME%" (
- if defined RHQ_CLI_DEBUG echo No embedded JRE found - will try to use JAVA_HOME:
%JAVA_HOME%
- set RHQ_CLI_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
rem CALL subroutine that exits this script normally
rem ----------------------------------------------------------------------
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat
index 2b95d74c..d2c554c 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat
@@ -47,7 +47,7 @@ rem If the embedded JRE is to be used but is not available, the
fallback
rem JRE to be used will be determined by the JAVA_HOME environment variable.
rem ===========================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_SERVER_DEBUG%" == "false" (
@@ -80,23 +80,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_SERVER_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
%JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_SERVER_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
!JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_SERVER_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat
index a8a70ff..ba6cbd8 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat
@@ -58,7 +58,7 @@ rem
rem This script does not use the built-in JBossAS run.bat.
rem ===========================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_SERVER_DEBUG%" == "false" (
@@ -91,23 +91,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_SERVER_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
%JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_SERVER_DEBUG echo No RHQ JAVA property set, defaulting to JAVA_HOME:
!JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_SERVER_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat
index 6f97385..f29b7c9 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat
@@ -50,7 +50,7 @@ rem left unset if it is not needed.
rem
rem =============================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_STORAGE_DEBUG%" == "false" (
@@ -135,23 +135,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_STORAGE_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: %JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_STORAGE_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: !JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_STORAGE_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat
index 7560932..c2f7f02 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat
@@ -60,7 +60,7 @@ rem
rem This script does not use the built-in cassandra.bat.
rem ===========================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_STORAGE_DEBUG%" == "false" (
@@ -111,23 +111,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_STORAGE_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: %JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_STORAGE_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: !JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_STORAGE_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat
index 844495d..7976b98 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat
@@ -50,7 +50,7 @@ rem left unset if it is not needed.
rem
rem =============================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_DATA_MIGRATION_DEBUG%" == "false" (
@@ -135,23 +135,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_DATA_MIGRATION_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: %JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_DATA_MIGRATION_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: !JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_DATA_MIGRATION_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
index d998d29..8d16ceb 100644
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
@@ -49,7 +49,7 @@ rem left unset if it is not
needed.
rem =============================================================================
-setlocal
+setlocal enabledelayedexpansion
rem if debug variable is set, it is assumed to be on, unless its value is false
if "%RHQ_CONTROL_DEBUG%" == "false" (
@@ -134,23 +134,23 @@ rem
----------------------------------------------------------------------
if not defined RHQ_JAVA_EXE_FILE_PATH (
if defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_SERVER_JAVA_EXE_FILE_PATH!
)
)
if not defined RHQ_JAVA_HOME (
if defined RHQ_SERVER_JAVA_HOME (
- set RHQ_JAVA_HOME=%RHQ_SERVER_JAVA_HOME%
+ set RHQ_JAVA_HOME=!RHQ_SERVER_JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
if not defined RHQ_JAVA_HOME (
- if defined RHQ_CONTROL_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: %JAVA_HOME%
- set RHQ_JAVA_HOME=%JAVA_HOME%
+ if defined RHQ_CONTROL_DEBUG echo No RHQ JAVA property set, defaulting to
JAVA_HOME: !JAVA_HOME!
+ set RHQ_JAVA_HOME=!JAVA_HOME!
)
)
if not defined RHQ_JAVA_EXE_FILE_PATH (
- set RHQ_JAVA_EXE_FILE_PATH=%RHQ_JAVA_HOME%\bin\java.exe
+ set RHQ_JAVA_EXE_FILE_PATH=!RHQ_JAVA_HOME!\bin\java.exe
)
if defined RHQ_CONTROL_DEBUG echo RHQ_JAVA_HOME: %RHQ_JAVA_HOME%
@@ -178,7 +178,7 @@ if defined RHQ_CONTROL_DEBUG (
set _RHQ_LOGLEVEL=INFO
)
-rem set some of the base required options
+rem Set some of the base required options
set RHQ_CONTROL_JAVA_OPTS=%RHQ_CONTROL_JAVA_OPTS% -Djava.awt.headless=true
-Drhq.server.properties-file="%RHQ_SERVER_HOME%\bin\rhq-server.properties"
-Drhq.control.logdir="%RHQ_SERVER_HOME%\logs"
-Drhq.control.loglevel=%_RHQ_LOGLEVEL% -Drhq.server.basedir="%RHQ_SERVER_HOME%"
-Drhqctl.properties-file="%RHQ_SERVER_HOME%\bin\rhqctl.properties"
-Drhq.java-exe-file-path="%RHQ_JAVA_EXE_FILE_PATH%"
rem Sample JPDA settings for remote socket debugging
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc
new file mode 100644
index 0000000..ffef3ce
--- /dev/null
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc
@@ -0,0 +1,19 @@
+#*****************************************************************************
+# RHQ Server Java Service Wrapper Settings Include File
+#
+# This file specifies a set of additional environment variables that will be
+# applied to the RHQ Server JVM. This file will likely be empty.
+#
+# If adding additional Java properties note that the properties must follow
+# a strict number ordering (that continues from rhq-server-wrapper.conf)
+# and currently must start with:
+#
+# wrapper.java.additional.23=
+#
+# For example, to set a non-default temp directory for Java:
+# Note: use forward slashes for directories:
+#
+# wrapper.java.additional.23="-Djava.io.tmpdir=c:/temp"
+#
+#*****************************************************************************
+
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env
index 1441e0a..ff0cb19 100644
---
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env
@@ -2,15 +2,21 @@
# RHQ Storage Node Java Service Wrapper Environment Settings File
#
# This file specifies a set of environment variables that will be
-# applied to the Storage Node JVM.
+# applied to the RHQ Storage Node JVM.
#
-# THIS FILE SHOULD NOT BE EDITED!
+#*****************************************************************************
+
+
+#*****************************************************************************
+# MANAGED SETTINGS
#
-# This file represents the values managed as RHQ Storage Node resource
+# This section represents the values managed as RHQ Storage Node resource
# configuration values. Or, set by the installer.
#
+# DO NOT EDIT THESE VALUES BY HAND. Changes should be performed via
+# the Administration section of the RHQ GUI.
+#
#*****************************************************************************
-
set.jmx_port=7299
set.heap_min=-Xms512M
@@ -22,3 +28,14 @@ set.thread_stack_size=-Xss180k
set.heap_dump_on_OOMError=-XX:+HeapDumpOnOutOfMemoryError
set.heap_dump_dir=
+
+
+#*****************************************************************************
+# CUSTOM SETTINGS
+#
+# This section if for additional properties managed by the user. In general
+# there will be nothing defined in this section. More likely any customization
+# of what is set in the rhq-storage-wrapper.conf would be located in the
+# rhq-storage-wrapper.inc file. See that file for more information.
+#
+#*****************************************************************************
diff --git
a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.inc
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.inc
new file mode 100644
index 0000000..ef5aa09
--- /dev/null
+++
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.inc
@@ -0,0 +1,19 @@
+#*****************************************************************************
+# RHQ Storage Node Java Service Wrapper Settings Include File
+#
+# This file specifies a set of additional environment variables that will be
+# applied to the RHQ Storage Node JVM. This file will likely be empty.
+#
+# If adding additional Java properties note that the properties must follow
+# a strict number ordering (that continues from rhq-storage-wrapper.conf)
+# and currently must start with:
+#
+# wrapper.java.additional.21=
+#
+# For example, to set a non-default temp directory for Java:
+# Note: use forward slashes for directories:
+#
+# wrapper.java.additional.21="-Djava.io.tmpdir=c:/temp"
+#
+#*****************************************************************************
+
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
index 8cd24ee..d883571 100644
---
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
+++
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
@@ -3,13 +3,19 @@
# last wrapper.java.additional.N entry in rhq-server-wrapper.conf.
#
+# reduce memory needs for dev env.
+wrapper.java.additional.23=-Xms512M
+wrapper.java.additional.24=-Xmx512M
+wrapper.java.additional.25=-XX:PermSize=200M
+wrapper.java.additional.26=-XX:MaxPermSize=200M
+
# enable remote debugging
-wrapper.java.additional.23=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
+wrapper.java.additional.27=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
# enable jprofiler
#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.24=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.25=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
+#wrapper.java.additional.28=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.29=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
# disable JVM startup timeout
wrapper.startup.timeout=0
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index e82a25b..f92789e 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -1008,7 +1008,7 @@
${comment}rhq.storage.verify-data-dirs-empty=${rhq.storage.verify-data-dirs-empt
<target name="copy-dev-resources" if="copy.dev.resources">
<echo>Copying dev-only resources ...</echo>
- <copy todir="${project.build.outputDirectory}"
verbose="true">
+ <copy todir="${project.build.outputDirectory}"
overwrite="true" verbose="true">
<fileset dir="src/main/dev-resources" />
</copy>
<loadproperties>
commit 3fd2e23cf7753026050f89d939e3a29f3d0025f6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Oct 24 16:23:59 2013 -0400
Use the root pom maven plugin version
diff --git a/modules/plugins/OpenShift-support/pom.xml
b/modules/plugins/OpenShift-support/pom.xml
index 0a0c2ff..1b284d7 100644
--- a/modules/plugins/OpenShift-support/pom.xml
+++ b/modules/plugins/OpenShift-support/pom.xml
@@ -48,7 +48,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>