modules/core/domain/intentional-api-changes-since-4.5.1.xml | 11 +++++++-
modules/enterprise/agent/src/etc/rhq-agent.sh | 13 ++++++++--
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 8 +++---
3 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit 57fd95fca7c516481c31666324ea50257a21afa5
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Dec 20 20:46:32 2012 +0100
Adding renamed servlet (TopologyGWTService) to the web.xml
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index 124c979..a17f947 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -198,8 +198,8 @@
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.PlatformUtilizationGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI
CloudGWTService</servlet-name>
-
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.CloudGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI
TopologyGWTService</servlet-name>
+
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TopologyGWTServiceImpl</servlet-class>
</servlet>
<servlet>
@@ -374,8 +374,8 @@
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/PlatformUtilizationGWTService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI
CloudGWTService</servlet-name>
-
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/CloudGWTService</url-pattern>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI
TopologyGWTService</servlet-name>
+
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/TopologyGWTService</url-pattern>
</servlet-mapping>
<servlet-mapping>
commit 87fb0278c16f47d5597e02685d7693d12b9b6b21
Merge: 2d5ccbf 1769169
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Dec 20 20:39:59 2012 +0100
Merge branch 'master' into jkremser/ha-jsf-to-gwt-rewrite
commit 1769169f2126bc78cc5b237a818f2bd703d2ea83
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 20 12:32:28 2012 -0500
Add API diff clirr exclusion
diff --git a/modules/core/domain/intentional-api-changes-since-4.5.1.xml
b/modules/core/domain/intentional-api-changes-since-4.5.1.xml
index ff10f26..d7d376a 100644
--- a/modules/core/domain/intentional-api-changes-since-4.5.1.xml
+++ b/modules/core/domain/intentional-api-changes-since-4.5.1.xml
@@ -17,5 +17,14 @@
<justification>
A few sort specifiers that were actually in error and if used would have
produced a downstream error.
</justification>
- </difference>
+ </difference>
+ <difference>
+
<className>org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite</className>
+ <differenceType>7004</differenceType><!-- num argments changed
-->
+ <method>AlertConditionAvailabilityCategoryComposite(*)</method>
+ <justification>
+ This composite is not exposed remotely. The previous constructor signature
was missing an argument
+ required for correct behavior. See BZ 888927.
+ </justification>
+ </difference>
</differences>
commit e437f5771c4b79ce570ad24cb3c545078d9a944a
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 20 00:18:51 2012 +0100
[BZ 880795] - The upgraded Augeas library no longer contains the file
"libaugeas.so", which causes the default native library lookup mechanisms
to fail. Standard ld should be able to find the .so.x.y files, too,
but the presence of java.library.path system property seems to be causing
this not to kick in during the library loading as done by the JVM.
To work around this problem, we need to instruct JNA to have a "backup
plan" in case the standard lookup mechanisms fail. This can be done using
the "jna.platform.library.path" system property, which instructs JNA to use
that path to look up libraries if everything else fails (and do the .so.x.y
resolution on its own).
We set this variable to the same value as we override LD_LIBRARY_PATH to
so that JNA library loading and native (as in system-wide) library loading
works the same for the agent process. This way we can load the JNA
libraries using the .so.x.y resolution the same way as the system resolves
the native libraries using stadard ld mechanisms in spite of there being
the java.library.path variable set (which is needed by SIGAR).
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh
b/modules/enterprise/agent/src/etc/rhq-agent.sh
index e80581d..b3ee8a7 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -212,7 +212,9 @@ fi
debug_msg "RHQ_AGENT_CMDLINE_OPTS: $RHQ_AGENT_CMDLINE_OPTS"
# ----------------------------------------------------------------------
-# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent
+# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent and
+# prepare jna.platform.library.path for JNA to be able to load augeas from our
+# custom location.
# ----------------------------------------------------------------------
if [ -n "$_LINUX" ]; then
@@ -230,6 +232,13 @@ if [ -n "$_LINUX" ]; then
fi
fi
export LD_LIBRARY_PATH
+
+ # We need to force our custom library path as the "system" look up path to
+ # JNA. Without this, the lookup of .so.x.y versions wouldn't work.
+ # We also need to keep the LD_LIBRARY_PATH in place so that the default
+ # system lookup works for libfa, which libaugeas depends on.
+
_JNA_LIBRARY_PATH="\"-Djna.platform.library.path=${LD_LIBRARY_PATH}\""
+
debug_msg "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
fi
@@ -265,7 +274,7 @@ if [ -z "$RHQ_AGENT_MAINCLASS" ]; then
fi
# Build the command line that starts the VM
-CMD="\"${RHQ_AGENT_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}"
+CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT}
${_JAVA_LIBRARY_PATH_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS}
${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\"
${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
debug_msg "Executing the agent with this command line:"
debug_msg "$CMD"
Show replies by date