modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
| 2
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/admin-navigation-plain.xml
| 106 +++
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml
| 13
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
| 1
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp
| 3
modules/enterprise/gui/portal-war/src/main/webapp/admin/license/License.jsp
| 2
modules/enterprise/gui/portal-war/src/main/webapp/admin/license/LicenseEdit.jsp
| 28 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config-plain.xhtml
| 108 ++++
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-details-plain.xhtml
| 155 +++++
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml
| 28 +
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-map-plain.xhtml
| 21
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-plain.xhtml
| 41 +
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml
| 29 +
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-view-map-plain.xhtml
| 22
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-list-plain.xhtml
| 268 ++++++++++
15 files changed, 823 insertions(+), 4 deletions(-)
New commits:
commit d8fca9dc8305e86a642cd4be9633b93476670c98
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Aug 12 13:57:54 2010 -0400
implement "plain" scheme using iframed-facelets for unimplemented admin >
config > plugins section
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index dc1bb5c..5779155 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -241,7 +241,7 @@ public class AdministrationView extends HLayout implements
BookmarkableView {
} else if ("License".equals(page)) {
url = "/admin/license/LicenseAdmin.do?mode=view";
} else if ("Plugins".equals(page)) {
- url = "/rhq/admin/plugin/plugin-list.xhtml";
+ url = "/rhq/admin/plugin/plugin-list-plain.xhtml";
}
url = addQueryStringParam(url, "nomenu=true");
content = new FullHTMLPane(url);
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/admin-navigation-plain.xml
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/admin-navigation-plain.xml
new file mode 100644
index 0000000..e2c4d98
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/admin-navigation-plain.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+
+<faces-config version="1.2"
xmlns="http://java.sun.com/xml/ns/javaee"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+ <navigation-rule>
+ <from-view-id>/rhq/admin/largeenv-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <!-- catch all navigation-case: if any actions return 'success', go
here -->
+ <from-outcome>success</from-outcome>
+ <to-view-id>/rhq/admin/largeenv-plain.xhtml</to-view-id>
+ <redirect/>
+ </navigation-case>
+
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/rhq/admin/plugin/plugin-list-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <!-- catch all navigation-case: if any actions return 'success', go
here -->
+ <from-action>#{InstalledPluginsUIBean.uploadPlugin}</from-action>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/rhq/admin/plugin/plugin-list-plain.xhtml</to-view-id>
+ <redirect/>
+ </navigation-case>
+
+ </navigation-rule>
+
+ <navigation-rule>
+
<from-view-id>/rhq/admin/plugin/plugin-config-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <from-action>#{ConfigHelperUIBean.accessMap}</from-action>
+
<to-view-id>/rhq/admin/plugin/plugin-edit-view-map-plain.xhtml?plugin=#{pluginConfigUIBean.plugin.name}&deployment=#{pluginConfigUIBean.plugin.deployment}&pluginType=#{pluginConfigUIBean.plugin.type}&listName=#{param.listName}&listIndex=#{param.listIndex}</to-view-id>
+
+ <redirect />
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/rhq/admin/plugin/plugin-edit-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <from-action>#{ConfigHelperUIBean.addNewMap}</from-action>
+
<to-view-id>/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml</to-view-id>
+ </navigation-case>
+
+ <navigation-case>
+ <from-action>#{ConfigHelperUIBean.accessMap}</from-action>
+
<to-view-id>/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml</to-view-id>
+ </navigation-case>
+
+ <navigation-case>
+
<from-action>#{editPluginConfigurationUIBean.updatePlugin}</from-action>
+ <from-outcome>success</from-outcome>
+
<to-view-id>/rhq/admin/plugin/plugin-config-plain.xhtml?pluginName=#{editPluginConfigurationUIBean.plugin.name}</to-view-id>
+
+ <redirect />
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+
<from-view-id>/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+
<to-view-id>/rhq/admin/plugin/plugin-edit-plain.xhtml?plugin=#{pluginConfigUIBean.plugin.name}&deployment=#{pluginConfigUIBean.plugin.deployment}&pluginType=#{pluginConfigUIBean.plugin.type}</to-view-id>
+
+ <redirect/>
+ </navigation-case>
+
+ </navigation-rule>
+
+ <navigation-rule>
+
<from-view-id>/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml</from-view-id>
+
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+
<to-view-id>/rhq/admin/plugin/plugin-edit-plain.xhtml?plugin=#{pluginConfigUIBean.plugin.name}&deployment=#{pluginConfigUIBean.plugin.deployment}&pluginType=#{pluginConfigUIBean.plugin.type}</to-view-id>
+
+ <redirect/>
+ </navigation-case>
+
+ </navigation-rule>
+
+ <navigation-rule>
+
<from-view-id>/rhq/admin/plugin/plugin-details-plain.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+
<to-view-id>/rhq/admin/plugin/plugin-details-plain.xhtml?plugin=#{plugin.name}&deployment=#{plugin.deployment}&pluginType=#{serverPlugin.type}&control=#{param.control}</to-view-id>
+ <redirect/>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <navigation-case>
+ <from-outcome>sessionExpired</from-outcome>
+ <to-view-id>/Login.do</to-view-id>
+ <redirect/>
+ </navigation-case>
+ </navigation-rule>
+
+</faces-config>
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
index 87580b6..ed22bc6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
@@ -162,6 +162,7 @@
/WEB-INF/jsf-navigation/summary-navigation.xml,
/WEB-INF/jsf-navigation/test-navigation.xml,
+ /WEB-INF/jsf-navigation/admin-plain-navigation.xml,
/WEB-INF/jsf-navigation/alert-plain-navigation.xml,
/WEB-INF/jsf-navigation/cluster-plain-navigation.xml,
/WEB-INF/jsf-navigation/content-plain-navigation.xml,
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config-plain.xhtml
new file mode 100644
index 0000000..56c872d
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config-plain.xhtml
@@ -0,0 +1,108 @@
+<ui:composition template="/rhq/entity/layout/main-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:define name="content">
+
+ <h:form id="pluginsConfigForm">
+ <h:panelGrid columns="2" width="100%"
columnClasses="col1,col2">
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Available Plugins" />
+ </f:facet>
+
+ <rich:tree
nodeSelectListener="#{pluginConfigUIBean.processSelection}"
+
adviseNodeSelected="#{pluginConfigUIBean.adviseSelected}"
+
adviseNodeOpened="#{pluginConfigUIBean.adviseOpened}"
+ reRender="pluginConfig"
+ value="#{pluginConfigUIBean.root}"
+ ajaxSubmitSelection="true"
+ switchType="client"
+ var="item"
+ toggleOnClick="false"
+ nodeFace="#{item.class.simpleName}"
+ >
+
+ <rich:treeNode type="String">
+ <h:outputText value="#{item}s" />
+ </rich:treeNode>
+ <rich:treeNode type="ServerPlugin">
+ <h:outputText value="#{item.displayName}" />
+ </rich:treeNode>
+ </rich:tree>
+ </rich:panel>
+
+ <h:panelGroup id="pluginConfig">
+ <rich:panel id="detailsLink"
+ style="background: #EEEEEE;"
+ rendered="#{pluginConfigUIBean.plugin != null}"
>
+ <h:outputText value="See the " />
+ <h:outputLink
value="/rhq/admin/plugin/plugin-details-plain.xhtml">
+ <f:param name="plugin"
value="#{pluginConfigUIBean.plugin.name}"/>
+ <f:param name="deployment"
value="#{pluginConfigUIBean.plugin.deployment}"/>
+ <f:param name="pluginType"
value="#{pluginConfigUIBean.plugin.type}"/>
+ <h:outputText
value="'#{pluginConfigUIBean.plugin.displayName}' details page"/>
+ </h:outputLink>
+ <h:outputText value=" for more plugin information."
/>
+ </rich:panel>
+
+ <rich:panel id="noConfigMessage"
+ style="background: #EEEEEE;"
+ rendered="#{not pluginConfigUIBean.editable and
pluginConfigUIBean.plugin != null}" >
+ <h:outputText escape="true" value="Plugin
'#{pluginConfigUIBean.plugin.displayName}' has no configuration." />
+ </rich:panel>
+
+ <rich:panel id="pluginButtonsTopPanel"
rendered="#{pluginConfigUIBean.editable}">
+ <h:panelGroup id="pluginButtonsTop">
+ <h:outputLink
value="/rhq/admin/plugin/plugin-edit-plain.xhtml"
styleClass="buttonmed">
+ <f:param name="plugin"
value="#{pluginConfigUIBean.plugin.name}"/>
+ <f:param name="deployment"
value="#{pluginConfigUIBean.plugin.deployment}"/>
+ <f:param name="pluginType"
value="#{pluginConfigUIBean.plugin.type}"/>
+ <h:outputText value="EDIT"/>
+ </h:outputLink>
+ </h:panelGroup>
+ </rich:panel>
+
+ <rich:panel
rendered="#{pluginConfigUIBean.plugin.pluginConfiguration != null}">
+ <f:facet name="header">
+ <h:outputText value="Plugin Configuration"/>
+ </f:facet>
+ <onc:config
configurationDefinition="#{pluginConfigUIBean.pluginConfigurationDefinition}"
+
configuration="#{pluginConfigUIBean.plugin.pluginConfiguration}"
+ readOnly="true" />
+ </rich:panel>
+
+ <rich:panel
rendered="#{pluginConfigUIBean.plugin.scheduledJobsConfiguration != null}">
+ <f:facet name="header">
+ <h:outputText value="Scheduled Jobs"/>
+ </f:facet>
+ <onc:config
configurationDefinition="#{pluginConfigUIBean.scheduledJobsDefinition}"
+
configuration="#{pluginConfigUIBean.plugin.scheduledJobsConfiguration}"
+ readOnly="true" />
+ </rich:panel>
+
+ <rich:panel id="pluginButtonsBottomPanel"
rendered="#{pluginConfigUIBean.editable}">
+ <h:panelGroup id="pluginButtonsBottom">
+ <h:outputLink
value="/rhq/admin/plugin/plugin-edit-plain.xhtml"
styleClass="buttonmed">
+ <f:param name="plugin"
value="#{pluginConfigUIBean.plugin.name}"/>
+ <f:param name="deployment"
value="#{pluginConfigUIBean.plugin.deployment}"/>
+ <f:param name="pluginType"
value="#{pluginConfigUIBean.plugin.type}"/>
+ <h:outputText value="EDIT"/>
+ </h:outputLink>
+ </h:panelGroup>
+ </rich:panel>
+
+ </h:panelGroup>
+ </h:panelGrid>
+ </h:form>
+ </ui:define>
+
+</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-details-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-details-plain.xhtml
new file mode 100644
index 0000000..fc22797
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-details-plain.xhtml
@@ -0,0 +1,155 @@
+<ui:composition template="/rhq/entity/layout/main-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:define name="content">
+
+ <h:form id="pluginsForm">
+
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Plugin: #{plugin.displayName}
(#{plugin.name})"/>
+ </f:facet>
+
+ <h:panelGrid styleClass="BlockContent" columns="4"
width="100%">
+
+ <h:outputLabel styleClass="BlockLabel"
value="Version:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.version}"/>
+
+ <h:outputLabel styleClass="BlockLabel" value="AMPS
Version:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.ampsVersion}"/>
+
+ <h:outputLabel styleClass="BlockLabel"
value="Enabled:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.enabled}"/>
+
+ <h:outputLabel styleClass="BlockLabel"
value="Type:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.deployment}"/>
+
+ <h:outputLabel styleClass="BlockLabel"
value="MD5:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.md5}"/>
+
+ <h:outputLabel styleClass="BlockLabel"
value="Description:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.description}"/>
+
+ <h:outputLabel styleClass="BlockLabel"
value="Path:"/>
+ <h:outputText styleClass="BlockContent"
value="#{plugin.path}"/>
+ </h:panelGrid>
+
+ <br />
+ <h:outputLink
value="/rhq/admin/plugin/plugin-config-plain.xhtml"
rendered="#{plugin.deployment eq 'SERVER'}">
+ <f:param name="pluginName"
value="#{plugin.name}"/>
+ <h:outputText value="Configure
'#{plugin.displayName}'"/>
+ </h:outputLink>
+ <br />
+ <br />
+
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Plugin Help"/>
+ </f:facet>
+
+ <h:outputText escape="false" value="<pre>
#{plugin.help} </pre>"/>
+ </rich:panel>
+
+ <rich:panel rendered="#{plugin.deployment == 'SERVER' and
ServerPluginControlUIBean.controls.size > 0 and ServerPluginControlUIBean.permission
}">
+ <f:facet name="header">
+ <h:outputText value="Plugin Controls"/>
+ </f:facet>
+
+ <rich:dataTable id="serverPluginsDataTable"
+ value="#{ServerPluginControlUIBean.controls}"
+ var="control"
+ width="100%"
+ columnsWidth="25% 75%"
+ headerClass="tableRowHeader"
+ footerClass="on-pager-footer"
+
onRowMouseOver="this.style.backgroundColor='#E7E7E7'"
+
onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'">
+
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Name"/>
+ </f:facet>
+
+ <h:outputLink
value="/rhq/admin/plugin/plugin-details-plain.xhtml">
+ <f:param name="plugin"
value="#{plugin.name}"/>
+ <f:param name="deployment"
value="#{plugin.deployment}"/>
+ <f:param name="pluginType"
value="#{plugin.type}"/>
+ <f:param name="control"
value="#{control[0]}"/>
+ <h:outputText value="#{control[1]} *"
rendered="#{param.control eq control[0]}"/>
+ <h:outputText value="#{control[1]}"
rendered="#{param.control ne control[0]}"/>
+ </h:outputLink>
+ </rich:column>
+
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Description"/>
+ </f:facet>
+
+ <h:outputText value="#{control[2]}"/>
+ </rich:column>
+ </rich:dataTable>
+
+ <br/>
+ <onc:config id="paramConfig"
+ rendered="#{param.control ne null}"
+
readOnly="#{ServerPluginControlUIBean.resultsAvailable}"
+
configurationDefinition="#{ServerPluginControlUIBean.paramsDefinition}"
+
configuration="#{ServerPluginControlUIBean.paramsConfiguration}"
+ nullConfigurationDefinitionMessage="This control does
not accept parameters"
+ nullConfigurationMessage="This control does not accept
parameters!"
+ nullConfigurationStyle="InfoBlock"/>
+ <br />
+ <input type="hidden" name="plugin"
value="#{plugin.name}" />
+ <input type="hidden" name="deployment"
value="#{plugin.deployment}" />
+ <input type="hidden" name="pluginType"
value="#{serverPlugin.type}" />
+ <c:if test="${not empty param.control}">
+ <input type="hidden" name="control"
value="#{param.control}" />
+ </c:if>
+ <h:commandButton
action="#{ServerPluginControlUIBean.invokeControl}"
+ rendered="#{param.control ne null and
!ServerPluginControlUIBean.resultsAvailable }"
+ value="EXECUTE"
+ styleClass="buttonmed"
+ onclick="return preventDoubleClick();"/>
+ <br/>
+ <h:panelGrid
rendered="#{ServerPluginControlUIBean.resultsAvailable}">
+ <rich:panel>
+ <h:outputText
rendered="#{ServerPluginControlUIBean.resultsError ne null}"
value="Results: #{ServerPluginControlUIBean.resultsError}"
styleClass="ErrorBlock" />
+ <h:outputText
rendered="#{ServerPluginControlUIBean.resultsError eq null}"
value="Results: Success!" styleClass="InfoBlock" />
+ </rich:panel>
+ <rich:panel
rendered="#{ServerPluginControlUIBean.resultsDefinition ne null}">
+ <onc:config id="resultsConfig"
+ readOnly="true"
+
configurationDefinition="#{ServerPluginControlUIBean.resultsDefinition}"
+
configuration="#{ServerPluginControlUIBean.resultsConfiguration}"
+ nullConfigurationDefinitionMessage="No result
properties were returned"
+ nullConfigurationMessage="No result properties
were returned!"
+
nullConfigurationStyle="#{ServerPluginControlUIBean.resultsError eq null ?
'InfoBlock' : 'WarnBlock'}"/>
+ </rich:panel>
+ </h:panelGrid>
+
+
+ </rich:panel>
+
+ </rich:panel>
+ </h:form>
+
+ <script type="text/javascript">
+ var submitted = false;
+ function preventDoubleClick() {
+ if (submitted) { return false; }
+ else { submitted = true; return true; }
+ }
+ </script>
+
+ </ui:define>
+
+ </ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml
new file mode 100644
index 0000000..73d77e6
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-add-map-plain.xhtml
@@ -0,0 +1,28 @@
+<ui:composition template="/rhq/admin/plugin/plugin-edit-map-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:param name="actionVerb" value="Add to" />
+ <ui:param name="editBreadCrumb" value="true" />
+
+ <ui:define name="mapConfig">
+ <onc:config
configurationDefinition="#{editPluginConfigurationUIBean.currentConfigurationDefinition}"
+
configuration="#{editPluginConfigurationUIBean.currentConfiguration}"
+ listName="#{param.listName}" />
+
+ <h:panelGrid columns="2" styleClass="buttons-table"
columnClasses="button-cell">
+ <h:commandButton value="OK" type="submit"
action="#{editPluginConfigurationUIBean.finishMap}"
+ alt="Click to Add Map"
styleClass="buttonmed"/>
+ <h:commandButton value="RESET" type="reset"
immediate="true"
+ alt="Click to Reset Fields"
styleClass="buttonmed"/>
+ </h:panelGrid>
+ </ui:define>
+</ui:composition>
\ No newline at end of file
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-map-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-map-plain.xhtml
new file mode 100644
index 0000000..8e0f8b9
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-map-plain.xhtml
@@ -0,0 +1,21 @@
+<ui:composition template="/rhq/entity/layout/main-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:define name="content">
+
+ <h:form id="editPluginConfigurationForm"
onsubmit="prepareInputsForSubmission(this)">
+ <ui:insert name="mapConfig" />
+ </h:form>
+
+ </ui:define>
+
+</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-plain.xhtml
new file mode 100644
index 0000000..ffa8733
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-plain.xhtml
@@ -0,0 +1,41 @@
+<ui:composition template="/rhq/entity/layout/main-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:define name="content">
+
+ <h:form id="pluginConfigForm">
+ <rich:panel
rendered="#{editPluginConfigurationUIBean.plugin.pluginConfiguration !=
null}">
+ <f:facet name="header">
+ <h:outputText value="Plugin Configuration"/>
+ </f:facet>
+ <onc:config
configurationDefinition="#{editPluginConfigurationUIBean.pluginConfigurationDefinition}"
+
configuration="#{editPluginConfigurationUIBean.plugin.pluginConfiguration}"
/>
+ </rich:panel>
+
+ <rich:panel
rendered="#{editPluginConfigurationUIBean.plugin.scheduledJobsConfiguration !=
null}">
+ <f:facet name="header">
+ <h:outputText value="Scheduled Jobs"/>
+ </f:facet>
+ <onc:config
configurationDefinition="#{editPluginConfigurationUIBean.scheduledJobsDefinition}"
+
configuration="#{editPluginConfigurationUIBean.plugin.scheduledJobsConfiguration}"
/>
+ </rich:panel>
+
+ <h:panelGroup id="pluginButtons">
+ <h:commandButton value="SAVE" type="submit"
action="#{editPluginConfigurationUIBean.updatePlugin}"
+ alt="Click to Save Changes"
styleClass="buttonmed" />
+ <h:commandButton value="RESET" type="reset"
immediate="true"
+ title="Click to Reset Fields"
styleClass="buttonmed"/>
+ </h:panelGroup>
+ </h:form>
+ </ui:define>
+
+</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml
new file mode 100644
index 0000000..8d847b7
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-update-map-plain.xhtml
@@ -0,0 +1,29 @@
+<ui:composition template="/rhq/admin/plugin/plugin-edit-map-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:param name="actionVerb" value="Update" />
+ <ui:param name="editBreadCrumb" value="true" />
+
+ <ui:define name="mapConfig">
+ <onc:config
configurationDefinition="#{editPluginConfigurationUIBean.currentConfigurationDefinition}"
+
configuration="#{editPluginConfigurationUIBean.currentConfiguration}"
+ listName="#{param.listName}"
+ listIndex="#{param.listIndex}" />
+
+ <h:panelGrid columns="2" styleClass="buttons-table"
columnClasses="button-cell">
+ <h:commandButton value="OK" type="submit"
action="#{editPluginConfigurationUIBean.finishMap}"
+ alt="Click to Update Map"
styleClass="buttonmed"/>
+ <h:commandButton value="RESET" type="reset"
immediate="true"
+ alt="Click to Reset Fields"
styleClass="buttonmed"/>
+ </h:panelGrid>
+ </ui:define>
+</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-view-map-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-view-map-plain.xhtml
new file mode 100644
index 0000000..02b18c4
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-view-map-plain.xhtml
@@ -0,0 +1,22 @@
+<ui:composition template="/rhq/admin/plugin/plugin-edit-map-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:param name="actionVerb" value="View" />
+
+ <ui:define name="mapConfig">
+ <onc:config
configurationDefinition="#{editPluginConfigurationUIBean.scheduledJobsDefinition}"
+
configuration="#{editPluginConfigurationUIBean.plugin.scheduledJobsConfiguration}"
+ listName="#{param.listName}"
+ listIndex="#{param.listIndex}"
+ readOnly="true" />
+ </ui:define>
+</ui:composition>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-list-plain.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-list-plain.xhtml
new file mode 100644
index 0000000..c85a6c1
--- /dev/null
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-list-plain.xhtml
@@ -0,0 +1,268 @@
+<ui:composition template="/rhq/entity/layout/main-plain.xhtml"
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:onc="http://jboss.org/on/component"
+
xmlns:onf="http://jboss.org/on/function"
+
xmlns:s="http://jboss.com/products/seam/taglib"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <ui:define name="content">
+
+<h:form id="pluginsForm">
+
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Installed Plugins"/>
+ </f:facet>
+
+ <h:panelGrid columns="1" width="100%">
+ <rich:tabPanel switchType="ajax"
selectedTab="#{InstalledPluginsSessionUIBean.selectedTab}">
+
+ <!-- ========== AGENT PLUGINS TAB ========== -->
+
+ <rich:tab name="AGENT" label="Agent Plugins">
+
+ <rich:dataTable id="agentPluginsDataTable"
+
value="#{InstalledPluginsUIBean.installedAgentPlugins}"
+ var="agentPlugin"
+ width="100%"
+ columnsWidth="3%, 20%, 52%, 15%, 10%"
+ styleClass="resources-table"
+ footerClass="on-pager-footer"
+
onRowMouseOver="this.style.backgroundColor='#E7E7E7'"
+
onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'">
+
+
+ <rich:column>
+ <f:facet name="header">
+ <onc:allSelect target="selectedPlugin"/>
+ </f:facet>
+
+ <onc:select name="selectedPlugin"
value="#{agentPlugin.id}"/>
+ </rich:column>
+
+ <rich:column rendered="#{param.debug}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="ID"/>
+ </f:facet>
+
+ <h:outputText value="#{agentPlugin.id}"/>
+ </rich:column>
+
+ <rich:column sortBy="#{agentPlugin.displayName}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Name"/>
+ </f:facet>
+
+ <h:outputLink
value="/rhq/admin/plugin/plugin-details-plain.xhtml">
+ <f:param name="plugin"
value="#{agentPlugin.name}"/>
+ <f:param name="deployment" value="AGENT"/>
+ <h:outputText value="#{agentPlugin.displayName}"/>
+ </h:outputLink>
+
+ </rich:column>
+
+ <rich:column sortBy="#{agentPlugin.description}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Description"/>
+ </f:facet>
+
+ <h:outputText value="#{agentPlugin.description}"/>
+ </rich:column>
+
+ <rich:column sortBy="#{agentPlugin.mtime}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Last
Update"/>
+ </f:facet>
+
+ <h:outputText value="#{agentPlugin.mtime}">
+ <f:converter converterId="UserDateTimeConverter" />
+ </h:outputText>
+ </rich:column>
+
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Enabled"/>
+ </f:facet>
+
+ <h:graphicImage
value="/images/icons/availability_green_16.png"
rendered="#{agentPlugin.enabled}"/>
+ <h:graphicImage value="/images/icons/availability_red_16.png"
rendered="#{!agentPlugin.enabled}"/>
+ </rich:column>
+
+ <f:facet name="footer">
+ <rich:columnGroup>
+ <rich:column colspan="5" width="100%">
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.enableAgentPlugins}"
+ value="ENABLE"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.disableAgentPlugins}"
+ value="DISABLE"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ </rich:column>
+ <rich:column colspan="5" width="100%"
breakBefore="true">
+ <h:commandButton
action="#{InstalledPluginsUIBean.scan}"
+ value="SCAN FOR UPDATES"
styleClass="on-pager-button buttonsmall">
+ </h:commandButton>
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+ </rich:dataTable>
+
+ </rich:tab>
+
+ <!-- ========== SERVER PLUGINS TAB ========== -->
+
+ <rich:tab name="SERVER" label="Server Plugins">
+
+ <rich:dataTable id="serverPluginsDataTable"
+
value="#{InstalledPluginsUIBean.installedServerPlugins}"
+ var="serverPlugin"
+ width="100%"
+
columnsWidth="#{InstalledPluginsSessionUIBean.showAllServerPlugins ? '3%, 20%,
52%, 15%, 5%, 5%' : '3%, 20%, 52%, 15%, 10%'}"
+ styleClass="resources-table"
+ footerClass="on-pager-footer"
+
onRowMouseOver="this.style.backgroundColor='#E7E7E7'"
+
onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'">
+
+
+ <rich:column>
+ <f:facet name="header">
+ <onc:allSelect target="selectedPlugin"/>
+ </f:facet>
+
+ <onc:select name="selectedPlugin"
value="#{serverPlugin.id}"/>
+ </rich:column>
+
+ <rich:column rendered="#{param.debug}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="ID"/>
+ </f:facet>
+
+ <h:outputText value="#{serverPlugin.id}"/>
+ </rich:column>
+
+ <rich:column sortBy="#{serverPlugin.displayName}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Name"/>
+ </f:facet>
+
+ <h:outputLink
value="/rhq/admin/plugin/plugin-details-plain.xhtml"
rendered="#{serverPlugin.status eq 'INSTALLED'}">
+ <f:param name="plugin"
value="#{serverPlugin.name}"/>
+ <f:param name="deployment" value="SERVER"/>
+ <f:param name="pluginType"
value="#{serverPlugin.type}"/>
+ <h:outputText value="#{serverPlugin.displayName}"/>
+ </h:outputLink>
+ <h:outputText value="#{serverPlugin.displayName}"
rendered="#{serverPlugin.status ne 'INSTALLED'}"/>
+
+ </rich:column>
+
+ <rich:column sortBy="#{serverPlugin.description}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Description"/>
+ </f:facet>
+
+ <h:outputText value="#{serverPlugin.description}"/>
+ </rich:column>
+
+ <rich:column sortBy="#{serverPlugin.mtime}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Last
Update"/>
+ </f:facet>
+
+ <h:outputText value="#{serverPlugin.mtime}">
+ <f:converter converterId="UserDateTimeConverter" />
+ </h:outputText>
+ </rich:column>
+
+
+ <rich:column sortBy="#{serverPlugin.enabled}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Enabled"/>
+ </f:facet>
+
+ <h:graphicImage
value="/images/icons/availability_green_16.png"
rendered="#{serverPlugin.enabled}"/>
+ <h:graphicImage value="/images/icons/availability_red_16.png"
rendered="#{!serverPlugin.enabled}"/>
+ </rich:column>
+
+ <rich:column sortBy="#{serverPlugin.status}"
rendered="#{InstalledPluginsSessionUIBean.showAllServerPlugins}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText"
value="Deployed"/>
+ </f:facet>
+
+ <h:graphicImage
value="/images/icons/availability_green_16.png"
rendered="#{serverPlugin.status eq 'INSTALLED' }"/>
+ <h:graphicImage value="/images/icons/availability_red_16.png"
rendered="#{serverPlugin.status ne 'INSTALLED' }"/>
+ </rich:column>
+
+ <f:facet name="footer">
+ <rich:columnGroup>
+ <rich:column
colspan="#{InstalledPluginsSessionUIBean.showAllServerPlugins ? 6 : 5}"
width="100%">
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.enableServerPlugins}"
+ value="ENABLE"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.disableServerPlugins}"
+ value="DISABLE"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.undeployServerPlugins}"
+ value="UNDEPLOY"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ <onc:selectCommandButton
action="#{InstalledPluginsUIBean.purgeServerPlugins}"
+
rendered="#{InstalledPluginsSessionUIBean.showAllServerPlugins}"
+ value="PURGE"
target="selectedPlugin" styleClass="on-pager-button buttonsmall">
+ </onc:selectCommandButton>
+ </rich:column>
+ <rich:column breakBefore="true"
colspan="#{InstalledPluginsSessionUIBean.showAllServerPlugins ? 6 : 5}"
width="100%">
+ <h:commandButton
action="#{InstalledPluginsUIBean.scan}"
+ value="SCAN FOR UPDATES"
styleClass="on-pager-button buttonsmall">
+ </h:commandButton>
+ <h:commandButton
action="#{InstalledPluginsUIBean.restartMasterPluginContainer}"
+ value="RESTART MASTER PLUGIN CONTAINER"
styleClass="on-pager-button buttonsmall">
+ </h:commandButton>
+ <h:commandButton
action="#{InstalledPluginsSessionUIBean.showUndeployedServerPlugins}"
+
rendered="#{!InstalledPluginsSessionUIBean.showAllServerPlugins}"
+ value="SHOW UNDEPLOYED"
styleClass="on-pager-button buttonsmall">
+ </h:commandButton>
+ <h:commandButton
action="#{InstalledPluginsSessionUIBean.hideUndeployedServerPlugins}"
+
rendered="#{InstalledPluginsSessionUIBean.showAllServerPlugins}"
+ value="HIDE UNDEPLOYED"
styleClass="on-pager-button buttonsmall">
+ </h:commandButton>
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+ </rich:dataTable>
+
+ </rich:tab>
+ </rich:tabPanel>
+ </h:panelGrid>
+
+ </rich:panel>
+
+<rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Upload Plugin"/>
+ </f:facet>
+
+ <h:panelGrid columns="1" width="100%">
+ <rich:fileUpload
+ id="upload"
+ fileUploadListener="#{InstalledPluginsUIBean.fileUploadListener}"
+ maxFilesQuantity="10"
+ acceptedTypes="jar"
+ noDuplicate="true"
+ immediateUpload="false"
+ autoclear="false"
+ allowFlash="false">
+ <a4j:support event="onuploadcomplete"
reRender="pluginsmessages" />
+ </rich:fileUpload>
+ </h:panelGrid>
+
+</rich:panel>
+</h:form>
+</ui:define>
+
+</ui:composition>
commit dc2c58ac2e463d43f331d393955a605576e0476f
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Aug 12 13:57:21 2010 -0400
implement "plain" scheme using iframed-facelets for unimplemented admin >
config > settings section
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 4ad7b5f..dc5dcfb 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
@@ -33,6 +33,9 @@
<c:if test="${not empty param.debug}">
<input type="hidden" name="debug"
value="${param.debug}" />
</c:if>
+<c:if test="${not empty param.nomenu}">
+ <input type="hidden" name="nomenu"
value="${param.nomenu}" />
+</c:if>
<tiles:insert page="/admin/config/SystemInfoForm.jsp"/>
<br>
commit 36bde6fd9ce6e52d996ae59be1a131abf2905630
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Aug 12 13:56:50 2010 -0400
implement "plain" / "nomenu" scheme using iframed-facelets for
unimplemented admin > config > license section
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml
index a4a323e..6c08474 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml
@@ -1898,6 +1898,19 @@
<forward name="failure"
path="/admin/license/LicenseAdmin.do?mode=edit&error=true"
redirect="true"/>
<forward name="success"
path="/admin/license/LicenseAdmin.do?mode=view&update=true"
redirect="true"/>
</action>
+
+ <action path="/admin/license/UpdateLicenseNoMenu"
+ name="LicenseAdminForm"
+ scope="request"
+ parameter="mode"
+ type="org.rhq.enterprise.gui.action.license.LicenseUpdateAction"
+
input="/admin/license/LicenseAdmin.do?mode=edit&nomenu=true">
+ <set-property property="title" value="License"/>
+ <forward name="cancel"
path="/admin/license/LicenseAdmin.do?mode=view&nomenu=true"
redirect="true"/>
+ <forward name="reset"
path="/admin/license/LicenseAdmin.do?mode=edit&nomenu=true"
redirect="true"/>
+ <forward name="failure"
path="/admin/license/LicenseAdmin.do?mode=edit&error=true&nomenu=true"
redirect="true"/>
+ <forward name="success"
path="/admin/license/LicenseAdmin.do?mode=view&update=true&nomenu=true"
redirect="true"/>
+ </action>
<action path="/dashboard/Admin"
forward=".dashboard.admin.layout">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/License.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/License.jsp
index 6f30264..4c7d47a 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/License.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/License.jsp
@@ -84,7 +84,7 @@
<hq:authorization permission="MANAGE_SETTINGS">
<tr>
- <td class="BlockContent" colspan="4"
align="center"><html:link
action="/admin/license/LicenseAdmin.do?mode=edit">Update
License</html:link>
+ <td class="BlockContent" colspan="4"
align="center"><html:link
action="/admin/license/LicenseAdmin.do?mode=edit&nomenu=true">Update
License</html:link>
</td>
</tr>
</hq:authorization>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/LicenseEdit.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/LicenseEdit.jsp
index 5019eb0..f49a8bf 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/LicenseEdit.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/license/LicenseEdit.jsp
@@ -10,7 +10,8 @@
<table width="100%" cellpadding="0" cellspacing="0"
border="0">
- <html:form action="/admin/license/UpdateLicense"
enctype="multipart/form-data" method="POST">
+ <c:if test="${not empty param.nomenu}">
+ <html:form action="/admin/license/UpdateLicenseNoMenu"
enctype="multipart/form-data" method="POST">
<tr>
<td colspan="4" class="BlockHeader">
<tiles:insert definition=".header.tab">
@@ -30,7 +31,30 @@
</tr>
<tiles:insert definition=".form.buttons"/>
-
</html:form>
+ </c:if>
+ <c:if test="${empty param.nomenu}">
+ <html:form action="/admin/license/UpdateLicense"
enctype="multipart/form-data" method="POST">
+ <tr>
+ <td colspan="4" class="BlockHeader">
+ <tiles:insert definition=".header.tab">
+ <tiles:put name="tabKey"
value="admin.license.UpdateLicenseTab"/>
+ </tiles:insert>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4">An up to date license file can be downloaded
from the
+ <a
href="https://network.jboss.com/jbossnetwork/restricted/listSoftware...
+ JBoss Network Customer Service Portal</a>.</td>
+ </tr>
+ <tr>
+ <td class="BlockLabel"><fmt:message
key="admin.license.LicenseFile"/></td>
+ <td class="BlockContent"><html:file
property="licenseFile"/></td>
+ <td colspan="2"
class="BlockContent"> </td>
+ </tr>
+
+ <tiles:insert definition=".form.buttons"/>
+ </html:form>
+ </c:if>
</table>
\ No newline at end of file