modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java
| 10 ++--
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
| 2
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
| 3 +
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ServerConfigForm.jsp
| 22 ++++++++++
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml
| 8 +++
5 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit bc45354dc2691e227986b89fd86d13cb6b91bd5b
Author: Justin Harris <jharris(a)redhat.com>
Date: Mon Nov 30 15:43:59 2009 -0500
Adding in server plugins page link from the server settings page.
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java
index 675dd9e..75747eb 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java
@@ -75,8 +75,8 @@ public class PluginConfigurationUIBean {
}
public boolean isEditable() {
- return this.currentPlugin != null && (
- this.currentPlugin.getPluginConfiguration() != null ||
+ return this.currentPlugin != null &&
+ (this.currentPlugin.getPluginConfiguration() != null ||
this.currentPlugin.getScheduledJobsConfiguration() != null);
}
@@ -114,8 +114,11 @@ public class PluginConfigurationUIBean {
}
private TreeNode createPluginNode(PluginKey pluginKey) {
+ ServerPlugin plugin = serverPluginsBean.getServerPlugin(pluginKey);
+ plugin = serverPluginsBean.getServerPluginRelationships(plugin);
+
TreeNode pluginNode = new TreeNodeImpl();
- pluginNode.setData(serverPluginsBean.getServerPlugin(pluginKey));
+ pluginNode.setData(plugin);
return pluginNode;
}
@@ -123,7 +126,6 @@ public class PluginConfigurationUIBean {
public void processSelection(NodeSelectedEvent event) {
HtmlTree tree = (HtmlTree) event.getSource();
this.currentPlugin = (ServerPlugin) tree.getRowData();
- this.currentPlugin =
serverPluginsBean.getServerPluginRelationships(currentPlugin);
lookupConfigDefinitions();
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
index 6ef4d86..34e1218 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
+++
b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties
@@ -653,6 +653,8 @@ admin.settings.SNMPGenericID=Generic ID:
admin.settings.SNMPSpecificID=Specific ID:
admin.settings.SNMPAgentAddress=Agent Address:
+admin.settings.ServerPluginsConfigPropTab=Server Plugins Configuration Properties
+
admin.settings.UseCAMAuth=Use ${product.shortName} Internal Authentication
admin.settings.UseLDAPAuth=Use LDAP Authentication
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
index 99caf2c..e2c5478 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
@@ -50,6 +50,9 @@
<br>
<br>
<tiles:insert page="/admin/config/SNMPForm.jsp"/>
+<br>
+<br>
+<tiles:insert page="/admin/config/ServerConfigForm.jsp"/>
<%--<tiles:insert page="/admin/config/MiscForm.jsp"/>--%>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ServerConfigForm.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ServerConfigForm.jsp
new file mode 100644
index 0000000..008f1cb
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ServerConfigForm.jsp
@@ -0,0 +1,22 @@
+<%@ page language="java" %>
+<%@ page errorPage="/common/Error.jsp" %>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html-el"
prefix="html" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-tiles"
prefix="tiles" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-logic"
prefix="logic" %>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+
+<tiles:insert definition=".header.tab">
+ <tiles:put name="tabKey"
value="admin.settings.ServerPluginsConfigPropTab"/>
+</tiles:insert>
+
+<table width="100%" cellpadding="0" cellspacing="0"
border="0">
+ <tr>
+ <td class="BlockCheckboxLabel" align="left"
colspan="4">
+ <a href="/rhq/admin/plugin/plugin-config.xhtml">Configure Server
Plugins</a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4" class="BlockBottomLine"><html:img
page="/images/spacer.gif" width="1" height="1"
border="0"/></td>
+ </tr>
+</table>
\ No newline at end of file
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml
index 49425e4..fea1d29 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml
@@ -25,7 +25,13 @@
</ui:define>
<ui:define name="breadcrumbs">
- <h:outputLink value="plugin-config.xhtml" >Plugin
Configuration</h:outputLink>
+ <h:outputLink value="/admin/config/Config.do?mode=edit">
+ <h:outputText value="Server Settings"/>
+ </h:outputLink>
+ >
+ <h:outputLink value="plugin-config.xhtml">
+ <h:outputText value="Server Plugins Configuration"/>
+ </h:outputLink>
</ui:define>
<ui:define name="body">