modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
| 10 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java
| 27 ++++++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java
| 8 ++
4 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit 7cde889a84325eda5164b0c7f72fa024be072e7a
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Mar 28 10:28:02 2012 -0400
[BZ 802544] Adding details url column in config history report
Also fixing a couple compilation errors in coregui.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
index c3cb655..23edd16 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
@@ -237,7 +237,7 @@ public class DriftComplianceReport extends LocatableVLayout implements
Bookmarka
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue)
{
ExportModalWindow exportModalWindow =
-
ExportModalWindow.createExportWindowForInventorySummary("driftCompliance",
null);
+
ExportModalWindow.createExportWindowForInventorySummary("driftCompliance",
false, null);
exportModalWindow.show();
refreshTableInfo();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
index 3dc5eab..6ee27d9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
@@ -1,14 +1,15 @@
package org.rhq.enterprise.gui.coregui.client.report.alert;
+import java.util.ArrayList;
+import java.util.List;
+
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.enterprise.gui.coregui.client.alert.SubsystemResourceAlertView;
import org.rhq.enterprise.gui.coregui.client.components.ExportModalWindow;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
-import java.util.ArrayList;
-import java.util.List;
-
public class SubsystemRecentAlertsView extends SubsystemResourceAlertView {
public SubsystemRecentAlertsView(String locatorId, boolean hasWriteAccess) {
@@ -42,7 +43,8 @@ public class SubsystemRecentAlertsView extends
SubsystemResourceAlertView {
alertPriorityList.add(AlertPriority.LOW);
}
}
- ExportModalWindow exportModalWindow =
ExportModalWindow.createExportWindowForRecentAlerts("recentAlerts",alertPriorityList);
+ ExportModalWindow exportModalWindow =
ExportModalWindow.createExportWindowForRecentAlerts(
+ "recentAlerts", alertPriorityList.toArray(new
String[alertPriorityList.size()]));
exportModalWindow.show();
refreshTableInfo();
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java
index 60547fa..39a25d9 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java
@@ -7,16 +7,15 @@ import java.io.OutputStream;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Request;
import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
import org.rhq.enterprise.server.rest.AbstractRestBean;
import org.rhq.enterprise.server.rest.SetCallerInterceptor;
@@ -34,11 +33,9 @@ public class ConfigurationHistoryHandler extends AbstractRestBean
implements Con
@EJB
private ConfigurationManagerLocal configurationManager;
- @EJB
- private SubjectManagerLocal subjectMgr;
-
@Override
- public StreamingOutput configurationHistory(UriInfo uriInfo, Request request,
HttpHeaders headers ) {
+ public StreamingOutput configurationHistory(UriInfo uriInfo, final HttpServletRequest
request,
+ HttpHeaders headers ) {
return new StreamingOutput() {
@Override
@@ -71,16 +68,28 @@ public class ConfigurationHistoryHandler extends AbstractRestBean
implements Con
+
formatDateTime(configurationUpdate.getCreatedTime())+","
+
formatDateTime(configurationUpdate.getModifiedTime())+","
+ configurationUpdate.getStatus()+","
- +
cleanForCSV(ReportHelper.parseAncestry(configurationUpdate.getResource().getAncestry()));
+ +
cleanForCSV(ReportHelper.parseAncestry(configurationUpdate.getResource().getAncestry())) +
","
+ + getDetailsURL(configurationUpdate);
//@todo: check dates, user, update-type
}
private String getHeader(){
- return "Name,Version,Date Submitted,Date
Completed,Status,Ancestry";
+ return "Name,Version,Date Submitted,Date
Completed,Status,Ancestry,Details URL";
}
- };
+ private String getDetailsURL(ResourceConfigurationUpdate configUpdate) {
+ String protocol;
+ if (request.isSecure()) {
+ protocol = "https";
+ } else {
+ protocol = "http";
+ }
+ return protocol + "://" + request.getServerName() +
":" + request.getServerPort() +
+ "/coregui/#Resource/" + configUpdate.getResource().getId()
+ "/Configuration/History/" +
+ configUpdate.getId();
+ }
+ };
}
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java
index 8446563..879d760 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java
@@ -1,10 +1,14 @@
package org.rhq.enterprise.server.rest.reporting;
import javax.ejb.Local;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.StreamingOutput;
+import javax.ws.rs.core.UriInfo;
@Path("/reports/configurationHistory")
@Local
@@ -15,7 +19,7 @@ public interface ConfigurationHistoryLocal {
@Produces({"text/csv", "application/xml"})
StreamingOutput configurationHistory(
@Context UriInfo uriInfo,
- @Context Request request,
+ @Context HttpServletRequest request,
@Context HttpHeaders headers);
}