[rhq] modules/enterprise
by mazz
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2ba64f818ae263bec15d3b76e3aebd9ead8ce823
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 16:24:00 2011 -0400
BZ 691504
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
index 61a7505..673d08e 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
@@ -62,8 +62,8 @@
String icon = "/images/icons/Content_" + extra + "16.png";
- String link = "/rhq/resource/content/installed_package_details.xhtml?id=" + resourceId +
- "¤tPackageId=" + installedPackage.getId();
+ String link = "#Resource/" + resourceId + "/Content/Deployed";
+ // "/rhq/resource/content/installed_package_details.xhtml?id=" + resourceId + "¤tPackageId=" + installedPackage.getId();
%>
{ "start" : "<%=sdf.format(new Date(installedPackage.getTimestamp()))%>",
13 years, 1 month
[rhq] 2 commits - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java | 15 ++++++++++
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 4 +-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 4 +-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 2 -
7 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 78ac4ad74b991ed8f6b1a90df7cc31cba05e9620
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 16:12:58 2011 -0400
BZ 691504 - timeline now links to the new GWT UI where appropriate
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
index 173fe16..f4b9194 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
@@ -62,7 +62,7 @@
buf.append("<b>Value:</b>" + log.getValue() + "</b>");
}
- String link = "/alerts/Alerts.do?mode=viewAlert&id=" + resourceId + "&a=" + alert.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Alerts/History/" + alert.getId();
%>
{ "start" : "<%=sdf.format(new Date(alert.getCtime()))%>",
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
index 6bb34c4..34baadf 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
@@ -43,7 +43,7 @@
String icon = FunctionTagLibrary.getResourceConfigStatusURL(configUpdate.getStatus());
- String link = "/rhq/resource/configuration/history.xhtml?id=" + resourceId + "&configId=" + configUpdate.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Configuration/History/" + configUpdate.getId();
%>
{ "start" : "<%=sdf.format(configUpdate.getCreatedTime())%>",
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
index 46f3480..463984e 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
@@ -58,7 +58,7 @@
icon = "/images/icn_create_child.png"; // TODO
}
- String link = "/rhq/resource/inventory/view.xhtml?id=" + resourceId ;
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId ;
%>
@@ -95,7 +95,7 @@
icon = "/images/icn_delete_child.png"; // TODO
}
- String link = "/rhq/resource/inventory/view.xhtml?id=" + resourceId ;
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId ;
%>
{ "start" : "<%=sdf.format(entry.getCreatedTime())%>",
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
index 5b4320e..bb6ced8 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
@@ -157,13 +157,13 @@
String color = eventColor(event.getSeverity());
String icon = FunctionTagLibrary.getEventSeverityURL(event.getSeverity(), grouped);
- String link = "/rhq/resource/events/history.xhtml?id=" + resourceId + "&eventId=" + event.getEventId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History/" + event.getEventId();
String detail = null;
if (grouped) {
StringBuilder buf = new StringBuilder();
for (EventComposite childEvent : ((GroupedEventComposite)event).events) {
- buf.append("<a href='/rhq/resource/events/history.xhtml?id=" + resourceId + "&eventId=" + childEvent.getEventId() + "'>");
+ buf.append("<a href='/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History/" + childEvent.getEventId() + "'>");
buf.append("<font size=\"-1\" color=\"" + color + "\">" + escapeBackslashes(trimLength(childEvent.getEventDetail(),80)) + "</font></a><br />");
}
detail = buf.toString();
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
index 0846050..5e28985 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
@@ -45,7 +45,7 @@
String icon = FunctionTagLibrary.getOperationStatusURL(operation.getStatus());
- String link = "/rhq/resource/operation/resourceOperationHistoryDetails.xhtml?id=" + resourceId + "&opId=" + operation.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Operations/History/" + operation.getId();
// out.write(
// " <event start=\"" + sdf.format(new Date(operation.getCreatedTime())) + "\" " +
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
index 06ff3aa..ed75a07 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
@@ -53,7 +53,7 @@
break;
}
- String link = "/rhq/resource/inventory/history.xhtml?id=" + resourceId + "&configId=" + configUpdate.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Inventory/PluginConfigurationHistoryView/" + configUpdate.getId();
%>
commit c30433b4d14efbeda2594b1f4a51ff74715793f8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 16:12:13 2011 -0400
make the timestamp col a link to the details
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index 65ebb57..8456f2b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -50,6 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Joseph Marques
@@ -177,6 +178,20 @@ public class EventCompositeHistoryView extends TableSection<EventCompositeDataso
super.configureTable();
}
+ protected String getDetailsLinkColumnName() {
+ return "timestamp";
+ }
+
+ protected CellFormatter getDetailsLinkColumnCellFormatter() {
+ return new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ Integer recordId = getId(record);
+ String detailsUrl = "#" + getBasePath() + "/" + recordId;
+ return SeleniumUtility.getLocatableHref(detailsUrl, TimestampCellFormatter.format(value), null);
+ }
+ };
+ }
+
private void setupTableInteractions() {
TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY
: TableActionEnablement.NEVER;
13 years, 1 month
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 42 ++++------
1 file changed, 17 insertions(+), 25 deletions(-)
New commits:
commit 24280444ac3904c3fe4e1d6a25334ff89d42ccfe
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 1 15:45:33 2011 -0400
fix NPE that occurred when you edited an existing list-o-maps member map and then clicked the member map editor modal's OK button
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 4d4e358..69a3c52 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -952,8 +952,8 @@ public class ConfigurationEditor extends LocatableVLayout {
PropertyMapListGridRecord record = (PropertyMapListGridRecord) recordClickEvent.getRecord();
PropertyMap memberPropertyMap = (PropertyMap) record.getPropertyMap();
Log.debug("Editing property map: " + memberPropertyMap);
- displayMapEditor(summaryTable, record, memberPropertyDefinitionMap, propertyList, memberPropertyMap,
- mapReadOnly);
+ displayMapEditor(summaryTable, record, propertyDefinitionList, propertyList,
+ memberPropertyDefinitionMap, memberPropertyMap, mapReadOnly);
}
});
fieldsList.add(editField);
@@ -1005,8 +1005,8 @@ public class ConfigurationEditor extends LocatableVLayout {
addRowButton.setIcon(Window.getImgURL("[SKIN]/actions/add.png"));
addRowButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- displayMapEditor(summaryTable, null, memberPropertyDefinitionMap,
- propertyList, null, mapReadOnly);
+ displayMapEditor(summaryTable, null, propertyDefinitionList, propertyList,
+ memberPropertyDefinitionMap, null, mapReadOnly);
}
});
toolStrip.addMember(addRowButton);
@@ -1538,15 +1538,15 @@ public class ConfigurationEditor extends LocatableVLayout {
}
private void displayMapEditor(final ListGrid summaryTable, final PropertyMapListGridRecord existingRecord,
- PropertyDefinitionMap definition, final PropertyList list, final PropertyMap map,
+ final PropertyDefinitionList propertyDefinitionList, final PropertyList propertyList, PropertyDefinitionMap memberMapDefinition, final PropertyMap memberMap,
final boolean mapReadOnly) {
- final List<PropertyDefinition> memberDefinitions = new ArrayList<PropertyDefinition>(definition
+ final List<PropertyDefinition> memberDefinitions = new ArrayList<PropertyDefinition>(memberMapDefinition
.getPropertyDefinitions().values());
Collections.sort(memberDefinitions, new PropertyDefinitionComparator());
- final boolean newRow = (map == null);
- final PropertyMap workingMap = (newRow) ? new PropertyMap(definition.getName()) : map.deepCopy(true);
+ final boolean newRow = (memberMap == null);
+ final PropertyMap workingMap = (newRow) ? new PropertyMap(memberMapDefinition.getName()) : memberMap.deepCopy(true);
final LocatableWindow popup = new LocatableWindow(extendLocatorId("MapEditor"));
String title = (mapReadOnly) ? MSG.view_configEdit_viewRow() : MSG.view_configEdit_editRow();
@@ -1582,25 +1582,17 @@ public class ConfigurationEditor extends LocatableVLayout {
return;
}
if (newRow) {
- try {
- list.add(workingMap);
- int index = list.getList().size() - 1;
- PropertyMapListGridRecord record = new PropertyMapListGridRecord(workingMap, index,
- memberDefinitions);
- summaryTable.addData(record);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ propertyList.add(workingMap);
+ int index = propertyList.getList().size() - 1;
+ PropertyMapListGridRecord record = new PropertyMapListGridRecord(workingMap, index,
+ memberDefinitions);
+ summaryTable.addData(record);
} else {
- try {
- mergePropertyMap(workingMap, map, memberDefinitions);
- existingRecord.refresh();
- summaryTable.updateData(existingRecord);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ mergePropertyMap(workingMap, memberMap, memberDefinitions);
+ existingRecord.refresh();
+ summaryTable.updateData(existingRecord);
}
- firePropertyChangedEvent(list, null, true);
+ firePropertyChangedEvent(propertyList, propertyDefinitionList, true);
summaryTable.redraw();
}
13 years, 1 month
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java | 4 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 836344458731d5d3e20032589875775a5fef1910
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 15:37:20 2011 -0400
format date col
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
index 40a342f..831408a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
@@ -36,6 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -114,7 +115,8 @@ public class EventCompositeDetailsView extends LocatableVLayout implements Bookm
source.setValue(composite.getSourceLocation());
StaticTextItem timestamp = new StaticTextItem("timestamp", MSG.view_inventory_eventHistory_timestamp());
- timestamp.setValue(composite.getTimestamp());
+ timestamp.setValue(TimestampCellFormatter.format(composite.getTimestamp(),
+ TimestampCellFormatter.DATE_TIME_FORMAT_FULL));
TextAreaItem detail = new TextAreaItem("details", MSG.view_inventory_eventHistory_details());
detail.setValue(composite.getEventDetail());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index 0657f04..65ebb57 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
+import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
@@ -101,6 +102,7 @@ public class EventCompositeHistoryView extends TableSection<EventCompositeDataso
@Override
protected void configureTable() {
ListGridField timestampField = new ListGridField("timestamp", MSG.view_inventory_eventHistory_timestamp());
+ TimestampCellFormatter.prepareDateField(timestampField);
ListGridField severityField = new ListGridField("severity", MSG.view_inventory_eventHistory_severity());
severityField.setAlign(Alignment.CENTER);
13 years, 1 month
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 4efc5ad73f2a0c2c942174e56c42b87c76deb5eb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 1 15:14:08 2011 -0400
fix bug in config editor that was causing inputs for optional props to get disabled upon that input losing focus
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 35d61f2..4d4e358 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -1434,9 +1434,10 @@ public class ConfigurationEditor extends LocatableVLayout {
valueItem.addBlurHandler(new BlurHandler() {
public void onBlur(BlurEvent event) {
- boolean isUnset = (event.getItem().getValue() == null);
- unsetItem.setValue(isUnset);
- valueItem.disable();
+ if (event.getItem().getValue() == null) {
+ unsetItem.setValue(true);
+ valueItem.disable();
+ }
}
});
13 years, 1 month
[rhq] modules/plugins
by mazz
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 28 +++++-----
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 6fba3dbee8ced1cfd281d1edb27c973dec557ff3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 14:13:28 2011 -0400
BZ 689561 - have config description say that the units are in seconds
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index bf48dcd..b6169f0 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -350,23 +350,23 @@
<c:group name="plugincontainer" displayName="Plugin Container" hiddenByDefault="false">
<c:description>Plugin Container configuration properties</c:description>
<c:simple-property name="rhq.agent.plugins.directory" type="string" activationPolicy="restart" required="true" default="plugins" displayName="Plugins Directory" description="Location on the file system where the plugin jar files are stored"/>
- <c:simple-property name="rhq.agent.plugins.server-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Server Discovery Initial Delay" description="Startup delay before the first server discovery is run" />
- <c:simple-property name="rhq.agent.plugins.server-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="900" displayName="Server Discovery Period" description="Time between server discoveries" />
- <c:simple-property name="rhq.agent.plugins.service-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="20" displayName="Service Discovery Initial Delay" description="Startup delay before the first service discovery is run" />
- <c:simple-property name="rhq.agent.plugins.service-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="86400" displayName="Service Discovery Period" description="Time between service discoveries" />
- <c:simple-property name="rhq.agent.plugins.availability-scan.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Availability Scan Initial Delay" description="Startup delay before the first availability scan is run" />
- <c:simple-property name="rhq.agent.plugins.availability-scan.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="300" displayName="Availability Scan Period" description="Time between availability scans" />
- <c:simple-property name="rhq.agent.plugins.measurement-collection.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Measurement Collection Initial Delay" description="Startup delay before the first measurement collection is run" />
+ <c:simple-property name="rhq.agent.plugins.server-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Server Discovery Initial Delay" description="Startup delay before the first server discovery is run (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.server-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="900" displayName="Server Discovery Period" description="Time between server discoveries (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.service-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="20" displayName="Service Discovery Initial Delay" description="Startup delay before the first service discovery is run (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.service-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="86400" displayName="Service Discovery Period" description="Time between service discoveries (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.availability-scan.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Availability Scan Initial Delay" description="Startup delay before the first availability scan is run (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.availability-scan.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="300" displayName="Availability Scan Period" description="Time between availability scans (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.measurement-collection.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Measurement Collection Initial Delay" description="Startup delay before the first measurement collection is run (in seconds)" />
<c:simple-property name="rhq.agent.plugins.measurement-collection.threadpool-size" type="integer" activationPolicy="restart" required="false" default="5" displayName="Measurement Collection Threadpool Size" description="Number of concurrent measurement collections that can be run" />
- <c:simple-property name="rhq.agent.plugins.operation-invocation-timeout-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="600" displayName="Operation Invocation Timeout" description="Time before an operation invocation is aborted" />
+ <c:simple-property name="rhq.agent.plugins.operation-invocation-timeout-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="600" displayName="Operation Invocation Timeout" description="Time before an operation invocation is aborted (in seconds)" />
<c:simple-property name="rhq.agent.plugins.operation-invoker.threadpool-size" type="integer" activationPolicy="restart" required="false" default="5" displayName="Operation Invoker Threadpool Size" description="Number of concurrent operation invocations that can be run" />
- <c:simple-property name="rhq.agent.plugins.content-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Content Discovery Initial Delay" description="Startup delay before the first content discovery is run" />
- <c:simple-property name="rhq.agent.plugins.content-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Content Discovery Period" description="Time between content discoveries" />
+ <c:simple-property name="rhq.agent.plugins.content-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Content Discovery Initial Delay" description="Startup delay before the first content discovery is run (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.content-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Content Discovery Period" description="Time between content discoveries (in seconds)" />
<c:simple-property name="rhq.agent.plugins.content-discovery.threadpool-size" type="integer" activationPolicy="restart" required="false" default="10" displayName="Content Discovery Threadpool Size" description="Number of concurrent content discoveries that can be run" />
- <c:simple-property name="rhq.agent.plugins.configuration-discovery.initial-delay-secs" type="integer" activationPolicy="restart" required="false" default="300" displayName="Configuration Change Detection Startup Delay" description="Time before configuration change detection starts in seconds" />
- <c:simple-property name="rhq.agent.plugins.configuration-discovery.period-secs" type="integer" activationPolicy="restart" required="false" default="3600" displayName="Configuration Change Detection Interval" description="Time period for checking for configuration changes in seconds" />
- <c:simple-property name="rhq.agent.plugins.event-sender.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Initial Delay" description="Defines the delay before the first event report gets sent to the server" />
- <c:simple-property name="rhq.agent.plugins.event-sender.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Period" description="Defines how often event reports get sent to the server" />
+ <c:simple-property name="rhq.agent.plugins.configuration-discovery.initial-delay-secs" type="integer" activationPolicy="restart" required="false" default="300" displayName="Configuration Change Detection Startup Delay" description="Time before configuration change detection starts (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.configuration-discovery.period-secs" type="integer" activationPolicy="restart" required="false" default="3600" displayName="Configuration Change Detection Interval" description="Time period for checking for configuration changes (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.event-sender.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Initial Delay" description="Defines the delay before the first event report gets sent to the server (in seconds)" />
+ <c:simple-property name="rhq.agent.plugins.event-sender.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Period" description="Defines how often event reports get sent to the server (in seconds)" />
<c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" activationPolicy="restart" required="false" default="200" displayName="Event Report Max Per Source" description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored" />
<c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" activationPolicy="restart" required="false" default="400" displayName="Event Report Max Total" description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server" />
<c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Plugins" description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names." />
13 years, 1 month
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 2 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fac70debb685e058f92ea918522e019d1cf76028
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 12:57:55 2011 -0400
make consistent the name for the "platform summary", "cpu and memory utilization"
portlet and report page. now named "platform utilization"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index a58c909..a0171c2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
*/
public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet {
- public static final ViewName VIEW_ID = new ViewName("CpuAndMemoryUtilization", MSG.view_reports_platforms());
+ public static final ViewName VIEW_ID = new ViewName("PlatformUtilization", MSG.view_reports_platforms());
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "PlatformSummary";
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 26b3bf0..fd78426 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1460,7 +1460,7 @@ view_portlet_defaultName_inventorySummary = Inventory Summary
view_portlet_defaultName_mashup = Mashup
view_portlet_defaultName_message = Message
view_portlet_defaultName_operations = Operations
-view_portlet_defaultName_platformSummary = Platform Summary
+view_portlet_defaultName_platformSummary = Platform Utilization
view_portlet_defaultName_problemResources = Alerted or Unavailable Resources
view_portlet_defaultName_recentAlerts = Recent Alerts
view_portlet_defaultName_recentlyAddedResources = Recently Added Resources
@@ -1494,7 +1494,7 @@ view_portlet_help_oobs = This portlet displays OOB(Out of Bound) metric conditio
view_portlet_help_operations = This portlet displays executing, completed and scheduled operations for the current user''s inventory.
view_portlet_help_operations_criteria = This portlet displays Operations consistent with display criteria configured.
view_portlet_help_pkg_history = This portlet shows relevant package history based on display criteria configured.
-view_portlet_help_platformSummary = This portlet displays information about the current user''s platform resources.
+view_portlet_help_platformSummary = This portlet displays utilization data (such as current CPU and memory usage) for platform resources that are accessible by the current user.
view_portlet_help_problemResources = This portlet displays the current user''s alerted or unavailable resources.
view_portlet_help_recentAlerts = This portlet displays alerts recently fired on the current user''s viewable inventory.
view_portlet_help_recentlyAdded = This portlet displays resources that have recently been imported into inventory.
@@ -2016,7 +2016,7 @@ view_groupInventoryMembers_title_updateMembership = Update Membership
view_reportsTop_title = Reports
view_reportsTop_description = This section provides access to global reports.
-view_reports_platforms = CPU And Memory Utilization
+view_reports_platforms = Platform Utilization
view_reports_subsystems = Subsystems
view_reports_alertDefinitions = Alert Definitions
13 years, 1 month
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 5 ++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 7 ++++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 981d97853714fb8c54e50fc608535c1b0fd27ebf
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 1 12:40:35 2011 -0400
add some more HTML escaping to bundle views (includes fix for https://bugzilla.redhat.com/show_bug.cgi?id=676768)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index c188a42..ca08fdb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.components.upload.TextFileRetriever
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
@@ -231,7 +232,9 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
}
public void onFailure(Throwable caught) {
- wizard.getView().showMessage(caught.getMessage());
+ // Escape it, since it contains the URL, which the user entered.
+ String message = StringUtility.escapeHtml(caught.getMessage());
+ wizard.getView().showMessage(message);
CoreGUI.getErrorHandler().handleError(MSG.view_bundle_createWizard_createFailure(), caught);
wizard.setBundleVersion(null);
setButtonsDisableMode(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 62bf4ed..e220cfc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -25,6 +25,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.deployment;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.AnimationEffect;
@@ -347,9 +348,9 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
resource.setAutoFitWidth(true);
resource.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
resource.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
return "<a href=\"" + LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("resourceId"))
- + "\">" + o + "</a>";
+ + "\">" + StringUtility.escapeHtml(String.valueOf(value)) + "</a>";
}
});
@@ -367,7 +368,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
status.setShowValueIconOnly(true);
status.setWidth("*");
- ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>();
+ List<ListGridRecord> records = new ArrayList<ListGridRecord>();
for (BundleResourceDeployment rd : deployment.getResourceDeployments()) {
ListGridRecord record = new ListGridRecord();
Resource rr = rd.getResource();
13 years, 1 month
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d4aa795ddb93453c4649ffb7f08b28f08240f5e1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 12:16:51 2011 -0400
BZ 691526 - log the error properly when setting favorite fails
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index d8020f3..6c7d628 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -316,7 +316,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
} else {
m = MSG.view_titleBar_common_removedFavFailure(ResourceGroupTitleBar.this.group.getName());
}
- CoreGUI.getMessageCenter().notify(new Message(m, Message.Severity.Error));
+ CoreGUI.getErrorHandler().handleError(m, throwable);
// Revert back to our original favorite status, since the server update failed.
toggleFavoriteLocally();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index dcdffd9..b3e801c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -356,7 +356,7 @@ public class ResourceTitleBar extends LocatableVLayout {
} else {
msg = MSG.view_titleBar_common_removedFavFailure(resource.getName());
}
- CoreGUI.getMessageCenter().notify(new Message(msg, Message.Severity.Info));
+ CoreGUI.getErrorHandler().handleError(msg, throwable);
// Revert back to our original favorite status, since the server update failed.
toggleFavoriteLocally();
13 years, 1 month
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit aafb9f840be235a83767c5469038f2ebcef72182
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 1 12:07:12 2011 -0400
more HTML escaping
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
index dfe6bdb..4b85d4f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail;
import java.util.ArrayList;
@@ -163,6 +162,7 @@ public class OverviewForm extends EnhancedDynamicForm {
nameItem.setName("name");
nameItem.setTitle(MSG.view_summaryOverviewForm_field_name());
nameItem.setValue(resource.getName());
+ nameItem.setAttribute(OUTPUT_AS_HTML_ATTRIBUTE, true);
if (nameItem instanceof EditableFormItem) {
EditableFormItem togglableNameItem = (EditableFormItem) nameItem;
togglableNameItem.setValidators(notEmptyOrNullValidator);
@@ -202,6 +202,7 @@ public class OverviewForm extends EnhancedDynamicForm {
descriptionItem.setName("description");
descriptionItem.setTitle(MSG.view_summaryOverviewForm_field_description());
descriptionItem.setValue(resource.getDescription());
+ descriptionItem.setAttribute(OUTPUT_AS_HTML_ATTRIBUTE, true);
if (descriptionItem instanceof EditableFormItem) {
EditableFormItem togglableDescriptionItem = (EditableFormItem) descriptionItem;
togglableDescriptionItem.setValidators(notNullValidator);
@@ -242,6 +243,7 @@ public class OverviewForm extends EnhancedDynamicForm {
locationItem.setName("location");
locationItem.setTitle(MSG.view_summaryOverviewForm_field_location());
locationItem.setValue(resource.getLocation());
+ locationItem.setAttribute(OUTPUT_AS_HTML_ATTRIBUTE, true);
if (locationItem instanceof EditableFormItem) {
EditableFormItem togglableLocationItem = (EditableFormItem) locationItem;
togglableLocationItem.setValidators(notNullValidator);
13 years, 1 month