modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
| 8 --------
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
| 4 +++-
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
| 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 813c49855969171406f638a9d32112b722b99d19
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Apr 30 13:37:35 2013 -0700
[BZ 955760] Syntax fix for gzip compression enablement.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
index 29a6d76..4e90c62 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
@@ -348,7 +348,7 @@ fi
# Add the JVM opts that we always want to specify, whether or not the user set
RHQ_SERVER_JAVA_OPTS.
# Note that the double equals for the policy file specification IS INTENTIONAL
-_HTTP_COMPRESSION="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on
org.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html"
+_HTTP_COMPRESSION="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on
-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html"
RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS}
-Drhq.server.home=${RHQ_SERVER_HOME} -Djboss.server.log.dir=${_LOG_DIR_PATH}
-Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true
-Djboss.server.default.config=standalone-full.xml
-Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager
-Djava.security.policy==${RHQ_SERVER_HOME}/bin/rhq-server.security-policy
${_HTTP_COMPRESSION} ${_JBOSS_DEBUG_LOGGING}"
debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS"
commit 8c54ef01abaa6790f49f96c492fe6649a0245a6f
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Apr 30 09:06:23 2013 -0700
Move jquery(1.7.2) library out of CoreGUI.gwt.xml now that we don't have GFlot
dependency (GFlot was removed with addition of d3 charts).
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 3d5ae84..7d50e87 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -46,14 +46,6 @@
<when-type-assignable
class="com.google.gwt.user.client.rpc.RemoteService"/>
</generate-with>
- <!-- External javascript libraries -->
- <!-- jquery.sparkline requires jquery. We don't explicitly provide jquery here
because it is already
- embedded in the GFlot JAR (the charting lib used for GraphPortlet).
Furthermore, GFlot 2.4.2 requires
- the version of jquery (1.7.2).
- -->
- <script src="/coregui/js/jquery-1.7.2.min.js"/>
-
-
<!--
Limit compilation to your preferred browser(s) to speed up compile time.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 8722614..1b69b53 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -15,10 +15,12 @@
<link rel="stylesheet" href="css/tipsy.css">
<link rel="stylesheet" href="css/charts.css">
- <script defer="defer" type="text/javascript"
src="/coregui/js/jquery.sparkline-2.1.min.js"></script>
<script defer="defer" type="text/javascript"
src="/coregui/js/rhq.js"></script>
<script defer="defer" type="text/javascript"
src="/coregui/js/d3.v3.js"></script>
<script defer="defer" type="text/javascript"
src="/coregui/js/nv.d3.js"></script>
+ <!-- jquery dependent js libs -->
+ <script defer="defer" type="text/javascript"
src="/coregui/js/jquery-1.7.2.min.js"></script>
+ <script defer="defer" type="text/javascript"
src="/coregui/js/jquery.sparkline-2.1.min.js"></script>
<script defer="defer" type="text/javascript"
src="/coregui/js/jquery.tipsy.js"></script>
<script type="text/javascript">
Show replies by date