modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 ++--
modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 59776e2009c2e2b17ca45d5c88e6373def9da879
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Feb 23 09:23:23 2010 -0500
fix a couple invalid docs URLs
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 571cf22..8132311 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
@@ -88,7 +88,7 @@ common.field.value=Value
common.marketing.FeatureDisabled=This feature is unavailable, please contact sales to upgrade
-common.url.help=https://network.jboss.com/confluence/display/DOC/Users+Guide
+common.url.help=http://www.rhq-project.org/display/JOPR2
common.error.invalid.oid=OID specified is invalid, please enter OID in form of 1.2.3.4
@@ -2916,7 +2916,7 @@ software.common.InstallPreview.PatchTitle=Title
software.common.InstallPreview.StepDescription=Step Description
software.common.InstallPreview.ShortDescription=Short Description
software.common.InstallPreview.LongDescription=Detailed Description
-software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="https\://network.jboss.com/confluence/display/DOC/Installing+a+Patch" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul>
+software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki\: <a href\="http://www.rhq-project.org/display/JOPR2/Demos#Demos-ContentSubsystem" target\="_new">Installing a Patch</a>. Please contact support for more information.</li></ul>
software.common.InstallPreview.NotAllowedToInstall=This user doesn't have the appropriate rights to install an update. Only users that can control a resource may install an update.
software.common.ManualUninstall.TableTitle=Manual Update Uninstallation
commit b3c691dfd0f407658ba9004bbcbdda0c235404ef
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Feb 23 09:22:03 2010 -0500
fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636)
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp
index 59bb5d1..3831ebb 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<%@ page language="java" contentType="text/xml" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %>
<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/">
- <repo>
+ <channel>
<title><c:out value="${rssFeed.title}"/></title>
<link><c:out value="${rssFeed.baseUrl}"/></link>
<description><fmt:message key="dashboard.template.title"/> <c:out value="${rssFeed.title}"/></description>
@@ -25,5 +25,6 @@
<guid><![CDATA[<c:out value="${item.guid}"/>]]></guid>
</item>
</c:forEach>
- </repo>
+ </channel>
</rss>
+
1
0
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit e60d5bc39ad9c103e072eaa1e8fca7a0aedb9191
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 22 21:35:49 2010 +0100
If no emails failed, we can set the state to success
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index ff4025f..c21bf21 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -739,6 +739,16 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
}
if (anl.getResultState()==ResultState.FAILED_EMAIL)
anl.setBadEmails(StringUtils.getListAsString(badList,","));
+ if (anl.getResultState()==ResultState.DEFERRED_EMAIL && badList.isEmpty())
+ anl.setResultState(ResultState.SUCCESS);
+ }
+ }
+ else { // No bad addresses
+ // Only set the result state to success for email sending notifications
+ // We must not set them if the notification failed.
+ for (AlertNotificationLog anl : alert.getAlertNotificationLogs()) {
+ if (anl.getResultState()==ResultState.DEFERRED_EMAIL)
+ anl.setResultState(ResultState.SUCCESS);
}
}
1
0
22 Feb '10
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 10 +
modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java | 80 +++++++---
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 59 +++++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 21 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 23 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 2
modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java | 2
modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 9 -
modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java | 2
modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java | 2
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 2
13 files changed, 167 insertions(+), 51 deletions(-)
New commits:
commit 6d87241b69c095bd2928f4e3b03bc9dcfbeeefd1
Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org>
Date: Sat Feb 20 10:49:01 2010 +0100
Fix potential NPE
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
index 5ed6d4f..b90def3 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
@@ -113,8 +113,8 @@ public class AlertNotificationLog implements Serializable {
@PrePersist
@PreUpdate
public void trimMessage() {
- if (message.length()>255)
- message = message.substring(0,254);
+ if (message!=null && message.length()>255)
+ message = message.substring(0,255);
}
protected AlertNotificationLog() {
commit 2d38d85bb4500c1a873aba7b193fb9984d00539d
Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org>
Date: Sat Feb 20 09:47:10 2010 +0100
Truncate the message at 140 chars, as identi.ca bails out on longer messages; seems to improve stability with Twitter too.
Introduce abbreviated versions of the messages as space on Microblog etc is scarce. BZ 555091
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
index ba75940..5ed6d4f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java
@@ -38,6 +38,8 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -108,6 +110,13 @@ public class AlertNotificationLog implements Serializable {
@Transient
transient List<String> transientEmails = new ArrayList<String>();
+ @PrePersist
+ @PreUpdate
+ public void trimMessage() {
+ if (message.length()>255)
+ message = message.substring(0,254);
+ }
+
protected AlertNotificationLog() {
} // JPA
@@ -130,7 +139,6 @@ public class AlertNotificationLog implements Serializable {
public AlertNotificationLog(Alert alert, String senderName, ResultState state, String message) {
this.alert = alert;
- this.sender = sender;
this.resultState = state;
this.message = message;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index 454b9a9..ff4025f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -780,7 +780,7 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
Map<String, String> alertMessage = emailManager.getAlertEmailMessage(
prettyPrintResourceHierarchy(alertDefinition.getResource()), alertDefinition.getResource().getName(),
alertDefinition.getName(), alertDefinition.getPriority().toString(), new Date(alert.getCtime()).toString(),
- prettyPrintAlertConditions(alert.getConditionLogs()), prettyPrintAlertURL(alert));
+ prettyPrintAlertConditions(alert.getConditionLogs(), false), prettyPrintAlertURL(alert));
String messageSubject = alertMessage.keySet().iterator().next();
String messageBody = alertMessage.values().iterator().next();
@@ -834,13 +834,14 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
/**
* Create a human readable description of the conditions that led to this alert.
* @param alert Alert to create human readable condition description
+ * @param shortVersion if true the messages printed are abbreviated to save space
* @return human readable condition log
*/
- public String prettyPrintAlertConditions(Alert alert) {
- return prettyPrintAlertConditions(alert.getConditionLogs());
+ public String prettyPrintAlertConditions(Alert alert, boolean shortVersion) {
+ return prettyPrintAlertConditions(alert.getConditionLogs(), shortVersion);
}
- private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs) {
+ private String prettyPrintAlertConditions(Set<AlertConditionLog> conditionLogs, boolean shortVersion) {
StringBuilder builder = new StringBuilder();
int conditionCounter = 1;
@@ -858,16 +859,27 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
builder.append(NEW_LINE);
- builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT,
- conditionCounter, prettyPrintAlertCondition(aLog.getCondition()), new SimpleDateFormat(
- "yyyy/MM/dd HH:mm:ss z").format(new Date(aLog.getCtime())), formattedValue));
+ String format;
+ if (shortVersion)
+ format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT;
+ else
+ format = AlertI18NResourceKeys.ALERT_EMAIL_CONDITION_LOG_FORMAT;
+ SimpleDateFormat dateFormat;
+ if (shortVersion)
+ dateFormat= new SimpleDateFormat(
+ "yy/MM/dd HH:mm:ss z");
+ else
+ dateFormat= new SimpleDateFormat(
+ "yyyy/MM/dd HH:mm:ss z");
+ builder.append(AlertI18NFactory.getMessage(format,
+ conditionCounter, prettyPrintAlertCondition(aLog.getCondition(), shortVersion), dateFormat.format(new Date(aLog.getCtime())), formattedValue));
conditionCounter++;
}
return builder.toString();
}
- private String prettyPrintAlertCondition(AlertCondition condition) {
+ private String prettyPrintAlertCondition(AlertCondition condition, boolean shortVersion) {
StringBuilder builder = new StringBuilder();
AlertConditionCategory category = condition.getCategory();
@@ -915,19 +927,38 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
}
} else if ((category == AlertConditionCategory.RESOURCE_CONFIG) || (category == AlertConditionCategory.CHANGE)
|| (category == AlertConditionCategory.TRAIT)) {
- builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED));
+
+ if (shortVersion)
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT));
+ else
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CURRENT_LIST_VALUE_CHANGED));
+
} else if (category == AlertConditionCategory.EVENT) {
if ((condition.getOption() != null) && (condition.getOption().length() > 0)) {
+ String propsCbEventSeverityRegexMatch;
+ if (shortVersion)
+ propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT;
+ else
+ propsCbEventSeverityRegexMatch = AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH;
+
builder.append(AlertI18NFactory.getMessage(
- AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH, condition.getName(),
+ propsCbEventSeverityRegexMatch, condition.getName(),
condition.getOption()));
} else {
- builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY,
- condition.getName()));
+ if (shortVersion)
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT,
+ condition.getName()));
+ else
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY,
+ condition.getName()));
}
} else if (category == AlertConditionCategory.AVAILABILITY) {
- builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY,
- condition.getOption()));
+ if (shortVersion)
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT,
+ condition.getOption()));
+ else
+ builder.append(AlertI18NFactory.getMessage(AlertI18NResourceKeys.ALERT_CONFIG_PROPS_CB_AVAILABILITY,
+ condition.getOption()));
} else {
// do nothing
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java
index 996f245..e482ffa 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java
@@ -96,9 +96,10 @@ public interface AlertManagerLocal {
/**
* Create a human readable description of the conditions that led to this alert.
* @param alert Alert to create human readable condition description
+ * @param shortVersion if true the messages printed are abbreviated to save space
* @return human readable condition log
*/
- String prettyPrintAlertConditions(Alert alert);
+ String prettyPrintAlertConditions(Alert alert, boolean shortVersion);
/**
* Tells us if the definition of the passed alert will be disabled after this alert was fired
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java
index 8734771..1de3d85 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java
@@ -32,20 +32,41 @@ public interface AlertI18NResourceKeys {
@I18NMessage(locale = "de", value = "VerfŸgbarkeit wird {0}") })
String ALERT_CONFIG_PROPS_CB_AVAILABILITY = "alert.config.props.CB.Availability";
+ @I18NMessages( { @I18NMessage("Avail goes {0}"),
+ @I18NMessage(locale = "de", value = "Verf. wird {0}") })
+ String ALERT_CONFIG_PROPS_CB_AVAILABILITY_SHORT = "alert.config.props.CB.Availability.short";
+
@I18NMessages( { @I18NMessage("Event Severity: {0}"),
@I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0}") })
String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY = "alert.config.props.CB.EventSeverity";
+ @I18NMessages( { @I18NMessage("Sev: {0}"),
+ @I18NMessage(locale = "de", value = "Schwere: {0}") })
+ String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_SHORT = "alert.config.props.CB.EventSeverity.short";
+
@I18NMessages( { @I18NMessage("Event Severity: {0} and matching expression \"{1}\""),
@I18NMessage(locale = "de", value = "Schwere des Ereignesses: {0} und zugehšriger Ausdruck \"{1}\"") })
String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH = "alert.config.props.CB.EventSeverity.RegexMatch";
+ @I18NMessages( { @I18NMessage("Sev: {0} & exp \"{1}\""),
+ @I18NMessage(locale = "de", value = "Schwere: {0} & Ausdruck \"{1}\"") })
+ String ALERT_CONFIG_PROPS_CB_EVENT_SEVERITY_REGEX_MATCH_SHORT = "alert.config.props.CB.EventSeverity.RegexMatch.short";
+
@I18NMessages( { @I18NMessage("value changed"), @I18NMessage(locale = "de", value = "Der Wert hat sich geŠndert") })
String ALERT_CURRENT_LIST_VALUE_CHANGED = "alert.current.list.ValueChanged";
+ @I18NMessages( { @I18NMessage("val chg"), @I18NMessage(locale = "de", value = "WertŠnd.") })
+ String ALERT_CURRENT_LIST_VALUE_CHANGED_SHORT = "alert.current.list.ValueChanged.short";
+
@I18NMessages( {
@I18NMessage("\\ - Condition {0}: {1}\\n\\\n" + "\\ - Date/Time: {2}\\n\\\n" + "\\ - Details: {3}\\n\\\n"),
@I18NMessage(locale = "de", value = " - Bedingung {0}: {1}\\n\\\n - Datum/Uhrzeit: {2}\\n\\\n"
+ "\\ - Details: {3}\\n\\\n") })
String ALERT_EMAIL_CONDITION_LOG_FORMAT = "alert.email.condition.log.format";
+
+ @I18NMessages( {
+ @I18NMessage("\\ - Cond {0}: {1}\\n\\\n" + "\\ - Time: {2}\\n\\\n" + "\\ - Det: {3}\\n\\\n"),
+ @I18NMessage(locale = "de", value = " - Bed {0}: {1}\\n\\\n - Zeit: {2}\\n\\\n"
+ + "\\ - Det: {3}\\n\\\n") })
+ String ALERT_EMAIL_CONDITION_LOG_FORMAT_SHORT = "alert.email.condition.log.format.short";
}
\ No newline at end of file
diff --git a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java
index 93eecc6..95abdb9 100644
--- a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java
+++ b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java
@@ -65,7 +65,7 @@ public class IrcSender extends AlertSender<IrcAlertComponent> {
b.append("): ");
b.append(alertManager.prettyPrintAlertURL(alert));
b.append("\n");
- b.append(alertManager.prettyPrintAlertConditions(alert));
+ b.append(alertManager.prettyPrintAlertConditions(alert, false));
return b.toString();
}
diff --git a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java
index 257b315..b13763e 100644
--- a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java
+++ b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java
@@ -57,14 +57,19 @@ public class MicroblogSender extends AlertSender {
b.append("' (");
b.append(alert.getAlertDefinition().getResource().getId());
b.append("): ");
- b.append(alertManager.prettyPrintAlertConditions(alert));
+ b.append(alertManager.prettyPrintAlertConditions(alert, true));
b.append("-by @JBossJopr"); // TODO not for production :-)
// TODO use some alert url shortening service
SenderResult result ;
String txt = "user@baseUrl [" + user + "@" + baseUrl + "]:";
try {
- Status status = twitter.updateStatus(b.toString());
+ String msg = b.toString();
+ if (msg.length()>140)
+ msg = msg.substring(0,140);
+
+ Status status = twitter.updateStatus(msg);
+
result = new SenderResult(ResultState.SUCCESS,"Send notification to " + txt + ", msg-id: " + status.getId());
} catch (TwitterException e) {
diff --git a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java
index 649d6ed..b14c85d 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java
+++ b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java
@@ -74,7 +74,7 @@ public class MobicentsSender extends AlertSender {
// Switch locale to english, as the voice synthesizer expects this for now
Locale currentLocale = Locale.getDefault();
Locale.setDefault(Locale.ENGLISH);
- b.append(alertManager.prettyPrintAlertConditions(alert));
+ b.append(alertManager.prettyPrintAlertConditions(alert, false));
Locale.setDefault(currentLocale);
boolean willBeDisabled = alertManager.willDefinitionBeDisabled(alert);
diff --git a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java
index 985d890..bac51fb 100644
--- a/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java
+++ b/modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java
@@ -93,7 +93,7 @@ public class ScriptLangSender extends AlertSender<ScriptLangComponent> {
Object[] args = new Object[3];
args[0] = alert;
args[1] = alertManager.prettyPrintAlertURL(alert);
- args[2] = alertManager.prettyPrintAlertConditions(alert);
+ args[2] = alertManager.prettyPrintAlertConditions(alert, false);
result = ((Invocable) engine).invokeFunction("sendAlert", args);
if (result == null) {
diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
index 3fd5d79..045c3bb 100644
--- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
+++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
@@ -68,7 +68,7 @@ public class SnmpSender extends AlertSender {
String result;
List<Resource> lineage = resourceManager.getResourceLineage(alert.getAlertDefinition().getResource().getId());
String platformName = lineage.get(0).getName();
- String conditions = alertManager.prettyPrintAlertConditions(alert);
+ String conditions = alertManager.prettyPrintAlertConditions(alert, false);
String alertUrl = alertManager.prettyPrintAlertURL(alert);
SenderResult res ;
commit 798ac30ead634c43a72beed52446a38d9bfc1f09
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Feb 19 17:51:53 2010 -0500
i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not
diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
index 8c37b50..cd3b479 100644
--- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
+++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
@@ -588,11 +588,9 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
writeLock.unlock();
}
} else {
- if (m_needToCallInitializeCallback) {
- Throwable t = new Throwable("Initialize callback lock could not be acquired");
- LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage());
- return new GenericCommandResponse(command, false, null, t);
- }
+ Throwable t = new Throwable("Initialize callback lock could not be acquired");
+ LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage());
+ return new GenericCommandResponse(command, false, null, t);
}
}
return null;
commit 9746ea32492b638eacb741d608d9ce17349c925d
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Feb 19 17:44:11 2010 -0500
should not worry about the lock failure if the init callback doesn't need to be invoked anyway
diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
index 762b9b4..8c37b50 100644
--- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
+++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
@@ -588,10 +588,11 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
writeLock.unlock();
}
} else {
- m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later
- Throwable t = new Throwable("Initialize callback lock could not be acquired");
- LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage());
- return new GenericCommandResponse(command, false, null, t);
+ if (m_needToCallInitializeCallback) {
+ Throwable t = new Throwable("Initialize callback lock could not be acquired");
+ LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage());
+ return new GenericCommandResponse(command, false, null, t);
+ }
}
}
return null;
commit c2cca917c88986ca48c84bbbdaf3408753299bf1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Feb 19 17:38:16 2010 -0500
BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback
diff --git a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
index 3775212..762b9b4 100644
--- a/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
+++ b/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java
@@ -21,6 +21,9 @@ package org.rhq.enterprise.communications.command.client;
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import mazz.i18n.Logger;
@@ -95,10 +98,22 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
private InitializeCallback m_initializeCallback;
/**
- * When the first element is <code>true</code>, the initialize callback will need to be called prior
- * to sending any commands. This is an array because the array itself is used for its lock.
+ * When <code>true</code>, the initialize callback will need to be called prior
+ * to sending any commands. Used in conjunection with its associated RW lock.
*/
- private final boolean[] m_needToCallInitializeCallback;
+ private boolean m_needToCallInitializeCallback;
+
+ /**
+ * RW lock when needing to access its associated atomic boolean flag.
+ */
+ private final ReentrantReadWriteLock m_needToCallInitializeCallbackLock;
+
+ /**
+ * Number of minutes to wait while attempting to aquire a lock before attempting
+ * to invoke the initialize callback. If this amount of minutes expires before the lock
+ * is acquired, an error will occur and the initialize callback will have to be attempted later.
+ */
+ private final long m_initializeCallbackLockAcquisitionTimeoutMins;
/**
* Constructor for {@link JBossRemotingRemoteCommunicator} that initializes the client with no invoker locator
@@ -200,7 +215,17 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
m_clientConfiguration.putAll(client_config);
}
- m_needToCallInitializeCallback = new boolean[] { false };
+ m_needToCallInitializeCallback = false;
+ m_needToCallInitializeCallbackLock = new ReentrantReadWriteLock();
+
+ long mins;
+ try {
+ String minsStr = System.getProperty("rhq.communications.initial-callback-lock-wait-mins", "60");
+ mins = Long.parseLong(minsStr);
+ } catch (Throwable t) {
+ mins = 60L;
+ }
+ m_initializeCallbackLockAcquisitionTimeoutMins = mins;
return;
}
@@ -319,7 +344,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
if (m_remotingClient != null) {
m_remotingClient.disconnect();
m_remotingClient = null;
- m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it
+ m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it
}
LOG.info(CommI18NResourceKeys.COMMUNICATOR_CHANGING_ENDPOINT, m_invokerLocator, locator);
@@ -377,7 +402,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
public void setInitializeCallback(InitializeCallback callback) {
m_initializeCallback = callback;
- m_needToCallInitializeCallback[0] = (callback != null); // specifically do not synchronize, just set it
+ m_needToCallInitializeCallback = (callback != null); // specifically do not synchrononize by using lock, just set it
}
public String getRemoteEndpoint() {
@@ -403,7 +428,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
public void connect() throws Exception {
if ((m_remotingClient != null) && !m_remotingClient.isConnected()) {
m_remotingClient.connect();
- m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it
+ m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it
}
return;
@@ -412,7 +437,7 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
public void disconnect() {
if (m_remotingClient != null) {
m_remotingClient.disconnect();
- m_needToCallInitializeCallback[0] = (getInitializeCallback() != null); // specifically do not synchronize, just set it
+ m_needToCallInitializeCallback = (getInitializeCallback() != null); // specifically do not synchrononize by using lock, just set it
}
return;
@@ -535,18 +560,38 @@ public class JBossRemotingRemoteCommunicator implements RemoteCommunicator {
private CommandResponse invokeInitializeCallbackIfNeeded(Command command) {
InitializeCallback callback = getInitializeCallback();
if (callback != null) {
- // block here - in effect, this will stop all commands from going out until the callback is done
- synchronized (m_needToCallInitializeCallback) {
- if (m_needToCallInitializeCallback[0]) {
- try {
- m_needToCallInitializeCallback[0] = !callback.sendingInitialCommand(this, command);
- LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback[0]);
- } catch (Throwable t) {
- m_needToCallInitializeCallback[0] = true; // callback failed, we'll want to call it again
- LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil.getAllMessages(t));
- return new GenericCommandResponse(command, false, null, t);
+ // block here - in effect, this will stop all commands from going out until the callback is done
+ // to avoid infinite blocking, we'll only wait for a set time (though long).
+
+ WriteLock writeLock = m_needToCallInitializeCallbackLock.writeLock();
+ boolean locked;
+ try {
+ locked = writeLock.tryLock(m_initializeCallbackLockAcquisitionTimeoutMins, TimeUnit.MINUTES);
+ } catch (InterruptedException ie) {
+ locked = false;
+ }
+
+ if (locked) {
+ try {
+ if (m_needToCallInitializeCallback) {
+ try {
+ m_needToCallInitializeCallback = (!callback.sendingInitialCommand(this, command));
+ LOG.debug(CommI18NResourceKeys.INITIALIZE_CALLBACK_DONE, m_needToCallInitializeCallback);
+ } catch (Throwable t) {
+ m_needToCallInitializeCallback = true; // callback failed, we'll want to call it again
+ LOG.error(t, CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, ThrowableUtil
+ .getAllMessages(t));
+ return new GenericCommandResponse(command, false, null, t);
+ }
}
+ } finally {
+ writeLock.unlock();
}
+ } else {
+ m_needToCallInitializeCallback = true; // can't invoke callback, we'll want to still call it later
+ Throwable t = new Throwable("Initialize callback lock could not be acquired");
+ LOG.error(CommI18NResourceKeys.INITIALIZE_CALLBACK_FAILED, t.getMessage());
+ return new GenericCommandResponse(command, false, null, t);
}
}
return null;
commit 55ba6f8778820bdd417e99909220136a2e1e091f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Feb 19 11:10:53 2010 -0500
BZ 566724 - if classloader fails to be created, master PC will skip the plugin
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java
index f46eaf5..bd4feac 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java
@@ -136,16 +136,23 @@ public class MasterServerPluginContainer {
String pluginName = descriptor.getName();
ServerPluginType pluginType = new ServerPluginType(descriptor);
PluginKey pluginKey = PluginKey.createServerPluginKey(pluginType.stringify(), pluginName);
- ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey);
- log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl
- + "] into its plugin container");
try {
- ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader, descriptor);
- boolean enabled = !allDisabledPlugins.contains(pluginKey);
- pc.loadPlugin(env, enabled);
- log.info("Preloaded server plugin [" + pluginKey.getPluginName() + "]");
+ ClassLoader classLoader = this.classLoaderManager.obtainServerPluginClassLoader(pluginKey);
+ log.debug("Pre-loading server plugin [" + pluginKey + "] from [" + pluginUrl
+ + "] into its plugin container");
+ try {
+ ServerPluginEnvironment env = new ServerPluginEnvironment(pluginUrl, classLoader,
+ descriptor);
+ boolean enabled = !allDisabledPlugins.contains(pluginKey);
+ pc.loadPlugin(env, enabled);
+ log.info("Preloaded server plugin [" + pluginName + "]");
+ } catch (Exception e) {
+ log.warn("Failed to preload server plugin [" + pluginName + "] from URL [" + pluginUrl
+ + "]", e);
+ }
} catch (Exception e) {
- log.warn("Failed to preload server plugin [" + pluginUrl + "]", e);
+ log.warn("Failed to preload server plugin [" + pluginName
+ + "]; cannot get its classloader from URL [ " + pluginUrl + "]", e);
}
} else {
log.warn("There is no server plugin container to support plugin: " + pluginUrl);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
index 9f27ce9..fa26970 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
@@ -64,7 +64,7 @@ public class ServerPluginClassLoader extends URLClassLoader {
try {
unpackedDirectory = unpackEmbeddedJars(pluginJarName, pluginUrl, classpathUrlList, tmpDirectory);
} catch (Exception e) {
- throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl);
+ throw new Exception("Failed to unpack embedded JARs within: " + pluginUrl, e);
}
}
}
commit 2ffc564d7ff69a427755fa374419bc5980e47f94
Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org>
Date: Fri Feb 19 13:37:36 2010 +0100
Fix link to definitions BZ 566004
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml
index b6e386c..fd09f82 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml
@@ -148,8 +148,7 @@
</onc:sortableColumnHeader>
</f:facet>
- <h:outputLink value="/alerts/Config.do">
- <f:param name="mode" value="viewRoles"/>
+ <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml">
<f:param name="id" value="#{Resource.id}"/>
<f:param name="ad" value="#{item.alert.alertDefinition.id}"/>
<h:outputText value="#{item.alert.alertDefinition.name}" />
1
0
modules/enterprise/gui/portal-war/src/main/webapp/css/win.css | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml | 12 ++-
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml | 32 ++++------
3 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit 6f3b5b0bfd49cbaddbe30b57423e53141ea56b13
Author: John Sanda <john(a)localhost.localdomain>
Date: Mon Feb 22 15:23:23 2010 -0500
Updating formatting and css
Attempting to right-align the toolbar links with the text area. Making the text area a
fixed with and the path name header above it the same width with wrapping turned on to
handle long path names.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
index 41148d1..1d4bca6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
@@ -179,24 +179,30 @@
.rawConfigFileHeader {
color: gray;
- white-space: nowrap;
+ white-space: normal;
font-weight: bold;
font-family: sans-serif;
+ width: 600px;
+
}
.rawConfigFileContents {
font-family: sans-serif;
color: gray;
+ margin-left: 1px;
background-color: white;
border-style: solid;
border-width: thin;
border-color: rgb(102, 102, 102);
- width: 100%;
- height: 300px;
+ width: 600px;
+ height: 350px;
overflow-x: auto;
overflow-y: scroll;
}
+.rawToolbarLinksTable {
+ text-align: right;;
+}
</style>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
index 8514547..730d7c4 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
@@ -15,10 +15,10 @@
<c:choose>
<c:when test="#{readOnly}">
- <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: gray; vertical-align: top;"/>
+ <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: gray; vertical-align: top; padding-left: 10px;"/>
</c:when>
<c:otherwise>
- <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;"/>
+ <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top; padding-left: 10px;"/>
</c:otherwise>
</c:choose>
@@ -99,19 +99,19 @@
</rich:panel>
- <h:panelGrid columns="1" style="width:100%;">
- <h:panelGrid columns="4" style="width:100%;">
- <h:outputLink id="viewErrorsLink"
+ <h:panelGrid columns="1" width="97%">
+ <rich:panel style="width: 600px; text-align: right;">
+ <h:outputLink id="viewErrorsLink"
value="#"
onclick="#{rich:component('errorWindow')}.show()"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;">
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top; padding-left: 10px;">
#{selectedRawUIBean.errorLabel}
</h:outputLink>
<h:outputLink value="#"
onclick="#{rich:component('modalEditor')}.show()"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); text-align: right; vertical-align: top;">
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); text-align: right; vertical-align: top; padding-left: 10px;">
View Full Screen
</h:outputLink>
@@ -124,25 +124,24 @@
<h:commandLink action="#{editor['download']}"
value="Download"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;">
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top; padding-left: 10px;">
<f:param name="id" value="#{ResourceUIBean.id}"/>
</h:commandLink>
+ </rich:panel>
- <h:outputLabel id="selectedFileHeader" value="#{selectedRawUIBean.path}" styleClass="rawConfigFileHeader"/>
- </h:panelGrid>
+ <h:outputLabel id="selectedFileHeader" value="#{selectedRawUIBean.path}" styleClass="rawConfigFileHeader"/>
- <rich:panel style="margin-left:1px; border: none;">
- <h:inputTextarea id="fileContents"
- styleClass="rawConfigFileContents"
- value="#{selectedRawUIBean.contents}"
- readonly="#{readOnly}"/>
+ <h:inputTextarea id="fileContents"
+ styleClass="rawConfigFileContents"
+ value="#{selectedRawUIBean.contents}"
+ readonly="#{readOnly}">
<c:if test="#{!readOnly}">
<a4j:support event="onkeyup"
ignoreDupeResponses="true"
reRender="fileMenuPanel,upperCommitPanel,lowerCommitPanel"
requestDelay="1000"/>
</c:if>
- </rich:panel>
+ </h:inputTextarea>
</h:panelGrid>
</h:panelGrid>
commit ee73afc2cbba1174019aaab35cf111c3adfdc587
Author: John Sanda <john(a)localhost.localdomain>
Date: Mon Feb 22 10:48:08 2010 -0500
Removing icon for download link since other toolbar links do not have icons
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/css/win.css b/modules/enterprise/gui/portal-war/src/main/webapp/css/win.css
index 01fd46c..195e299 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/css/win.css
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/css/win.css
@@ -1715,7 +1715,7 @@ P.compact {
/**--- Raw Config ---------------------*/
.raw-outer-table {
- width: 100%;
+ width: 90%;
}
.raw-outer-table-left-col {
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
index 25d13d1..8514547 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml
@@ -15,10 +15,10 @@
<c:choose>
<c:when test="#{readOnly}">
- <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: gray"/>
+ <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: gray; vertical-align: top;"/>
</c:when>
<c:otherwise>
- <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202);"/>
+ <c:set var="uploadLinkStyle" value="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;"/>
</c:otherwise>
</c:choose>
@@ -104,14 +104,14 @@
<h:outputLink id="viewErrorsLink"
value="#"
onclick="#{rich:component('errorWindow')}.show()"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202);">
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;">
#{selectedRawUIBean.errorLabel}
</h:outputLink>
<h:outputLink value="#"
onclick="#{rich:component('modalEditor')}.show()"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); text-align: right;">
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); text-align: right; vertical-align: top;">
View Full Screen
</h:outputLink>
@@ -124,8 +124,7 @@
<h:commandLink action="#{editor['download']}"
value="Download"
- style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202);">
- <h:graphicImage value="/images/download.png"/>
+ style="white-space: nowrap; font-weight: normal; color: rgb(62, 118, 202); vertical-align: top;">
<f:param name="id" value="#{ResourceUIBean.id}"/>
</h:commandLink>
1
0
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 21cb56c17f931bef485efc24937cd6ed0777884b
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 14:37:07 2010 -0500
refactoring fix
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java
index 0523a85..bf00de2 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java
@@ -45,10 +45,10 @@ import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementCategory;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.ResourceOperationHistory;
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java | 147 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java | 54 ---
4 files changed, 1 insertion(+), 226 deletions(-)
New commits:
commit 2931b0cb503a7a71652b3345f5b03df8a88fb696
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 14:17:26 2010 -0500
Fixing capitalization
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java
deleted file mode 100644
index 13eae48..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.admin.users;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.criteria.SubjectCriteria;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.fields.DataSourceIntegerField;
-import com.smartgwt.client.data.fields.DataSourceTextField;
-import com.smartgwt.client.rpc.RPCResponse;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-
-/**
- * @author Greg Hinkle
- */
-public class UsersDataSource extends RPCDataSource {
-
- private static UsersDataSource INSTANCE;
-
- private SubjectGWTServiceAsync subjectService = GWTServiceLookup.getSubjectService();
-
-
- public static UsersDataSource getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new UsersDataSource();
- }
- return INSTANCE;
- }
-
-
- protected UsersDataSource() {
- super("Users");
-
-
-
- DataSourceField idDataField = new DataSourceIntegerField("id", "ID");
- idDataField.setPrimaryKey(true);
-
- DataSourceTextField usernameField = new DataSourceTextField("username", "User Name");
- usernameField.setCanEdit(false);
-
- //DataSourceTextField name = new DataSourceTextField("name", "Name");
-
- DataSourceTextField firstName = new DataSourceTextField("firstName", "First Name");
-
- DataSourceTextField lastName = new DataSourceTextField("lastName", "Last Name");
-
-
- DataSourceTextField email = new DataSourceTextField("email", "Email Address");
-
-
- DataSourceTextField phone = new DataSourceTextField("phoneNumber", "Phone");
-
- DataSourceTextField department = new DataSourceTextField("department", "Department");
-
- DataSourceField roles = new DataSourceField();
- roles.setForeignKey("Roles.id");
- roles.setName("roles");
- roles.setMultiple(true);
-
-
- setFields(idDataField, usernameField, firstName, lastName, phone, email, department);
- }
-
-
-
- public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
- final long start = System.currentTimeMillis();
-
-
-
- SubjectCriteria criteria = new SubjectCriteria();
-// criteria.addFilterName(query);
-
- if (request.getStartRow() != null && request.getEndRow() != null) {
- criteria.setPageControl(PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - request.getStartRow()));
- } else {
- criteria.setPageControl(PageControl.getSingleRowInstance());
- }
-
-// criteria.addSortAgentName(PageOrdering.ASC);
-
-
- subjectService.findSubjectsByCriteria(criteria, new AsyncCallback<PageList<Subject>>() {
- public void onFailure(Throwable caught) {
- Window.alert("Failed to load " + caught.getMessage());
- System.err.println("Failed to fetch Resource Data");
- response.setStatus(RPCResponse.STATUS_FAILURE);
- processResponse(requestId, response);
- }
-
- public void onSuccess(PageList<Subject> result) {
-
- System.out.println("Data retrieved in: " + (System.currentTimeMillis() - start));
-
- ListGridRecord[] records = new ListGridRecord[result.size()];
- for (int x=0; x<result.size(); x++) {
- Subject res = result.get(x);
- ListGridRecord record = new ListGridRecord();
- record.setAttribute("id",res.getId());
- record.setAttribute("username",res.getName());
- record.setAttribute("name",res.getFirstName() + " " + res.getLastName());
- record.setAttribute("firstName", res.getFirstName());
- record.setAttribute("lastName", res.getLastName());
- record.setAttribute("factive", res.getFactive());
- record.setAttribute("department", res.getDepartment());
- record.setAttribute("phoneNumber", res.getPhoneNumber());
- record.setAttribute("email",res.getEmailAddress());
- records[x] = record;
- }
-
- response.setData(records);
- response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
- processResponse(requestId, response);
-
- }
- });
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java
deleted file mode 100644
index 9358332..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.gwt;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-
-@RemoteServiceRelativePath("ConfigurationGWTService")
-public interface ConfigurationGWTService extends RemoteService {
-
- Configuration getPluginConfiguration(int resourceId);
-
- ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId);
-
- Configuration getResourceConfiguration(int resourceId);
-
- ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId);
-
- RawConfiguration dummy(RawConfiguration config);
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
index d1858af..7887501 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
@@ -51,4 +51,4 @@ public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implemen
return new RawConfiguration();
// Dummy method for gwt compiler
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java
deleted file mode 100644
index d1858af..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.rhq.enterprise.gui.coregui.server.gwt;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTService;
-import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
-import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implements ConfigurationGWTService {
-
-
- public Configuration getPluginConfiguration(int resourceId) {
-
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
-
- Configuration configuration = configurationManager.getPluginConfiguration(getSessionSubject(), resourceId);
-
- return SerialUtility.prepare(configuration, "PluginConfiguration");
- }
-
- public ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId) {
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
-
- ConfigurationDefinition definition = configurationManager.getPluginConfigurationDefinitionForResourceType(getSessionSubject(), resourceTypeId);
- return SerialUtility.prepare(definition, "PluginDefinition");
- }
-
-
- public Configuration getResourceConfiguration(int resourceId) {
-
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
-
- Configuration configuration = configurationManager.getResourceConfiguration(getSessionSubject(), resourceId);
- return SerialUtility.prepare(configuration, "ResourceConfiguration");
- }
-
- public ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId) {
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
-
- ConfigurationDefinition definition = configurationManager.getResourceConfigurationDefinitionWithTemplatesForResourceType(getSessionSubject(), resourceTypeId);
- return SerialUtility.prepare(definition, "ResourceDefinition");
- }
-
- public RawConfiguration dummy(RawConfiguration config) {
- System.out.println(config.getPath());
- return new RawConfiguration();
- // Dummy method for gwt compiler
- }
-}
\ No newline at end of file
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java | 11 ++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 19 +++++-----
2 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 4e3868418ec3465a1c988ad2109957082e1917f0
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 14:08:42 2010 -0500
tab prettyness
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java
index b759b21..6b3a09a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java
@@ -35,13 +35,13 @@ public class SubTabLayout extends VLayout {
ToolStrip buttonBar;
- LinkedHashMap<String,Canvas> subtabs = new LinkedHashMap<String, Canvas>();
+ LinkedHashMap<String, Canvas> subtabs = new LinkedHashMap<String, Canvas>();
Canvas currentlyDisplayed;
@Override
- protected void onInit() {
- super.onInit();
+ protected void onDraw() {
+ super.onDraw();
setWidth100();
setHeight100();
@@ -51,7 +51,6 @@ public class SubTabLayout extends VLayout {
buttonBar = new ToolStrip();
buttonBar.setBackgroundColor("grey");
buttonBar.setWidth100();
-
for (final String title : subtabs.keySet()) {
@@ -65,6 +64,8 @@ public class SubTabLayout extends VLayout {
button.setActionType(SelectionType.RADIO);
button.setRadioGroup("subtabs");
button.setBorder(null);
+
+ button.setBaseStyle("SubTabButton");
// button.setStyleName("SubTabButton");
// button.setStylePrimaryName("SubTabButton");
@@ -91,8 +92,6 @@ public class SubTabLayout extends VLayout {
}
-
-
public void registerSubTab(String title, Canvas canvas) {
subtabs.put(title, canvas);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 5db61ff..9afc8a1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -49,7 +49,9 @@ public class ResourceDetailView extends VLayout implements Presenter, ResourceSe
private Tab monitoringTab;
private Tab inventoryTab;
private Tab operationsTab;
+ private Tab alertsTab;
private Tab configurationTab;
+ private Tab eventsTab;
private Tab contentTab;
private TabSet topTabSet;
@@ -75,16 +77,17 @@ public class ResourceDetailView extends VLayout implements Presenter, ResourceSe
topTabSet.setHeight100();
- summaryTab = new Tab("Summary");
-
- monitoringTab = new Tab("Monitoring");
- inventoryTab = new Tab("Inventory");
- operationsTab = new Tab("Operations");
- configurationTab = new Tab("Configuration");
- contentTab = new Tab("Content");
+ summaryTab = new Tab("Summary", "/images/icons/Service_up_16.png");
+ monitoringTab = new Tab("Monitoring","/images/icons/Monitor_grey_16.png");
+ inventoryTab = new Tab("Inventory","/images/icons/Inventory_grey_16.png");
+ operationsTab = new Tab("Operations","/images/icons/Operation_grey_16.png");
+ alertsTab = new Tab("Alerts","/images/icons/Alert_grey_16.png");
+ configurationTab = new Tab("Configuration","/images/icons/Configure_grey_16.png");
+ eventsTab = new Tab("Events","/images/icons/Events_grey_16.png");
+ contentTab = new Tab("Content","/images/icons/Content_grey_16.png");
- topTabSet.setTabs(summaryTab, monitoringTab, inventoryTab, operationsTab, configurationTab, contentTab);
+ topTabSet.setTabs(summaryTab, monitoringTab, inventoryTab, operationsTab, alertsTab, configurationTab, eventsTab, contentTab);
title.setContents("Loading...");
addMember(title);
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 147 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 24 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 54 +++
3 files changed, 225 insertions(+)
New commits:
commit 9ce0d1e9a0a0b083ec3a5edc6a22dfdcbc5994b2
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 14:00:19 2010 -0500
Fixing capitalization of a few files (darn git ignore case)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java
new file mode 100644
index 0000000..13eae48
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java
@@ -0,0 +1,147 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.users;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+/**
+ * @author Greg Hinkle
+ */
+public class UsersDataSource extends RPCDataSource {
+
+ private static UsersDataSource INSTANCE;
+
+ private SubjectGWTServiceAsync subjectService = GWTServiceLookup.getSubjectService();
+
+
+ public static UsersDataSource getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new UsersDataSource();
+ }
+ return INSTANCE;
+ }
+
+
+ protected UsersDataSource() {
+ super("Users");
+
+
+
+ DataSourceField idDataField = new DataSourceIntegerField("id", "ID");
+ idDataField.setPrimaryKey(true);
+
+ DataSourceTextField usernameField = new DataSourceTextField("username", "User Name");
+ usernameField.setCanEdit(false);
+
+ //DataSourceTextField name = new DataSourceTextField("name", "Name");
+
+ DataSourceTextField firstName = new DataSourceTextField("firstName", "First Name");
+
+ DataSourceTextField lastName = new DataSourceTextField("lastName", "Last Name");
+
+
+ DataSourceTextField email = new DataSourceTextField("email", "Email Address");
+
+
+ DataSourceTextField phone = new DataSourceTextField("phoneNumber", "Phone");
+
+ DataSourceTextField department = new DataSourceTextField("department", "Department");
+
+ DataSourceField roles = new DataSourceField();
+ roles.setForeignKey("Roles.id");
+ roles.setName("roles");
+ roles.setMultiple(true);
+
+
+ setFields(idDataField, usernameField, firstName, lastName, phone, email, department);
+ }
+
+
+
+ public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
+ final long start = System.currentTimeMillis();
+
+
+
+ SubjectCriteria criteria = new SubjectCriteria();
+// criteria.addFilterName(query);
+
+ if (request.getStartRow() != null && request.getEndRow() != null) {
+ criteria.setPageControl(PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - request.getStartRow()));
+ } else {
+ criteria.setPageControl(PageControl.getSingleRowInstance());
+ }
+
+// criteria.addSortAgentName(PageOrdering.ASC);
+
+
+ subjectService.findSubjectsByCriteria(criteria, new AsyncCallback<PageList<Subject>>() {
+ public void onFailure(Throwable caught) {
+ Window.alert("Failed to load " + caught.getMessage());
+ System.err.println("Failed to fetch Resource Data");
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(requestId, response);
+ }
+
+ public void onSuccess(PageList<Subject> result) {
+
+ System.out.println("Data retrieved in: " + (System.currentTimeMillis() - start));
+
+ ListGridRecord[] records = new ListGridRecord[result.size()];
+ for (int x=0; x<result.size(); x++) {
+ Subject res = result.get(x);
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute("id",res.getId());
+ record.setAttribute("username",res.getName());
+ record.setAttribute("name",res.getFirstName() + " " + res.getLastName());
+ record.setAttribute("firstName", res.getFirstName());
+ record.setAttribute("lastName", res.getLastName());
+ record.setAttribute("factive", res.getFactive());
+ record.setAttribute("department", res.getDepartment());
+ record.setAttribute("phoneNumber", res.getPhoneNumber());
+ record.setAttribute("email",res.getEmailAddress());
+ records[x] = record;
+ }
+
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(requestId, response);
+
+ }
+ });
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java
new file mode 100644
index 0000000..9358332
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java
@@ -0,0 +1,24 @@
+package org.rhq.enterprise.gui.coregui.client.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+@RemoteServiceRelativePath("ConfigurationGWTService")
+public interface ConfigurationGWTService extends RemoteService {
+
+ Configuration getPluginConfiguration(int resourceId);
+
+ ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId);
+
+ Configuration getResourceConfiguration(int resourceId);
+
+ ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId);
+
+ RawConfiguration dummy(RawConfiguration config);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
new file mode 100644
index 0000000..d1858af
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
@@ -0,0 +1,54 @@
+package org.rhq.enterprise.gui.coregui.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implements ConfigurationGWTService {
+
+
+ public Configuration getPluginConfiguration(int resourceId) {
+
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ Configuration configuration = configurationManager.getPluginConfiguration(getSessionSubject(), resourceId);
+
+ return SerialUtility.prepare(configuration, "PluginConfiguration");
+ }
+
+ public ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId) {
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ ConfigurationDefinition definition = configurationManager.getPluginConfigurationDefinitionForResourceType(getSessionSubject(), resourceTypeId);
+ return SerialUtility.prepare(definition, "PluginDefinition");
+ }
+
+
+ public Configuration getResourceConfiguration(int resourceId) {
+
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ Configuration configuration = configurationManager.getResourceConfiguration(getSessionSubject(), resourceId);
+ return SerialUtility.prepare(configuration, "ResourceConfiguration");
+ }
+
+ public ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId) {
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ ConfigurationDefinition definition = configurationManager.getResourceConfigurationDefinitionWithTemplatesForResourceType(getSessionSubject(), resourceTypeId);
+ return SerialUtility.prepare(definition, "ResourceDefinition");
+ }
+
+ public RawConfiguration dummy(RawConfiguration config) {
+ System.out.println(config.getPath());
+ return new RawConfiguration();
+ // Dummy method for gwt compiler
+ }
+}
\ No newline at end of file
1
0
22 Feb '10
dev/null |binary
modules/core/domain/pom.xml | 16
modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml | 7
modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java | 8
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverter.java | 360 +++++
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/util/Recordizable.java | 28
modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java | 172 ++
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java | 359 -----
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java | 1
modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 2
modules/core/domain/war/org.rhq.core.RHQDomain/org.rhq.core.RHQDomain.nocache.js | 11
modules/enterprise/gui/coregui/pom.xml | 689 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadCrumb.java | 119 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 288 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java | 114 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 289 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 73 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 123 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 157 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 127 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java | 147 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 157 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/FullHTMLPane.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java | 99 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 315 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 200 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/Portlet.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 93 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 114 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtService.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtServiceAsync.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTService.java | 43
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTServiceAsync.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTService.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTServiceAsync.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSelectListener.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeDatasource.java | 252 ---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeView.java | 158 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java | 212 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 146 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceSummaryView.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 308 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 358 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java | 146 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 232 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 102 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 80 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 86 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 157 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 76 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/configuration/ConfigurationGwtServiceImpl.java | 78 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/group/ResourceGroupGWTServiceImpl.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/resource/ResourceGWTServiceImpl.java | 170 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 61
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 36
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 3
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 42
modules/enterprise/gui/coregui/src/main/webapp/images/RHQ.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_opened.png |binary
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 1
modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml | 66
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml | 53
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java | 4
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 79 -
117 files changed, 6403 insertions(+), 1834 deletions(-)
New commits:
commit ed907b2efaf2fbb7eb47d066e4148f3f2e117d89
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 13:14:48 2010 -0500
removed old package
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java
deleted file mode 100644
index 950ffaa..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.type.detail;
-
-/**
- * @author Greg Hinkle
- */
-public class CustomResourceTreeGrid {
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java
deleted file mode 100644
index de56d7e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.type.detail;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceDetailView {
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java
deleted file mode 100644
index a5db2d0..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.type.detail;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceSummaryView {
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java
deleted file mode 100644
index abaa9f0..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.type.detail;
-
-import org.rhq.core.domain.operation.OperationDefinition;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceTreeDatasource;
-
-import com.smartgwt.client.widgets.Window;
-import com.smartgwt.client.widgets.events.CloseClickHandler;
-import com.smartgwt.client.widgets.events.CloseClientEvent;
-import com.smartgwt.client.widgets.menu.Menu;
-import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.menu.MenuItemSeparator;
-import com.smartgwt.client.widgets.menu.events.ClickHandler;
-import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
-import com.smartgwt.client.widgets.tree.TreeGrid;
-import com.smartgwt.client.widgets.tree.events.DataArrivedEvent;
-import com.smartgwt.client.widgets.tree.events.DataArrivedHandler;
-import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent;
-import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceTreeView extends ResourceTreeView.ResourceTreeGrid {
-
- public ResourceTreeView() {
- super();
-
-
- resourceTree.setWidth(500);
- resourceTree.setShowResizeBar(true);
- resourceTree.setHeight100();
- resourceTree.setOpenerImage("resources/dir.png");
- resourceTree.setOpenerIconSize(16);
-
- resourceTree.setAutoFetchData(true);
- resourceTree.setAnimateFolders(false);
-
- resourceTree.setDataSource(new ResourceTreeDatasource());
-// ((Layout)treeTab.getPane()).add.addChild(resourceTree);
-
-
- final Menu contextMenu = new Menu();
- MenuItem item = new MenuItem("Expand node");
- item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- TreeGrid treeGrid = (TreeGrid) event.getTarget();
- System.out.println("You right clicked: " + treeGrid.getSelectedRecord());
- }
- });
-
- /* Do menu support datasources? GH: Seemingly they'll only load once when done this way
- contextMenu.setDataSource(new DataSource() {
- {
- setClientOnly(false);
- setDataProtocol(DSProtocol.CLIENTCUSTOM);
- setDataFormat(DSDataFormat.CUSTOM);
- }
- protected Object transformRequest(DSRequest request) {
- System.out.println("Looking up menu info");
- return request;
- }
- });
- */
-
- // Should only do this once, but it opens the platform node (which is not actually the root node)
- resourceTree.addDataArrivedHandler(new DataArrivedHandler() {
- public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
- resourceTree.getTree().openFolders(resourceTree.getTree().getChildren(resourceTree.getTree().getRoot()));
- }
- });
-
-
- resourceTree.setContextMenu(contextMenu);
- resourceTree.addNodeContextClickHandler(new NodeContextClickHandler() {
- public void onNodeContextClick(final NodeContextClickEvent nodeContextClickEvent) {
- nodeContextClickEvent.getNode();
- contextMenu.setItems(new MenuItem(nodeContextClickEvent.getNode().getName()));
- resourceTree.getTree();
- if (nodeContextClickEvent.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) {
-
- ResourceTreeDatasource.ResourceTreeNode node = (ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode();
- contextMenu.addItem(new MenuItem("Type: " + ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getName()));
-
-
- MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration");
- editPluginConfiguration.addClickHandler(new ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
- int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
- int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
-
- Window configEditor = new Window();
- configEditor.setTitle("Edit " + resource.getName() + " plugin configuration");
- configEditor.setWidth(800);
- configEditor.setHeight(800);
- configEditor.setIsModal(true);
- configEditor.setShowModalMask(true);
- configEditor.centerInPage();
-// configEditor.setShowResizeBar =
- configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.plugin));
- configEditor.show();
-
- }
- });
- editPluginConfiguration.setEnabled(node.getResource().getResourceType().getPluginConfigurationDefinition() != null);
- contextMenu.addItem(editPluginConfiguration);
-
-
- MenuItem editResourceConfiguration = new MenuItem("Resource Configuration");
- editResourceConfiguration.addClickHandler(new ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
- int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
- int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
-
- final Window configEditor = new Window();
- configEditor.setTitle("Edit " + resource.getName() + " resource configuration");
- configEditor.setWidth(800);
- configEditor.setHeight(800);
- configEditor.setIsModal(true);
- configEditor.setShowModalMask(true);
- configEditor.centerInPage();
- configEditor.addCloseClickHandler(new CloseClickHandler() {
- public void onCloseClick(CloseClientEvent closeClientEvent) {
- configEditor.destroy();
- }
- });
- configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.resource));
- configEditor.show();
-
- }
- });
- editResourceConfiguration.setEnabled(node.getResource().getResourceType().getResourceConfigurationDefinition() != null);
- contextMenu.addItem(editResourceConfiguration);
-
- contextMenu.addItem(new MenuItemSeparator());
-
- MenuItem operations = new MenuItem("Operations");
- Menu opSubMenu = new Menu();
- for (OperationDefinition operationDefinition : node.getResourceType().getOperationDefinitions()) {
- opSubMenu.addItem(new MenuItem(operationDefinition.getDisplayName()));
-
- }
- operations.setEnabled(!node.getResourceType().getOperationDefinitions().isEmpty());
- operations.setSubmenu(opSubMenu);
- contextMenu.addItem(operations);
-
- }
-
-
- contextMenu.showContextMenu();
- }
- });
-
-
- addMember(resourceTree);
-
- }
-
-
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java
deleted file mode 100644
index 3149053..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.type.detail;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceView {
-
-}
commit ffb448ebbb371ec9e03e06032af3c3add1dc0799
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon Feb 22 13:13:30 2010 -0500
Additional Gwt Prototyping
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index aa60cf6..ef75cd2 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -209,6 +209,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.smartgwt</groupId>
+ <artifactId>smartgwt</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+
</dependencies>
<build>
@@ -241,7 +255,7 @@
<version>1.2.0-11137</version>
<configuration>
<inplace>true</inplace>
- <logLevel>INFO</logLevel>
+ <logLevel>DEBUG</logLevel>
<runTarget>RHQDomain.html</runTarget>
<warSourceDirectory>war</warSourceDirectory>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml b/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml
index f0e9608..634ac86 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml
+++ b/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml
@@ -3,10 +3,17 @@
<module>
<inherits name='com.google.gwt.user.User'/>
+ <inherits name='com.smartgwt.SmartGwt' />
<entry-point class='org.rhq.core.client.RHQDomain'/>
<source path="client"/>
<source path="domain"/>
+
+ <generate-with class="org.rhq.core.rebind.RecordBuilderGenerator">
+ <when-type-assignable class="org.rhq.core.domain.util.Recordizable"/>
+ </generate-with>
+
+
</module>
\ No newline at end of file
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java
index fa3a923..e49db95 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java
@@ -22,6 +22,8 @@
*/
package org.rhq.core.domain.auth;
+import org.rhq.core.domain.util.Recordizable;
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -43,7 +45,7 @@ import javax.persistence.Table;
@NamedQuery(name = Principal.QUERY_FIND_ALL_USERS, query = "SELECT m FROM Principal AS m") })
@SequenceGenerator(name = "RHQ_PRINCIPAL_ID_SEQ", sequenceName = "RHQ_PRINCIPAL_ID_SEQ", allocationSize = 10)
@Table(name = "RHQ_PRINCIPAL")
-public class Principal implements Serializable {
+public class Principal implements Serializable, Recordizable {
public static final String QUERY_FIND_BY_USERNAME = "Principal.findByUsername";
public static final String QUERY_FIND_ALL_USERS = "Principal.findAllUsers";
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java
index fba19a9..99f7d92 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java
@@ -25,6 +25,7 @@ package org.rhq.core.domain.auth;
import org.rhq.core.domain.alert.notification.SubjectNotification;
import org.rhq.core.domain.authz.Role;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.util.Recordizable;
import org.jetbrains.annotations.NotNull;
@@ -185,7 +186,7 @@ import java.util.Set;
@SequenceGenerator(name = "RHQ_SUBJECT_ID_SEQ", sequenceName = "RHQ_SUBJECT_ID_SEQ")
@Table(name = "RHQ_SUBJECT")
/*@Cache(usage= CacheConcurrencyStrategy.TRANSACTIONAL)*/
-public class Subject implements Serializable {
+public class Subject implements Serializable, Recordizable {
public static final String QUERY_FIND_ALL = "Subject.findAll";
public static final String QUERY_FIND_BY_IDS = "Subject.findByIds";
public static final String QUERY_FIND_BY_NAME = "Subject.findByName";
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
index dc92a71..51120f1 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
@@ -32,6 +32,9 @@ import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageOrdering;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @author Joseph Marques
*/
@@ -42,6 +45,8 @@ public class ResourceTypeCriteria extends Criteria {
private static final long serialVersionUID = 1L;
private Integer filterId;
+ private List<Integer> filterIds; // requires overrides
+
private String filterName;
private String filterDescription;
private ResourceCategory filterCategory;
@@ -71,6 +76,7 @@ public class ResourceTypeCriteria extends Criteria {
super(ResourceType.class);
filterOverrides.put("pluginName", "plugin like ?");
+ filterOverrides.put("ids", "id in ( ? )");
sortOverrides.put("pluginName", "plugin");
}
@@ -84,6 +90,10 @@ public class ResourceTypeCriteria extends Criteria {
this.filterId = filterId;
}
+ public void addFilterIds(Integer... filterIds) {
+ this.filterIds = Arrays.asList(filterIds);
+ }
+
public void addFilterName(String filterName) {
this.filterName = filterName;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
index 7009737..4a1e41e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java
@@ -39,6 +39,7 @@ public class RoleCriteria extends Criteria {
private Integer filterId;
private String filterName;
private String filterDescription;
+ private Integer filterSubjectId;
private boolean fetchSubjects;
private boolean fetchResourceGroups;
@@ -49,6 +50,9 @@ public class RoleCriteria extends Criteria {
public RoleCriteria() {
super(Role.class);
+
+ filterOverrides.put("subjectId", "id in (select sr.id from Role sr JOIN sr.subjects s where s.id = :id)");
+
}
@Override
@@ -72,6 +76,10 @@ public class RoleCriteria extends Criteria {
this.filterDescription = filterDescription;
}
+ public void setFilterSubjectId(Integer filterSubjectId) {
+ this.filterSubjectId = filterSubjectId;
+ }
+
public boolean getFetchSubjects() {
return this.fetchSubjects;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverter.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverter.java
new file mode 100644
index 0000000..0a2c1d4
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverter.java
@@ -0,0 +1,360 @@
+ /*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ package org.rhq.core.domain.measurement;
+
+ import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+ import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+ import com.google.gwt.i18n.client.NumberFormat;
+
+ import java.util.HashSet;
+ import java.util.Set;
+
+ public class MeasurementConverter {
+ private static final int MAX_PRECISION_DIGITS = 4;
+ private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
+
+
+ private static NumberFormat getDefaultNumberFormat() {
+ NumberFormat nf = NumberFormat.getFormat("0.0");
+
+ return nf;
+ }
+
+ public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ MeasurementUnits originUnits = origin.getUnits();
+ Double originValue = origin.getValue();
+
+ return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
+ }
+
+ public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
+ boolean wasNegative = false;
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementUnits baseUnit = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
+
+ Double results = scale(valueAndUnits, targetUnits);
+ if (wasNegative) {
+ results = -results;
+ }
+
+ return results;
+ }
+
+ public static String format(String value, MeasurementUnits targetUnits) {
+ if (targetUnits == null) {
+ return value;
+ } else {
+ return value + targetUnits;
+ }
+ }
+
+ /**
+ * Formats the given array of double values: determines the necessary precision such that when formatted, they are
+ * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
+ * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
+ * bounded for presentation considerations.
+ *
+ * @param values the values to be formatted
+ * @param targetUnits the target units for the values
+ * @param bestFit whether or not to use a normalized scale for the family of units
+ *
+ * @return the formatted values
+ */
+ public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
+ if ((null == values) || (values.length == 0)) {
+ return null;
+ }
+
+ MeasurementUnits originalUnits = targetUnits;
+
+ /*
+ * in the overwhelming majority of cases, you're going to want to apply a bestFit
+ * to the passed data, but it's not required; it's perfectly possible to allow a
+ * list of doubles to be formatted without being fit, in which case the targetUnits
+ * will be part of the formatted display for each result element
+ */
+ if (bestFit) {
+ // find bestFit units by taking the average
+ Double average = 0.0;
+
+ for (int i = 0, sz = values.length; i < sz; i++) {
+ /*
+ * adding fractional amount iterative leads to greater
+ * error, but prevents overflow on large data sets
+ */
+ average += (values[i] / sz);
+ }
+
+ MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
+ //noinspection UnnecessaryLocalVariable
+ MeasurementUnits fittedUnits = fittedAverage.getUnits();
+
+ /*
+ * and change the local reference to targetUnits, so that the same logic
+ * can be used both for the bestFit and non-bestFit computations
+ */
+ targetUnits = fittedUnits;
+ }
+
+ @SuppressWarnings("unused")
+ Set<String> existingStrings; // technically this *is* unused because
+ int precisionDigits = 0;
+ boolean scaleWithMorePrecision = true;
+ String[] results = new String[values.length];
+ NumberFormat nf = getDefaultNumberFormat();
+
+ /*
+ * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
+ *
+ * increase the maxPrecisionDigits in the while condition
+ * itself to ensure it gets done for every loop
+ */
+ while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
+ /*
+ * make the assumption that we no longer need to scale beyond this iteration
+ */
+ scaleWithMorePrecision = false;
+
+ /*
+ * we need to record the uniquely formatted values so we can determine
+ */
+ existingStrings = new HashSet<String>();
+ nf = NumberFormat.getFormat(getFormat(0, precisionDigits));
+
+ Double[] scaledValues = new Double[values.length];
+
+ for (int i = 0; i < scaledValues.length; i++) {
+ /*
+ * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
+ * Otherwise, apply standard multi-unit scaling.
+ */
+ if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
+ scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
+ } else {
+ scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
+ }
+ }
+
+ for (int i = 0; i < results.length; i++) {
+ /*
+ * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
+ * we do this to see how many units we'll have to scale to afterwards (outside this
+ * while loop) to make the array of values passed to us unique
+ */
+ String formatted = nf.format(scaledValues[i]);
+
+ /*
+ * check whether formatted value was in the set or not; if it was, we have to
+ * loop, but only if we're not not already at our maximum precision
+ */
+ boolean wasNewElement = existingStrings.add(formatted);
+
+ if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
+ scaleWithMorePrecision = true;
+ break;
+ }
+
+ results[i] = formatted;
+ }
+ }
+
+ /*
+ * we did the best we could in terms of trying to find a precision that adds the most
+ * uniqueness to the given set of values, NOW tack on the formatted value for the units
+ */
+ for (int i = 0; i < results.length; i++) {
+ results[i] = format(results[i], targetUnits);
+ }
+
+ return results;
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
+ return format(value, targetUnits, bestFit, null, null);
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) {
+ if (value == null || Double.isNaN(value)) {
+ return NULL_OR_NAN_FORMATTED_VALUE;
+ }
+ if (bestFit) {
+ MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
+
+ value = valueAndUnits.getValue();
+ targetUnits = valueAndUnits.getUnits();
+ }
+
+ // apply relative scale at presentation time
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ value = MeasurementUnits.scaleUp(value, targetUnits);
+ }
+
+ NumberFormat numberFormat =
+ NumberFormat.getFormat(
+ getFormat(
+ minimumFractionDigits != null ? minimumFractionDigits : 1,
+ maximumFractionDigits != null ? maximumFractionDigits : 1));
+
+ String formatted = numberFormat.format(value);
+
+ return format(formatted, targetUnits);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
+ throws MeasurementConversionException {
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
+
+ MeasurementUnits baseUnits = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
+ Double scaledMagnitude = scale(valueAndUnits, targetUnits);
+
+ return format(scaledMagnitude, targetUnits, bestFit);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
+ return fit(origin, units, null, null);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
+ MeasurementUnits highUnits) {
+
+ // work-around for the various Chart descendants not properly setting their units field;
+ if (null == units) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition, absolutely specified units don't scale to anything
+ if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
+ || (MeasurementUnits.Family.DURATION == units.getFamily())) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition relative-valued units are self-scaled (converted at formatting)
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // if the magnitude is zero, the best-fit also will spin around forever since it won't change
+ if (Math.abs(origin) < 1e-9) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ boolean wasNegative = false;
+
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementNumericValueAndUnits currentValueAndUnits;
+ MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
+
+ // first, make the value smaller if it's too big
+ int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
+
+ do {
+ currentValueAndUnits = nextValueAndUnits;
+
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
+ if (nextOrdinal == maxOrdinal) {
+ // we could theoretically get bigger, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as big as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double smallerValue = scale(currentValueAndUnits, biggerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
+ } while (nextValueAndUnits.getValue() > 1.0);
+
+ // next, make the value bigger if it's too small
+ int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
+
+ while (currentValueAndUnits.getValue() < 1.0) {
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
+ if (nextOrdinal == minOrdinal) {
+ // we could theoretically get smaller, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as small as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double biggerValue = scale(currentValueAndUnits, smallerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
+
+ currentValueAndUnits = nextValueAndUnits;
+ }
+
+ if (wasNegative) {
+ return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
+ .getUnits());
+ }
+
+ return currentValueAndUnits;
+ }
+
+ public static String getFormat(int minDigits, int maxDigits) {
+ StringBuilder buf = new StringBuilder("0.");
+ for (int i = 0; i < minDigits;i++) {
+ buf.append("0");
+ }
+ for (int i = 0; i < (maxDigits-minDigits);i++) {
+ buf.append("#");
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index a624b66..1f5419b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -18,6 +18,7 @@
*/
package org.rhq.core.domain.measurement.composite;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementDataNumeric1H;
import org.rhq.core.domain.measurement.MeasurementUnits;
@@ -160,7 +161,6 @@ public class MeasurementOOBComposite implements Serializable {
}
}
- /* TODO: GWT
public String getFormattedBaseband() {
String min = MeasurementConverter.format(blMin, units, true);
@@ -173,7 +173,7 @@ public class MeasurementOOBComposite implements Serializable {
public String getFormattedOutlier() {
return MeasurementConverter.format(outlier, units, true);
- }*/
+ }
@Override
public String toString() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 569e0e8..a208829 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -899,7 +899,7 @@ public class Resource implements Comparable<Resource>, Serializable {
private String location;
@JoinColumn(name = "RESOURCE_TYPE_ID", referencedColumnName = "ID", nullable = false)
- @ManyToOne
+ @ManyToOne // TODO GH: It would be prefferable for this to be lazy, but will need cleanup throughout the app (fetch = FetchType.LAZY)
@Summary(index = 4)
private ResourceType resourceType;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
index 7cc2f06..dd9f65a 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
@@ -650,6 +650,10 @@ public class ResourceType implements Serializable, Comparable<ResourceType> {
return operationDefinitions;
}
+ public void setOperationDefinitions(Set<OperationDefinition> operationDefinitions) {
+ this.operationDefinitions = operationDefinitions;
+ }
+
public boolean addOperationDefinition(OperationDefinition operationDefinition) {
operationDefinition.setResourceType(this);
return this.operationDefinitions.add(operationDefinition);
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/Recordizable.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/Recordizable.java
new file mode 100644
index 0000000..262d131
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/Recordizable.java
@@ -0,0 +1,28 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.domain.util;
+
+/**
+ * A marker interface for generating Record builders
+ *
+ * @author Greg Hinkle
+ */
+public interface Recordizable {
+
+}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java b/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
new file mode 100644
index 0000000..ca6a5ab
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
@@ -0,0 +1,172 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.rebind;
+
+import com.google.gwt.core.ext.Generator;
+import com.google.gwt.core.ext.GeneratorContext;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.typeinfo.JClassType;
+import com.google.gwt.core.ext.typeinfo.JField;
+import com.google.gwt.core.ext.typeinfo.NotFoundException;
+import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
+import com.google.gwt.user.rebind.SourceWriter;
+
+import javax.persistence.Entity;
+
+import java.io.PrintWriter;
+
+
+/**
+ * This is the start to a rebinder for our domain entities to allow for the
+ * easy generation of Smart's Record objecgts. I have not yet gotten this working.
+ *
+ *
+ * @author Greg Hinkle
+ */
+public class RecordBuilderGenerator extends Generator {
+
+
+
+
+ protected TreeLogger logger;
+ private String packageName;
+ private String qualifiedStubClassName;
+ private JClassType requestedClass;
+ private String simpleStubClassName;
+ private SourceWriter sourceWriter;
+ private TypeOracle typeOracle;
+
+ /**
+ * Create a new type that satisfies the rebind request.
+ */
+ @Override
+ public String generate(TreeLogger logger, GeneratorContext context, String typeName) throws UnableToCompleteException {
+
+ System.out.println("classType " + typeName);
+
+ if (!init(logger, context, typeName)) {
+ return null;
+ }
+
+ writeSource();
+ sourceWriter.commit(logger);
+
+ return qualifiedStubClassName;
+ }
+
+ protected JClassType getRequestedClass() {
+ return requestedClass;
+ }
+
+ protected SourceWriter getSourceWriter() {
+ return sourceWriter;
+ }
+
+ protected TypeOracle getTypeOracle() {
+ return typeOracle;
+ }
+
+ @SuppressWarnings("unused")
+ protected void writeSource() throws UnableToCompleteException {
+
+
+
+ JField[] fields = requestedClass.getFields();
+
+ writeBuildRecordMethod(fields, sourceWriter);
+ }
+
+ /**
+ * Gets the name of the native stub class.
+ */
+ private String getSimpleStubClassName(JClassType baseClass) {
+ return "__" + baseClass.getSimpleSourceName() + "_RecordBuilder";
+ }
+
+ private SourceWriter getSourceWriter(TreeLogger logger, GeneratorContext ctx,
+ String packageName, String className, String superclassName) {
+
+ PrintWriter printWriter = ctx.tryCreate(logger, packageName, className);
+ if (printWriter == null) {
+ return null;
+ }
+
+ ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory(
+ packageName, className);
+
+ composerFactory.setSuperclass(superclassName);
+
+ return composerFactory.createSourceWriter(ctx, printWriter);
+ }
+
+ private boolean init(TreeLogger logger, GeneratorContext context,
+ String typeName) throws UnableToCompleteException {
+ this.logger = logger;
+ typeOracle = context.getTypeOracle();
+ assert typeOracle != null;
+
+ try {
+ requestedClass = typeOracle.getType(typeName);
+ } catch (NotFoundException e) {
+ logger.log(
+ TreeLogger.ERROR,
+ "Could not find type '"
+ + typeName
+ + "'; please see the log, as this usually indicates a previous error ",
+ e);
+ throw new UnableToCompleteException();
+ }
+
+ if (requestedClass.getAnnotation(Entity.class) == null) {
+ System.out.println("Not an entity: " + typeName);
+ return false;
+ }
+
+ System.out.println("$$$$$$$$Making a record builder for: "+ typeName);
+
+ // Get the stub class name, and see if its source file exists.
+ //
+ simpleStubClassName = getSimpleStubClassName(requestedClass);
+ packageName = requestedClass.getPackage().getName();
+ qualifiedStubClassName = packageName + "." + simpleStubClassName;
+
+ sourceWriter = getSourceWriter(logger, context, packageName,
+ simpleStubClassName, requestedClass.getQualifiedSourceName());
+
+ return sourceWriter != null;
+ }
+
+ private void writeBuildRecordMethod(JField[] fields, SourceWriter sw) {
+ sw.println();
+ sw.println("protected final com.smartgwt.client.data.Record buildRecord(" + requestedClass.getQualifiedSourceName() + " entity) throws Throwable {");
+ sw.indent();
+
+ sw.println("com.smartgwt.client.data.Record record = new com.smartgwt.client.data.Record();");
+
+ for (JField field :fields) {
+ sw.println("record.setAttribute(\"" + field.getName() + "\", " + field.getName() + ");");
+ }
+ sw.println("return record;");
+ sw.outdent();
+ sw.println("}");
+ }
+
+}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
deleted file mode 100644
index 38886d8..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
+++ /dev/null
@@ -1,359 +0,0 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- package org.rhq.core.server;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
- public class MeasurementConverter {
- private static final int MAX_PRECISION_DIGITS = 4;
- private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
-
-
- private static NumberFormat getDefaultNumberFormat() {
- NumberFormat nf = NumberFormat.getNumberInstance();
-
- nf.setMinimumFractionDigits(1);
- nf.setMaximumFractionDigits(1);
-
- return nf;
- }
-
- public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- MeasurementUnits originUnits = origin.getUnits();
- Double originValue = origin.getValue();
-
- return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
- }
-
- public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
- boolean wasNegative = false;
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementUnits baseUnit = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
-
- Double results = scale(valueAndUnits, targetUnits);
- if (wasNegative) {
- results = -results;
- }
-
- return results;
- }
-
- public static String format(String value, MeasurementUnits targetUnits) {
- if (targetUnits == null) {
- return value;
- } else {
- return value + targetUnits;
- }
- }
-
- /**
- * Formats the given array of double values: determines the necessary precision such that when formatted, they are
- * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
- * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
- * bounded for presentation considerations.
- *
- * @param values the values to be formatted
- * @param targetUnits the target units for the values
- * @param bestFit whether or not to use a normalized scale for the family of units
- *
- * @return the formatted values
- */
- public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
- if ((null == values) || (values.length == 0)) {
- return null;
- }
-
- MeasurementUnits originalUnits = targetUnits;
-
- /*
- * in the overwhelming majority of cases, you're going to want to apply a bestFit
- * to the passed data, but it's not required; it's perfectly possible to allow a
- * list of doubles to be formatted without being fit, in which case the targetUnits
- * will be part of the formatted display for each result element
- */
- if (bestFit) {
- // find bestFit units by taking the average
- Double average = 0.0;
-
- for (int i = 0, sz = values.length; i < sz; i++) {
- /*
- * adding fractional amount iterative leads to greater
- * error, but prevents overflow on large data sets
- */
- average += (values[i] / sz);
- }
-
- MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
- //noinspection UnnecessaryLocalVariable
- MeasurementUnits fittedUnits = fittedAverage.getUnits();
-
- /*
- * and change the local reference to targetUnits, so that the same logic
- * can be used both for the bestFit and non-bestFit computations
- */
- targetUnits = fittedUnits;
- }
-
- @SuppressWarnings("unused")
- Set<String> existingStrings; // technically this *is* unused because
- int precisionDigits = 0;
- boolean scaleWithMorePrecision = true;
- String[] results = new String[values.length];
- NumberFormat nf = getDefaultNumberFormat();
-
- /*
- * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
- *
- * increase the maxPrecisionDigits in the while condition
- * itself to ensure it gets done for every loop
- */
- while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
- /*
- * make the assumption that we no longer need to scale beyond this iteration
- */
- scaleWithMorePrecision = false;
-
- /*
- * we need to record the uniquely formatted values so we can determine
- */
- existingStrings = new HashSet<String>();
- nf.setMinimumFractionDigits(0);
- nf.setMaximumFractionDigits(precisionDigits);
-
- Double[] scaledValues = new Double[values.length];
-
- for (int i = 0; i < scaledValues.length; i++) {
- /*
- * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
- * Otherwise, apply standard multi-unit scaling.
- */
- if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
- scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
- } else {
- scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
- }
- }
-
- for (int i = 0; i < results.length; i++) {
- /*
- * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
- * we do this to see how many units we'll have to scale to afterwards (outside this
- * while loop) to make the array of values passed to us unique
- */
- String formatted = nf.format(scaledValues[i]);
-
- /*
- * check whether formatted value was in the set or not; if it was, we have to
- * loop, but only if we're not not already at our maximum precision
- */
- boolean wasNewElement = existingStrings.add(formatted);
-
- if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
- scaleWithMorePrecision = true;
- break;
- }
-
- results[i] = formatted;
- }
- }
-
- /*
- * we did the best we could in terms of trying to find a precision that adds the most
- * uniqueness to the given set of values, NOW tack on the formatted value for the units
- */
- for (int i = 0; i < results.length; i++) {
- results[i] = format(results[i], targetUnits);
- }
-
- return results;
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
- return format(value, targetUnits, bestFit, null, null);
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) {
- if (value == null || Double.isNaN(value)) {
- return NULL_OR_NAN_FORMATTED_VALUE;
- }
- if (bestFit) {
- MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
-
- value = valueAndUnits.getValue();
- targetUnits = valueAndUnits.getUnits();
- }
-
- // apply relative scale at presentation time
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- value = MeasurementUnits.scaleUp(value, targetUnits);
- }
-
- NumberFormat numberFormat = getDefaultNumberFormat();
- if (null != minimumFractionDigits) {
- numberFormat.setMinimumFractionDigits(minimumFractionDigits);
- }
- if (null != maximumFractionDigits) {
- numberFormat.setMaximumFractionDigits(maximumFractionDigits);
- }
- String formatted = numberFormat.format(value);
-
- return format(formatted, targetUnits);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
- throws MeasurementConversionException {
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
-
- MeasurementUnits baseUnits = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
- Double scaledMagnitude = scale(valueAndUnits, targetUnits);
-
- return format(scaledMagnitude, targetUnits, bestFit);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
- return fit(origin, units, null, null);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
- MeasurementUnits highUnits) {
-
- // work-around for the various Chart descendants not properly setting their units field;
- if (null == units) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition, absolutely specified units don't scale to anything
- if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
- || (MeasurementUnits.Family.DURATION == units.getFamily())) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition relative-valued units are self-scaled (converted at formatting)
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // if the magnitude is zero, the best-fit also will spin around forever since it won't change
- if (Math.abs(origin) < 1e-9) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- boolean wasNegative = false;
-
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementNumericValueAndUnits currentValueAndUnits;
- MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
-
- // first, make the value smaller if it's too big
- int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
-
- do {
- currentValueAndUnits = nextValueAndUnits;
-
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
- if (nextOrdinal == maxOrdinal) {
- // we could theoretically get bigger, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
- if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as big as we can get, break out of the loop so we can return
- break;
- }
-
- Double smallerValue = scale(currentValueAndUnits, biggerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
- } while (nextValueAndUnits.getValue() > 1.0);
-
- // next, make the value bigger if it's too small
- int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
-
- while (currentValueAndUnits.getValue() < 1.0) {
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
- if (nextOrdinal == minOrdinal) {
- // we could theoretically get smaller, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
- if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as small as we can get, break out of the loop so we can return
- break;
- }
-
- Double biggerValue = scale(currentValueAndUnits, smallerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
-
- currentValueAndUnits = nextValueAndUnits;
- }
-
- if (wasNegative) {
- return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
- .getUnits());
- }
-
- return currentValueAndUnits;
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
index b6e3400..2f8bb84 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
@@ -18,6 +18,7 @@
*/
package org.rhq.core.server;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
index 3ded1f3..e98acf5 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
@@ -22,11 +22,11 @@
*/
package org.rhq.core.domain.util.units.test;
+ import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.measurement.util.MeasurementConversionException;
import org.rhq.core.domain.test.AbstractEJB3Test;
- import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.server.MeasurementParser;
import org.testng.annotations.Test;
diff --git a/modules/core/domain/war/org.rhq.core.RHQDomain/org.rhq.core.RHQDomain.nocache.js b/modules/core/domain/war/org.rhq.core.RHQDomain/org.rhq.core.RHQDomain.nocache.js
deleted file mode 100644
index 99c25d6..0000000
--- a/modules/core/domain/war/org.rhq.core.RHQDomain/org.rhq.core.RHQDomain.nocache.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function org_rhq_core_RHQDomain(){var M='',nb='" for "gwt:onLoadErrorFn"',lb='" for "gwt:onPropertyErrorFn"',Y='"><\/script>',$='#',Jb='.cache.html',ab='/',Fb='3C270A543567B1504B412C851F735B64',Gb='9B31C5558B3E2D8FD9916265E4229863',Lb='<script defer="defer">org_rhq_core_RHQDomain.onInjectionDone(\'org.rhq.core.RHQDomain\')<\/script>',X='<script id="',ib='=',_='?',Hb='BCDC87C8FB31D977A6C8A4C3C09709AF',kb='Bad handler "',Kb='DOMContentLoaded',Ib='E90A89EA1142771F9E672D04C2F1AF84',Z='SCRIPT',W='__gwt_marker_org.rhq.core.RHQDomain',bb='base',Q='begin',P='bootstrap',db='clear.cache.gif',hb='content',V='end',zb='gecko',Ab='gecko1_8',R='gwt.codesvr=',S='gwt.hosted=',T='gwt.hybrid',mb='gwt:onLoadErrorFn',jb='gwt:onPropertyErrorFn',gb='gwt:property',Db='hosted.html?org_rhq_core_RHQDomain',yb='ie6',xb='ie8',ob='iframe',cb='img',pb="javascript:''",Cb='loadExternalRefs',eb='meta',rb='moduleRequested',U='moduleStartup',wb='msie',fb='name',tb='opera',N='org.rhq.core.RHQDomain',qb='position:absolute;width:0;height:0;border:none',vb='safari',Eb='selectingPermutation',O='startup',Bb='unknown',sb='user.agent',ub='webkit';var k=window,l=document,m=k.__gwtStatsEvent?function(a){return k.__gwtStatsEvent(a)}:null,n=k.__gwtStatsSessionId?k.__gwtStatsSessionId:null,o,p,q,r=M,s={},t=[],u=[],v=[],w,x;m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:P,millis:(new Date).getTime(),type:Q});if(!k.__gwt_stylesLoaded){k.__gwt_stylesLoaded={}}if(!k.__gwt_scriptsLoaded){k.__gwt_scriptsLoaded={}}function y(){var b=false;try{var c=k.location.search;return (c.indexOf(R)!=-1||(c.indexOf(S)!=-1||k.external&&k.external.gwtOnLoad))&&c.indexOf(T)==-1}catch(a){}y=function(){return b};return b}
-function z(){if(o&&p){var b=l.getElementById(N);var c=b.contentWindow;if(y()){c.__gwt_getProperty=function(a){return F(a)}}org_rhq_core_RHQDomain=null;c.gwtOnLoad(w,N,r);m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:U,millis:(new Date).getTime(),type:V})}}
-function A(){var e,f=W,g;l.write(X+f+Y);g=l.getElementById(f);e=g&&g.previousSibling;while(e&&e.tagName!=Z){e=e.previousSibling}function h(a){var b=a.lastIndexOf($);if(b==-1){b=a.length}var c=a.indexOf(_);if(c==-1){c=a.length}var d=a.lastIndexOf(ab,Math.min(c,b));return d>=0?a.substring(0,d+1):M}
-;if(e&&e.src){r=h(e.src)}if(r==M){var i=l.getElementsByTagName(bb);if(i.length>0){r=i[i.length-1].href}else{r=h(l.location.href)}}else if(r.match(/^\w+:\/\//)){}else{var j=l.createElement(cb);j.src=r+db;r=h(j.src)}if(g){g.parentNode.removeChild(g)}}
-function B(){var b=document.getElementsByTagName(eb);for(var c=0,d=b.length;c<d;++c){var e=b[c],f=e.getAttribute(fb),g;if(f){if(f==gb){g=e.getAttribute(hb);if(g){var h,i=g.indexOf(ib);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=M}s[f]=h}}else if(f==jb){g=e.getAttribute(hb);if(g){try{x=eval(g)}catch(a){alert(kb+g+lb)}}}else if(f==mb){g=e.getAttribute(hb);if(g){try{w=eval(g)}catch(a){alert(kb+g+nb)}}}}}}
-function E(a,b){var c=v;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b}
-function F(a){var b=u[a](),c=t[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(x){x(a,d,b)}throw null}
-var G;function H(){if(!G){G=true;var a=l.createElement(ob);a.src=pb;a.id=N;a.style.cssText=qb;a.tabIndex=-1;l.body.appendChild(a);m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:U,millis:(new Date).getTime(),type:rb});a.contentWindow.location.replace(r+J)}}
-u[sb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(tb)!=-1){return tb}else if(b.indexOf(ub)!=-1){return vb}else if(b.indexOf(wb)!=-1){if(document.documentMode>=8){return xb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return yb}}}}else if(b.indexOf(zb)!=-1){var d=/rv:([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){if(c(d)>=1008)return Ab}return zb}return Bb};t[sb]={gecko:0,gecko1_8:1,ie6:2,ie8:3,opera:4,safari:5};org_rhq_core_RHQDomain.onScriptLoad=function(){if(G){p=true;z()}};org_rhq_core_RHQDomain.onInjectionDone=function(){o=true;m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:Cb,millis:(new Date).getTime(),type:V});z()};A();var I;var J;if(y()){if(k.external&&(k.external.initModule&&k.external.initModule(N))){k.location.reload();return}J=Db;I=M}B();m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:P,millis:(new Date).getTime(),type:Eb});if(!y()){try{E([zb],Fb);E([Ab],Fb);E([tb],Gb);E([vb],Hb);E([yb],Ib);E([xb],Ib);I=v[F(sb)];J=I+Jb}catch(a){return}}var K;function L(){if(!q){q=true;z();if(l.removeEventListener){l.removeEventListener(Kb,L,false)}if(K){clearInterval(K)}}}
-if(l.addEventListener){l.addEventListener(Kb,function(){H();L()},false)}var K=setInterval(function(){if(/loaded|complete/.test(l.readyState)){H();L()}},50);m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:P,millis:(new Date).getTime(),type:V});m&&m({moduleName:N,sessionId:n,subSystem:O,evtGroup:Cb,millis:(new Date).getTime(),type:Q});l.write(Lb)}
-org_rhq_core_RHQDomain();
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 13c9c54..0574f6e 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -1,348 +1,379 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>rhq-coregui</artifactId>
- <packaging>war</packaging>
-
- <name>RHQ Enterprise Core GUI</name>
- <description>the RHQ Enterprise Core GUI webapp</description>
-
- <scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/coreg…</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/coreg…</developerConnection>
- </scm>
-
- <properties>
-
- <scm.module.path>modules/enterprise/gui/coregui/</scm.module.path>
-
- <!-- dependency versions -->
-
- <gwt.version>2.0.0</gwt.version>
-
- <product.shortName>RHQ</product.shortName>
- <product.name>RHQ</product.name>
- <product.fullName>RHQ</product.fullName>
- <product.url.domain>rhq-project.org</product.url.domain>
- <product.sales.email>sales(a)rhq-project.org</product.sales.email>
- <product.support.email>info(a)rhq-project.org</product.support.email>
- <product.version>${project.version}</product.version>
- <product.help.doc.root>http://support.rhq-project.org/display/RHQ/</product.help.doc.root>
- </properties>
-
- <dependencies>
-
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!--<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-incubator</artifactId>
- <scope>provided</scope>
- <version>2.0</version>
- </dependency>-->
-
-
- <dependency>
- <groupId>com.smartgwt</groupId>
- <artifactId>smartgwt</artifactId>
- <version>2.0</version>
- </dependency>
-
-
- <!-- Internal Deps -->
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear -->
- </dependency>
-
- <!-- 3rd Party Deps -->
-
-
- <!-- needed for referenced domain entities that use Hibernate annotations (due to JDK5 bug) -->
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- transitive dependency needed for JspC -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- needed for referenced domain entities that use JPA annotations (due to JDK5 bug) -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- needed for EJB3 annotations (e.g. ApplicationException) -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- Needed due to JDK 1.5 bug. -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>coregui</finalName>
-
-
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- <include>**/*.gwt.xml</include>
- </includes>
- </resource>
- </resources>
-
-
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>1.2.0-11137</version>
- <configuration>
- <noServer>true</noServer>
- <inplace>false</inplace>
- <logLevel>INFO</logLevel>
- <runTarget>coregui/CoreGUI.html</runTarget>
- <extraJvmArgs>-Xmx512m</extraJvmArgs>
- <localWorkers>2</localWorkers>
- <draftCompile>true</draftCompile>
- <buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
- <hostedWebapp>target/hostedwar</hostedWebapp>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
- </archive>
- <webResources>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/webapp</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>Generate I18N Resource Bundles</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
- <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
- <classpath refid="maven.runtime.classpath" />
- <classfileset dir="${project.build.outputDirectory}">
- <include name="**/*I18NResourceKeys.class" />
- </classfileset>
- </i18n>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>Maintain an unfiltered copy of i18n properties files</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.outputDirectory}">
- <fileset dir="src/main/webapp-filtered/WEB-INF/classes">
- <include name="ApplicationResources.properties" />
- </fileset>
- <mapper type="glob" from="*" to="*.unfiltered" />
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
-
- </build>
-
- <profiles>
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
- <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
- <rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName>
- <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-coregui</artifactId>
+ <packaging>war</packaging>
+
+ <name>RHQ Enterprise Core GUI</name>
+ <description>the RHQ Enterprise Core GUI webapp</description>
+
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/coreg…</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/coreg…
+ </developerConnection>
+ </scm>
+
+ <properties>
+
+ <scm.module.path>modules/enterprise/gui/coregui/</scm.module.path>
+
+ <!-- dependency versions -->
+
+ <gwt.version>2.0.0</gwt.version>
+
+ <product.shortName>RHQ</product.shortName>
+ <product.name>RHQ</product.name>
+ <product.fullName>RHQ</product.fullName>
+ <product.url.domain>rhq-project.org</product.url.domain>
+ <product.sales.email>sales(a)rhq-project.org</product.sales.email>
+ <product.support.email>info(a)rhq-project.org</product.support.email>
+ <product.version>${project.version}</product.version>
+ <product.help.doc.root>http://support.rhq-project.org/display/RHQ/</product.help.doc.root>
+ </properties>
+
+ <dependencies>
+
+
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-incubator</artifactId>
+ <scope>provided</scope>
+ <version>2.0</version>
+ </dependency>-->
+
+
+ <dependency>
+ <groupId>com.smartgwt</groupId>
+ <artifactId>smartgwt</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+
+ <!-- Internal Deps -->
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <!-- by rhq.ear (as ejb-jar) -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <!-- by rhq.ear (as ejb-jar) -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-util</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <!-- by rhq.ear -->
+ </dependency>
+
+ <!-- 3rd Party Deps -->
+
+
+ <!-- needed for referenced domain entities that use Hibernate annotations (due to JDK5 bug) -->
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+
+ <!-- transitive dependency needed for JspC -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+
+ <!-- needed for referenced domain entities that use JPA annotations (due to JDK5 bug) -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+
+ <!-- needed for EJB3 annotations (e.g. ApplicationException) -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+
+ <!-- Needed due to JDK 1.5 bug. -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>coregui</finalName>
+
+
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ <include>**/*.gwt.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <noServer>true</noServer>
+ <inplace>false</inplace>
+ <logLevel>INFO</logLevel>
+ <runTarget>http://localhost:7080/coregui/CoreGUI.html</runTarget>
+ <extraJvmArgs>-Xmx512m</extraJvmArgs>
+ <localWorkers>2</localWorkers>
+ <draftCompile>true</draftCompile>
+ <buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
+ <hostedWebapp>target/hostedwar</hostedWebapp>
+ <debugSuspend>false</debugSuspend>
+ <servicePattern>**/gwt/*GWTService.java</servicePattern>
+
+ </configuration>
+ <executions>
+ <execution>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>deploy-classes</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <!--
- <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" />
- <echo>*** Copying updated files from target/${project.build.finalName}/WEB-INF/classes to ${classes.dir}...</echo>
- <copy todir="${classes.dir}" verbose="${rhq.verbose}">
- <fileset dir="war/WEB-INF/classes" />
- </copy>
- -->
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo>
- <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
- <fileset dir="${basedir}/src/main/webapp" />
- </copy>
- </tasks>
- </configuration>
<goals>
- <goal>run</goal>
+ <goal>compile</goal>
+ <goal>generateAsync</goal>
</goals>
- </execution>
-
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Build-Number>${buildNumber}</Build-Number>
+ </manifestEntries>
+ </archive>
+ <webResources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/webapp</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <!--
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
<execution>
- <id>deploy</id>
- <phase>package</phase>
+ <id>Generate I18N Resource Bundles</id>
+ <phase>process-classes</phase>
<configuration>
- <tasks>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo>
- <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
- <fileset dir="${basedir}/target/${project.build.finalName}" />
- </copy>
- </tasks>
+ <tasks>
+ <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
+ <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
+ <classpath refid="maven.runtime.classpath" />
+ <classfileset dir="${project.build.outputDirectory}">
+ <include name="**/*I18NResourceKeys.class" />
+ </classfileset>
+ </i18n>
+ </tasks>
</configuration>
<goals>
- <goal>run</goal>
+ <goal>run</goal>
</goals>
</execution>
-
<execution>
- <id>undeploy</id>
- <phase>clean</phase>
+ <id>Maintain an unfiltered copy of i18n properties files</id>
+ <phase>process-classes</phase>
<configuration>
- <tasks>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
- <delete dir="${deployment.dir}" />
- </tasks>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}">
+ <fileset dir="src/main/webapp-filtered/WEB-INF/classes">
+ <include name="ApplicationResources.properties" />
+ </fileset>
+ <mapper type="glob" from="*" to="*.unfiltered" />
+ </copy>
+ </tasks>
</configuration>
<goals>
- <goal>run</goal>
+ <goal>run</goal>
</goals>
</execution>
-
</executions>
</plugin>
-
- </plugins>
- </build>
- </profile>
-
-
- </profiles>
-
- <repositories>
- <repository>
- <id>smartgwt</id>
- <name>SmartGWT</name>
- <url>http://www.smartclient.com/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- </repositories>
+ -->
+ </plugins>
+
+ </build>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+
+ <properties>
+ <rhq.rootDir>../../../..</rhq.rootDir>
+ <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+ <rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName>
+ <rhq.deploymentDir>
+ ${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}
+ </rhq.deploymentDir>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>deploy-classes</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <!--
+ <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" />
+ <echo>*** Copying updated files from target/${project.build.finalName}/WEB-INF/classes to ${classes.dir}...</echo>
+ <copy todir="${classes.dir}" verbose="${rhq.verbose}">
+ <fileset dir="war/WEB-INF/classes" />
+ </copy>
+ -->
+ <property name="deployment.dir" location="${rhq.deploymentDir}"/>
+ <echo>*** Copying updated files from
+ src${file.separator}main${file.separator}webapp${file.separator} to
+ ${deployment.dir}${file.separator}...
+ </echo>
+ <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
+ <fileset dir="${basedir}/src/main/webapp"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>deploy</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <property name="deployment.dir" location="${rhq.deploymentDir}"/>
+ <echo>*** Copying updated files from
+ target${file.separator}${project.build.finalName}${file.separator} to
+ ${deployment.dir}${file.separator}...
+ </echo>
+ <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
+ <fileset dir="${basedir}/target/${project.build.finalName}"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>undeploy</id>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <property name="deployment.dir" location="${rhq.deploymentDir}"/>
+ <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
+ <delete dir="${deployment.dir}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>smartgwt</id>
+ <name>SmartGWT</name>
+ <url>http://www.smartclient.com/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>codehaus</id>
+ <name>codehaus</name>
+ <url>http://repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
</project>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 16f7e48..bf5e646 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -12,15 +12,20 @@
<inherits name='com.google.gwt.widgetideas.WidgetIdeas'/>
-->
+<!-- <generate-with class="org.rhq.core.rebind.RecordBuilderGenerator">
+ <when-type-assignable class="org.rhq.core.domain.util.Recordizable"/>
+ </generate-with>-->
<set-property name="user.agent" value="safari"/>
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/>
- <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.inventory.group.ResourceGroupGWTServiceImpl"/>
- <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.inventory.resource.ResourceGWTServiceImpl"/>
- <servlet path="/ConfigurationGwtService"
- class="org.rhq.enterprise.gui.coregui.server.inventory.configuration.ConfigurationGwtServiceImpl"/>
+ <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
+ <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
+ <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
+ <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
+ <servlet path="/ConfigurationGwtService" class="org.rhq.enterprise.gui.coregui.server.gwt.ConfigurationGWTServiceImpl"/>
+ <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
</module>
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadCrumb.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadCrumb.java
new file mode 100644
index 0000000..65a5285
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadCrumb.java
@@ -0,0 +1,119 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.ui.Hyperlink;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.widgets.HTMLPane;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.HStack;
+
+import java.util.ArrayList;
+
+/**
+ * @author Greg Hinkle
+ */
+public class BreadCrumb extends HTMLPane {
+
+ private ArrayList<Place> trail = new ArrayList<Place>();
+
+ public BreadCrumb() {
+
+ setHeight(28);
+ setBackgroundColor("#E6E3E3");
+ setPadding(5);
+ setOverflow(Overflow.CLIP_V);
+ }
+
+
+ public void initialize(String historyPath) {
+ String[] ids =historyPath.split("\\/");
+
+ for (String id : ids) {
+ trail.add(new Place(id,"?"));
+ }
+
+ }
+
+ public void verify(String historyPath) {
+ String[] ids = historyPath.split("\\/");
+
+ for (int i = 0; i < ids.length; i++) {
+ if (trail.size() > i && !trail.get(i).getId().equals(ids[i])) {
+ trail = new ArrayList(trail.subList(0,i));
+ trail.add(new Place(ids[i], "?"));
+ } else {
+ if (trail.size() > i) {
+ trail.set(i,new Place(ids[i],"?"));
+ } else {
+ trail.add(new Place(ids[i],"?"));
+ }
+ }
+ }
+ }
+
+
+
+ public void setPlace(Place place) {
+ trail.clear();
+ addPlace(place);
+ }
+
+ public void addPlace(Place place) {
+ trail.add(place);
+
+ refresh();
+ }
+
+ public void refresh() {
+ String content = "";
+ boolean first = true;
+
+ String path = "";
+ for (Place place : trail) {
+ if (!first) {
+ content += " > ";
+ }
+ first = false;
+ if (path.length() > 0) {
+ path += "/";
+ }
+ path += place.getId();
+
+
+ content += "<a class=\"BreadCrumb\" href=\"#" + path + "\">" + place.getName() + "</a>";
+ }
+
+ setContents(content);
+
+ History.newItem(path);
+
+ redraw();
+ }
+
+
+ public ArrayList<Place> getTrail() {
+ return trail;
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 9bc598f..bb2a598 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -1,39 +1,52 @@
package org.rhq.enterprise.gui.coregui.client;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import org.rhq.enterprise.gui.coregui.client.inventory.configuration.ConfigurationGwtService;
-import org.rhq.enterprise.gui.coregui.client.inventory.configuration.ConfigurationGwtServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceGWTService;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceTreeView;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
+import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardView;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourcesView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceView;
+import org.rhq.enterprise.gui.coregui.client.menu.MenuBarView;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.RequestCallback;
+import com.google.gwt.http.client.RequestException;
+import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.RootPanel;
import com.smartgwt.client.core.KeyIdentifier;
-import com.smartgwt.client.types.Side;
-import com.smartgwt.client.types.TabBarControls;
import com.smartgwt.client.util.KeyCallback;
import com.smartgwt.client.util.Page;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.menu.Menu;
-import com.smartgwt.client.widgets.menu.MenuButton;
-import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.menu.events.ItemClickEvent;
-import com.smartgwt.client.widgets.menu.events.ItemClickHandler;
-import com.smartgwt.client.widgets.tab.Tab;
-import com.smartgwt.client.widgets.tab.TabSet;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import java.util.ArrayList;
/**
* @author Greg Hinkle
*/
public class CoreGUI implements EntryPoint {
- ResourceGWTServiceAsync resourceService;
- ConfigurationGwtServiceAsync configurationService;
+
+ public static final String CONTENT_CANVAS_ID = "BaseContent";
+
+ private static Subject sessionSubject;
+ private static Subject fullSubject;
+
+ private static BreadCrumb breadCrumb;
+
+ private static Canvas content;
public void onModuleLoad() {
@@ -48,85 +61,206 @@ public class CoreGUI implements EntryPoint {
});
}
-// MenuBarView menuBarView = new MenuBarView();
+
+ RequestBuilder b = new RequestBuilder(RequestBuilder.GET, "/j_security_check.do?j_username=rhqadmin&j_password=rhqadmin");
+ try {
+ b.setCallback(new RequestCallback() {
+ public void onResponseReceived(Request request, Response response) {
+ System.out.println("Portal-War logged in");
+ }
+
+ public void onError(Request request, Throwable exception) {
+ System.out.println("Portal-War login failed");
+ }
+ });
+ b.send();
+ } catch (RequestException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+
+
+ SubjectGWTServiceAsync subjectService = SubjectGWTServiceAsync.Util.getInstance();
+
+ subjectService.login("rhqadmin", "rhqadmin", new AsyncCallback<Subject>() {
+ public void onFailure(Throwable caught) {
+ System.out.println("failed to login");
+ Label loginFailed = new Label("Could not login");
+ loginFailed.draw();
+ }
+
+ public void onSuccess(Subject result) {
+ System.out.println("Logged in: " + result.getSessionId());
+ setSessionSubject(result);
+ buildCoreUI();
+ }
+ });
+ }
+
+
+ private void buildCoreUI() {
+
+ VLayout layout = new VLayout();
+ layout.setWidth100();//(1200);
+ layout.setHeight100(); //(900);
+
+// HTMLPane menuPane = new HTMLPane();
+// menuPane.setWidth100();
+// menuPane.setHeight(26);
+// menuPane.setContentsType(ContentsType.PAGE);
+// menuPane.setContentsURL("/rhq/common/menu/menu.xhtml");
+// menuPane.setZIndex(400000);
+//
+// layout.addMember(menuPane);
+
+
+ MenuBarView menuBarView = new MenuBarView();
+ menuBarView.setWidth("100%");
// WidgetCanvas menuCanvas = new WidgetCanvas(menuBarView);
// menuCanvas.setTop(0);
// menuCanvas.setWidth100();
// menuCanvas.draw();
- resourceService = ResourceGWTService.App.getInstance();
- configurationService = ConfigurationGwtService.App.getInstance();
+ layout.addMember(menuBarView);
+
+
+ breadCrumb = new BreadCrumb();
+
+ layout.addMember(breadCrumb);
DOM.setInnerHTML(RootPanel.get("Loading-Panel").getElement(), "");
- final TabSet topTabSet = new TabSet();
- topTabSet.setTabBarPosition(Side.TOP);
- topTabSet.setWidth(1200);
- topTabSet.setHeight(900);
-
-
- Tab tableTab = new Tab("Resource Search Table");
- Tab treeTab = new Tab("Resource Tree");
- final Tab configTab = new Tab("Configuration Editor");
-
-
- // Agent: resource (10005) type (10060)
- // Raw: 10003 / 10023
- // both: 10002 / 10022
-
- configTab.setPane(new ConfigurationEditor(10005, 10060));
- treeTab.setPane(new ResourceTreeView());
- tableTab.setPane(new ResourceSearchView());
-
-
- topTabSet.addTab(configTab);
- topTabSet.addTab(tableTab);
- topTabSet.addTab(treeTab);
-
- topTabSet.setTop(50);
-
-
- final Menu configSelectMenu = new Menu();
- configSelectMenu.addItem(new MenuItem("Agent"));
- configSelectMenu.addItem(new MenuItem("Raw Only"));
- configSelectMenu.addItem(new MenuItem("Structured and Raw"));
- configSelectMenu.addItem(new MenuItem("List Of Maps"));
- configSelectMenu.addItemClickHandler(new ItemClickHandler() {
- public void onItemClick(ItemClickEvent itemClickEvent) {
- int x = configSelectMenu.getItemNum(itemClickEvent.getItem());
- System.out.println("Loading: "+ x);
- topTabSet.removeTab(configTab);
- switch (x) {
- case 0:
- configTab.setPane(new ConfigurationEditor(10005, 10060));
- break;
- case 1:
- configTab.setPane(new ConfigurationEditor(10003, 10023));
- break;
- case 2:
- configTab.setPane(new ConfigurationEditor(10002, 10022));
- break;
- case 3:
- configTab.setPane(new ConfigurationEditor(10149, 10134));
- break;
- }
- topTabSet.addTab(configTab,0);
- topTabSet.selectTab(0);
- topTabSet.redraw();
+ Canvas canvas = new Canvas(CONTENT_CANVAS_ID);
+ canvas.setWidth100();
+ canvas.setHeight100();
+
+ layout.addMember(canvas);
+
+
+// canvas.addChild(new AdministrationView()) ; //DemoCanvas());
+
+
+ layout.draw();
+
+
+ breadCrumb.initialize(History.getToken());
+
+ History.addValueChangeHandler(new ValueChangeHandler<String>() {
+ public void onValueChange(ValueChangeEvent<String> historyChangeEvent) {
+ System.out.println("History request: " + historyChangeEvent.getValue());
+
+
+
+ breadCrumb.verify(historyChangeEvent.getValue());
+
+ ArrayList<Place> trail = breadCrumb.getTrail();
+
+ Place base = trail.get(0);
+
+
+ if (content != null && content instanceof Presenter) {
+ Presenter p = ((Presenter) content);
+ if (!p.fireDisplay(base, trail.subList(1, trail.size()))) {
+ Canvas c = displayContent(base.getId());
+ setContent(c);
+
+ if (trail.size() >= 2 && c instanceof Presenter) {
+ ((Presenter) c).fireDisplay(trail.get(0), trail.subList(1, trail.size()));
+ }
+ }
+ } else {
+ Canvas c = displayContent(base.getId());
+ setContent(c);
+ if (trail.size() >= 2 && c instanceof Presenter) {
+ ((Presenter) c).fireDisplay(trail.get(0), trail.subList(1, trail.size()));
+ }
+ }
}
});
+ History.fireCurrentHistoryState();
+ }
+
+ public Canvas displayContent(String key) {
+ Canvas c = null;
+ if (key.equals("Administration")) {
+ c = new AdministrationView();
+ } else if (key.equals("Demo")) {
+ c = new DemoCanvas();
+ } else if (key.equals("Resources")) {
+ c = new ResourcesView();
+ } else if (key.equals("Resource")) {
+ c = new ResourceView();
+ } else if (key.equals("Dashboard")) {
+ c = new DashboardView();
+ }
+ return c;
+ }
+
- topTabSet.setTabBarControls(TabBarControls.TAB_SCROLLER, TabBarControls.TAB_PICKER, new MenuButton("Config Resource",configSelectMenu));
+ private void buildCaches() {
- topTabSet.draw();
+/* final long start = System.currentTimeMillis();
+ ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.fetchOperationDefinitions(true);
+ criteria.setPageControl(PageControl.getUnlimitedInstance());
+// criteria.fetchMetricDefinitions(true);
+
+ ResourceTypeGWTService.App.getInstance().findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() {
+ public void onFailure(Throwable caught) {
+ System.out.println("bad" + caught);
+ }
+
+ public void onSuccess(PageList<ResourceType> result) {
+ System.out.println("Resource Types loaded in: " + (System.currentTimeMillis() - start));
+ SC.say("Loaded " + result.size() + " resource types in " + (System.currentTimeMillis() - start));
+ }
+ });*/
}
+ // -------------------- Static application utilities ----------------------
+
+
+ public static Subject getSessionSubject() {
+ return sessionSubject;
+ }
+
+ public static void setSessionSubject(Subject subject) {
+ GWTServiceLookup.registerSession(String.valueOf(subject.getSessionId()));
+
+ // TODO this breaks because of reattach rules, bizarely even in queries. gonna switch out to non-subject include apis
+ // Create a minimized session object for validation on requests
+// Subject s = new Subject(subject.getName(),subject.getFactive(), subject.getFsystem());
+// s.setSessionId(subject.getSessionId());
+ CoreGUI.sessionSubject = subject;
+ }
+
+ public static void setContent(Canvas newContent) {
+ Canvas contentCanvas = Canvas.getById(CONTENT_CANVAS_ID);
+ if (contentCanvas.getChildren().length > 0)
+ contentCanvas.getChildren()[0].destroy();
+
+ if (newContent != null) {
+ content = newContent;
+ contentCanvas.addChild(newContent);
+ }
+ contentCanvas.draw();
+ }
+
+ public static void addBreadCrumb(Place place) {
+ breadCrumb.addPlace(place);
+
+ }
+
+ public static void setBreadCrumb(Place place) {
+ breadCrumb.setPlace(place);
+
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
new file mode 100644
index 0000000..350cc71
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
@@ -0,0 +1,114 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeView;
+
+import com.smartgwt.client.types.Side;
+import com.smartgwt.client.types.TabBarControls;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuButton;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.events.ItemClickEvent;
+import com.smartgwt.client.widgets.menu.events.ItemClickHandler;
+import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
+
+/**
+ * @author Greg Hinkle
+ */
+public class DemoCanvas extends Canvas {
+
+ @Override
+ protected void onInit() {
+
+ setWidth100();
+ setHeight100();
+
+
+ final TabSet topTabSet = new TabSet();
+ topTabSet.setTabBarPosition(Side.TOP);
+ topTabSet.setWidth100();//(1200);
+ topTabSet.setHeight100(); //(900);
+
+ // topTabSet.setTop(50);
+
+
+ Tab tableTab = new Tab("Resource Search Table");
+ Tab treeTab = new Tab("Resource Tree");
+ final Tab configTab = new Tab("Configuration Editor");
+
+
+ // Agent: resource (10005) type (10060)
+ // Raw: 10003 / 10023
+ // both: 10002 / 10022
+
+ configTab.setPane(new ConfigurationEditor(10005, 10060, ConfigurationEditor.ConfigType.plugin));
+ treeTab.setPane(new ResourceTreeView(new Resource(10001)));
+ tableTab.setPane(new ResourceSearchView());
+
+
+ topTabSet.addTab(configTab);
+ topTabSet.addTab(tableTab);
+ topTabSet.addTab(treeTab);
+
+
+
+ final Menu configSelectMenu = new Menu();
+ configSelectMenu.addItem(new MenuItem("Agent"));
+ configSelectMenu.addItem(new MenuItem("Raw Only"));
+ configSelectMenu.addItem(new MenuItem("Structured and Raw"));
+ configSelectMenu.addItem(new MenuItem("List Of Maps"));
+ configSelectMenu.addItemClickHandler(new ItemClickHandler() {
+ public void onItemClick(ItemClickEvent itemClickEvent) {
+ int x = configSelectMenu.getItemNum(itemClickEvent.getItem());
+ System.out.println("Loading: " + x);
+ topTabSet.removeTab(configTab);
+ switch (x) {
+ case 0:
+ configTab.setPane(new ConfigurationEditor(10005, 10060));
+ break;
+ case 1:
+ configTab.setPane(new ConfigurationEditor(10003, 10023));
+ break;
+ case 2:
+ configTab.setPane(new ConfigurationEditor(10002, 10022));
+ break;
+ case 3:
+ configTab.setPane(new ConfigurationEditor(10149, 10134));
+ break;
+ }
+ topTabSet.addTab(configTab, 0);
+ topTabSet.selectTab(0);
+ topTabSet.redraw();
+
+ }
+ });
+
+
+ topTabSet.setTabBarControls(TabBarControls.TAB_SCROLLER, TabBarControls.TAB_PICKER, new MenuButton("Config Resource", configSelectMenu));
+
+
+ addChild(topTabSet);
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
new file mode 100644
index 0000000..2f772db
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
@@ -0,0 +1,39 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.smartgwt.client.widgets.Canvas;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public interface Presenter {
+
+
+ boolean fireDisplay(Place place, List<Place> children);
+
+
+ Place getPlace();
+
+}
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
new file mode 100644
index 0000000..4a3ee93
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -0,0 +1,289 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin;
+
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Presenter;
+import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
+import org.rhq.enterprise.gui.coregui.client.admin.users.UserEditView;
+import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.VisibilityMode;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.HTMLPane;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
+import com.smartgwt.client.widgets.grid.events.SelectionEvent;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+import com.smartgwt.client.widgets.tree.Tree;
+import com.smartgwt.client.widgets.tree.TreeGrid;
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author Greg Hinkle
+ */
+public class AdministrationView extends HLayout implements Presenter {
+
+ private SectionStack sectionStack;
+
+ private Canvas contentCanvas;
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+
+
+ contentCanvas = new Canvas();
+ contentCanvas.setWidth("*");
+ contentCanvas.setHeight100();
+
+
+ sectionStack = new SectionStack();
+ sectionStack.setShowResizeBar(true);
+ sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
+ sectionStack.setWidth(250);
+ sectionStack.setHeight100();
+
+ sectionStack.addSection(buildSecuritySection());
+ sectionStack.addSection(buildPluginsSection());
+ sectionStack.addSection(buildManagementClusterSection());
+ sectionStack.addSection(buildSystemConfigurationSection());
+
+ addMember(sectionStack);
+ addMember(contentCanvas);
+
+
+ setContent(buildLanding());
+ CoreGUI.setBreadCrumb(getPlace());
+ }
+
+
+ private HTMLFlow buildLanding() {
+ String contents = "<h1>Administration</h1>\n" +
+ "From this section, the RHQ global settings can be administered. This includeds configuring \n" +
+ "<a href=\"\">Security</a>, setting up <a href=\"\">Plugins</a> and other stuff.";
+ HTMLFlow flow = new HTMLFlow(contents);
+ flow.setPadding(20);
+ return flow;
+ }
+
+
+ private SectionStackSection buildSecuritySection() {
+ final SectionStackSection section = new SectionStackSection("Security");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode manageUsersNode = new TreeNode("Manage Users");
+ final TreeNode manageRolesNode = new TreeNode("Manage Roles");
+ final TreeNode manageGroups = new TreeNode("Resource Groups");
+ tree.setRoot(new TreeNode("security",
+ manageUsersNode,
+ manageRolesNode,
+ manageGroups));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ if (selectionEvent.getRecord() == manageUsersNode) {
+ setContent(new UsersView());
+ } else if (selectionEvent.getRecord() == manageRolesNode) {
+ setContent(new RolesView());
+ } else if (selectionEvent.getRecord() == manageGroups) {
+ setContent(new RolesView());
+ }
+ }
+ });
+
+
+ section.addItem(treeGrid);
+
+
+ return section;
+ }
+
+
+ private SectionStackSection buildManagementClusterSection() {
+ final SectionStackSection section = new SectionStackSection("Management Cluster");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode manageServersNode = new TreeNode("Servers");
+ final TreeNode manageAgentsNode = new TreeNode("Agents");
+ final TreeNode manageAffinityGroupsNode = new TreeNode("Affinity Groups");
+ final TreeNode managePartitionEventsNode = new TreeNode("Partition Events");
+
+ tree.setRoot(new TreeNode("clustering",
+ manageServersNode,
+ manageAgentsNode,
+ manageAffinityGroupsNode,
+ managePartitionEventsNode));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ HTMLPane pane = new HTMLPane();
+ pane.setContentsType(ContentsType.PAGE);
+ pane.setWidth100();
+ pane.setHeight100();
+
+ String url = null;
+ if (selectionEvent.getRecord() == manageServersNode) {
+ url = "/rhq/ha/listServers.xhtml";
+ } else if (selectionEvent.getRecord() == manageAgentsNode) {
+ url = "/rhq/ha/listAgents.xhtml";
+ } else if (selectionEvent.getRecord() == manageAffinityGroupsNode) {
+ url = "/rhq/ha/listAffinityGroups.xhtml";
+ } else if (selectionEvent.getRecord() == managePartitionEventsNode) {
+ url = "/rhq/ha/listPartitionEvents.xhtml";
+ }
+ pane.setContentsURL(url + "?nomenu=true");
+ setContent(pane);
+
+ }
+ });
+
+
+ section.addItem(treeGrid);
+
+ return section;
+ }
+
+ private SectionStackSection buildPluginsSection() {
+ final SectionStackSection section = new SectionStackSection("Plugins");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode managePlugins = new TreeNode("Plugins");
+
+ tree.setRoot(new TreeNode("clustering",
+ managePlugins));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ HTMLPane pane = new HTMLPane();
+ pane.setContentsType(ContentsType.PAGE);
+ pane.setWidth100();
+ pane.setHeight100();
+
+ String url = null;
+ if (selectionEvent.getRecord() == managePlugins) {
+ url = "/rhq/admin/plugin/plugin-list.xhtml";
+ }
+ pane.setContentsURL(url + "?nomenu=true");
+ setContent(pane);
+ }
+ });
+
+ section.addItem(treeGrid);
+
+
+ return section;
+ }
+
+
+ private SectionStackSection buildSystemConfigurationSection() {
+ final SectionStackSection section = new SectionStackSection("System Configuration");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode manageSettings = new TreeNode("System Settings");
+ final TreeNode manageTemplates = new TreeNode("Templates");
+ final TreeNode manageLicense = new TreeNode("License");
+
+ tree.setRoot(new TreeNode("clustering",
+ manageSettings, manageTemplates, manageLicense));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ HTMLPane pane = new HTMLPane();
+ pane.setContentsType(ContentsType.PAGE);
+ pane.setWidth100();
+ pane.setHeight100();
+
+ String url = null;
+ if (selectionEvent.getRecord() == manageSettings) {
+ url = "/admin/config/Config.do?mode=edit";
+ } else if (selectionEvent.getRecord() == manageTemplates) {
+ url = "/admin/config/EditDefaults.do?mode=monitor&viewMode=all";
+ }
+
+ pane.setContentsURL(url + "&nomenu=true");
+ setContent(pane);
+ }
+ });
+
+ section.addItem(treeGrid);
+
+ return section;
+ }
+
+
+ public void setContent(Canvas newContent) {
+
+ if (contentCanvas.getChildren().length > 0)
+ contentCanvas.getChildren()[0].destroy();
+
+ contentCanvas.addChild(newContent);
+ contentCanvas.draw();
+
+ }
+
+
+ public boolean fireDisplay(Place place, List<Place> children) {
+ return place.equals(getPlace());
+ }
+
+ public Place getPlace() {
+ return new Place("Administration", "Administration");
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
new file mode 100644
index 0000000..01e3843
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -0,0 +1,73 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.roles;
+
+import com.smartgwt.client.data.DataSource;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.SubmitItem;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+/**
+ * @author Greg Hinkle
+ */
+public class RoleEditView extends VLayout {
+
+ private Label message = new Label("Select a role to edit...");
+ private DynamicForm form;
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+// addMember(message);
+
+ addMember(buildRoleForm());
+
+ }
+
+ DynamicForm buildRoleForm() {
+
+ form = new DynamicForm();
+ form.setAutoFetchData(true);
+ form.setDataSource(RolesDataSource.getInstance());
+
+ form.setUseAllDataSourceFields(true);
+
+ form.setItems(new SubmitItem("save","Save"));
+ form.setItems(new SubmitItem("cancel","Cancel"));
+// form.hide();
+
+ return form;
+ }
+
+ public void editRecord(Record record) {
+
+ form.editRecord(record);
+// message.hide();
+ form.show();
+ form.redraw();
+ }
+
+ public void editNone() {
+// form.hide();
+// message.show();
+
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
new file mode 100644
index 0000000..12af5ab
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
@@ -0,0 +1,123 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.roles;
+
+import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.criteria.RoleCriteria;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.RoleGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+/**
+ * @author Greg Hinkle
+ */
+public class RolesDataSource extends RPCDataSource {
+
+ private RoleGWTServiceAsync roleService = GWTServiceLookup.getRoleService();
+
+ private boolean initialized = false;
+
+ private static RolesDataSource INSTANCE;
+
+ public static RolesDataSource getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new RolesDataSource();
+ }
+ return INSTANCE;
+ }
+
+
+ private String query;
+
+ protected RolesDataSource() {
+ super("Roles");
+
+
+ DataSourceField idDataField = new DataSourceIntegerField("id", "ID");
+ idDataField.setPrimaryKey(true);
+
+ DataSourceTextField nameField = new DataSourceTextField("name", "Name");
+
+
+ setFields(idDataField, nameField);
+ }
+
+
+ public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
+ final long start = System.currentTimeMillis();
+
+
+ RoleCriteria criteria = new RoleCriteria();
+// criteria.addFilterName(query);
+
+ if (request.getStartRow() != null && request.getEndRow() != null) {
+ criteria.setPageControl(PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - request.getStartRow()));
+ } else {
+ criteria.setPageControl(PageControl.getSingleRowInstance());
+ }
+
+// criteria.addSortAgentName(PageOrdering.ASC);
+
+ roleService.findRolesByCriteria(criteria, new AsyncCallback<PageList<Role>>() {
+ public void onFailure(Throwable caught) {
+ Window.alert("Failed to load " + caught.getMessage());
+ System.err.println("Failed to fetch Resource Data");
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(requestId, response);
+ }
+
+ public void onSuccess(PageList<Role> result) {
+
+ System.out.println("Data retrieved in: " + (System.currentTimeMillis() - start));
+
+ ListGridRecord[] records = new ListGridRecord[result.size()];
+ for (int x = 0; x < result.size(); x++) {
+ Role role = result.get(x);
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute("id", role.getId());
+ record.setAttribute("name", role.getName());
+
+
+ record.setAttribute("permissions", role.getPermissions());
+
+ records[x] = record;
+ }
+
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(requestId, response);
+
+ }
+ });
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
new file mode 100644
index 0000000..7356424
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -0,0 +1,157 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.roles;
+
+import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource;
+
+import com.smartgwt.client.types.Autofit;
+import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.SelectionAppearance;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.types.VisibilityMode;
+import com.smartgwt.client.util.BooleanCallback;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
+import com.smartgwt.client.widgets.grid.events.SelectionEvent;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
+/**
+ * @author Greg Hinkle
+ */
+public class RolesView extends SectionStack {
+
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setVisibilityMode(VisibilityMode.MULTIPLE);
+ setWidth100();
+ setHeight100();
+
+ final RolesDataSource datasource = RolesDataSource.getInstance();
+
+ VLayout gridHolder = new VLayout();
+ gridHolder.setWidth100();
+ gridHolder.setHeight100();
+
+ final ListGrid listGrid = new ListGrid();
+ listGrid.setWidth100();
+ listGrid.setHeight100();
+ listGrid.setDataSource(datasource);
+ listGrid.setAutoFetchData(true);
+ listGrid.setAutoFitData(Autofit.HORIZONTAL);
+ listGrid.setAlternateRecordStyles(true);
+ listGrid.setSelectionType(SelectionStyle.SIMPLE);
+ listGrid.setSelectionAppearance(SelectionAppearance.CHECKBOX);
+
+ listGrid.setShowFilterEditor(true);
+
+
+ listGrid.setUseAllDataSourceFields(true);
+
+// ListGridField idField = new ListGridField("id", "Id", 55);
+// idField.setType(ListGridFieldType.INTEGER);
+//
+// ListGridField nameField = new ListGridField("username", "Name", 100);
+//
+//
+// ListGridField descriptionField = new ListGridField("name", "Name", 150);
+// ListGridField emailField = new ListGridField("email", "Email Address", 100);
+//
+// listGrid.setFields(idField, nameField, descriptionField, emailField);
+
+
+ gridHolder.addMember(listGrid);
+
+ ToolStrip toolStrip = new ToolStrip();
+ toolStrip.setMembersMargin(15);
+
+ final IButton removeButton = new IButton("Remove");
+ removeButton.setDisabled(true);
+ removeButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ SC.confirm("Are you sure you want to delete " + listGrid.getSelection().length + " resources?",
+ new BooleanCallback() {
+ public void execute(Boolean aBoolean) {
+
+ }
+ }
+ );
+ }
+ });
+
+
+ final Label tableInfo = new Label("Total: " + listGrid.getTotalRows());
+ tableInfo.setWrap(false);
+
+ toolStrip.addMember(removeButton);
+ toolStrip.addMember(new LayoutSpacer());
+ toolStrip.addMember(tableInfo);
+
+ gridHolder.addMember(toolStrip);
+
+
+ listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ int selectedCount = ((ListGrid) selectionEvent.getSource()).getSelection().length;
+ tableInfo.setContents("Total: " + listGrid.getTotalRows() + " (" + selectedCount + " selected)");
+ removeButton.setDisabled(selectedCount == 0);
+ }
+ });
+
+
+ SectionStackSection topSection = new SectionStackSection("Roles");
+ topSection.setExpanded(true);
+ topSection.setItems(gridHolder);
+
+ addSection(topSection);
+
+
+ final RoleEditView roleEditor = new RoleEditView();
+
+ final SectionStackSection detailSection = new SectionStackSection("Edit Role");
+ detailSection.setItems(roleEditor);
+ addSection(detailSection);
+
+
+ listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ if (selectionEvent.getState()) {
+ expandSection(1);
+ roleEditor.editRecord(selectionEvent.getRecord());
+ } else
+ collapseSection(1);
+ roleEditor.editNone();
+ }
+ });
+
+
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
new file mode 100644
index 0000000..83e599d
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
@@ -0,0 +1,127 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.users;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
+
+import com.google.gwt.user.client.ui.Widget;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.docs.FormLayout;
+import com.smartgwt.client.types.VisibilityMode;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.BooleanItem;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.SectionItem;
+import com.smartgwt.client.widgets.form.fields.TextItem;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+
+/**
+ * @author Greg Hinkle
+ */
+public class UserEditView extends HLayout {
+
+ private Subject subject;
+ private Subject originalSubject;
+
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+
+ SectionStack sectionStack = new SectionStack();
+ sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
+
+ sectionStack.setWidth100();
+ sectionStack.setHeight100();
+
+ SectionStackSection subjectSection = new SectionStackSection("Edit Subject");
+ subjectSection.setItems(buildSubjectEditor());
+
+ SectionStackSection roleSection = new SectionStackSection("Edit Subject's Roles");
+ roleSection.setItems(buildRoleEditor());
+
+ sectionStack.setSections(subjectSection, roleSection );
+
+ addMember(buildSubjectEditor());
+
+ }
+
+ private Canvas buildSubjectEditor() {
+ DynamicForm form = new DynamicForm();
+ form.setWidth100();
+
+ SectionItem userEditSection = new SectionItem("userEditSection", "Edit User");
+
+
+// TextItem firstName = new TextItem("firstName", "First Name");
+//
+// TextItem lastName = new TextItem("lastName", "Last Name");
+//
+// TextItem email = new TextItem("email", "Email Address");
+//
+//
+// BooleanItem enabled = new BooleanItem();
+// enabled.setName("enabled");
+// enabled.setTitle("Enabled");
+//
+// TextItem username = new TextItem("username", "Username");
+//
+// TextItem phone = new TextItem("phone", "Phone");
+
+
+// form.setField//s(userEditSection);
+
+
+ UsersDataSource ds = UsersDataSource.getInstance();
+ ds.filterData(new Criteria("id", "2"));
+
+ form.setUseAllDataSourceFields(true);
+ form.setDataSource(ds);
+
+ form.setAutoFetchData(true);
+
+ form.getField("id").hide();
+
+ FormItem[] forms = form.getFields();
+
+
+
+
+ return form;
+
+
+ }
+
+
+ private Canvas buildRoleEditor() {
+
+ RolesView rv = new RolesView();
+ // set subject criteria
+ return rv;
+
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java
new file mode 100644
index 0000000..13eae48
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDatasource.java
@@ -0,0 +1,147 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.users;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+/**
+ * @author Greg Hinkle
+ */
+public class UsersDataSource extends RPCDataSource {
+
+ private static UsersDataSource INSTANCE;
+
+ private SubjectGWTServiceAsync subjectService = GWTServiceLookup.getSubjectService();
+
+
+ public static UsersDataSource getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new UsersDataSource();
+ }
+ return INSTANCE;
+ }
+
+
+ protected UsersDataSource() {
+ super("Users");
+
+
+
+ DataSourceField idDataField = new DataSourceIntegerField("id", "ID");
+ idDataField.setPrimaryKey(true);
+
+ DataSourceTextField usernameField = new DataSourceTextField("username", "User Name");
+ usernameField.setCanEdit(false);
+
+ //DataSourceTextField name = new DataSourceTextField("name", "Name");
+
+ DataSourceTextField firstName = new DataSourceTextField("firstName", "First Name");
+
+ DataSourceTextField lastName = new DataSourceTextField("lastName", "Last Name");
+
+
+ DataSourceTextField email = new DataSourceTextField("email", "Email Address");
+
+
+ DataSourceTextField phone = new DataSourceTextField("phoneNumber", "Phone");
+
+ DataSourceTextField department = new DataSourceTextField("department", "Department");
+
+ DataSourceField roles = new DataSourceField();
+ roles.setForeignKey("Roles.id");
+ roles.setName("roles");
+ roles.setMultiple(true);
+
+
+ setFields(idDataField, usernameField, firstName, lastName, phone, email, department);
+ }
+
+
+
+ public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
+ final long start = System.currentTimeMillis();
+
+
+
+ SubjectCriteria criteria = new SubjectCriteria();
+// criteria.addFilterName(query);
+
+ if (request.getStartRow() != null && request.getEndRow() != null) {
+ criteria.setPageControl(PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - request.getStartRow()));
+ } else {
+ criteria.setPageControl(PageControl.getSingleRowInstance());
+ }
+
+// criteria.addSortAgentName(PageOrdering.ASC);
+
+
+ subjectService.findSubjectsByCriteria(criteria, new AsyncCallback<PageList<Subject>>() {
+ public void onFailure(Throwable caught) {
+ Window.alert("Failed to load " + caught.getMessage());
+ System.err.println("Failed to fetch Resource Data");
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(requestId, response);
+ }
+
+ public void onSuccess(PageList<Subject> result) {
+
+ System.out.println("Data retrieved in: " + (System.currentTimeMillis() - start));
+
+ ListGridRecord[] records = new ListGridRecord[result.size()];
+ for (int x=0; x<result.size(); x++) {
+ Subject res = result.get(x);
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute("id",res.getId());
+ record.setAttribute("username",res.getName());
+ record.setAttribute("name",res.getFirstName() + " " + res.getLastName());
+ record.setAttribute("firstName", res.getFirstName());
+ record.setAttribute("lastName", res.getLastName());
+ record.setAttribute("factive", res.getFactive());
+ record.setAttribute("department", res.getDepartment());
+ record.setAttribute("phoneNumber", res.getPhoneNumber());
+ record.setAttribute("email",res.getEmailAddress());
+ records[x] = record;
+ }
+
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(requestId, response);
+
+ }
+ });
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
new file mode 100644
index 0000000..ba3bab3
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -0,0 +1,157 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.admin.users;
+
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
+
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.Autofit;
+import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.SelectionAppearance;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.types.VisibilityMode;
+import com.smartgwt.client.util.BooleanCallback;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
+import com.smartgwt.client.widgets.grid.events.SelectionEvent;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
+/**
+ * @author Greg Hinkle
+ */
+public class UsersView extends SectionStack {
+
+
+
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setVisibilityMode(VisibilityMode.MULTIPLE);
+ setWidth100();
+ setHeight100();
+
+ final UsersDataSource datasource = UsersDataSource.getInstance();
+
+ VLayout gridHolder = new VLayout();
+ gridHolder.setWidth100();
+ gridHolder.setHeight100();
+
+ final ListGrid listGrid = new ListGrid();
+ listGrid.setWidth100();
+ listGrid.setHeight100();
+ listGrid.setDataSource(datasource);
+ listGrid.setAutoFetchData(true);
+ listGrid.setAutoFitData(Autofit.HORIZONTAL);
+// listGrid.setAutoFitData(Autofit.HORIZONTAL);
+ listGrid.setAlternateRecordStyles(true);
+// listGrid.setAutoFitData(Autofit.HORIZONTAL);
+ listGrid.setSelectionType(SelectionStyle.SIMPLE);
+ listGrid.setSelectionAppearance(SelectionAppearance.CHECKBOX);
+
+ listGrid.setShowFilterEditor(true);
+
+ ListGridField idField = new ListGridField("id", "Id", 55);
+ idField.setType(ListGridFieldType.INTEGER);
+
+ ListGridField nameField = new ListGridField("username", "Name", 100);
+
+
+ ListGridField descriptionField = new ListGridField("name", "Name", 150);
+ ListGridField emailField = new ListGridField("email", "Email Address", 100);
+
+ listGrid.setFields(idField, nameField, descriptionField, emailField);
+
+
+ gridHolder.addMember(listGrid);
+
+ ToolStrip toolStrip = new ToolStrip();
+ toolStrip.setMembersMargin(15);
+
+ final IButton removeButton = new IButton("Remove");
+ removeButton.setDisabled(true);
+ removeButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ SC.confirm("Are you sure you want to delete " + listGrid.getSelection().length + " resources?",
+ new BooleanCallback() {
+ public void execute(Boolean aBoolean) {
+
+ }
+ }
+ );
+ }
+ });
+
+
+
+ final Label tableInfo = new Label("Total: " + listGrid.getTotalRows());
+ tableInfo.setWrap(false);
+
+ toolStrip.addMember(removeButton);
+ toolStrip.addMember(new LayoutSpacer());
+ toolStrip.addMember(tableInfo);
+
+ gridHolder.addMember(toolStrip);
+
+
+ listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ int selectedCount = ((ListGrid)selectionEvent.getSource()).getSelection().length;
+ tableInfo.setContents("Total: " + listGrid.getTotalRows() + " (" + selectedCount + " selected)");
+ removeButton.setDisabled(selectedCount == 0);
+ }
+ });
+
+ final SectionStackSection detailsSection = new SectionStackSection("Details");
+ detailsSection.setItems(new Label("Select a user to edit..."));
+ detailsSection.setExpanded(false);
+
+ listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ for (Canvas c : detailsSection.getItems())
+ c.destroy();
+
+ detailsSection.setItems(new UserEditView());
+ detailsSection.setExpanded(true);
+ expandSection(1);
+ }
+ });
+
+
+ SectionStackSection gridSection = new SectionStackSection("Search Users");
+ gridSection.setExpanded(true);
+ gridSection.setItems(gridHolder);
+ addSection(gridSection);
+ addSection(detailsSection);
+
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/FullHTMLPane.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/FullHTMLPane.java
new file mode 100644
index 0000000..3e8f61a
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/FullHTMLPane.java
@@ -0,0 +1,35 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.components;
+
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.widgets.HTMLPane;
+
+/**
+ * @author Greg Hinkle
+ */
+public class FullHTMLPane extends HTMLPane {
+
+ public FullHTMLPane(String url) {
+ setWidth100();
+ setHeight100();
+ setContentsType(ContentsType.PAGE);
+ setContentsURL(url);
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java
new file mode 100644
index 0000000..b759b21
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java
@@ -0,0 +1,99 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.components;
+
+import com.smartgwt.client.types.SelectionType;
+import com.smartgwt.client.widgets.Button;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
+import java.util.LinkedHashMap;
+
+/**
+ * @author Greg Hinkle
+ */
+public class SubTabLayout extends VLayout {
+
+ ToolStrip buttonBar;
+
+ LinkedHashMap<String,Canvas> subtabs = new LinkedHashMap<String, Canvas>();
+
+ Canvas currentlyDisplayed;
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+ setMargin(0);
+ setPadding(0);
+
+ buttonBar = new ToolStrip();
+ buttonBar.setBackgroundColor("grey");
+ buttonBar.setWidth100();
+
+
+
+ for (final String title : subtabs.keySet()) {
+ if (currentlyDisplayed == null) {
+ currentlyDisplayed = subtabs.get(title);
+ }
+
+
+ Button button = new Button(title);
+ button.setShowRollOver(false);
+ button.setActionType(SelectionType.RADIO);
+ button.setRadioGroup("subtabs");
+ button.setBorder(null);
+// button.setStyleName("SubTabButton");
+// button.setStylePrimaryName("SubTabButton");
+
+ button.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ if (currentlyDisplayed != null) {
+ removeMember(currentlyDisplayed);
+ }
+ currentlyDisplayed = subtabs.get(title);
+ addMember(currentlyDisplayed);
+ markForRedraw();
+ }
+ });
+
+ buttonBar.addMember(button);
+
+ }
+ addMember(buttonBar);
+
+ // Initial settings
+ Button b = (Button) buttonBar.getMember(0);
+ b.select();
+ addMember(currentlyDisplayed);
+ }
+
+
+
+
+ public void registerSubTab(String title, Canvas canvas) {
+ subtabs.put(title, canvas);
+ }
+}
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 71d098e..4b87244 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
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.components.configuration;
+import org.rhq.core.domain.configuration.AbstractPropertyMap;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
@@ -35,28 +36,33 @@ import org.rhq.core.domain.configuration.definition.PropertyGroupDefinition;
import org.rhq.core.domain.configuration.definition.constraint.Constraint;
import org.rhq.core.domain.configuration.definition.constraint.IntegerRangeConstraint;
import org.rhq.core.domain.configuration.definition.constraint.RegexConstraint;
-import org.rhq.enterprise.gui.coregui.client.inventory.configuration.ConfigurationGwtService;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.CanvasUtility;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.AnimationEffect;
+import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TreeModelType;
import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
-import com.smartgwt.client.widgets.AnimationCallback;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.ItemChangedEvent;
import com.smartgwt.client.widgets.form.events.ItemChangedHandler;
import com.smartgwt.client.widgets.form.fields.ButtonItem;
import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.CheckboxItem;
-import com.smartgwt.client.widgets.form.fields.FileItem;
import com.smartgwt.client.widgets.form.fields.FloatItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.IntegerItem;
@@ -69,7 +75,8 @@ import com.smartgwt.client.widgets.form.fields.TextAreaItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
-import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator;
import com.smartgwt.client.widgets.form.validator.RegExpValidator;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -93,7 +100,6 @@ import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
import com.smartgwt.client.widgets.tab.Tab;
import com.smartgwt.client.widgets.tab.TabSet;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
-import com.smartgwt.client.widgets.toolbar.ToolStripSeparator;
import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -101,6 +107,7 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -112,6 +119,8 @@ import java.util.Set;
public class ConfigurationEditor extends VLayout {
+ private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
+
private TabSet tabSet;
private ToolStrip toolStrip;
@@ -121,6 +130,7 @@ public class ConfigurationEditor extends VLayout {
private boolean changed = false;
+ private Label loadingLabel = new Label("<b>Loading...</b>");
private int resourceId;
private int resourceTypeId;
@@ -131,6 +141,11 @@ public class ConfigurationEditor extends VLayout {
plugin, resource
}
+ ; // Need this extra semicolon for the qdox parser
+
+ public ConfigurationEditor() {
+
+ }
public ConfigurationEditor(int resourceId, int resourceTypeId) {
this(resourceId, resourceTypeId, ConfigType.resource);
@@ -144,37 +159,51 @@ public class ConfigurationEditor extends VLayout {
}
+ public void showError(Throwable failure) {
+ addMember(new Label(failure.getMessage()));
+ }
+ public void showError(String message) {
+ addMember(new Label(message));
+ }
+
@Override
- protected void onInit() {
- super.onInit();
+ protected void onDraw() {
+ super.onDraw();
+ System.out.println("onInit");
-// addMember(new Label("<b>Loading...</b>"));
-// this.redraw();
+ addMember(loadingLabel);
+ this.redraw();
+ final long start = System.currentTimeMillis();
if (configType == ConfigType.resource) {
- ConfigurationGwtService.App.getInstance().getResourceConfiguration(resourceId, new AsyncCallback<Configuration>() {
+ configurationService.getResourceConfiguration( resourceId, new AsyncCallback<Configuration>() {
public void onFailure(Throwable caught) {
+ showError(caught);
}
public void onSuccess(Configuration result) {
configuration = result;
+ System.out.println("Config retreived in: " + (System.currentTimeMillis() - start));
reload();
}
});
- ConfigurationGwtService.App.getInstance().getResourceConfigurationDefinition(resourceTypeId, new AsyncCallback<ConfigurationDefinition>() {
- public void onFailure(Throwable caught) {
- }
-
- public void onSuccess(ConfigurationDefinition result) {
- definition = result;
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(new Integer[]{resourceTypeId}, EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition), new ResourceTypeRepository.TypeLoadedCallback() {
+ public void onTypesLoaded(HashMap<Integer, ResourceType> types) {
+ System.out.println("ConfigDef retreived in: " + (System.currentTimeMillis() - start));
+ definition = types.get(resourceTypeId).getResourceConfigurationDefinition();
+ if (definition == null) {
+ showError("No configuration supported for this resource");
+ }
reload();
}
});
+
} else if (configType == ConfigType.plugin) {
- ConfigurationGwtService.App.getInstance().getPluginConfiguration(resourceId, new AsyncCallback<Configuration>() {
+ configurationService.getPluginConfiguration(resourceId, new AsyncCallback<Configuration>() {
public void onFailure(Throwable caught) {
+ showError(caught);
}
public void onSuccess(Configuration result) {
@@ -183,12 +212,10 @@ public class ConfigurationEditor extends VLayout {
}
});
- ConfigurationGwtService.App.getInstance().getPluginConfigurationDefinition(resourceTypeId, new AsyncCallback<ConfigurationDefinition>() {
- public void onFailure(Throwable caught) {
- }
-
- public void onSuccess(ConfigurationDefinition result) {
- definition = result;
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(new Integer[]{resourceTypeId}, EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition), new ResourceTypeRepository.TypeLoadedCallback() {
+ public void onTypesLoaded(HashMap<Integer, ResourceType> types) {
+ System.out.println("ConfigDef retreived in: " + (System.currentTimeMillis() - start));
+ definition = types.get(resourceTypeId).getPluginConfigurationDefinition();
reload();
}
});
@@ -202,6 +229,7 @@ public class ConfigurationEditor extends VLayout {
return;
}
+
originalConfiguration = configuration.deepCopy();
@@ -221,6 +249,8 @@ public class ConfigurationEditor extends VLayout {
tabSet.addTab(tab);
}
+ removeMember(loadingLabel);
+
addMember(tabSet);
this.redraw();
@@ -337,7 +367,17 @@ public class ConfigurationEditor extends VLayout {
saveButton.setAlign(Alignment.CENTER);
saveButton.setDisabled(true);
toolStrip.addMember(saveButton);
- toolStrip.addMember(new IButton("Reset"));
+
+
+ IButton resetButton = new IButton("Reset");
+ resetButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ reload();
+ }
+ });
+
+
+ toolStrip.addMember(resetButton);
toolStrip.addMember(new LayoutSpacer());
toolStrip.addMember(new MenuButton("Jump to Section", menu));
@@ -358,11 +398,24 @@ public class ConfigurationEditor extends VLayout {
} else {
section = new SectionStackSection(group.getDisplayName() +
(group.getDescription() != null
- ? ("<div style='padding-left: 20px; font-weight: normal; font-size: smaller;'>" + group.getDescription() + "</div>")
+ ? ("<div style='padding-left: 30px; font-weight: normal; font-size: smaller;'>" + group.getDescription() + "</div>")
: ""));
section.setExpanded(!group.isDefaultHidden());
}
+ ArrayList<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(
+ ((group == null) ? definition.getNonGroupedProperties() : definition.getPropertiesInGroup(group.getName()))
+ );
+ Collections.sort(definitions, new PropertyDefinitionComparator());
+
+ DynamicForm form = buildPropertiesForm(definitions, configuration);
+
+ section.addItem(form);
+ return section;
+ }
+
+
+ private DynamicForm buildPropertiesForm(ArrayList<PropertyDefinition> definitions, AbstractPropertyMap propertyMap) {
DynamicForm form = new DynamicForm();
form.setValidateOnChange(true);
@@ -370,17 +423,8 @@ public class ConfigurationEditor extends VLayout {
public void onItemChanged(ItemChangedEvent itemChangedEvent) {
if (!changed) {
changed = true;
- toolStrip.setBackgroundColor("yellow");
- saveButton.animateHide(AnimationEffect.FADE, new AnimationCallback() {
- public void execute(boolean b) {
- saveButton.setDisabled(false);
- saveButton.animateShow(AnimationEffect.FADE, new AnimationCallback() {
- public void execute(boolean b) {
-
- }
- },1000);
- }
- }, 1000);
+ CanvasUtility.blink(saveButton);
+ saveButton.setDisabled(false);
}
}
});
@@ -395,26 +439,25 @@ public class ConfigurationEditor extends VLayout {
boolean odd = true;
- ArrayList<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(
- ((group == null) ? definition.getNonGroupedProperties() : definition.getPropertiesInGroup(group.getName()))
- );
- Collections.sort(definitions, new PropertyDefinitionComparator());
-
- for (PropertyDefinition property : definitions) {
- addItems(fields, property, odd);
+ for (PropertyDefinition propertyDefinition : definitions) {
+ Property property = propertyMap.get(propertyDefinition.getName());
+ if (property == null) {
+ if (propertyDefinition instanceof PropertyDefinitionSimple) {
+ property = new PropertySimple(propertyDefinition.getName(), null);
+ propertyMap.put(property);
+ }
+ }
+ addItems(fields, propertyDefinition, property, odd);
odd = !odd;
}
form.setFields(fields.toArray(new FormItem[fields.size()]));
-
- section.addItem(form);
- return section;
+ return form;
}
- public void addItems(ArrayList<FormItem> fields, PropertyDefinition propertyDefinition, boolean oddRow) {
- Property property = configuration.get(propertyDefinition.getName());
+ public void addItems(ArrayList<FormItem> fields, PropertyDefinition propertyDefinition, Property property, boolean oddRow) {
StaticTextItem nameItem = new StaticTextItem();
nameItem.setValue("<b>" + propertyDefinition.getDisplayName() + "</b>");
@@ -446,13 +489,15 @@ public class ConfigurationEditor extends VLayout {
}
}
- private void buildListOfMapsField(ArrayList<FormItem> fields, PropertyDefinitionMap propertyDefinition, boolean oddRow, PropertyList property) {
+ private void buildListOfMapsField(ArrayList<FormItem> fields, final PropertyDefinitionMap propertyDefinition, boolean oddRow, final PropertyList propertyList) {
final ListGrid summaryTable = new ListGrid();
+// summaryTable.setID("config_summaryTable_" + propertyDefinition.getName());
summaryTable.setAlternateRecordStyles(true);
summaryTable.setShowAllRecords(true);
summaryTable.setBodyOverflow(Overflow.VISIBLE);
summaryTable.setOverflow(Overflow.VISIBLE);
+ summaryTable.setAutoFitData(Autofit.HORIZONTAL);
ArrayList<ListGridField> fieldsList = new ArrayList<ListGridField>();
ArrayList<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(propertyDefinition.getPropertyDefinitions().values());
@@ -485,6 +530,7 @@ public class ConfigurationEditor extends VLayout {
editField.addRecordClickHandler(new RecordClickHandler() {
public void onRecordClick(RecordClickEvent recordClickEvent) {
System.out.println("You want to edit: " + recordClickEvent.getRecord());
+ displayMapEditor(summaryTable, recordClickEvent.getRecord(), propertyDefinition, propertyList, (PropertyMap) recordClickEvent.getRecord().getAttributeAsObject("_RHQ_PROPERTY"));
}
});
fieldsList.add(editField);
@@ -521,23 +567,29 @@ public class ConfigurationEditor extends VLayout {
summaryTable.setFields(fieldsList.toArray(new ListGridField[fieldsList.size()]));
- ListGridRecord[] rows = new ListGridRecord[property.getList().size()];
- int i = 0;
- for (Property row : property.getList()) {
- PropertyMap rowMap = (PropertyMap) row;
+ ListGridRecord[] rows = buildSummaryRecords(propertyList, definitions);
+ summaryTable.setData(rows);
- ListGridRecord record = new ListGridRecord();
- for (PropertyDefinition subDef : definitions) {
- PropertyDefinitionSimple subDefSimple = (PropertyDefinitionSimple) subDef;
- record.setAttribute(subDefSimple.getName(), ((PropertySimple) rowMap.get(subDefSimple.getName())).getStringValue());
+
+ VLayout summaryTableHolder = new VLayout();
+
+ ToolStrip toolStrip = new ToolStrip();
+ IButton addRowButton = new IButton();
+ 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, propertyDefinition, propertyList, null);
}
- rows[i++] = record;
- }
- summaryTable.setData(rows);
+ });
+
+ toolStrip.addMember(addRowButton);
+
+
+ summaryTableHolder.setMembers(summaryTable, toolStrip);
CanvasItem item = new CanvasItem();
- item.setCanvas(summaryTable);
+ item.setCanvas(summaryTableHolder);
// item.setHeight(500);
item.setColSpan(3);
item.setEndRow(true);
@@ -546,6 +598,30 @@ public class ConfigurationEditor extends VLayout {
}
+ private ListGridRecord[] buildSummaryRecords(PropertyList propertyList, ArrayList<PropertyDefinition> definitions) {
+ ListGridRecord[] rows = new ListGridRecord[propertyList.getList().size()];
+ int i = 0;
+ for (Property row : propertyList.getList()) {
+ PropertyMap rowMap = (PropertyMap) row;
+
+ ListGridRecord record = buildSummaryRecord(definitions, rowMap);
+ rows[i++] = record;
+ }
+ return rows;
+ }
+
+ private ListGridRecord buildSummaryRecord(ArrayList<PropertyDefinition> definitions, PropertyMap rowMap) {
+ ListGridRecord record = new ListGridRecord();
+ for (PropertyDefinition subDef : definitions) {
+ PropertyDefinitionSimple subDefSimple = (PropertyDefinitionSimple) subDef;
+ PropertySimple propertySimple = ((PropertySimple) rowMap.get(subDefSimple.getName()));
+ record.setAttribute(subDefSimple.getName(), propertySimple != null ? propertySimple.getStringValue() : null);
+ //((PropertySimple) rowMap.get(subDefSimple.getName())).getStringValue());
+ }
+ record.setAttribute("_RHQ_PROPERTY", rowMap);
+ return record;
+ }
+
private FormItem buildSimpleField(ArrayList<FormItem> fields, PropertyDefinitionSimple propertyDefinition, boolean oddRow, Property property) {
final PropertySimple propertySimple = (PropertySimple) property;
@@ -587,6 +663,8 @@ public class ConfigurationEditor extends VLayout {
switch (propertyDefinition.getType()) {
case STRING:
+ case FILE:
+ case DIRECTORY:
valueItem = new TextItem();
valueItem.setValue(property == null ? "" : propertySimple.getStringValue());
break;
@@ -600,7 +678,10 @@ public class ConfigurationEditor extends VLayout {
break;
case BOOLEAN:
valueItem = new RadioGroupItem();
- ((RadioGroupItem) valueItem).setValueMap("Yes", "No");
+ LinkedHashMap<String, String> valMap = new LinkedHashMap<String, String>();
+ valMap.put("true", "Yes");
+ valMap.put("false", "No");
+ valueItem.setValueMap(valMap);
valueItem.setValue(property == null || propertySimple.getStringValue() == null ? false : propertySimple.getBooleanValue());
break;
case INTEGER:
@@ -614,12 +695,6 @@ public class ConfigurationEditor extends VLayout {
valueItem = new FloatItem();
valueItem.setValue(property == null || propertySimple.getStringValue() == null ? 0 : propertySimple.getDoubleValue());
break;
- case FILE:
- valueItem = new FileItem();
- break;
- case DIRECTORY:
- valueItem = new TextItem();
- break;
}
}
@@ -663,6 +738,14 @@ public class ConfigurationEditor extends VLayout {
final FormItem finalValueItem = valueItem;
+
+
+ finalValueItem.addChangedHandler(new ChangedHandler() {
+ public void onChanged(ChangedEvent changedEvent) {
+ propertySimple.setValue(changedEvent.getValue());
+ }
+ });
+
unsetItem.addChangeHandler(new ChangeHandler() {
public void onChange(ChangeEvent changeEvent) {
Boolean isUnset = (Boolean) changeEvent.getValue();
@@ -673,7 +756,7 @@ public class ConfigurationEditor extends VLayout {
finalValueItem.setDisabled(false);
finalValueItem.focusInItem();
}
- propertySimple.setValue(changeEvent.getValue());
+ propertySimple.setValue(finalValueItem.getValue());
}
});
@@ -681,6 +764,98 @@ public class ConfigurationEditor extends VLayout {
}
+ private void displayMapEditor(final ListGrid summaryTable, final Record existingRecord, PropertyDefinitionMap definition, final PropertyList list, PropertyMap map) {
+
+
+ final ArrayList<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(
+ definition.getPropertyDefinitions().values());
+
+ Collections.sort(definitions, new PropertyDefinitionComparator());
+
+ final boolean newRow = map == null;
+ if (newRow)
+ map = new PropertyMap(definition.getName());
+
+
+ final PropertyMap finalMap = map;
+ final PropertyMap copy = finalMap.deepCopy(true);
+
+ VLayout layout = new VLayout();
+ layout.setHeight100();
+
+ DynamicForm childForm = buildPropertiesForm(definitions, finalMap);
+ childForm.setHeight100();
+ layout.addMember(childForm);
+
+ final Window popup = new Window();
+ popup.setTitle("Edit Configuration Row");
+ popup.setWidth(800);
+ popup.setHeight(600);
+ popup.setIsModal(true);
+ popup.setShowModalMask(true);
+ popup.setShowCloseButton(false);
+ popup.centerInPage();
+
+ final IButton saveButton = new IButton("Save");
+// saveButton.setID("config_structured_button_save");
+ saveButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+
+ if (newRow) {
+ list.add(finalMap);
+ ListGridRecord record = buildSummaryRecord(definitions, finalMap);
+
+ System.out.println("here");
+ try {
+ summaryTable.addData(record);
+ System.out.println("there");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ for (PropertyDefinition subDef : definitions) {
+ PropertyDefinitionSimple subDefSimple = (PropertyDefinitionSimple) subDef;
+ PropertySimple propertySimple = ((PropertySimple) finalMap.get(subDefSimple.getName()));
+ existingRecord.setAttribute(subDefSimple.getName(), propertySimple != null ? propertySimple.getStringValue() : null);
+ }
+ summaryTable.updateData(existingRecord);
+ }
+ summaryTable.redraw();
+
+// ListGridRecord[] rows = buildSummaryRecords(list, definitions);
+// summaryTable.setData(rows);
+// summaryTable.redraw();
+// summaryTable.addData();
+ popup.destroy();
+
+ }
+ });
+
+
+ final IButton cancelButton = new IButton("Cancel");
+ cancelButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ if (!newRow) {
+ list.getList().set(list.getList().indexOf(finalMap), copy);
+ }
+ popup.destroy();
+ }
+ });
+
+ HLayout buttons = new HLayout();
+ buttons.setAlign(Alignment.CENTER);
+ buttons.setMembersMargin(10);
+ buttons.setMembers(saveButton, cancelButton);
+ layout.addMember(buttons);
+
+ popup.addItem(layout);
+
+ popup.show();
+
+
+ }
+
+
private static class PropertyDefinitionComparator implements Comparator<PropertyDefinition> {
public int compare(PropertyDefinition o1, PropertyDefinition o2) {
return new Integer(o1.getOrder()).compareTo(o2.getOrder());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java
index ae793d7..9e0e480 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java
@@ -23,7 +23,9 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.configuration.definition.PropertyGroupDefinition;
-import org.rhq.enterprise.gui.coregui.client.inventory.configuration.ConfigurationGwtService;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Autofit;
@@ -46,10 +48,15 @@ import com.smartgwt.client.widgets.layout.VLayout;
import java.util.List;
/**
+ * Note: This was a failed attempt at an editor composed with ListGrid components instead of DynamicForm components.
+ * I had problems with having different editors active for different rows in the table at the same time. Smart says
+ * they're working on enhancing this area... but the DynamicForm might be a better option anyway.
* @author Greg Hinkle
*/
public class ListGridConfigurationEditor extends VLayout {
+ private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
+
private ConfigurationDefinition definition;
private Configuration configuration;
@@ -59,7 +66,7 @@ public class ListGridConfigurationEditor extends VLayout {
setOverflow(Overflow.AUTO);
- ConfigurationGwtService.App.getInstance().getResourceConfiguration(10005, new AsyncCallback<Configuration>() {
+ configurationService.getResourceConfiguration(10005, new AsyncCallback<Configuration>() {
public void onFailure(Throwable caught) {
// TODO: Implement this method.
}
@@ -71,7 +78,7 @@ public class ListGridConfigurationEditor extends VLayout {
}
});
- ConfigurationGwtService.App.getInstance().getResourceConfigurationDefinition(10060, new AsyncCallback<ConfigurationDefinition>() {
+ configurationService.getResourceConfigurationDefinition(10060, new AsyncCallback<ConfigurationDefinition>() {
public void onFailure(Throwable caught) {
// TODO: Implement this method.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
new file mode 100644
index 0000000..ba77e31
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -0,0 +1,200 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.dashboard;
+
+import org.rhq.enterprise.gui.coregui.client.Presenter;
+import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.google.gwt.user.client.Random;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.widgets.AnimationCallback;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.ButtonItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class DashboardView extends VLayout implements Presenter {
+
+
+ private static String[] colors = new String[]{
+ "FF6600", "808000", "008000", "008080", "0000FF", "666699",
+ "FF0000", "FF9900", "99CC00", "339966", "33CCCC", "3366FF",
+ "800080", "969696", "FF00FF", "FFCC00", "FFFF00", "00FF00",
+ "00FFFF", "00CCFF", "993366", "C0C0C0", "FF99CC", "FFCC99",
+ "FFFF99", "CCFFCC", "CCFFFF", "99CCFF", "CC99FF", "FFFFFF"
+ };
+
+
+ public void onInit() {
+ setWidth100();
+ setHeight100();
+
+
+ final PortalLayout portalLayout = new PortalLayout(3);
+ portalLayout.setWidth100();
+ portalLayout.setHeight100();
+
+ // create portlets...
+ for (int i = 1; i <= 2; i++) {
+ Portlet portlet = new Portlet();
+ portlet.setTitle("Portlet");
+
+ Label label = new Label();
+ label.setAlign(Alignment.CENTER);
+ label.setLayoutAlign(VerticalAlignment.CENTER);
+ label.setContents("Portlet contents");
+ label.setBackgroundColor(colors[Random.nextInt(colors.length - 1)]);
+ portlet.addItem(label);
+ portalLayout.addPortlet(portlet);
+ }
+
+ VLayout vLayout = new VLayout(15);
+
+ final DynamicForm form = new DynamicForm();
+ form.setAutoWidth();
+ form.setNumCols(5);
+
+ final StaticTextItem numColItem = new StaticTextItem();
+ numColItem.setTitle("Columns");
+ numColItem.setValue(portalLayout.getMembers().length);
+
+ ButtonItem addColumn = new ButtonItem("addColun", "Add Column");
+// addColumn.setIcon("silk/application_side_expand.png");
+ addColumn.setAutoFit(true);
+ addColumn.setStartRow(false);
+ addColumn.setEndRow(false);
+
+
+ addColumn.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
+ public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) {
+ portalLayout.addMember(new PortalColumn());
+ numColItem.setValue(portalLayout.getMembers().length);
+
+ }
+ });
+
+ ButtonItem removeColumn = new ButtonItem("removeColumn", "Remove Column");
+// removeColumn.setIcon("silk/application_side_contract.png");
+ removeColumn.setAutoFit(true);
+ removeColumn.setStartRow(false);
+ removeColumn.setEndRow(false);
+
+
+ removeColumn.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
+ public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) {
+
+ Canvas[] canvases = portalLayout.getMembers();
+ int numMembers = canvases.length;
+ if (numMembers > 0) {
+ Canvas lastMember = canvases[numMembers - 1];
+ portalLayout.removeMember(lastMember);
+ numColItem.setValue(numMembers - 1);
+ }
+
+ }
+ });
+
+ final ButtonItem addPortlet = new ButtonItem("addPortlet", "Add Portlet");
+ addPortlet.setIcon("[skin]/images/actions/add.png");
+ addPortlet.setAutoFit(true);
+
+ addPortlet.setStartRow(false);
+ addPortlet.setEndRow(false);
+ addPortlet.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
+ public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) {
+
+ final Portlet newPortlet = new Portlet();
+ newPortlet.setTitle("Portlet ");
+
+// Label label = new Label();
+// label.setAlign(Alignment.CENTER);
+// label.setLayoutAlign(VerticalAlignment.CENTER);
+// label.setContents("Portlet contents");
+// label.setBackgroundColor(colors[Random.nextInt(colors.length - 1)]);
+// newPortlet.addItem(label);
+
+ if (Random.nextBoolean()) {
+ ResourceSearchView item = new ResourceSearchView();
+ newPortlet.addItem(item);
+
+ } else {
+ newPortlet.addItem(new RolesView());
+ }
+ newPortlet.setHeight(350);
+
+ newPortlet.setVisible(false);
+ PortalColumn column = portalLayout.addPortlet(newPortlet);
+
+ // also insert a blank spacer element, which will trigger the built-in
+ // animateMembers layout animation
+ final LayoutSpacer placeHolder = new LayoutSpacer();
+ placeHolder.setRect(newPortlet.getRect());
+ column.addMember(placeHolder, 0); // add to top
+
+ // create an outline around the clicked button
+ final Canvas outline = new Canvas();
+ outline.setLeft(form.getAbsoluteLeft() + addPortlet.getLeft());
+ outline.setTop(form.getAbsoluteTop());
+ outline.setWidth(addPortlet.getWidth());
+ outline.setHeight(addPortlet.getHeight());
+ outline.setBorder("2px solid 8289A6");
+ outline.draw();
+ outline.bringToFront();
+
+ outline.animateRect(newPortlet.getPageLeft(), newPortlet.getPageTop(),
+ newPortlet.getVisibleWidth(), newPortlet.getViewportHeight(),
+ new AnimationCallback() {
+ public void execute(boolean earlyFinish) {
+ // callback at end of animation - destroy placeholder and outline; show the new portlet
+ placeHolder.destroy();
+ outline.destroy();
+ newPortlet.show();
+ }
+ }, 750);
+ }
+ });
+
+
+ form.setItems(numColItem, addPortlet, addColumn, removeColumn);
+
+ addMember(form);
+ addMember(portalLayout);
+
+ }
+
+ public boolean fireDisplay(Place place, List<Place> children) {
+ return place.equals(getPlace());
+ }
+
+ public Place getPlace() {
+ return new Place("Dashboard", "Dashboard");
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java
new file mode 100644
index 0000000..18f729d
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java
@@ -0,0 +1,54 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.dashboard;
+
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.layout.VStack;
+
+/**
+ * @author Greg Hinkle
+ */
+public class PortalColumn extends VStack {
+
+ public PortalColumn() {
+
+ // leave some space between portlets
+ setMembersMargin(6);
+
+ // enable predefined component animation
+ setAnimateMembers(true);
+ setAnimateMemberTime(300);
+
+ // enable drop handling
+ setCanAcceptDrop(true);
+
+ // change appearance of drag placeholder and drop indicator
+ setDropLineThickness(4);
+
+ Canvas dropLineProperties = new Canvas();
+ dropLineProperties.setBackgroundColor("aqua");
+ setDropLineProperties(dropLineProperties);
+
+ setShowDragPlaceHolder(true);
+
+ Canvas placeHolderProperties = new Canvas();
+ placeHolderProperties.setBorder("2px solid 8289A6");
+ setPlaceHolderProperties(placeHolderProperties);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
new file mode 100644
index 0000000..a1932b8
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
@@ -0,0 +1,48 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.dashboard;
+
+import com.smartgwt.client.widgets.layout.HLayout;
+
+/**
+ * @author Greg Hinkle
+ */
+public class PortalLayout extends HLayout {
+ public PortalLayout(int numColumns) {
+ setMembersMargin(6);
+ for (int i = 0; i < numColumns; i++) {
+ addMember(new PortalColumn());
+ }
+ }
+
+ public PortalColumn addPortlet(Portlet portlet) {
+ // find the column with the fewest portlets
+ int fewestPortlets = Integer.MAX_VALUE;
+ PortalColumn fewestPortletsColumn = null;
+ for (int i = 0; i < getMembers().length; i++) {
+ int numPortlets = ((PortalColumn) getMember(i)).getMembers().length;
+ if (numPortlets < fewestPortlets) {
+ fewestPortlets = numPortlets;
+ fewestPortletsColumn = (PortalColumn) getMember(i);
+ }
+ }
+ fewestPortletsColumn.addMember(portlet);
+ return fewestPortletsColumn;
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/Portlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/Portlet.java
new file mode 100644
index 0000000..7c2c825
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/Portlet.java
@@ -0,0 +1,58 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.dashboard;
+
+import com.smartgwt.client.types.DragAppearance;
+import com.smartgwt.client.types.HeaderControls;
+import com.smartgwt.client.types.LayoutPolicy;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.widgets.HeaderControl;
+import com.smartgwt.client.widgets.Window;
+
+/**
+ * @author Greg Hinkle
+ */
+public class Portlet extends Window {
+
+ public Portlet() {
+
+ setShowShadow(false);
+
+ // enable predefined component animation
+ setAnimateMinimize(true);
+
+ // Window is draggable with "outline" appearance by default.
+ // "target" is the solid appearance.
+ setDragAppearance(DragAppearance.OUTLINE);
+ setCanDrop(true);
+
+ // customize the appearance and order of the controls in the window header
+ setHeaderControls(HeaderControls.MINIMIZE_BUTTON, HeaderControls.HEADER_LABEL, new HeaderControl(HeaderControl.SETTINGS), new HeaderControl(HeaderControl.HELP), HeaderControls.CLOSE_BUTTON);
+
+ // show either a shadow, or translucency, when dragging a portlet
+ // (could do both at the same time, but these are not visually compatible effects)
+ // setShowDragShadow(true);
+ setDragOpacity(30);
+
+ // these settings enable the portlet to autosize its height only to fit its contents
+ // (since width is determined from the containing layout, not the portlet contents)
+// setVPolicy(LayoutPolicy.NONE);
+ setOverflow(Overflow.VISIBLE);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java
new file mode 100644
index 0000000..9358332
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGwtService.java
@@ -0,0 +1,24 @@
+package org.rhq.enterprise.gui.coregui.client.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+@RemoteServiceRelativePath("ConfigurationGWTService")
+public interface ConfigurationGWTService extends RemoteService {
+
+ Configuration getPluginConfiguration(int resourceId);
+
+ ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId);
+
+ Configuration getResourceConfiguration(int resourceId);
+
+ ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId);
+
+ RawConfiguration dummy(RawConfiguration config);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
new file mode 100644
index 0000000..0253897
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
@@ -0,0 +1,93 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.gwt;
+
+
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.user.client.Cookies;
+import com.google.gwt.user.client.rpc.RpcRequestBuilder;
+import com.google.gwt.user.client.rpc.ServiceDefTarget;
+
+/**
+ * This lookup service retreives each RPC service and sets a
+ * custom RpcRequestBuilder that adds the login session id to
+ * be security checked on the server.
+ *
+ * @author Greg Hinkle
+ */
+public class GWTServiceLookup {
+
+ public static final String SESSION_NAME = "RHQ_Sesssion";
+
+
+ public static ConfigurationGWTServiceAsync getConfigurationService() {
+ return secure(ConfigurationGWTServiceAsync.Util.getInstance());
+ }
+
+ public static ResourceGWTServiceAsync getResourceService() {
+ return secure(ResourceGWTServiceAsync.Util.getInstance());
+ }
+
+ public static ResourceGroupGWTServiceAsync getResourceGroupService() {
+ return secure(ResourceGroupGWTServiceAsync.Util.getInstance());
+ }
+
+ public static ResourceTypeGWTServiceAsync getResourceTypeGWTService() {
+ return secure(ResourceTypeGWTServiceAsync.Util.getInstance());
+ }
+
+ public static RoleGWTServiceAsync getRoleService() {
+ return secure(RoleGWTServiceAsync.Util.getInstance());
+ }
+
+ public static SubjectGWTServiceAsync getSubjectService() {
+ return secure(SubjectGWTServiceAsync.Util.getInstance());
+ }
+
+
+
+
+ private static <T> T secure(Object sdt) {
+ if (!(sdt instanceof ServiceDefTarget)) return null;
+
+ ((ServiceDefTarget) sdt).setRpcRequestBuilder(new SessionRpcRequestBuilder());
+
+ return (T) sdt;
+ }
+
+
+ public static void registerSession(String sessionId) {
+ Cookies.setCookie(SESSION_NAME, sessionId);
+ }
+
+ public static class SessionRpcRequestBuilder extends RpcRequestBuilder {
+
+ @Override
+ protected void doFinish(RequestBuilder rb) {
+ super.doFinish(rb);
+
+ String sid = Cookies.getCookie(SESSION_NAME);
+ if (sid != null) {
+ rb.setHeader(SESSION_NAME, sid);
+ }
+ }
+ }
+
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
new file mode 100644
index 0000000..bc1e3a6
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
@@ -0,0 +1,41 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.util.PageList;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public interface ResourceGWTService extends RemoteService {
+
+ PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria);
+
+ List<Resource> getResourceLineage(int resourceId);
+
+ Resource getPlatformForResource(int resourceId);
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java
new file mode 100644
index 0000000..dbacd16
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java
@@ -0,0 +1,34 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.gwt;
+
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+
+
+/**
+ * @author Greg Hinkle
+ */
+@RemoteServiceRelativePath("ResourceGroupGWTService")
+public interface ResourceGroupGWTService extends RemoteService {
+
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java
new file mode 100644
index 0000000..89255e4
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java
@@ -0,0 +1,20 @@
+package org.rhq.enterprise.gui.coregui.client.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.criteria.ResourceTypeCriteria;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageList;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+@RemoteServiceRelativePath("ResourceTypeGWTService")
+public interface ResourceTypeGWTService extends RemoteService {
+
+ PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria);
+
+ RawConfiguration dummy(RawConfiguration config);
+
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java
new file mode 100644
index 0000000..66123f9
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java
@@ -0,0 +1,35 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.criteria.RoleCriteria;
+import org.rhq.core.domain.util.PageList;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+
+/**
+ * @author Greg Hinkle
+ */
+public interface RoleGWTService extends RemoteService {
+
+ PageList<Role> findRolesByCriteria(RoleCriteria criteria);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java
new file mode 100644
index 0000000..486b390
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java
@@ -0,0 +1,114 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageList;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.ServiceDefTarget;
+
+/**
+ * @author Greg Hinkle
+ * @see org.rhq.enterprise.server.auth.SubjectManagerRemote
+ */
+public interface SubjectGWTService extends RemoteService {
+
+
+ /**
+ * Change the password for a user.
+ *
+ * @param username The user whose password will be changed
+ * @param password The new password for the user
+ */
+ void changePassword(
+ String username,
+ String password);
+
+ /**
+ * Creates a new principal (username and password) in the internal database. The password will be encoded before
+ * being stored.
+ *
+ * @param username The username part of the principal
+ * @param password The password part ofthe principal
+ * @throws Exception if the principal could not be added
+ */
+ void createPrincipal(
+ String username,
+ String password);
+
+ /**
+ * Create a a new subject. This <b>ignores</b> the roles in <code>subject</code>. The created subject will not be
+ * assigned to any roles; use the {@link org.rhq.enterprise.server.authz.RoleManagerLocal role manager} to assign roles to a subject.
+ *
+ * @param subjectToCreate The subject to be created.
+ * @return the newly persisted {@link Subject}
+ */
+ Subject createSubject(
+ Subject subjectToCreate);
+
+ /**
+ * Deletes the given set of users, including both the {@link Subject} and {@link org.rhq.core.domain.auth.Principal} objects associated with
+ * those users.
+ *
+ * @param subjectIds identifies the subject IDs for all the users that are to be deleted
+ * @throws Exception if failed to delete one or more users
+ */
+ void deleteSubjects(
+ int[] subjectIds);
+
+
+ /**
+ * Logs a user into the system. This will authenticate the given user with the given password. If the user was
+ * already logged in, the current session will be used but the password will still need to be authenticated.
+ *
+ * @param username The name of the user.
+ * @param password The password.
+ * @return The subject of the authenticated user.
+ * @throws org.rhq.enterprise.server.exception.LoginException
+ * if the login failed for some reason
+ */
+ Subject login(
+ String username,
+ String password);
+
+ /**
+ * Logs out a user.
+ *
+ * @param subject The username for the current user
+ */
+ void logout(
+ Subject subject);
+
+ /**
+ * Updates an existing subject with new data. This does <b>not</b> cascade any changes to the roles but it will save
+ * the subject's configuration.
+ *
+ * @param subjectToModify the subject whose data is to be updated (which may or may not be the same as <code>user</code>)
+ * @return the merged subject, which may or may not be the same instance of <code>subjectToModify</code>
+ */
+ Subject updateSubject(
+ Subject subjectToModify);
+
+ PageList<Subject> findSubjectsByCriteria(
+ SubjectCriteria criteria);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtService.java
deleted file mode 100644
index 4aff689..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.inventory.configuration;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-import com.google.gwt.core.client.GWT;
-
-@RemoteServiceRelativePath("ConfigurationGwtService")
-public interface ConfigurationGwtService extends RemoteService {
-
- Configuration getPluginConfiguration(int resourceId);
-
- ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId);
-
- Configuration getResourceConfiguration(int resourceId);
-
- ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId);
-
- void dummy(RawConfiguration config);
-
- /**
- * Utility/Convenience class.
- * Use ConfigurationGwtService.App.getInstance() to access static instance of ConfigurationGwtServiceAsync
- */
- public static class App {
- private static final ConfigurationGwtServiceAsync ourInstance = (ConfigurationGwtServiceAsync) GWT.create(ConfigurationGwtService.class);
-
- public static ConfigurationGwtServiceAsync getInstance() {
- return ourInstance;
- }
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtServiceAsync.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtServiceAsync.java
deleted file mode 100644
index 7aadc0f..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/configuration/ConfigurationGwtServiceAsync.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.inventory.configuration;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface ConfigurationGwtServiceAsync {
-
-
- void getPluginConfiguration(int resourceId, AsyncCallback<Configuration> callback);
-
- void getPluginConfigurationDefinition(int resourceTypeId, AsyncCallback<ConfigurationDefinition> callback);
-
-
- void getResourceConfiguration(int resourceId, AsyncCallback<Configuration> callback);
-
- void getResourceConfigurationDefinition(int resourceTypeId, AsyncCallback<ConfigurationDefinition> callback);
-
- public void dummy(RawConfiguration config, AsyncCallback callback);
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTService.java
deleted file mode 100644
index 1252194..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.group;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-import com.google.gwt.core.client.GWT;
-
-
-
-/**
- * @author Greg Hinkle
- */
-@RemoteServiceRelativePath("ResourceGroupGWTService")
-public interface ResourceGroupGWTService extends RemoteService {
- /**
- * Utility/Convenience class.
- * Use ResourceGroupGWTService.App.getInstance() to access static instance of ResourceGroupGWTServiceAsync
- */
- public static class App {
- private static final ResourceGroupGWTServiceAsync ourInstance = (ResourceGroupGWTServiceAsync) GWT.create(ResourceGroupGWTService.class);
-
- public static ResourceGroupGWTServiceAsync getInstance() {
- return ourInstance;
- }
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTServiceAsync.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTServiceAsync.java
deleted file mode 100644
index c4ca842..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/group/ResourceGroupGWTServiceAsync.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.group;
-
-
-/**
- * @author Greg Hinkle
- */
-public interface ResourceGroupGWTServiceAsync {
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
index 57fe722..662e002 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
@@ -23,7 +23,9 @@ import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
-import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -31,16 +33,12 @@ import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSource;
import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.Record;
-import com.smartgwt.client.data.fields.DataSourceFloatField;
import com.smartgwt.client.data.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceIntegerField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
-import com.smartgwt.client.types.FieldType;
-import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -53,6 +51,9 @@ public class ResourceDatasource extends DataSource {
private String query;
+ private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
+
+
public ResourceDatasource() {
setClientOnly(false);
setDataProtocol(DSProtocol.CLIENTCUSTOM);
@@ -121,7 +122,6 @@ public class ResourceDatasource extends DataSource {
// criteria.addSortAgentName(PageOrdering.ASC);
- ResourceGWTServiceAsync resourceService = ResourceGWTService.App.getInstance();
resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() {
public void onFailure(Throwable caught) {
@@ -154,6 +154,7 @@ public class ResourceDatasource extends DataSource {
for (int x=0; x<result.size(); x++) {
Resource res = result.get(x);
ListGridRecord record = new ListGridRecord();
+ record.setAttribute("resouce",res);
record.setAttribute("id",res.getId());
record.setAttribute("name",res.getName());
record.setAttribute("description",res.getDescription());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTService.java
deleted file mode 100644
index 5ff68a2..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.util.PageList;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-import com.google.gwt.core.client.GWT;
-
-
-/**
- * @author Greg Hinkle
- */
-@RemoteServiceRelativePath("ResourceGWTService")
-public interface ResourceGWTService extends RemoteService {
-
- PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria);
-
- RawConfiguration dummy(RawConfiguration config);
-
- /**
- * Utility/Convenience class.
- * Use ResourceGWTService.App.getInstance() to access static instance of ResourceGWTServiceAsync
- */
- public static class App {
- private static final ResourceGWTServiceAsync ourInstance = (ResourceGWTServiceAsync) GWT.create(ResourceGWTService.class);
-
- public static ResourceGWTServiceAsync getInstance() {
- return ourInstance;
- }
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTServiceAsync.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTServiceAsync.java
deleted file mode 100644
index c7c7094..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceGWTServiceAsync.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.util.PageList;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-
-
-/**
- * @author Greg Hinkle
- */
-public interface ResourceGWTServiceAsync {
-
-
- void findResourcesByCriteria(ResourceCriteria criteria, AsyncCallback<PageList<Resource>> callback);
-
- void dummy(RawConfiguration config, AsyncCallback<RawConfiguration> callback);
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 7b2b097..131e958 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -18,7 +18,14 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+
import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ListGridFieldType;
@@ -26,6 +33,7 @@ import com.smartgwt.client.types.SelectionAppearance;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.ClickEvent;
@@ -34,26 +42,40 @@ import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.KeyPressEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.DataArrivedEvent;
import com.smartgwt.client.widgets.grid.events.DataArrivedHandler;
+import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
+import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
+import java.util.ArrayList;
+
/**
* @author Greg Hinkle
*/
public class ResourceSearchView extends VLayout {
+ private ListGrid listGrid;
+
+ private ArrayList<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
+
public ResourceSearchView() {
+ setWidth100();
+ setHeight100();
+
DynamicForm searchPanel = new DynamicForm();
final TextItem searchBox = new TextItem("query", "Search Resources");
searchBox.setValue("");
+ searchPanel.setWrapItemTitles(false);
searchPanel.setFields(searchBox);
@@ -64,23 +86,52 @@ public class ResourceSearchView extends VLayout {
VLayout gridHolder = new VLayout();
- final ListGrid listGrid = new ListGrid();
+ listGrid = new ListGrid();
listGrid.setWidth100();
listGrid.setHeight100();
listGrid.setDataSource(datasource);
listGrid.setAutoFetchData(true);
-// listGrid.setAutoFitData(Autofit.HORIZONTAL);
listGrid.setAlternateRecordStyles(true);
// listGrid.setAutoFitData(Autofit.HORIZONTAL);
listGrid.setCriteria(new Criteria("name", searchPanel.getValueAsString("query")));
listGrid.setSelectionType(SelectionStyle.SIMPLE);
listGrid.setSelectionAppearance(SelectionAppearance.CHECKBOX);
-
+
ListGridField idField = new ListGridField("id", "Id", 55);
idField.setType(ListGridFieldType.INTEGER);
ListGridField nameField = new ListGridField("name", "Name", 250);
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ return "<a href=\"#Resource/" + listGridRecord.getAttribute("id") +"\">" + o + "</a>";
+ }
+ });
+
+ /* TODO: Safe to remove this, we're now using links in the records
+ nameField.addRecordClickHandler(new RecordClickHandler() {
+ public void onRecordClick(final RecordClickEvent recordClickEvent) {
+ for (final ResourceSelectListener l : selectListeners) {
+ // TODO GH: This doesn't work
+ final int resourceId = recordClickEvent.getRecord().getAttributeAsInt("id");
+ ResourceCriteria c = new ResourceCriteria();
+ c.addFilterId(resourceId);
+ ResourceGWTServiceAsync.Util.getInstance().findResourcesByCriteria(CoreGUI.getSessionSubject(), c, new AsyncCallback<PageList<Resource>>() {
+ public void onFailure(Throwable caught) {
+ System.out.println("Failed ehre");
+ }
+
+ public void onSuccess(PageList<Resource> result) {
+
+ l.onResourceSelected(result.get(0));
+
+ }
+ });
+ }
+ }
+ });
+ */
+
ListGridField descriptionField = new ListGridField("description", "Description");
ListGridField availabilityField = new ListGridField("currentAvailability", "Availability", 55);
availabilityField.setAlign(Alignment.CENTER);
@@ -113,7 +164,7 @@ public class ResourceSearchView extends VLayout {
toolStrip.addMember(removeButton);
toolStrip.addMember(new LayoutSpacer());
- toolStrip.addMember(tableInfo);
+ toolStrip.addMember(tableInfo);
gridHolder.addMember(toolStrip);
@@ -150,8 +201,11 @@ public class ResourceSearchView extends VLayout {
}
}
});
+ }
+ public void addResourceSelectedListener(ResourceSelectListener listener) {
+ selectListeners.add(listener);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSelectListener.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSelectListener.java
new file mode 100644
index 0000000..e64f27b
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSelectListener.java
@@ -0,0 +1,29 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+
+import org.rhq.core.domain.resource.Resource;
+
+/**
+ * @author Greg Hinkle
+ */
+public interface ResourceSelectListener {
+
+ void onResourceSelected(Resource resource);
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeDatasource.java
deleted file mode 100644
index 8d8dd9b..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeDatasource.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.data.DataSource;
-import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.fields.DataSourceImageField;
-import com.smartgwt.client.data.fields.DataSourceIntegerField;
-import com.smartgwt.client.data.fields.DataSourceTextField;
-import com.smartgwt.client.rpc.RPCResponse;
-import com.smartgwt.client.types.DSDataFormat;
-import com.smartgwt.client.types.DSProtocol;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.tree.TreeNode;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceTreeDatasource extends DataSource {
-private boolean initialized = false;
-
-
- private String query;
-
- public ResourceTreeDatasource() {
- setClientOnly(false);
- setDataProtocol(DSProtocol.CLIENTCUSTOM);
- setDataFormat(DSDataFormat.CUSTOM);
-
- DataSourceField idDataField = new DataSourceTextField("id", "ID");
- idDataField.setPrimaryKey(true);
-
- DataSourceTextField nameDataField = new DataSourceTextField("name", "Name");
- nameDataField.setCanEdit(false);
-
- DataSourceTextField descriptionDataField = new DataSourceTextField("description", "Description");
- descriptionDataField.setCanEdit(false);
-
- DataSourceImageField availabilityDataField = new DataSourceImageField("currentAvailability", "Availability");
- descriptionDataField.setCanEdit(false);
-
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID");
-// parentIdField.setForeignKey("id");
-// parentIdField.setRootValue("10001");
-
- DataSourceTextField parentKeyField = new DataSourceTextField("parentKey", "Parent KEY");
- parentKeyField.setForeignKey("id");
- parentKeyField.setRootValue("10001");
-
-
-
-
-// nameDataField.setType(FieldType.);
-
- setFields(idDataField, parentIdField, parentKeyField, nameDataField, descriptionDataField, availabilityDataField);
- }
-
- public String getQuery() {
- return query;
- }
-
- public void setQuery(String query) {
- this.query = query;
- }
-
- @Override
- protected Object transformRequest(DSRequest request) {
- String requestId = request.getRequestId();
- DSResponse response = new DSResponse();
- response.setAttribute("clientContext", request.getAttributeAsObject("clientContext"));
- // Asume success
- response.setStatus(0);
- switch (request.getOperationType()) {
- case ADD:
- //executeAdd(lstRec, true);
- break;
- case FETCH:
- executeFetch(requestId, request, response);
- break;
- case REMOVE:
- //executeRemove(lstRec);
- break;
- case UPDATE:
- //executeAdd(lstRec, false);
- break;
-
- default:
- break;
- }
-
- return request.getData();
- }
-
- public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
- final long start = System.currentTimeMillis();
-
- String p = request.getCriteria().getAttribute("parentKey") == null ? "10001" : request.getCriteria().getAttribute("parentKey");
- System.out.println(Arrays.toString(request.getCriteria().getAttributes()));
- System.out.println("Loading " + p + "(" + request.getCriteria().getAttribute("parentKey") + ")");
-
- ResourceCriteria criteria = new ResourceCriteria();
- criteria.addFilterParentResourceId(Integer.parseInt(p));
- criteria.fetchResourceType(true);
-
-
- ResourceGWTServiceAsync resourceService = ResourceGWTService.App.getInstance();
-
- resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() {
- public void onFailure(Throwable caught) {
- Window.alert("Failed to load " + caught.getMessage());
- System.err.println("Failed to fetch resources");
- response.setStatus(RPCResponse.STATUS_FAILURE);
- processResponse(requestId, response);
- }
-
- public void onSuccess(PageList<Resource> result) {
-
- ResourceTreeNode[] records = new ResourceTreeNode[result.size()];
- for (int x=0; x<result.size(); x++) {
- Resource res = result.get(x);
- ResourceTreeNode record = new ResourceTreeNode(res);
- records[x] = record;
- }
-
-
-
- response.setData(build(records));
- response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
- processResponse(requestId, response);
-
- }
- });
- }
-
-
- private TreeNode[] build(ResourceTreeNode[] nodes) {
- ArrayList<TreeNode> built = new ArrayList<TreeNode>();
- HashMap<ResourceType, TypeTreeNode> types = new HashMap<ResourceType, TypeTreeNode>();
-
- for (ResourceTreeNode node : nodes) {
-
- if (!types.containsKey(node.getResourceType())) {
- TypeTreeNode typeNode = new TypeTreeNode(node.getParentId(),node.getResourceType().getName());
- built.add(typeNode);
- types.put(node.getResourceType(), typeNode);
- }
- built.add(node);
- }
-
-
- return built.toArray(new TreeNode[built.size()]);
-
- }
-
-
- private boolean sameTypes(ResourceTreeNode[] nodes) {
- ResourceType first = nodes[0].getResourceType();
- for (ResourceTreeNode node : nodes) {
- if (!first.equals(node)) {
- return false;
- }
- }
- return true;
- }
-
-
-
-
- public static class TypeTreeNode extends TreeNode {
-
-
- private TypeTreeNode(int parentId, String type) {
- setAttribute("id", parentId + type);
- setAttribute("parentId", parentId);
- setAttribute("parentKey", parentId);
- setAttribute("name", type);
- }
-
- }
-
-
-
- public static class ResourceTreeNode extends TreeNode {
-
- private Resource resource;
-
- private ResourceTreeNode(Resource resource) {
- this.resource = resource;
-
- setAttribute("id",resource.getId());
- setAttribute("parentId", resource.getParentResource() == null ? 0 : resource.getParentResource().getId());
- setAttribute("parentKey", resource.getParentResource() == null ? 0 : (resource.getParentResource().getId() + resource.getResourceType().getName()));
- setAttribute("name",resource.getName());
- setAttribute("description",resource.getDescription());
- setAttribute("currentAvailability",
- resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP
- ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
-
- }
-
- public int getParentId() {
- return getAttributeAsInt("parentId");
- }
-
-
- public Resource getResource() {
- return resource;
- }
-
- public void setResource(Resource resource) {
- this.resource = resource;
- }
-
- public ResourceType getResourceType() {
- return resource.getResourceType();
- }
-
-
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeView.java
deleted file mode 100644
index 27dbd0e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceTreeView.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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;
-
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.Window;
-import com.smartgwt.client.widgets.events.CloseClickHandler;
-import com.smartgwt.client.widgets.events.CloseClientEvent;
-import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.menu.Menu;
-import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.menu.MenuItemSeparator;
-import com.smartgwt.client.widgets.menu.events.ClickHandler;
-import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
-import com.smartgwt.client.widgets.tree.TreeGrid;
-import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent;
-import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceTreeView extends VLayout {
-
- public ResourceTreeView() {
- super();
-
-
- TreeGrid resourceTree = new TreeGrid();
- resourceTree.setWidth(500);
- resourceTree.setHeight100();
-// resourceTree.setNodeIcon("/images/icn_tree_Category_on.png");
-// resourceTree.setFolderIcon("/images/icn_tree_Category_on.png");
-// resourceTree.setShowOpenIcons(false);
-// resourceTree.setShowDropIcons(false);
-// resourceTree.setClosedIconSuffix("");
- resourceTree.setAutoFetchData(true);
- resourceTree.setAnimateFolders(false);
-
- resourceTree.setDataSource(new ResourceTreeDatasource());
-// ((Layout)treeTab.getPane()).add.addChild(resourceTree);
-
- final Menu contextMenu = new Menu();
- MenuItem item = new MenuItem("Expand node");
- item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- TreeGrid treeGrid = (TreeGrid) event.getTarget();
- System.out.println("You right clicked: " + treeGrid.getSelectedRecord());
- }
- });
- /* Do menu support datasources? GH: Seemingly they'll only load once when done this way
- contextMenu.setDataSource(new DataSource() {
- {
- setClientOnly(false);
- setDataProtocol(DSProtocol.CLIENTCUSTOM);
- setDataFormat(DSDataFormat.CUSTOM);
- }
- protected Object transformRequest(DSRequest request) {
- System.out.println("Looking up menu info");
- return request;
- }
- });
- */
-
-
-// contextMenu.addItem(item);
- resourceTree.setContextMenu(contextMenu);
- resourceTree.addNodeContextClickHandler(new NodeContextClickHandler() {
- public void onNodeContextClick(final NodeContextClickEvent nodeContextClickEvent) {
- nodeContextClickEvent.getNode();
- contextMenu.setItems(new MenuItem(nodeContextClickEvent.getNode().getName()));
- if (nodeContextClickEvent.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) {
- contextMenu.addItem(new MenuItem("Type: " + ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getName()));
-
-
- MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration");
- editPluginConfiguration.addClickHandler(new ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
- int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
- int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
-
- Window configEditor = new Window();
- configEditor.setTitle("Edit " + resource.getName() + " plugin configuration");
- configEditor.setWidth(800);
- configEditor.setHeight(800);
- configEditor.setIsModal(true);
- configEditor.setShowModalMask(true);
- configEditor.centerInPage();
-// configEditor.setShowResizeBar =
- configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.plugin));
- configEditor.show();
-
- }
- });
- contextMenu.addItem(editPluginConfiguration);
-
- MenuItem editResourceConfiguration = new MenuItem("Resource Configuration");
- editResourceConfiguration.addClickHandler(new ClickHandler() {
- public void onClick(MenuItemClickEvent event) {
- Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
- int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
- int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
-
- final Window configEditor = new Window();
- configEditor.setTitle("Edit " + resource.getName() + " resource configuration");
- configEditor.setWidth(800);
- configEditor.setHeight(800);
- configEditor.setIsModal(true);
- configEditor.setShowModalMask(true);
- configEditor.centerInPage();
- configEditor.addCloseClickHandler(new CloseClickHandler() {
- public void onCloseClick(CloseClientEvent closeClientEvent) {
- configEditor.destroy();
- }
- });
- configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.resource));
- configEditor.show();
-
- }
- });
- contextMenu.addItem(editResourceConfiguration);
-
- }
-
- contextMenu.addItem(new MenuItemSeparator());
- MenuItem operations = new MenuItem("Operations");
- Menu opSubMenu = new Menu();
- opSubMenu.setItems(new MenuItem("Start"), new MenuItem("Stop"), new MenuItem("Restart"));
- operations.setSubmenu(opSubMenu);
- contextMenu.addItem(operations);
- contextMenu.showContextMenu();
- }
- });
-
-
- addMember(resourceTree);
-
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
new file mode 100644
index 0000000..ec5bea4
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Presenter;
+import org.rhq.enterprise.gui.coregui.client.admin.users.UserEditView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceDetailView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceView;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.VisibilityMode;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLPane;
+import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
+import com.smartgwt.client.widgets.grid.events.SelectionEvent;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+import com.smartgwt.client.widgets.tree.Tree;
+import com.smartgwt.client.widgets.tree.TreeGrid;
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourcesView extends HLayout implements Presenter {
+
+ private SectionStack sectionStack;
+ private Canvas contentCanvas;
+
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+
+
+ contentCanvas = new Canvas();
+ contentCanvas.setWidth("*");
+ contentCanvas.setHeight100();
+
+
+ sectionStack = new SectionStack();
+ sectionStack.setShowResizeBar(true);
+ sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
+ sectionStack.setWidth(250);
+ sectionStack.setHeight100();
+
+ sectionStack.addSection(buildResourcesSection());
+ sectionStack.addSection(buildGroupsSection());
+
+ addMember(sectionStack);
+ addMember(contentCanvas);
+
+ setContent(buildResourceSearchView());
+
+ CoreGUI.setBreadCrumb(getPlace());
+ }
+
+
+ private ResourceSearchView buildResourceSearchView() {
+ ResourceSearchView searchView = new ResourceSearchView();
+ searchView.addResourceSelectedListener(new ResourceSelectListener() {
+ public void onResourceSelected(Resource resource) {
+ CoreGUI.setContent(new ResourceView(resource));
+ }
+ });
+ return searchView;
+ }
+
+
+ private SectionStackSection buildResourcesSection() {
+ final SectionStackSection section = new SectionStackSection("Resources");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode savedSearches = new TreeNode("Saved Searches", new TreeNode("Down JBossAS (4)"));
+ final TreeNode manageRolesNode = new TreeNode("Global Saved Searches");
+ tree.setRoot(new TreeNode("security",
+ savedSearches,
+ manageRolesNode));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ if (selectionEvent.getRecord() == savedSearches) {
+ setContent(new ResourceSearchView());
+ } else if (selectionEvent.getRecord() == manageRolesNode) {
+ setContent(new ResourceSearchView());
+ }
+ }
+ });
+
+
+ section.addItem(treeGrid);
+
+
+ return section;
+ }
+
+
+ private SectionStackSection buildGroupsSection() {
+ final SectionStackSection section = new SectionStackSection("Resource Groups");
+ section.setExpanded(true);
+
+ TreeGrid treeGrid = new TreeGrid();
+ treeGrid.setShowHeader(false);
+
+ Tree tree = new Tree();
+ final TreeNode manageServersNode = new TreeNode("Groups");
+ final TreeNode manageAgentsNode = new TreeNode("DynaGroups");
+ final TreeNode manageAffinityGroupsNode = new TreeNode("Special Groups");
+ final TreeNode managePartitionEventsNode = new TreeNode("Greg's Groups");
+
+ tree.setRoot(new TreeNode("clustering",
+ manageServersNode,
+ manageAgentsNode,
+ manageAffinityGroupsNode,
+ managePartitionEventsNode));
+
+ treeGrid.setData(tree);
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ HTMLPane pane = new HTMLPane();
+ pane.setContentsType(ContentsType.PAGE);
+ pane.setWidth100();
+ pane.setHeight100();
+
+ String url = null;
+ if (selectionEvent.getRecord() == manageServersNode) {
+ url = "/rhq/ha/listServers.xhtml";
+ } else if (selectionEvent.getRecord() == manageAgentsNode) {
+ url = "/rhq/ha/listAgents.xhtml";
+ } else if (selectionEvent.getRecord() == manageAffinityGroupsNode) {
+ url = "/rhq/ha/listAffinityGroups.xhtml";
+ } else if (selectionEvent.getRecord() == managePartitionEventsNode) {
+ url = "/rhq/ha/listPartitionEvents.xhtml";
+ }
+ pane.setContentsURL(url + "?nomenu=true");
+ setContent(pane);
+
+ }
+ });
+
+ section.addItem(treeGrid);
+
+
+ return section;
+ }
+
+
+ public void setContent(Canvas newContent) {
+ if (contentCanvas.getChildren().length > 0)
+ contentCanvas.getChildren()[0].destroy();
+ newContent.setWidth100();
+ newContent.setHeight100();
+ contentCanvas.addChild(newContent);
+ contentCanvas.draw();
+ }
+
+
+ public boolean fireDisplay(Place place, List<Place> children) {
+ if (place.equals(getPlace())) {
+ if (!children.isEmpty()) {
+ if (contentCanvas.getChildren().length > 0) {
+ Canvas element = contentCanvas.getChildren()[0];
+ if (element instanceof Presenter) {
+ ((Presenter) element).fireDisplay(children.get(0), children.subList(1, children.size() - 1));
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+
+ public Place getPlace() {
+ return new Place("Resources", "Resources");
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
new file mode 100644
index 0000000..5fe42be
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
@@ -0,0 +1,53 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource;
+
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.tree.TreeGrid;
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+/**
+ * @author Greg Hinkle
+ */
+public class CustomResourceTreeGrid extends TreeGrid {
+
+
+ @Override
+ protected String getIcon(Record record, boolean defaultState) {
+
+ boolean open = getTree().isOpen((TreeNode) record);
+
+ if (record instanceof ResourceTreeDatasource.ResourceTreeNode) {
+ Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) record).getResource();
+
+ boolean up = resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP;
+
+
+ return "resources/folder_" + (up ? "" : "down_") + (open ? "opened" : "closed") + ".png";
+
+ } else {
+ return "resources/folder_group_" + (open ? "opened" : "closed") + ".png";
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
new file mode 100644
index 0000000..5db61ff
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -0,0 +1,146 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Presenter;
+import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
+import org.rhq.enterprise.gui.coregui.client.components.SubTabLayout;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.Side;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.HTMLPane;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
+
+import java.util.List;
+
+/**
+ * Right panel of the resource view.
+ *
+ * @author Greg Hinkle
+ */
+public class ResourceDetailView extends VLayout implements Presenter, ResourceSelectListener {
+
+ private Resource resource;
+ private Tab summaryTab;
+ private Tab monitoringTab;
+ private Tab inventoryTab;
+ private Tab operationsTab;
+ private Tab configurationTab;
+ private Tab contentTab;
+ private TabSet topTabSet;
+
+
+ HTMLFlow title = new HTMLFlow();
+
+ public void setResource(Resource resource) {
+ this.resource = resource;
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+
+ // addMember(new ResourceSummaryView());
+
+ topTabSet = new TabSet();
+ topTabSet.setTabBarPosition(Side.TOP);
+ topTabSet.setWidth100();
+ topTabSet.setHeight100();
+
+
+ summaryTab = new Tab("Summary");
+
+ monitoringTab = new Tab("Monitoring");
+ inventoryTab = new Tab("Inventory");
+ operationsTab = new Tab("Operations");
+ configurationTab = new Tab("Configuration");
+ contentTab = new Tab("Content");
+
+
+ topTabSet.setTabs(summaryTab, monitoringTab, inventoryTab, operationsTab, configurationTab, contentTab);
+
+ title.setContents("Loading...");
+ addMember(title);
+
+ addMember(topTabSet);
+
+// CoreGUI.addBreadCrumb(getPlace());
+ }
+
+
+ public boolean fireDisplay(Place place, List<Place> children) {
+ if (place.equals(getPlace())) {
+
+
+ }
+ return true;
+
+ }
+
+ public Place getPlace() {
+ return new Place(String.valueOf(resource.getId()),resource.getName());
+ }
+
+ public void onResourceSelected(Resource resource) {
+ // TODO: Implement this method.
+
+ title.setContents("<h2>" + resource.getName() + "</h2>");
+ title.markForRedraw();
+
+ int selectedTab = topTabSet.getSelectedTabNumber();
+
+
+
+
+ FullHTMLPane summaryPane = new FullHTMLPane("/rhq/resource/summary/overview-plain.xhtml?id=" + resource.getId());
+ FullHTMLPane timelinePane = new FullHTMLPane("/rhq/resource/summary/timeline-plain.xhtml?id=" + resource.getId());
+ SubTabLayout summarySet = new SubTabLayout();
+ summarySet.registerSubTab("Overview", summaryPane);
+ summarySet.registerSubTab("Timeline", timelinePane);
+
+ topTabSet.updateTab(summaryTab, summarySet);
+
+
+
+ HTMLPane monitorPane = new HTMLPane();
+ monitorPane.setContentsURL("/rhq/common/monitor/graphs.xhtml?id=" + resource.getId());
+ monitorPane.setWidth100();
+ monitorPane.setHeight100();
+ monitorPane.setContentsType(ContentsType.PAGE);
+
+ topTabSet.updateTab(monitoringTab, monitorPane);
+
+
+ topTabSet.updateTab(configurationTab, new ConfigurationEditor(resource.getId(), resource.getResourceType().getId()));
+
+ topTabSet.setSelectedTab(selectedTab);
+ topTabSet.markForRedraw();
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceSummaryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceSummaryView.java
new file mode 100644
index 0000000..cda4983
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceSummaryView.java
@@ -0,0 +1,37 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceSummaryView extends DynamicForm {
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setItems(new StaticTextItem("Summary goes here..."));
+
+
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
new file mode 100644
index 0000000..ea54a2a
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -0,0 +1,308 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSource;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceImageField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.types.DSDataFormat;
+import com.smartgwt.client.types.DSProtocol;
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceTreeDatasource extends DataSource {
+
+
+ private boolean initialized = false;
+ int rootId;
+ List<Resource> initialData;
+
+ private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
+
+
+ public ResourceTreeDatasource(List<Resource> initialData) {
+ setClientOnly(false);
+ setDataProtocol(DSProtocol.CLIENTCUSTOM);
+ setDataFormat(DSDataFormat.CUSTOM);
+
+ this.initialData = initialData;
+
+ this.rootId = rootId;
+
+ DataSourceField idDataField = new DataSourceTextField("id", "ID");
+ idDataField.setPrimaryKey(true);
+
+ DataSourceTextField nameDataField = new DataSourceTextField("name", "Name");
+ nameDataField.setCanEdit(false);
+
+ DataSourceTextField descriptionDataField = new DataSourceTextField("description", "Description");
+ descriptionDataField.setCanEdit(false);
+
+ DataSourceImageField availabilityDataField = new DataSourceImageField("currentAvailability", "Availability");
+ descriptionDataField.setCanEdit(false);
+
+ DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID");
+ parentIdField.setForeignKey("id");
+// parentIdField.setRootValue(rootId);
+
+// DataSourceTextField parentKeyField = new DataSourceTextField("parentKey", "Parent KEY");
+// parentKeyField.setForeignKey("id");
+// parentKeyField.setRootValue(rootId);
+
+
+// nameDataField.setType(FieldType.);
+
+ setDropExtraFields(false);
+
+ setFields(idDataField, nameDataField, descriptionDataField, availabilityDataField);
+ }
+
+
+ @Override
+ protected Object transformRequest(DSRequest request) {
+ String requestId = request.getRequestId();
+ DSResponse response = new DSResponse();
+ response.setAttribute("clientContext", request.getAttributeAsObject("clientContext"));
+ // Asume success
+ response.setStatus(0);
+ switch (request.getOperationType()) {
+ case ADD:
+ //executeAdd(lstRec, true);
+ break;
+ case FETCH:
+ executeFetch(requestId, request, response);
+ break;
+ case REMOVE:
+ //executeRemove(lstRec);
+ break;
+ case UPDATE:
+ //executeAdd(lstRec, false);
+ break;
+
+ default:
+ break;
+ }
+
+ return request.getData();
+ }
+
+ public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) {
+ final long start = System.currentTimeMillis();
+
+
+ String p = request.getCriteria().getAttribute("parentId");
+// System.out.println("All attributes: " + Arrays.toString(request.getCriteria().getAttributes()));
+
+ ResourceCriteria criteria = new ResourceCriteria();
+
+ if (p == null) {
+ System.out.println("DataSourceTree: Loading initial data");
+
+// criteria.addFilterId(rootId);
+
+ processIncomingData(initialData, response, requestId);
+ return;
+
+ } else {
+ System.out.println("DataSourceTree: Loading " + p);
+
+ criteria.addFilterParentResourceId(Integer.parseInt(p));
+ }
+
+ // The server is already eager fetch resource type
+ // * criteria.fetchResourceType(true);
+
+
+ resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() {
+ public void onFailure(Throwable caught) {
+ Window.alert("Failed to load " + caught.getMessage());
+ System.err.println("Failed to fetch resources");
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(requestId, response);
+ }
+
+ public void onSuccess(PageList<Resource> result) {
+ System.out.println("Got resources in: " + (System.currentTimeMillis() - start));
+
+ processIncomingData(result, response, requestId);
+ }
+ });
+ }
+
+
+ private void processIncomingData(List<Resource> result, final DSResponse response, final String requestId) {
+
+ ResourceTypeRepository.Cache.getInstance().loadResourceTypes(result, EnumSet.of(ResourceTypeRepository.MetadataType.operations),
+ new ResourceTypeRepository.ResourceTypeLoadedCallback() {
+ public void onResourceTypeLoaded(List<Resource> result) {
+ response.setData(build(result));
+ processResponse(requestId, response);
+
+ }
+ });
+ }
+
+
+ /**
+ * Construct a set of TreeNodes from a list of resources
+ *
+ * @param resources
+ * @return
+ */
+ public static TreeNode[] build(List<Resource> resources) {
+ ResourceTreeNode[] records = new ResourceTreeNode[resources.size()];
+ for (int x = 0; x < resources.size(); x++) {
+ Resource res = resources.get(x);
+ ResourceTreeNode record = new ResourceTreeNode(res);
+ records[x] = record;
+ }
+
+ return introduceTypeFolders(records);
+ }
+
+
+ private static TreeNode[] introduceTypeFolders(ResourceTreeNode[] nodes) {
+ ArrayList<TreeNode> built = new ArrayList<TreeNode>();
+ HashMap<ResourceType, TypeTreeNode> types = new HashMap<ResourceType, TypeTreeNode>();
+
+
+ for (ResourceTreeNode node : nodes) {
+ built.add(node);
+
+ if (!types.containsKey(node.getResourceType()) && node.getResourceType().getCategory() != ResourceCategory.PLATFORM) {
+ TypeTreeNode typeNode = new TypeTreeNode(String.valueOf(node.getResource().getParentResource().getId()), node.getResourceType().getName());
+ built.add(typeNode);
+ types.put(node.getResourceType(), typeNode);
+ }
+ }
+
+
+ return built.toArray(new TreeNode[built.size()]);
+
+ }
+
+
+ private static boolean sameTypes(ResourceTreeNode[] nodes) {
+ ResourceType first = nodes[0].getResourceType();
+ for (ResourceTreeNode node : nodes) {
+ if (!first.equals(node)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+
+ public static class TypeTreeNode extends TreeNode {
+
+
+ private TypeTreeNode(String parentId, String type) {
+ setID(parentId + "_" + type);
+ setParentID(parentId);
+
+ setAttribute("id", parentId + "_" + type);
+ setAttribute("parentId", parentId);
+// setAttribute("parentKey", parentId);
+ setAttribute("name", type);
+ }
+
+ }
+
+
+ public static class ResourceTreeNode extends TreeNode {
+
+ private Resource resource;
+
+ private ResourceTreeNode(Resource resource) {
+ this.resource = resource;
+
+ String id = String.valueOf(resource.getId());
+ String parentId = resource.getParentResource() == null ? null : (resource.getParentResource().getId() + "_" + resource.getResourceType().getName());
+
+// System.out.println(id + " / " + parentId);
+
+ setID(id);
+ setParentID(parentId);
+
+ setAttribute("id", id);
+ setAttribute("parentId", parentId);
+
+// setAttribute("parentKey", resource.getParentResource() == null ? 0 : (resource.getParentResource().getId() + resource.getResourceType().getName()));
+
+ setAttribute("name", resource.getName());
+ setAttribute("description", resource.getDescription());
+ setAttribute("currentAvailability",
+ resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP
+ ? "/images/icons/availability_green_16.png"
+ : "/images/icons/availability_red_16.png");
+
+ }
+
+ @Override
+ public String getIcon() {
+
+ boolean up = resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP;
+
+ // (open ? "opened" : "closed") +
+
+ return "resources/folder_" + (up ? "" : "down_") + ".png";
+ }
+
+
+ public Resource getResource() {
+ return resource;
+ }
+
+ public void setResource(Resource resource) {
+ this.resource = resource;
+ }
+
+ public ResourceType getResourceType() {
+ return resource.getResourceType();
+ }
+
+
+ public String getParentId() {
+ return getAttribute("parentId");
+ }
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
new file mode 100644
index 0000000..93a4431
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -0,0 +1,358 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
+
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.CloseClickHandler;
+import com.smartgwt.client.widgets.events.CloseClientEvent;
+import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
+import com.smartgwt.client.widgets.grid.events.SelectionEvent;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.MenuItemSeparator;
+import com.smartgwt.client.widgets.menu.events.ClickHandler;
+import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
+import com.smartgwt.client.widgets.tree.TreeGrid;
+import com.smartgwt.client.widgets.tree.TreeNode;
+import com.smartgwt.client.widgets.tree.events.DataArrivedEvent;
+import com.smartgwt.client.widgets.tree.events.DataArrivedHandler;
+import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent;
+import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceTreeView extends VLayout {
+ private Resource selectedResource;
+ private Resource rootResource;
+
+ private TreeGrid treeGrid;
+
+ private ArrayList<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
+
+ private boolean initialSelect = false;
+
+ public ResourceTreeView(Resource selectedResource) {
+ super();
+ this.selectedResource = selectedResource;
+
+ setWidth("30%");
+ setHeight100();
+
+ setShowResizeBar(true);
+
+ if (selectedResource != null) {
+ setSelectedResource(selectedResource);
+ }
+// ResourceTreeDatasource ds = new ResourceTreeDatasource();
+//
+// setDataSource(new ResourceTreeDatasource());
+// setCriteria(new Criteria("selectedResourceId",String.valueOf(selectedResource.getId())));
+
+// setCriteria(new Criteria("",));
+ }
+
+ public void onInit() {
+
+ }
+
+ private void buildTree() {
+
+ treeGrid = new CustomResourceTreeGrid();
+
+ treeGrid.setOpenerImage("resources/dir.png");
+ treeGrid.setOpenerIconSize(16);
+
+ treeGrid.setAutoFetchData(true);
+ treeGrid.setAnimateFolders(false);
+ treeGrid.setSelectionType(SelectionStyle.SINGLE);
+
+ final Menu contextMenu = new Menu();
+ MenuItem item = new MenuItem("Expand node");
+ item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ TreeGrid treeGrid = (TreeGrid) event.getTarget();
+ System.out.println("You right clicked: " + treeGrid.getSelectedRecord());
+ }
+ });
+
+ /* Do menu support datasources? GH: Seemingly they'll only load once when done this way
+ contextMenu.setDataSource(new DataSource() {
+ {
+ setClientOnly(false);
+ setDataProtocol(DSProtocol.CLIENTCUSTOM);
+ setDataFormat(DSDataFormat.CUSTOM);
+ }
+ protected Object transformRequest(DSRequest request) {
+ System.out.println("Looking up menu info");
+ return request;
+ }
+ });
+ */
+
+ // Should only do this once, but it opens the platform node (which is not actually the root node)
+// treeGrid.addDataArrivedHandler(new DataArrivedHandler() {
+// public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
+// treeGrid.getTree().openFolders(treeGrid.getTree().getChildren(treeGrid.getTree().getRoot()));
+// }
+// });
+
+
+ treeGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ if (selectionEvent.getState()) {
+ if (treeGrid.getSelectedRecord() instanceof ResourceTreeDatasource.ResourceTreeNode) {
+ ResourceTreeDatasource.ResourceTreeNode node = (ResourceTreeDatasource.ResourceTreeNode) treeGrid.getSelectedRecord();
+ System.out.println("Resource selected in tree: " + node.getResource());
+ History.newItem("Resource/" + node.getResource().getId());
+// for (ResourceSelectListener l : selectListeners) {
+// l.onResourceSelected(node.getResource());
+// }
+ }
+
+ }
+ }
+ });
+
+
+ // This constructs the context menu for the resource at the time of the click.
+ setContextMenu(contextMenu);
+ treeGrid.addNodeContextClickHandler(new NodeContextClickHandler() {
+ public void onNodeContextClick(final NodeContextClickEvent nodeContextClickEvent) {
+ nodeContextClickEvent.getNode();
+ contextMenu.setItems(new MenuItem(nodeContextClickEvent.getNode().getName()));
+
+ contextMenu.addItem(new MenuItem("Id: " + nodeContextClickEvent.getNode().getAttribute("id")));
+ contextMenu.addItem(new MenuItem("Parent: " + nodeContextClickEvent.getNode().getAttribute("parentId")));
+
+
+ if (nodeContextClickEvent.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) {
+
+ ResourceTreeDatasource.ResourceTreeNode node = (ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode();
+ contextMenu.addItem(new MenuItem("Type: " + ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getName()));
+
+
+ MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration");
+ editPluginConfiguration.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
+ int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
+ int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
+
+ Window configEditor = new Window();
+ configEditor.setTitle("Edit " + resource.getName() + " plugin configuration");
+ configEditor.setWidth(800);
+ configEditor.setHeight(800);
+ configEditor.setIsModal(true);
+ configEditor.setShowModalMask(true);
+ configEditor.centerInPage();
+// configEditor.setShowResizeBar =
+ configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.plugin));
+ configEditor.show();
+
+ }
+ });
+ editPluginConfiguration.setEnabled(node.getResource().getResourceType().getPluginConfigurationDefinition() != null);
+ contextMenu.addItem(editPluginConfiguration);
+
+
+ MenuItem editResourceConfiguration = new MenuItem("Resource Configuration");
+ editResourceConfiguration.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
+ int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
+ int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
+
+ final Window configEditor = new Window();
+ configEditor.setTitle("Edit " + resource.getName() + " resource configuration");
+ configEditor.setWidth(800);
+ configEditor.setHeight(800);
+ configEditor.setIsModal(true);
+ configEditor.setShowModalMask(true);
+ configEditor.centerInPage();
+ configEditor.addCloseClickHandler(new CloseClickHandler() {
+ public void onCloseClick(CloseClientEvent closeClientEvent) {
+ configEditor.destroy();
+ }
+ });
+ configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.resource));
+ configEditor.show();
+
+ }
+ });
+ editResourceConfiguration.setEnabled(node.getResource().getResourceType().getResourceConfigurationDefinition() != null);
+ contextMenu.addItem(editResourceConfiguration);
+
+ contextMenu.addItem(new MenuItemSeparator());
+
+ MenuItem operations = new MenuItem("Operations");
+ Menu opSubMenu = new Menu();
+ for (OperationDefinition operationDefinition : node.getResourceType().getOperationDefinitions()) {
+ opSubMenu.addItem(new MenuItem(operationDefinition.getDisplayName()));
+
+ }
+ operations.setEnabled(!node.getResourceType().getOperationDefinitions().isEmpty());
+ operations.setSubmenu(opSubMenu);
+ contextMenu.addItem(operations);
+
+ }
+
+
+ contextMenu.showContextMenu();
+ }
+ });
+ }
+
+
+ public void setSelectedResource(final Resource selectedResource) {
+ this.selectedResource = selectedResource;
+
+ TreeNode node = null;
+ if (treeGrid != null && treeGrid.getTree() != null
+ && (node = treeGrid.getTree().findById(String.valueOf(selectedResource.getId()))) != null) {
+ treeGrid.getTree().openFolder(node);
+ } else {
+ final ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
+ resourceService.getResourceLineage(selectedResource.getId(), new AsyncCallback<List<Resource>>() {
+ public void onFailure(Throwable caught) {
+ SC.say("Failed to lookup platform");
+ System.out.println("Failed to lookup parent");
+ }
+
+ public void onSuccess(List<Resource> result) {
+ Resource root = result.get(0);
+
+ if (!root.equals(ResourceTreeView.this.rootResource)) {
+
+ if (treeGrid != null) {
+ treeGrid.destroy();
+ }
+ buildTree();
+
+// TreeNode[] selectedLineage = ResourceTreeDatasource.build(result);
+// TreeNode[] preloadData = ResourceTreeDatasource.build(preload(result));
+//
+// TreeNode[] rootData = ResourceTreeDatasource.build(result.subList(0,0));
+
+
+ ResourceTreeView.this.rootResource = root;
+
+
+// treeGrid.setLoadDataOnDemand(true);
+ ResourceTreeDatasource dataSource = new ResourceTreeDatasource(result);
+ treeGrid.setDataSource(dataSource);
+// treeGrid.setInitialData(selectedLineage);
+
+
+ addMember(treeGrid);
+// treeGrid.fetchData();
+
+
+ treeGrid.addDataArrivedHandler(new DataArrivedHandler() {
+ public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
+ if (!initialSelect) {
+
+ TreeNode selectedNode = treeGrid.getTree().findById(String.valueOf(selectedResource.getId()));
+ System.out.println("Trying to preopen: " + selectedNode);
+ if (selectedNode != null) {
+ System.out.println("Preopen node!!!");
+ treeGrid.getTree().openFolders(treeGrid.getTree().getParents(selectedNode));
+ treeGrid.selectRecord(selectedNode);
+ initialSelect = true;
+ }
+ }
+ }
+ });
+
+// treeGrid.fegetTree().openFolder(rootData[0]);
+
+
+ } else {
+ initialSelect = false;
+ for (TreeNode n : ResourceTreeDatasource.build(result)) {
+ treeGrid.getDataSource().addData(n);
+ }
+//
+// TreeNode selectedNode = treeGrid.getTree().findById(String.valueOf(selectedResource.getId()));
+// if (selectedNode != null) {
+// treeGrid.getTree().openFolders(treeGrid.getTree().getParents(selectedNode));
+// treeGrid.selectRecord(selectedNode);
+// } else {
+// System.out.println("Couldn't select " + selectedResource.getId());
+// }
+ }
+
+// TreeNode[] selectedLineage = ResourceTreeDatasource.build(result);
+// getTree().linkNodes(selectedLineage);
+
+
+ // CoreGUI.addBreadCrumb(new Place(String.valueOf(result.getId()), result.getName()));
+ }
+ });
+ }
+ }
+
+
+ /*private List<Resource> preload(final List<Resource> lineage) {
+
+ final ArrayList<Resource> list = new ArrayList<Resource>(lineage);
+
+ ResourceGWTServiceAsync resourceService = ResourceGWTServiceAsync.Util.getInstance();
+
+ ResourceCriteria c = new ResourceCriteria();
+ c.addFilterParentResourceId(lineage.get(0).getId());
+ resourceService.findResourcesByCriteria(CoreGUI.getSessionSubject(), c, new AsyncCallback<PageList<Resource>>() {
+ public void onFailure(Throwable caught) {
+ SC.say("SHit");
+ }
+
+ public void onSuccess(PageList<Resource> result) {
+ SC.say("GotONE");
+
+ if (lineage.size() > 1) {
+ result.addAll(preload(lineage.subList(1, lineage.size())));
+ }
+ }
+ });
+ }
+ }
+*/
+
+ public void addResourceSelectListener(ResourceSelectListener listener) {
+ this.selectListeners.add(listener);
+ }
+}
+
+
+
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
new file mode 100644
index 0000000..0299905
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
@@ -0,0 +1,146 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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 org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Presenter;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeView;
+import org.rhq.enterprise.gui.coregui.client.places.Place;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.layout.HLayout;
+
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceView extends HLayout implements Presenter {
+
+ private Canvas contentCanvas;
+
+
+ private Resource selectedResource;
+ private Resource resourcePlatform;
+
+
+ private ResourceTreeView treeView;
+ private ResourceDetailView detailView;
+
+ private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
+
+
+ public ResourceView() {
+
+ }
+
+ public ResourceView(Resource selectedResource) {
+ this.selectedResource = selectedResource;
+
+ System.out.println("displaying resource: " + selectedResource);
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setWidth100();
+ setHeight100();
+
+
+ treeView = new ResourceTreeView(selectedResource);
+ addMember(treeView);
+
+ contentCanvas = new Canvas();
+ addMember(contentCanvas);
+
+
+ detailView = new ResourceDetailView();
+
+ treeView.addResourceSelectListener(detailView);
+
+
+ setContent(detailView);
+
+ }
+
+ public boolean fireDisplay(Place place, List<Place> children) {
+ try {
+ if (place.equals(getPlace())) {
+ if (children.size() > 0) {
+ Place resourcePlace = children.get(0);
+ int resourceId = Integer.parseInt(resourcePlace.getId());
+
+ if (selectedResource == null || selectedResource.getId() != resourceId) {
+ setSelectedResource(resourceId);
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+
+
+ public void setSelectedResource(int resourceId) {
+ ResourceCriteria criteria = new ResourceCriteria();
+ criteria.addFilterId(resourceId);
+ resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() {
+ public void onFailure(Throwable caught) {
+ SC.say("failed to load");
+ }
+
+ public void onSuccess(PageList<Resource> result) {
+ Resource res = result.get(0);
+ setSelectedResource(res);
+ }
+ });
+ }
+
+
+ public void setSelectedResource(Resource resource) {
+ this.selectedResource = resource;
+ treeView.setSelectedResource(resource);
+ detailView.onResourceSelected(resource);
+ }
+
+
+ public Place getPlace() {
+// return new Place("Resource[" + selectedResource.getId() + "]", "Resource - " + selectedResource.getName());
+ return new Place("Resource", "Resource");
+ }
+
+ public void setContent(Canvas newContent) {
+ if (contentCanvas.getChildren().length > 0)
+ contentCanvas.getChildren()[0].destroy();
+ contentCanvas.addChild(newContent);
+ contentCanvas.draw();
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
new file mode 100644
index 0000000..55a082b
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -0,0 +1,232 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type;
+
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.criteria.ResourceTypeCriteria;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceTypeRepository {
+
+ private HashMap<Integer, ResourceType> typeCache = new HashMap<Integer, ResourceType>();
+ private HashMap<Integer, EnumSet<MetadataType>> typeCacheLevel = new HashMap<Integer, EnumSet<MetadataType>>();
+
+ private static ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
+
+ public enum MetadataType {
+ children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition
+ }
+
+
+ public static class Cache {
+ private static final ResourceTypeRepository ourInstance = GWT.create(ResourceTypeRepository.class);
+
+ public static ResourceTypeRepository getInstance() {
+ return ourInstance;
+ }
+ }
+
+
+ public static interface TypeLoadedCallback {
+ void onTypesLoaded(HashMap<Integer, ResourceType> types);
+ }
+
+ public static interface ResourceTypeLoadedCallback {
+ void onResourceTypeLoaded(List<Resource> resources);
+ }
+
+ public void loadResourceTypes(final PageList<Resource> resources, final ResourceTypeLoadedCallback callback) {
+ loadResourceTypes(resources, null, callback);
+ }
+
+ public void loadResourceTypes(final List<Resource> resources, final EnumSet<MetadataType> metadataTypes, final ResourceTypeLoadedCallback callback) {
+
+
+ resourceTypeService.dummy(new RawConfiguration(), new AsyncCallback<RawConfiguration>() {
+ public void onFailure(Throwable caught) {
+ System.out.println("dummy failed");
+ }
+
+ public void onSuccess(RawConfiguration result) {
+ System.out.println("dummy worked");
+ }
+ });
+
+ if (resources.size() == 0) {
+ callback.onResourceTypeLoaded(resources);
+ return;
+ }
+
+ System.out.println("Getting types from cache");
+ long start = System.currentTimeMillis();
+
+ HashSet<Integer> types = new HashSet<Integer>();
+ for (Resource res : resources) {
+ types.add(res.getResourceType().getId());
+ }
+ getResourceTypes(types.toArray(new Integer[types.size()]), metadataTypes, new TypeLoadedCallback() {
+ public void onTypesLoaded(HashMap<Integer, ResourceType> types) {
+ for (Resource res : resources) {
+ res.setResourceType(types.get(res.getResourceType().getId()));
+ }
+ callback.onResourceTypeLoaded(resources);
+ }
+ });
+
+ System.out.println("Loaded types from cache in " + (System.currentTimeMillis() - start));
+
+ }
+
+
+ public void getResourceTypes(Integer[] resourceTypeIds, final TypeLoadedCallback callback) {
+ getResourceTypes(resourceTypeIds, null, callback);
+ }
+
+
+ public void getResourceTypes(Integer[] resourceTypeIds, final EnumSet<MetadataType> metadataTypes, final TypeLoadedCallback callback) {
+ ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+
+ ArrayList<Integer> typesNeeded = new ArrayList<Integer>();
+
+ final HashMap<Integer, ResourceType> cachedTypes = new HashMap<Integer, ResourceType>();
+
+ for (Integer typeId : resourceTypeIds) {
+ if (!typeCache.containsKey(typeId) || (metadataTypes != null && !typeCacheLevel.get(typeId).containsAll(metadataTypes))) {
+ typesNeeded.add(typeId);
+ } else {
+ cachedTypes.put(typeId, typeCache.get(typeId));
+ }
+ }
+
+
+
+ if (typesNeeded.isEmpty()) {
+ callback.onTypesLoaded(cachedTypes);
+ return;
+ }
+
+
+ if (metadataTypes != null) {
+ for (MetadataType metadataType : metadataTypes) {
+ switch (metadataType) {
+ case children:
+ criteria.fetchChildResourceTypes(true);
+ break;
+ case content:
+ criteria.fetchPackageTypes(true);
+ break;
+ case measurements:
+ criteria.fetchMetricDefinitions(true);
+ break;
+ case operations:
+ criteria.fetchOperationDefinitions(true);
+ break;
+ case events:
+ criteria.fetchEventDefinitions(true);
+ break;
+ case pluginConfigurationDefinition:
+ criteria.fetchPluginConfigurationDefinition(true);
+ break;
+ case resourceConfigurationDefinition:
+ criteria.fetchResourceConfigurationDefinition(true);
+ break;
+ }
+ }
+ }
+
+ criteria.addFilterIds(typesNeeded.toArray(new Integer[typesNeeded.size()]));
+
+ criteria.setPageControl(PageControl.getUnlimitedInstance());
+
+ resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() {
+ public void onFailure(Throwable caught) {
+ // TODO: Implement this method.
+ caught.printStackTrace();
+ }
+
+ public void onSuccess(PageList<ResourceType> result) {
+ for (ResourceType type : result) {
+ if (typeCache.containsKey(type.getId())) {
+ ResourceType cachedType = typeCache.get(type.getId());
+ if (metadataTypes != null) {
+ for (MetadataType metadataType : metadataTypes) {
+ switch (metadataType) {
+ case children:
+ cachedType.setChildResourceTypes(type.getChildResourceTypes());
+ break;
+ case operations:
+ cachedType.setOperationDefinitions(type.getOperationDefinitions());
+ break;
+ case measurements:
+ cachedType.setMetricDefinitions(type.getMetricDefinitions());
+ break;
+ case content:
+ cachedType.setPackageTypes(type.getPackageTypes());
+ break;
+ case events:
+ cachedType.setPackageTypes(type.getPackageTypes());
+ break;
+ case pluginConfigurationDefinition:
+ cachedType.setPluginConfigurationDefinition(type.getPluginConfigurationDefinition());
+ break;
+ case resourceConfigurationDefinition:
+ cachedType.setResourceConfigurationDefinition(type.getResourceConfigurationDefinition());
+ break;
+ }
+ }
+ }
+ cachedTypes.put(type.getId(), cachedType);
+ } else {
+ typeCache.put(type.getId(), type);
+ cachedTypes.put(type.getId(), type);
+ }
+
+ if (metadataTypes != null) {
+ if (typeCacheLevel.containsKey(type.getId())) {
+ typeCacheLevel.get(type.getId()).addAll(metadataTypes);
+ } else {
+ typeCacheLevel.put(type.getId(), EnumSet.copyOf(metadataTypes));
+ }
+ }
+ }
+ callback.onTypesLoaded(cachedTypes);
+ }
+ });
+ }
+
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java
new file mode 100644
index 0000000..950ffaa
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/CustomResourceTreeGrid.java
@@ -0,0 +1,26 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type.detail;
+
+/**
+ * @author Greg Hinkle
+ */
+public class CustomResourceTreeGrid {
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java
new file mode 100644
index 0000000..de56d7e
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceDetailView.java
@@ -0,0 +1,26 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type.detail;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceDetailView {
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java
new file mode 100644
index 0000000..a5db2d0
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceSummaryView.java
@@ -0,0 +1,26 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type.detail;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceSummaryView {
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java
new file mode 100644
index 0000000..abaa9f0
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceTreeView.java
@@ -0,0 +1,182 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type.detail;
+
+import org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceTreeDatasource;
+
+import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.CloseClickHandler;
+import com.smartgwt.client.widgets.events.CloseClientEvent;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.MenuItemSeparator;
+import com.smartgwt.client.widgets.menu.events.ClickHandler;
+import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
+import com.smartgwt.client.widgets.tree.TreeGrid;
+import com.smartgwt.client.widgets.tree.events.DataArrivedEvent;
+import com.smartgwt.client.widgets.tree.events.DataArrivedHandler;
+import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent;
+import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceTreeView extends ResourceTreeView.ResourceTreeGrid {
+
+ public ResourceTreeView() {
+ super();
+
+
+ resourceTree.setWidth(500);
+ resourceTree.setShowResizeBar(true);
+ resourceTree.setHeight100();
+ resourceTree.setOpenerImage("resources/dir.png");
+ resourceTree.setOpenerIconSize(16);
+
+ resourceTree.setAutoFetchData(true);
+ resourceTree.setAnimateFolders(false);
+
+ resourceTree.setDataSource(new ResourceTreeDatasource());
+// ((Layout)treeTab.getPane()).add.addChild(resourceTree);
+
+
+ final Menu contextMenu = new Menu();
+ MenuItem item = new MenuItem("Expand node");
+ item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ TreeGrid treeGrid = (TreeGrid) event.getTarget();
+ System.out.println("You right clicked: " + treeGrid.getSelectedRecord());
+ }
+ });
+
+ /* Do menu support datasources? GH: Seemingly they'll only load once when done this way
+ contextMenu.setDataSource(new DataSource() {
+ {
+ setClientOnly(false);
+ setDataProtocol(DSProtocol.CLIENTCUSTOM);
+ setDataFormat(DSDataFormat.CUSTOM);
+ }
+ protected Object transformRequest(DSRequest request) {
+ System.out.println("Looking up menu info");
+ return request;
+ }
+ });
+ */
+
+ // Should only do this once, but it opens the platform node (which is not actually the root node)
+ resourceTree.addDataArrivedHandler(new DataArrivedHandler() {
+ public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
+ resourceTree.getTree().openFolders(resourceTree.getTree().getChildren(resourceTree.getTree().getRoot()));
+ }
+ });
+
+
+ resourceTree.setContextMenu(contextMenu);
+ resourceTree.addNodeContextClickHandler(new NodeContextClickHandler() {
+ public void onNodeContextClick(final NodeContextClickEvent nodeContextClickEvent) {
+ nodeContextClickEvent.getNode();
+ contextMenu.setItems(new MenuItem(nodeContextClickEvent.getNode().getName()));
+ resourceTree.getTree();
+ if (nodeContextClickEvent.getNode() instanceof ResourceTreeDatasource.ResourceTreeNode) {
+
+ ResourceTreeDatasource.ResourceTreeNode node = (ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode();
+ contextMenu.addItem(new MenuItem("Type: " + ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getName()));
+
+
+ MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration");
+ editPluginConfiguration.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
+ int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
+ int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
+
+ Window configEditor = new Window();
+ configEditor.setTitle("Edit " + resource.getName() + " plugin configuration");
+ configEditor.setWidth(800);
+ configEditor.setHeight(800);
+ configEditor.setIsModal(true);
+ configEditor.setShowModalMask(true);
+ configEditor.centerInPage();
+// configEditor.setShowResizeBar =
+ configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.plugin));
+ configEditor.show();
+
+ }
+ });
+ editPluginConfiguration.setEnabled(node.getResource().getResourceType().getPluginConfigurationDefinition() != null);
+ contextMenu.addItem(editPluginConfiguration);
+
+
+ MenuItem editResourceConfiguration = new MenuItem("Resource Configuration");
+ editResourceConfiguration.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ Resource resource = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource();
+ int resourceId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResource().getId();
+ int resourceTypeId = ((ResourceTreeDatasource.ResourceTreeNode) nodeContextClickEvent.getNode()).getResourceType().getId();
+
+ final Window configEditor = new Window();
+ configEditor.setTitle("Edit " + resource.getName() + " resource configuration");
+ configEditor.setWidth(800);
+ configEditor.setHeight(800);
+ configEditor.setIsModal(true);
+ configEditor.setShowModalMask(true);
+ configEditor.centerInPage();
+ configEditor.addCloseClickHandler(new CloseClickHandler() {
+ public void onCloseClick(CloseClientEvent closeClientEvent) {
+ configEditor.destroy();
+ }
+ });
+ configEditor.addItem(new ConfigurationEditor(resourceId, resourceTypeId, ConfigurationEditor.ConfigType.resource));
+ configEditor.show();
+
+ }
+ });
+ editResourceConfiguration.setEnabled(node.getResource().getResourceType().getResourceConfigurationDefinition() != null);
+ contextMenu.addItem(editResourceConfiguration);
+
+ contextMenu.addItem(new MenuItemSeparator());
+
+ MenuItem operations = new MenuItem("Operations");
+ Menu opSubMenu = new Menu();
+ for (OperationDefinition operationDefinition : node.getResourceType().getOperationDefinitions()) {
+ opSubMenu.addItem(new MenuItem(operationDefinition.getDisplayName()));
+
+ }
+ operations.setEnabled(!node.getResourceType().getOperationDefinitions().isEmpty());
+ operations.setSubmenu(opSubMenu);
+ contextMenu.addItem(operations);
+
+ }
+
+
+ contextMenu.showContextMenu();
+ }
+ });
+
+
+ addMember(resourceTree);
+
+ }
+
+
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java
new file mode 100644
index 0000000..3149053
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/detail/ResourceView.java
@@ -0,0 +1,26 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.type.detail;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceView {
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 6eba412..a45cfa4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -18,9 +18,25 @@
*/
package org.rhq.enterprise.gui.coregui.client.menu;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.DemoCanvas;
+import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
+
+import com.google.gwt.user.client.ui.Anchor;
+import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.Widget;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.WidgetCanvas;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.LinkItem;
+import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
+import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.menu.Menu;
import com.smartgwt.client.widgets.menu.MenuBar;
import com.smartgwt.client.widgets.menu.MenuItem;
@@ -30,9 +46,8 @@ import java.util.LinkedHashMap;
/**
* @author Greg Hinkle
*/
-public class MenuBarView extends Composite {
+public class MenuBarView extends HLayout {
- WidgetCanvas canvas;
MenuBar menuBar;
@@ -40,12 +55,18 @@ public class MenuBarView extends Composite {
public MenuBarView() {
+ setHeight(30);
+ setAlign(VerticalAlignment.BOTTOM);
+ setAlign(Alignment.LEFT);
+/*
menuBar = new MenuBar();
-
+ menuBar.setBackgroundColor("gray");
+
Menu icon = new Menu();
icon.setTitle("iManage");
- menus.put("icon",icon);
+ icon.addItem(new MenuItem("Dashboard"));
+ menuBar.addMenus(new Menu[]{icon},0);
Menu overview = new Menu();
@@ -53,7 +74,7 @@ public class MenuBarView extends Composite {
overview.addItem(new MenuItem("Content Configuration"));
overview.addItem(new MenuItem("Monitoring"));
overview.addItem(new MenuItem("Administration"));
- menus.put(overview.getTitle(), overview);
+ menuBar.addMenus(new Menu[]{overview},1);
Menu views = new Menu();
@@ -62,13 +83,76 @@ public class MenuBarView extends Composite {
views.addItem(new MenuItem("Configuration Changes"));
views.addItem(new MenuItem("Content Changes"));
views.addItem(new MenuItem("Recent Administration"));
- menus.put(views.getTitle(),views);
+ menuBar.addMenus(new Menu[]{views},2);
+
- menuBar.setMenus(menus.values().toArray(new Menu[menus.size()]));
+ menuBar.setWidth100();
+
- initWidget(menuBar);
- setWidth("100%");
+ addChild(menuBar);
+ setWidth100();*/
}
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setMembersMargin(20);
+
+ Img logo = new Img("RHQ.png", 100, 35);
+ addMember(logo);
+
+ Hyperlink dashboardLink = new Hyperlink("Dashboard", "Dashboard");
+ dashboardLink.setStylePrimaryName("TopSectionLink");
+ addMember(dashboardLink);
+
+ Hyperlink demoLink = new Hyperlink("Demo", "Demo");
+ demoLink.setStylePrimaryName("TopSectionLink");
+ addMember(demoLink);
+
+ Hyperlink resourcesLink = new Hyperlink("Resources", "Resources");
+ resourcesLink.setStylePrimaryName("TopSectionLink");
+ addMember(resourcesLink);
+
+ Hyperlink bundlesLink = new Hyperlink("Bundles", "Bundles");
+ bundlesLink.setStylePrimaryName("TopSectionLink");
+ addMember(bundlesLink);
+
+
+ Hyperlink adminLink = new Hyperlink("Administration", "Administration");
+ adminLink.setStylePrimaryName("TopSectionLink");
+ addMember(adminLink);
+
+
+
+//
+// LinkItem demoLink = new LinkItem("Demo");
+// demoLink.setShowTitle(false);
+// demoLink.setLinkTitle("Demo");
+// demoLink.addClickHandler(new ClickHandler() {
+// public void onClick(ClickEvent clickEvent) {
+// CoreGUI.setContent(new DemoCanvas());
+// }
+// });
+//
+//
+// LinkItem adminLink = new LinkItem("Administration");
+// adminLink.setShowTitle(false);
+// adminLink.setLinkTitle("Administration");
+//
+// demoLink.addClickHandler(new ClickHandler() {
+// public void onClick(ClickEvent clickEvent) {
+// CoreGUI.setContent(new AdministrationView());
+// }
+// });
+//
+// DynamicForm form = new DynamicForm();
+//
+// form.setItems(demoLink, adminLink);
+//
+// addMember(form);
+
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
new file mode 100644
index 0000000..4e6a086
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
@@ -0,0 +1,62 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.places;
+
+/**
+ * @author Greg Hinkle
+ */
+public class Place {
+
+ private String id;
+ private String name;
+
+ public Place(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Place place = (Place) o;
+
+ if (!id.equals(place.id)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java
new file mode 100644
index 0000000..59495f8
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java
@@ -0,0 +1,53 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.util;
+
+import com.smartgwt.client.widgets.AnimationCallback;
+import com.smartgwt.client.widgets.Canvas;
+
+/**
+ * @author Greg Hinkle
+ */
+public class CanvasUtility {
+
+
+ public static void blink(Canvas canvas) {
+
+ canvas.animateFade(10, new FadeAnimationCallback(3,canvas,false));
+ }
+
+ private static class FadeAnimationCallback implements AnimationCallback {
+ int count;
+ Canvas canvas;
+ boolean fadeOut;
+
+ private FadeAnimationCallback(int count, Canvas canvas, boolean fadeOut) {
+ this.count = count;
+ this.canvas = canvas;
+ this.fadeOut = fadeOut;
+ }
+
+ public void execute(boolean b) {
+ if (count > 0) {
+ canvas.animateFade(fadeOut ? 10 : 100, new FadeAnimationCallback(count-1,canvas, !fadeOut));
+ }
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
new file mode 100644
index 0000000..e903a46
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
@@ -0,0 +1,80 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.util;
+
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSource;
+import com.smartgwt.client.types.DSDataFormat;
+import com.smartgwt.client.types.DSProtocol;
+
+/**
+ * @author Greg Hinkle
+ */
+public abstract class RPCDataSource extends DataSource {
+
+
+
+
+
+ public RPCDataSource(String name) {
+ System.out.println("Trying to build DS: " + name);
+ setID(name);
+ setClientOnly(false);
+ setDataProtocol(DSProtocol.CLIENTCUSTOM);
+ setDataFormat(DSDataFormat.CUSTOM);
+
+
+ }
+
+
+
+
+ @Override
+ protected Object transformRequest(DSRequest request) {
+ String requestId = request.getRequestId();
+ DSResponse response = new DSResponse();
+ response.setAttribute("clientContext", request.getAttributeAsObject("clientContext"));
+ // Asume success
+ response.setStatus(0);
+ switch (request.getOperationType()) {
+ case ADD:
+ //executeAdd(lstRec, true);
+ break;
+ case FETCH:
+ executeFetch(requestId, request, response);
+ break;
+ case REMOVE:
+ //executeRemove(lstRec);
+ break;
+ case UPDATE:
+ //executeAdd(lstRec, false);
+ break;
+
+ default:
+ break;
+ }
+
+ return request.getData();
+ }
+
+
+ public abstract void executeFetch(final String requestId, final DSRequest request, final DSResponse response);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
new file mode 100644
index 0000000..48245f3
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
@@ -0,0 +1,63 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+/**
+ * @author Greg Hinkle
+ */
+public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
+
+ private ThreadLocal<Subject> sessionSubject = new ThreadLocal<Subject>();
+
+
+ protected Subject getSessionSubject() {
+ return sessionSubject.get();
+ }
+
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String sid = req.getHeader(GWTServiceLookup.SESSION_NAME);
+ Subject subject = null;
+ if (sid != null) {
+ SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ try {
+ subject = subjectManager.getSubjectBySessionId(Integer.parseInt(sid));
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to validate session", e);
+ }
+ }
+ sessionSubject.set(subject);
+
+ super.service(req, resp);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java
new file mode 100644
index 0000000..d1858af
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGwtServiceImpl.java
@@ -0,0 +1,54 @@
+package org.rhq.enterprise.gui.coregui.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implements ConfigurationGWTService {
+
+
+ public Configuration getPluginConfiguration(int resourceId) {
+
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ Configuration configuration = configurationManager.getPluginConfiguration(getSessionSubject(), resourceId);
+
+ return SerialUtility.prepare(configuration, "PluginConfiguration");
+ }
+
+ public ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId) {
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ ConfigurationDefinition definition = configurationManager.getPluginConfigurationDefinitionForResourceType(getSessionSubject(), resourceTypeId);
+ return SerialUtility.prepare(definition, "PluginDefinition");
+ }
+
+
+ public Configuration getResourceConfiguration(int resourceId) {
+
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ Configuration configuration = configurationManager.getResourceConfiguration(getSessionSubject(), resourceId);
+ return SerialUtility.prepare(configuration, "ResourceConfiguration");
+ }
+
+ public ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId) {
+ ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
+
+ ConfigurationDefinition definition = configurationManager.getResourceConfigurationDefinitionWithTemplatesForResourceType(getSessionSubject(), resourceTypeId);
+ return SerialUtility.prepare(definition, "ResourceDefinition");
+ }
+
+ public RawConfiguration dummy(RawConfiguration config) {
+ System.out.println(config.getPath());
+ return new RawConfiguration();
+ // Dummy method for gwt compiler
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java
new file mode 100644
index 0000000..6aa5646
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java
@@ -0,0 +1,86 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import org.rhq.core.domain.resource.Resource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ObjectFilter {
+
+
+ public static <T extends Collection> T filterFields(T collection, Set<String> goodFields) {
+ long sizeOfBefore = sizeOf(collection);
+ for (Object object : collection) {
+ filterFields(object, goodFields);
+ }
+ System.out.println("Object filtered from size [" + sizeOfBefore + "] to [" + sizeOf(collection) + "]");
+
+ return collection;
+ }
+
+ public static <T> T filterFields(T object, Set<String> goodFields) {
+
+ try {
+ Field[] fields = Resource.class.getDeclaredFields();
+ for (Field f : fields) {
+ if (!Modifier.isFinal(f.getModifiers())) {
+ if (!goodFields.contains(f.getName())) {
+ // Only clearing objects, no point in clearing primitives as it
+ // doesn't save any space on the stream
+ if (Object.class.isAssignableFrom(f.getType())) {
+// System.out.println("clearing " + f.getName());
+ f.setAccessible(true);
+ f.set(object, null);
+ } else {
+// System.out.println("Can't do " + f.getType());
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+ return object;
+ }
+
+
+ private static int sizeOf(Object object) {
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(50000);
+ ObjectOutputStream o = new ObjectOutputStream(baos);
+ o.writeObject(object);
+ o.flush();
+ return baos.size();
+ } catch (Exception e) {
+ }
+ return -1;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
new file mode 100644
index 0000000..5e4164a
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -0,0 +1,157 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.resource.ResourceManagerLocal;
+import org.rhq.enterprise.server.util.HibernateDetachUtility;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements ResourceGWTService {
+
+ private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
+
+
+ private static String[] importantFields = {
+ "serialVersionUID",
+// "ROOT \n" +
+// "ROOT_ID \n" +
+ "id",
+
+// "uuid \n" +
+// "resourceKey \n" +
+ "name",
+
+// "connected \n" +
+// "version \n" +
+ "description",
+
+// "ctime \n" +
+// "mtime \n" +
+// "itime \n" +
+// "modifiedBy \n" +
+// "location \n" +
+ "resourceType",
+// "childResources \n" +
+ "parentResource",
+// "resourceConfiguration \n" +
+// "pluginConfiguration \n" +
+// "agent \n" +
+// "alertDefinitions \n" +
+// "resourceConfigurationUpdates \n" +
+// "pluginConfigurationUpdates \n" +
+// "implicitGroups \n" +
+// "explicitGroups \n" +
+// "contentServiceRequests \n" +
+// "createChildResourceRequests \n" +
+// "deleteResourceRequests \n" +
+// "operationHistories \n" +
+// "installedPackages \n" +
+// "installedPackageHistory \n" +
+// "resourceRepos \n" +
+// "schedules \n" +
+// "availability \n" +
+ "currentAvailability"
+// "resourceErrors \n" +
+// "eventSources \n" +
+// "productVersion "}
+
+ };
+
+ private static Set<String> importantFieldsSet = new HashSet<String>(Arrays.asList(importantFields));
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ System.out.println("Loading GWT RPC Services");
+ }
+
+ public ResourceGWTServiceImpl() {
+ }
+
+ public PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria) {
+ try {
+ PageList<Resource> result = resourceManager.findResourcesByCriteria(getSessionSubject(), criteria);
+ for (Resource resource : result) {
+ resource.setAgent(null);
+ }
+
+
+ HibernateDetachUtility.nullOutUninitializedFields(result,
+ HibernateDetachUtility.SerializationType.SERIALIZATION);
+
+ long start = System.currentTimeMillis();
+
+ ObjectFilter.filterFields(result, importantFieldsSet);
+
+ System.out.println("Took: " + (System.currentTimeMillis() - start) + "ms");
+
+ return result;
+ } catch (Exception e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ public List<Resource> getResourceLineage(int resourceId) {
+ return SerialUtility.prepare(resourceManager.getResourceLineage(resourceId), "ResourceService.getResourceLineage");
+ }
+
+
+ public Resource getPlatformForResource(int resourceId) {
+ return SerialUtility.prepare(resourceManager.getRootResourceForResource(resourceId), "ResourceService.getPlatformForResource");
+ }
+
+ public RawConfiguration dummy(RawConfiguration config) {
+ System.out.println(config.getPath());
+ return config;
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java
new file mode 100644
index 0000000..3516ecc
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java
@@ -0,0 +1,31 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTService;
+
+
+
+/**
+ * @author Greg Hinkle
+ */
+public class ResourceGroupGWTServiceImpl extends AbstractGWTServiceImpl implements ResourceGroupGWTService {
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java
new file mode 100644
index 0000000..6ff33b3
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java
@@ -0,0 +1,29 @@
+package org.rhq.enterprise.gui.coregui.server.gwt;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.RawConfiguration;
+import org.rhq.core.domain.criteria.ResourceTypeCriteria;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+public class ResourceTypeGWTServiceImpl extends AbstractGWTServiceImpl implements ResourceTypeGWTService {
+
+ public PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria) {
+
+ ResourceTypeManagerLocal typeManager = LookupUtil.getResourceTypeManager();
+
+ return SerialUtility.prepare(typeManager.findResourceTypesByCriteria(getSessionSubject(), criteria), "ResourceTypes.findResourceTypesByCriteria");
+ }
+
+ public RawConfiguration dummy(RawConfiguration config) {
+ System.out.println(config.getPath());
+ return new RawConfiguration();
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java
new file mode 100644
index 0000000..360e078
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java
@@ -0,0 +1,50 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.criteria.RoleCriteria;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.gwt.RoleGWTService;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.authz.RoleManagerLocal;
+import org.rhq.enterprise.server.exception.LoginException;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import javax.jws.WebParam;
+
+/**
+ * @author Greg Hinkle
+ */
+public class RoleGWTServiceImpl extends AbstractGWTServiceImpl implements RoleGWTService {
+
+ private RoleManagerLocal roleManager = LookupUtil.getRoleManager();
+
+
+ public PageList<Role> findRolesByCriteria(RoleCriteria criteria) {
+ return SerialUtility.prepare(roleManager.findRolesByCriteria(getSessionSubject(), criteria),
+ "RoleService.findRolesByCriteria");
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
new file mode 100644
index 0000000..f347e10
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -0,0 +1,76 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.gwt;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.exception.LoginException;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import javax.jws.WebParam;
+
+/**
+ * @author Greg Hinkle
+ */
+public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements SubjectGWTService {
+
+ private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+
+ public void changePassword(String username, String password) {
+ // TODO: Implement this method.
+ }
+
+ public void createPrincipal(String username, String password) {
+ // TODO: Implement this method.
+ }
+
+ public Subject createSubject(Subject subjectToCreate) {
+ return null; // TODO: Implement this method.
+ }
+
+ public void deleteSubjects(int[] subjectIds) {
+ // TODO: Implement this method.
+ }
+
+ public Subject login(String username, String password) {
+ try {
+ return SerialUtility.prepare(subjectManager.login(username, password), "SubjectManager.login");
+ } catch (LoginException e) {
+ throw new RuntimeException("LoginException: " + e.getMessage());
+ }
+ }
+
+ public void logout(Subject subject) {
+ // TODO: Implement this method.
+ }
+
+ public Subject updateSubject(Subject subjectToModify) {
+ return null; // TODO: Implement this method.
+ }
+
+ public PageList<Subject> findSubjectsByCriteria(SubjectCriteria criteria) {
+ return SerialUtility.prepare(subjectManager.findSubjectsByCriteria(getSessionSubject(), criteria), "SubjectManager.findSubjectsByCriteria");
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/configuration/ConfigurationGwtServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/configuration/ConfigurationGwtServiceImpl.java
deleted file mode 100644
index 7bf8269..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/configuration/ConfigurationGwtServiceImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.rhq.enterprise.gui.coregui.server.inventory.configuration;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.enterprise.gui.coregui.client.inventory.configuration.ConfigurationGwtService;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
-import org.rhq.enterprise.server.util.HibernateDetachUtility;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-public class ConfigurationGwtServiceImpl extends RemoteServiceServlet implements ConfigurationGwtService {
-
-
- public Configuration getPluginConfiguration(int resourceId) {
-
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
-
- Configuration configuration = configurationManager.getPluginConfiguration(subjectManager.getOverlord(), resourceId);
-
- try {
- HibernateDetachUtility.nullOutUninitializedFields(configuration, HibernateDetachUtility.SerializationType.SERIALIZATION);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return configuration;
- }
-
- public ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId) {
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
-
- ConfigurationDefinition definition = configurationManager.getPluginConfigurationDefinitionForResourceType(subjectManager.getOverlord(), resourceTypeId);
- try {
- HibernateDetachUtility.nullOutUninitializedFields(definition, HibernateDetachUtility.SerializationType.SERIALIZATION);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return definition;
- }
-
-
- public Configuration getResourceConfiguration(int resourceId) {
-
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
-
- Configuration configuration = configurationManager.getResourceConfiguration(subjectManager.getOverlord(), resourceId);
-
- try {
- HibernateDetachUtility.nullOutUninitializedFields(configuration, HibernateDetachUtility.SerializationType.SERIALIZATION);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return configuration;
- }
-
- public ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId) {
- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
-
- ConfigurationDefinition definition = configurationManager.getResourceConfigurationDefinitionWithTemplatesForResourceType(subjectManager.getOverlord(), resourceTypeId);
- try {
- HibernateDetachUtility.nullOutUninitializedFields(definition, HibernateDetachUtility.SerializationType.SERIALIZATION);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return definition;
- }
-
- public void dummy(RawConfiguration config) {
-
- // Dummy method for gwt compiler
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/group/ResourceGroupGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/group/ResourceGroupGWTServiceImpl.java
deleted file mode 100644
index fc94571..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/group/ResourceGroupGWTServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.server.inventory.group;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.group.ResourceGroupGWTService;
-
-
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceGroupGWTServiceImpl extends RemoteServiceServlet implements ResourceGroupGWTService {
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/resource/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/resource/ResourceGWTServiceImpl.java
deleted file mode 100644
index c413f72..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/inventory/resource/ResourceGWTServiceImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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.server.inventory.resource;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-import org.rhq.core.domain.configuration.RawConfiguration;
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceGWTService;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.util.HibernateDetachUtility;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Greg Hinkle
- */
-public class ResourceGWTServiceImpl extends RemoteServiceServlet implements ResourceGWTService {
-
- @Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- System.out.println("Loading GWT RPC Services");
- }
-
- public ResourceGWTServiceImpl() {
- }
-
- public PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria) {
- ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
- try {
- PageList<Resource> result = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), criteria);
- for (Resource resource : result) {
- resource.setAgent(null);
- }
-
-
- HibernateDetachUtility.nullOutUninitializedFields(result,
- HibernateDetachUtility.SerializationType.SERIALIZATION);
-
-
- String[] importantFields = {
- "serialVersionUID",
-// "ROOT \n" +
-// "ROOT_ID \n" +
- "id",
-
-// "uuid \n" +
-// "resourceKey \n" +
- "name",
-
-// "connected \n" +
-// "version \n" +
- "description",
-
-// "ctime \n" +
-// "mtime \n" +
-// "itime \n" +
-// "modifiedBy \n" +
-// "location \n" +
- "resourceType",
-// "childResources \n" +
- "parentResource",
-// "resourceConfiguration \n" +
-// "pluginConfiguration \n" +
-// "agent \n" +
-// "alertDefinitions \n" +
-// "resourceConfigurationUpdates \n" +
-// "pluginConfigurationUpdates \n" +
-// "implicitGroups \n" +
-// "explicitGroups \n" +
-// "contentServiceRequests \n" +
-// "createChildResourceRequests \n" +
-// "deleteResourceRequests \n" +
-// "operationHistories \n" +
-// "installedPackages \n" +
-// "installedPackageHistory \n" +
-// "resourceRepos \n" +
-// "schedules \n" +
-// "availability \n" +
- "currentAvailability"
-// "resourceErrors \n" +
-// "eventSources \n" +
-// "productVersion "}
-
- };
-
- List<String> goodFields = Arrays.asList(importantFields);
-
-
- long start = System.currentTimeMillis();
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream(50000);
- ObjectOutputStream o = new ObjectOutputStream(baos);
- o.writeObject(result);
- o.flush();
- System.out.println("Page " + criteria.getPageControl().getStartRow() + " : " + criteria.getPageControl().getPageSize());
- System.out.println("Serialized size before: " + baos.size());
-
- Field[] fields = Resource.class.getDeclaredFields();
- for (Resource res : result) {
- for (Field f : fields) {
- if (!Modifier.isFinal(f.getModifiers())) {
- if (!goodFields.contains(f.getName())) {
- if (Object.class.isAssignableFrom(f.getType())) {
-// System.out.println("clearing " + f.getName());
- f.setAccessible(true);
- f.set(res, null);
- } else {
-// System.out.println("Can't do " + f.getType());
- }
- }
- }
- }
- }
-
- baos = new ByteArrayOutputStream(50000);
- o = new ObjectOutputStream(baos);
- o.writeObject(result);
- o.flush();
- System.out.println("Serialized size after: " + baos.size());
-
- System.out.println("Took: " + (System.currentTimeMillis() - start) + "ms");
-
- return result;
- } catch (Exception e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- throw new RuntimeException(e);
- }
- }
-
-
- public RawConfiguration dummy(RawConfiguration config) {
- System.out.println(config.getPath());
- return config;
- }
-
-
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java
new file mode 100644
index 0000000..8758b72
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java
@@ -0,0 +1,61 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.server.util;
+
+import org.rhq.enterprise.server.util.HibernateDetachUtility;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+/**
+ * @author Greg Hinkle
+ */
+public class SerialUtility {
+
+
+ public static <T> T prepare(T value, String message) {
+
+ long start = System.currentTimeMillis();
+ try {
+ HibernateDetachUtility.nullOutUninitializedFields(value, HibernateDetachUtility.SerializationType.SERIALIZATION);
+
+ System.out.println("SerialUtility.prepare [" + message + "] Detached in: " + (System.currentTimeMillis() - start) + "ms, Size is: " + serialSize(value));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return value;
+ }
+
+
+ public static int serialSize(Object value) {
+
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(50000);
+ ObjectOutputStream o = new ObjectOutputStream(baos);
+ o.writeObject(value);
+ o.flush();
+ return baos.size();
+ } catch (IOException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ return -1;
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
index eb7edd9..9d5deaa 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
@@ -51,7 +51,43 @@ body {
}
+.TopSectionLink {
+ font-size: 16pt;
+ font-weight: bold;
+ text-decoration: none;
+ color: black;
+}
+
+z
+
+.BreadCrumb {
+ font-size: 12pt;
+ font-weidght: bold;
+ text-decoration: none;
+ color: darkgray;
+}
+
+.SectionHeader {
+ font-size: 16pt;
+ font-weight: bold;
+}
+
+
.textItemDisabled {
background: rgb(214, 213, 217);
+}
+
+.formTitle, .formTitleFocused {
+ font-weight:bold;
+}
+
+
+.SubTabButton,.SubTabButtonSelected {
+ font-family: Arial,Verdana,Bitstream Vera Sans,sans-serif;
+ font-size: 11px;
+ padding: 2px;
+}
+.SubTabButtonSelected {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 158ba7c..4f28aac 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -9,11 +9,12 @@
<body>
<script type="text/javascript" language="javascript"
src="org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
-<h1>RHQ</h1>
<div id="Loading-Panel">
<img src="/images/ajax-loader.gif" alt="loading"> Loading RHQ, please wait...
</div>
+<iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
+
</body>
</html>
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index 3c6990f..6b4eacc 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -6,18 +6,44 @@
version="2.5">
<servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RoleGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SubjectGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceGroupGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.inventory.group.ResourceGroupGWTServiceImpl</servlet-class>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.inventory.resource.ResourceGWTServiceImpl</servlet-class>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ConfigurationGwtService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.inventory.configuration.ConfigurationGwtServiceImpl
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ConfigurationGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ConfigurationGWTServiceImpl
</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceTypeGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl
+ </servlet-class>
+ </servlet>
+
+
+
+ <servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RoleGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/RoleGWTService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SubjectGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/SubjectGWTService</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
@@ -29,7 +55,11 @@
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ResourceGWTService</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ConfigurationGwtService</servlet-name>
- <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ConfigurationGwtService</url-pattern>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ConfigurationGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ConfigurationGWTService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceTypeGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ResourceTypeGWTService</url-pattern>
</servlet-mapping>
</web-app>
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/RHQ.png b/modules/enterprise/gui/coregui/src/main/webapp/images/RHQ.png
new file mode 100644
index 0000000..6850b02
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/RHQ.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_16.png
new file mode 100644
index 0000000..d09143b
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_16.png
new file mode 100644
index 0000000..bbebc5c
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_closed.png
new file mode 100644
index 0000000..c968e71
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_closed.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_opened.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_opened.png
new file mode 100644
index 0000000..5dbfb8b
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_opened.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_closed.png
new file mode 100644
index 0000000..caad126
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_closed.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_closed.png
new file mode 100644
index 0000000..96fbe1e
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_closed.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_opened.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_opened.png
new file mode 100644
index 0000000..3334ffe
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_opened.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_closed.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_closed.png
new file mode 100644
index 0000000..8035977
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_closed.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_opened.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_opened.png
new file mode 100644
index 0000000..dd48417
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_opened.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_opened.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_opened.png
new file mode 100644
index 0000000..c5df8d8
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_opened.png differ
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java
index d5ce234..5f3e110 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java
@@ -40,7 +40,7 @@ import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.alert.composite.AlertWithLatestConditionLog;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.composite.IntegerOptionItem;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java
index 30f991f..cd36869 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java
@@ -41,7 +41,7 @@ import org.rhq.core.domain.alert.composite.AlertWithLatestConditionLog;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.composite.IntegerOptionItem;
import org.rhq.core.domain.criteria.AlertCriteria;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageControl;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java
index 33fefdb..f66175d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java
@@ -20,8 +20,8 @@ package org.rhq.enterprise.gui.alert.description;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
import org.rhq.enterprise.server.measurement.util.MeasurementFormatter;
/**
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java
index 495a0d5..b0c9115 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.alert.description;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
/**
* Describes <code>THRESHOLD </code> {@link AlertCondition}s.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java
index b2a2045..d177c7b 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java
@@ -23,7 +23,7 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.util.Iterator;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.enterprise.gui.image.data.IDataPoint;
import org.rhq.enterprise.gui.image.data.IDisplayDataPoint;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java
index d95bc04..c6be083 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java
@@ -25,8 +25,8 @@ import java.awt.Rectangle;
import java.util.Collection;
import java.util.Iterator;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
import org.rhq.enterprise.gui.image.data.IDataPoint;
import org.rhq.enterprise.gui.image.data.IDisplayDataPoint;
import org.rhq.enterprise.gui.image.data.IHighLowDataPoint;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
index 1916861..8e1b3a7 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
@@ -37,7 +37,7 @@ import org.rhq.core.domain.alert.AlertDefinitionContext;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.enterprise.gui.legacy.Constants;
import org.rhq.enterprise.gui.legacy.action.resource.ResourceForm.FormContext;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java
index 7f4bafe..d176a9c 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java
@@ -44,7 +44,7 @@ import org.rhq.core.domain.alert.AlertConditionLog;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.measurement.MeasurementDefinition;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.enterprise.gui.legacy.AttrConstants;
import org.rhq.enterprise.gui.legacy.beans.AlertConditionBean;
import org.rhq.enterprise.gui.legacy.util.RequestUtils;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java
index 93e7590..13aeb70 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java
@@ -25,11 +25,11 @@ import org.apache.struts.action.ActionMessage;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.server.MeasurementParser;
import org.rhq.core.util.NumberUtil;
import org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ConditionBean;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java
index 105084e..af9d61d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java
@@ -38,12 +38,12 @@ import org.rhq.core.clientapi.util.ArrayUtil;
import org.rhq.core.clientapi.util.StringUtil;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.measurement.MeasurementBaseline;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.NumericType;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.Group;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java
index ffe1dd8..01e362e 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.struts.util.RequestUtils;
import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
/**
* This is a locale aware tag for displaying metrics and units. Suppose you have a metricDisplaySummary.setMin(9234289)
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java
index f431449..673db6b 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java
@@ -33,8 +33,8 @@ import org.rhq.core.clientapi.util.units.ScaleConstants;
import org.rhq.core.clientapi.util.units.UnitNumber;
import org.rhq.core.clientapi.util.units.UnitsConstants;
import org.rhq.core.clientapi.util.units.UnitsFormat;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
/**
* This class is a two in one decorator/tag for use within the <code>TableTag</code>; it is a <code>
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java
index 38e45bd..7afccb0 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java
@@ -32,7 +32,7 @@ import org.rhq.core.clientapi.util.units.DateFormatter.DateSpecifics;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.measurement.composite.MeasurementValueAndUnits;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.enterprise.gui.legacy.Constants;
import org.rhq.enterprise.server.measurement.uibean.MetricDisplaySummary;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java
index 723bb7b..7d1b7dd 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java
@@ -32,7 +32,7 @@ import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.alert.AlertConditionLog;
import org.rhq.core.domain.alert.composite.AlertHistoryComposite;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.gui.util.FacesContextUtility;
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_closed.png b/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_closed.png
deleted file mode 100644
index c968e71..0000000
Binary files a/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_closed.png and /dev/null differ
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_open.png b/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_open.png
deleted file mode 100644
index 5dbfb8b..0000000
Binary files a/modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_open.png and /dev/null differ
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 7d18ecd..fb2dc32 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -22,7 +22,6 @@
<rich:toolBarGroup location="left">
<ui:remove>===== Grab the core menu from the perspective manager =====</ui:remove>
-
<c:forEach
var="menuItem"
items="#{PerspectiveUIBean.coreMenu}">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
index 6359d7e..dc5c95b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml
@@ -98,7 +98,9 @@ Firefox and other Gecko-based browsers to render the page in "Almost Standards"
<div id="PageHeader" style="border-bottom: 2px solid #999; position: absolute; top: 0; bottom: 0; left: 0; right: 0;">
<!--<![endif]-->
- <ui:include src="/rhq/common/menu/menu.xhtml"/>
+ <c:if test="${empty param.nomenu}">
+ <ui:include src="/rhq/common/menu/menu.xhtml"/>
+ </c:if>
<!-- work around for IE and its broken box model. Without the concrete height value, the nav pane will shrink on hover. -->
<!--[if IE]>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml
new file mode 100644
index 0000000..ad0ff64
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html 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:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<body>
+ <table width="100%">
+ <tr>
+ <td width="50%" valign="top" nowrap="nowrap">
+ <ui:include src="/rhq/resource/summary/table/recentMetrics.xhtml"/>
+ <br />
+ <rich:separator lineType="beveled"
+ width="50%" height="3px"
+ style="align: center;" />
+
+ <ui:include src="/rhq/resource/summary/table/recentAlerts.xhtml" />
+ <br />
+ <rich:separator lineType="beveled"
+ width="50%" height="3px"
+ style="align: center;" />
+
+ <ui:include src="/rhq/resource/summary/table/recentOOBs.xhtml"
+ rendered="#{ResourceUIBean.facets.measurement}" />
+ </td>
+
+ <td width="50%" valign="top" nowrap="nowrap">
+ <ui:include src="/rhq/resource/summary/table/recentConfigUpdates.xhtml"
+ rendered="#{ResourceUIBean.facets.configuration}" />
+ <br />
+ <rich:separator lineType="beveled"
+ width="50%" height="3px"
+ style="align: center;" />
+
+ <ui:include src="/rhq/resource/summary/table/recentOperations.xhtml"
+ rendered="#{ResourceUIBean.facets.operation}" />
+ <br />
+ <rich:separator lineType="beveled"
+ width="50%" height="3px"
+ style="align: center;" />
+
+ <ui:include src="/rhq/resource/summary/table/recentEventCounts.xhtml"
+ rendered="#{ResourceUIBean.facets.event}" />
+ <br />
+ <rich:separator lineType="beveled"
+ width="50%" height="3px"
+ style="align: center;" />
+
+ <ui:include src="/rhq/resource/summary/table/recentPackageHistory.xhtml"
+ rendered="#{ResourceUIBean.facets.content}" />
+ </td>
+ </tr>
+ </table>
+
+</body>
+
+</html>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml
new file mode 100644
index 0000000..c787509
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html 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:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+<body>
+ <h:form id="resourceTimelineForm">
+ <input type="hidden" name="id" value="${param.id}"/>
+
+ <rich:panel styleClass="BlockContent">
+ <f:facet name="header">
+ <h:outputText value="Resource Timeline"/>
+ </f:facet>
+
+ <h:panelGrid columns="1" width="97%">
+ <iframe src ="/resource/common/monitor/events/EventsView.jsp?id=#{param.id}"
+ width="100%" height="550" scrolling="no" frameborder="0" />
+ </h:panelGrid>
+
+ </rich:panel>
+ </h:form>
+
+ <h:form id="metricDisplayRangeForm" >
+ <input type="hidden" name="id" value="${param.id}"/>
+ <table>
+ <tr>
+ <td><onc:metric optionList="m,h,d" /></td>
+ <td>
+ <h:commandLink rendered="#{not MetricComponentUtilityUIBean.readOnly}"
+ action="#{MetricComponentUtilityUIBean.update}" >
+ <img src="/images/dash-button_go-arrow.gif" alt="Apply Metric Settings "/>
+ </h:commandLink>
+ <h:commandLink rendered="#{MetricComponentUtilityUIBean.readOnly}"
+ action="#{MetricComponentUtilityUIBean.switchToSimpleMode}">
+ <h:outputText value="Switch to Simple Mode" />
+ </h:commandLink>
+ </td>
+ </tr>
+ </table>
+ </h:form>
+</body>
+</html>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index beb0600..84e1863 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -63,7 +63,7 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java
index 9bf5ec7..4988e54 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java
@@ -21,7 +21,7 @@ package org.rhq.enterprise.server.measurement.util;
import org.rhq.core.domain.measurement.MeasurementBaseline;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.server.MeasurementConverter;
+import org.rhq.core.domain.measurement.MeasurementConverter;
import org.rhq.enterprise.server.legacy.measurement.MeasurementConstants;
public class MeasurementFormatter {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 3cec165..7c463cc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -632,6 +632,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
int childResourceId = resourceId;
Resource parent;
while ((parent = getParentResource(childResourceId)) != null) {
+ resourceLineage.addAll(parent.getChildResources());
resourceLineage.addFirst(parent);
childResourceId = parent.getId(); // This also ensures Hibernate actually populates parent's fields.
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java
index ba5d623..12099c8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java
@@ -53,7 +53,9 @@ public class CriteriaQueryRunner<T> {
long count = (Long) countQuery.getSingleResult();
List<T> results = query.getResultList();
- initAllPersistentBags(results);
+ if (!queryGenerator.getPersistentBagFields().isEmpty()) {
+ initAllPersistentBags(results);
+ }
return new PageList<T>(results, (int) count, criteria.getPageControl());
}
diff --git a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
index c5240b7..d6b5987 100644
--- a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
+++ b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
@@ -26,6 +26,7 @@ import org.hibernate.proxy.HibernateProxy;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlTransient;
+
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -37,7 +38,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
@@ -65,7 +68,7 @@ public class HibernateDetachUtility {
}
private static void nullOutUninitializedFields(Object value, Set<Integer> nulledObjects, int depth,
- SerializationType serializationType) throws Exception {
+ SerializationType serializationType) throws Exception {
if (depth > 50) {
LOG.warn("Getting different object hierarchies back from calls: " + value.getClass().getName());
return;
@@ -79,22 +82,36 @@ public class HibernateDetachUtility {
if (value instanceof Object[]) {
Object[] objArray = (Object[]) value;
- for(int i = 0; i < objArray.length; i++)
- {
- nullOutUninitializedFields(objArray[i], nulledObjects, depth +1, serializationType);
+ for (int i = 0; i < objArray.length; i++) {
+ nullOutUninitializedFields(objArray[i], nulledObjects, depth + 1, serializationType);
}
- } else if (value instanceof Collection) {
+ } else if (value instanceof List) {
// Null out any entries in initialized collections
+ ListIterator i = ((List)value).listIterator();
+ while (i.hasNext()) {
+ Object val = i.next();
+ Object replace = replaceObject(val);
+ if (replace != null) {
+ val = replace;
+ i.set(replace);
+ }
+ nullOutUninitializedFields(val, nulledObjects, depth + 1, serializationType);
+ }
+
+ } else if (value instanceof Collection) {
for (Object val : (Collection) value) {
nullOutUninitializedFields(val, nulledObjects, depth + 1, serializationType);
}
} else if (value instanceof Map) {
- for (Object key : ((Map)value).keySet()) {
- nullOutUninitializedFields(((Map)value).get(key), nulledObjects, depth+1, serializationType);
- nullOutUninitializedFields(key, nulledObjects, depth+1, serializationType);
+ for (Object key : ((Map) value).keySet()) {
+ nullOutUninitializedFields(((Map) value).get(key), nulledObjects, depth + 1, serializationType);
+ nullOutUninitializedFields(key, nulledObjects, depth + 1, serializationType);
}
- }
+ } else if (value instanceof Enum) {
+ // don't need to detach enums, treat them as special objects
+ return;
+ }
if (serializationType == SerializationType.JAXB) {
@@ -114,7 +131,7 @@ public class HibernateDetachUtility {
}
private static void nullOutFieldsByFieldAccess(Object object, Set<Integer> nulledObjects, int depth,
- SerializationType serializationType) throws Exception {
+ SerializationType serializationType) throws Exception {
Class tmpClass = object.getClass();
@@ -155,7 +172,7 @@ public class HibernateDetachUtility {
String className = fieldValue.getClass().getName();
className = className.substring(0, className.indexOf("_$$_"));
if (!replacement.getClass().getName().contains("hibernate")) {
- nullOutUninitializedFields(replacement, nulledObjects, depth+1, serializationType);
+ nullOutUninitializedFields(replacement, nulledObjects, depth + 1, serializationType);
field.set(object, replacement);
} else {
@@ -214,20 +231,20 @@ public class HibernateDetachUtility {
} else if (fieldValue instanceof Set) {
replacement = new HashSet((Set) fieldValue);
} else if (fieldValue instanceof Collection) {
- replacement = new ArrayList((Collection)fieldValue);
+ replacement = new ArrayList((Collection) fieldValue);
}
setField(object, field.getName(), replacement);
- nullOutUninitializedFields(replacement, nulledObjects, depth+1, serializationType);
+ nullOutUninitializedFields(replacement, nulledObjects, depth + 1, serializationType);
}
} else {
if (fieldValue != null &&
(fieldValue.getClass().getName().contains("org.rhq") ||
- fieldValue instanceof Collection ||
- fieldValue instanceof Object[] ||
- fieldValue instanceof Map))
- nullOutUninitializedFields((fieldValue), nulledObjects, depth+1, serializationType);
+ fieldValue instanceof Collection ||
+ fieldValue instanceof Object[] ||
+ fieldValue instanceof Map))
+ nullOutUninitializedFields((fieldValue), nulledObjects, depth + 1, serializationType);
}
}
if (accessModifierFlag) {
@@ -238,10 +255,28 @@ public class HibernateDetachUtility {
}
+ private static Object replaceObject(Object object) {
+ Object replacement = null;
+
+ if (object instanceof HibernateProxy) {
+ if (object.getClass().getName().contains("javassist")) {
+ Class assistClass = object.getClass();
+ try {
+ Method m = assistClass.getMethod("writeReplace");
+ replacement = m.invoke(object);
+
+ String className = object.getClass().getName();
+ } catch (Exception e) {
+ System.out.println("Unable to write replace object " + object.getClass());
+ }
+ }
+ }
+ return replacement;
+ }
+
-
private static void nullOutFieldsByAccessors(Object value, Set<Integer> nulledObjects, int depth,
- SerializationType serializationType) throws Exception {
+ SerializationType serializationType) throws Exception {
// Null out any collections that aren't loaded
BeanInfo bi = Introspector.getBeanInfo(value.getClass(), Object.class);
@@ -264,18 +299,18 @@ public class HibernateDetachUtility {
Method writeMethod = pd.getWriteMethod();
if ((writeMethod != null) && (writeMethod.getAnnotation(XmlTransient.class) == null)) {
- pd.getWriteMethod().invoke(value, new Object[] { null });
+ pd.getWriteMethod().invoke(value, new Object[]{null});
} else {
nullOutField(value, pd.getName());
}
} catch (Exception lie) {
LOG.debug("Couldn't null out: " + pd.getName() + " off of " + value.getClass().getSimpleName()
- + " trying field access", lie);
+ + " trying field access", lie);
nullOutField(value, pd.getName());
}
} else {
if ((propertyValue instanceof Collection)
- || ((propertyValue != null) && propertyValue.getClass().getName().startsWith("org.rhq.core.domain"))) {
+ || ((propertyValue != null) && propertyValue.getClass().getName().startsWith("org.rhq.core.domain"))) {
nullOutUninitializedFields(propertyValue, nulledObjects, depth + 1, serializationType);
}
}
1
0
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java | 18 +++++++--
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml | 19 +++-------
2 files changed, 22 insertions(+), 15 deletions(-)
New commits:
commit 204c6b7de81df429eae5a506c36a84f0ddb7bdc2
Merge: e09efb0... 2ae22a1...
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Feb 22 13:06:45 2010 -0500
Merge branch 'linux-config' into ldap
commit 2ae22a1875e208342ef96cf98825ad31dd01b04f
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Feb 22 16:39:30 2010 +0100
BZ 565910 - Resource group summary pane uses resource names disambiguation.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java
index 970d2af..ff35220 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java
@@ -26,9 +26,11 @@ import org.rhq.core.domain.resource.composite.ResourceWithAvailability;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.util.IntExtractor;
import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean;
import org.rhq.enterprise.gui.common.paging.PageControlView;
import org.rhq.enterprise.gui.common.paging.PagedListDataModel;
+import org.rhq.enterprise.gui.common.paging.ResourceNameDisambiguatingPagedListDataModel;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -36,6 +38,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean {
public static final String MANAGED_BEAN_NAME = "ResourceGroupSummaryUIBean";
+ private static final IntExtractor<ResourceWithAvailability> RESOURCE_ID_EXTRACTOR = new IntExtractor<ResourceWithAvailability>() {
+ public int extract(ResourceWithAvailability object) {
+ return object.getResource().getId();
+ }
+ };
+
@Override
public DataModel getDataModel() {
if (dataModel == null) {
@@ -46,15 +54,15 @@ public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean {
return dataModel;
}
- protected class ListResourceGroupMembersDataModel extends PagedListDataModel<ResourceWithAvailability> {
+ protected class ListResourceGroupMembersDataModel extends ResourceNameDisambiguatingPagedListDataModel<ResourceWithAvailability> {
private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
public ListResourceGroupMembersDataModel(PageControlView view, String beanName) {
- super(view, beanName);
+ super(view, beanName, true);
}
@Override
- public PageList<ResourceWithAvailability> fetchPage(PageControl pageControl) {
+ public PageList<ResourceWithAvailability> fetchDataForPage(PageControl pageControl) {
Subject subject = EnterpriseFacesContextUtility.getSubject();
ResourceGroup resourceGroup = EnterpriseFacesContextUtility.getResourceGroup();
@@ -64,6 +72,10 @@ public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean {
return results;
}
+
+ protected IntExtractor<ResourceWithAvailability> getResourceIdExtractor() {
+ return RESOURCE_ID_EXTRACTOR;
+ }
}
@Override
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml
index 8fd84d9..200a1ed 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml
@@ -180,22 +180,17 @@ groupId - the group id of the Group being accessed
</f:facet>
<h:outputLink value="#{onf:getDefaultResourceTabURL()}">
- <f:param name="id" value="#{resourceWithAvailability.resource.id}"/>
- <h:outputText value="#{resourceWithAvailability.resource.name}"/>
+ <f:param name="id" value="#{resourceWithAvailability.original.resource.id}"/>
+ <h:outputText value="#{resourceWithAvailability.original.resource.name}"/>
</h:outputLink>
</rich:column>
<rich:column>
<f:facet name="header">
- <onc:sortableColumnHeader sort="parent.name">
- <h:outputText styleClass="headerText" value="Parent"/>
- </onc:sortableColumnHeader>
+ <h:outputText styleClass="headerText" value="Parent"/>
</f:facet>
- <h:outputLink value="#{onf:getDefaultResourceTabURL()}">
- <f:param name="id" value="#{resourceWithAvailability.parent.id}"/>
- <h:outputText value="#{resourceWithAvailability.parent.name}"/>
- </h:outputLink>
+ <onc:resourcePartialLineage parents="#{resourceWithAvailability.parents}"/>
</rich:column>
@@ -207,11 +202,11 @@ groupId - the group id of the Group being accessed
</f:facet>
<h:graphicImage value="/images/icons/availability_green_16.png" alt="Up" title="Up"
- rendered="#{resourceWithAvailability.availability == 'UP'}"/>
+ rendered="#{resourceWithAvailability.original.availability == 'UP'}"/>
<h:graphicImage value="/images/icons/availability_red_16.png" alt="Down" title="Down"
- rendered="#{resourceWithAvailability.availability == 'DOWN'}"/>
+ rendered="#{resourceWithAvailability.original.availability == 'DOWN'}"/>
<h:graphicImage value="/images/icons/availability_grey_16.png" alt="Unknown" title="Unknown"
- rendered="#{resourceWithAvailability.availability == null}"/>
+ rendered="#{resourceWithAvailability.original.availability == null}"/>
</rich:column>
<f:facet name="footer">
1
0