modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java | 48 +++++++++-
1 file changed, 46 insertions(+), 2 deletions(-)
New commits:
commit 22011e143bb53bfd1b1116b48de09f1281117b0f
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Apr 8 15:39:25 2013 -0400
Update some alert def tests to better test for bug 949048 and 949062
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
index 5e9620a..5e40380 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
@@ -20,6 +20,9 @@
package org.rhq.enterprise.server.alert;
+import static org.rhq.core.domain.measurement.DataType.MEASUREMENT;
+import static org.rhq.core.domain.measurement.NumericType.DYNAMIC;
+
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -28,6 +31,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.testng.annotations.Test;
+import org.rhq.core.domain.alert.AlertCondition;
+import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.alert.AlertDampening;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.AlertPriority;
@@ -36,6 +41,7 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.authz.Role;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -62,6 +68,7 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
final private String roleName = prefix + "role";
final private String groupName = prefix + "group";
final private String resourceName = prefix + "resource";
+ final private String measurementDefName = prefix + "measurement";
private AlertDefinitionManagerLocal alertDefinitionManager;
@@ -94,6 +101,14 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
Role role = SessionTestHelper.createNewRoleForSubject(em, subject, roleName, Permission.MANAGE_ALERTS);
newTestData.setRole(role);
ResourceType resourceType = SessionTestHelper.createNewResourceType(em);
+
+ // To test bug 949048 we need a metric on the type
+ MeasurementDefinition dynamicMeasuremenDef = new MeasurementDefinition(resourceType, measurementDefName);
+ dynamicMeasuremenDef.setDefaultOn(true);
+ dynamicMeasuremenDef.setDataType(MEASUREMENT);
+ dynamicMeasuremenDef.setMeasurementType(DYNAMIC);
+ em.persist(dynamicMeasuremenDef);
+
newTestData.setResourceType(resourceType);
ResourceGroup resourceGroup = new ResourceGroup(groupName, resourceType);
resourceGroup = resourceGroupManager.createPrivateResourceGroup(subject, resourceGroup);
@@ -260,6 +275,7 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
int[] ids = new int[] { resource2.getId(), resource3.getId() };
AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.fetchConditions(true);
criteria.addFilterResourceIds(ids[0], ids[1]);
List<AlertDefinition> result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(),
@@ -269,11 +285,20 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
assertEquals(name, result.get(0).getName());
assertEquals(name, result.get(1).getName());
assertTrue(result.get(0).getId() != result.get(1).getId());
+ assertEquals(1, result.get(0).getConditions().size());
+ assertEquals(1, result.get(1).getConditions().size());
- // remove member and ensure the alert def gets removed
+ // remove one member and ensure the alert def gets removed and no other members are affected (bug 949062)
LookupUtil.getResourceGroupManager().removeResourcesFromGroup(subjectManager.getOverlord(),
- testData.getResourceGroup().getId(), ids);
+ testData.getResourceGroup().getId(), new int[] { resource2.getId() });
+
+ result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(), criteria);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ // now the other one
+ LookupUtil.getResourceGroupManager().removeResourcesFromGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), new int[] { resource3.getId() });
result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(), criteria);
assertNotNull(result);
assertEquals(0, result.size());
@@ -324,6 +349,15 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
alertDefinition.setRecoveryId(0);
alertDefinition.setGroup(testData.getResourceGroup());
alertDefinition.setEnabled(true);
+
+ // We need a threshold alert condition to recreate the issue in bug 949048
+ AlertCondition ac = new AlertCondition();
+ ac.setCategory(AlertConditionCategory.THRESHOLD);
+ ac.setMeasurementDefinition(testData.getMeasurementDef());
+ ac.setComparator("<");
+ ac.setThreshold(0.5);
+ alertDefinition.addCondition(ac);
+
int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(),
alertDefinition, null, true);
testData.getAlertDefinitionIds().add(alertDefinitionId);
@@ -338,6 +372,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
private ResourceType resourceType;
+ private MeasurementDefinition measurementDef;
+
private ResourceGroup resourceGroup;
private Resource resource;
@@ -368,6 +404,14 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
this.resourceType = resourceType;
}
+ public MeasurementDefinition getMeasurementDef() {
+ return measurementDef;
+ }
+
+ public void setMeasurementDef(MeasurementDefinition measurementDef) {
+ this.measurementDef = measurementDef;
+ }
+
public ResourceGroup getResourceGroup() {
return resourceGroup;
}
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 174 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java | 85 ++--
3 files changed, 153 insertions(+), 107 deletions(-)
New commits:
commit cdd21b21fc4fa8bb548c24a1147dd36704ebf0ac
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Apr 8 14:03:17 2013 -0400
Bug 921927
Prevent concurrent searches for suggestion list entries or saved searches.
Timing issues could cause duplicates to show up in the list.
Also:
- fix an issue with return key handling, which should not fire off
another suggest list update but only hide the suggest list and perform the
resource list query.
- stop ignoring the Backspace character when editing the search textbox
entry. I found it unintuitive that only adding characters could trigger
a search.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
index d2089b4..1edd076 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
@@ -45,6 +45,9 @@ import org.rhq.enterprise.gui.coregui.client.util.Log;
*/
public class BasicSearchStrategy extends AbstractSearchStrategy {
+ private boolean isSearchInProgress = false;
+ private String pendingSearchExpression = null;
+
public BasicSearchStrategy(EnhancedSearchBar searchBar) {
super(searchBar);
}
@@ -71,6 +74,11 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
return sb.toString();
}
+ @Override
+ public int getCellHeight() {
+ return 20;
+ }
+
/**
* Executed when this field is clicked on. Note that if {@link
* com.smartgwt.client.widgets.grid.ListGrid#addRecordClickHandler ListGrid.recordClick} is also defined, it will be fired
@@ -84,21 +92,21 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
Log.debug("BasicSearchStrategy click");
String kind = event.getRecord().getAttribute(ATTR_KIND);
- String pattern;
+ String searchExpression;
if (kind.equals("SAVED") || kind.equals("GLOBAL")) {
Log.debug("Saved or Global Search Click");
- pattern = event.getRecord().getAttribute(ATTR_PATTERN);
+ searchExpression = event.getRecord().getAttribute(ATTR_PATTERN);
} else {
Log.debug("Regular Search Click");
- pattern = event.getRecord().getAttribute(ATTR_NAME);
+ searchExpression = event.getRecord().getAttribute(ATTR_NAME);
}
searchBar.getSearchTextItem().focusInItem();
- if (!(null == pattern || pattern.isEmpty())) {
- searchBar.getSearchTextItem().setValue(pattern);
- getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, pattern, pattern.length());
+ if (!(null == searchExpression || searchExpression.isEmpty())) {
+ searchBar.getSearchTextItem().setValue(searchExpression);
+ doSearch(searchExpression);
}
}
@@ -118,109 +126,135 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
@Override
public void searchReturnKeyHandler(KeyUpEvent keyUpEvent) {
- doSearch((String) keyUpEvent.getItem().getValue());
+ searchBar.getPickListGrid().hide();
}
private void doSearch(String searchExpression) {
+ if (isSearchInProgress) {
+ Log.debug("Adding pending search [" + searchExpression + "]");
+ pendingSearchExpression = (null == searchExpression) ? "" : searchExpression;
+ return;
+ }
+
+ Log.debug("Search Start");
+ isSearchInProgress = true;
+
if (null == searchExpression || searchExpression.isEmpty()) {
Log.debug("Empty Search expression");
- getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, null, 0);
+ getSearchSuggestions(SearchSubsystem.RESOURCE, null, 0);
+
} else {
Log.debug("doSearch: " + searchExpression);
- getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(),
- searchBar.getSearchTextItem().getValueAsString().length());
+ getSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(), searchBar
+ .getSearchTextItem().getValueAsString().length());
}
-
- // don't obscure the results
- searchBar.getPickListGrid().hide();
}
- @Override
- public int getCellHeight() {
- return 20;
- }
-
- private void getTabAwareSearchSuggestions(final SearchSubsystem searchSubsystem, final String expression,
- int caretPosition) {
+ private void getSearchSuggestions(final SearchSubsystem searchSubsystem, final String expression, int caretPosition) {
final long suggestStart = System.currentTimeMillis();
Log.debug("Searching for: " + expression);
+
searchService.getTabAwareSuggestions(searchSubsystem, expression, caretPosition, null,
new AsyncCallback<List<SearchSuggestion>>() {
@Override
public void onSuccess(List<SearchSuggestion> results) {
- ListGrid searchBarPickListGrid = searchBar.getPickListGrid();
- DataSource ds = searchBarPickListGrid.getDataSource();
- // create the datasource if needed
- if (null == ds) {
- ds = new DataSource();
- ds.setClientOnly(true);
- DataSourceTextField idField = new DataSourceTextField(ATTR_ID, "Id");
- idField.setPrimaryKey(true);
- idField.setCanView(false);
+ try {
+ ListGrid searchBarPickListGrid = searchBar.getPickListGrid();
+ DataSource ds = searchBarPickListGrid.getDataSource();
+
+ // create the datasource if needed
+ if (null == ds) {
+ ds = new DataSource();
+ ds.setClientOnly(true);
+ DataSourceTextField idField = new DataSourceTextField(ATTR_ID, "Id");
+ idField.setPrimaryKey(true);
+ idField.setCanView(false);
- DataSourceTextField valueField = new DataSourceTextField(ATTR_VALUE, "Value");
+ DataSourceTextField valueField = new DataSourceTextField(ATTR_VALUE, "Value");
- ds.setFields(idField, valueField);
+ ds.setFields(idField, valueField);
- searchBarPickListGrid.setDataSource(ds);
- ListGridField[] fields = searchBarPickListGrid.getAllFields();
- searchBarPickListGrid.getField(ATTR_VALUE).setShowHover(true);
- searchBarPickListGrid.getField(ATTR_VALUE).setHoverCustomizer(new HoverCustomizer() {
+ searchBarPickListGrid.setDataSource(ds);
+ ListGridField[] fields = searchBarPickListGrid.getAllFields();
+ searchBarPickListGrid.getField(ATTR_VALUE).setShowHover(true);
+ searchBarPickListGrid.getField(ATTR_VALUE).setHoverCustomizer(new HoverCustomizer() {
- public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
- String kind = record.getAttribute(ATTR_KIND);
- if (kind.equals("SAVED") || kind.equals("GLOBAL")) {
- String pattern = record.getAttribute(ATTR_PATTERN);
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
+ if (null == record) {
+ return "";
+ }
+ String kind = record.getAttribute(ATTR_KIND);
+ if (kind.equals("SAVED") || kind.equals("GLOBAL")) {
+ String pattern = record.getAttribute(ATTR_PATTERN);
- if (!(null == pattern || pattern.isEmpty())) {
- return pattern;
+ if (!(null == pattern || pattern.isEmpty())) {
+ return pattern;
+ }
}
+
+ return "";
}
+ });
- return null;
- }
- });
+ } else {
+ ds.invalidateCache();
+ }
- } else {
- ds.invalidateCache();
- }
+ for (SearchSuggestion searchSuggestion : results) {
+ Log.debug("search tab aware Suggestions: " + searchSuggestion.getKind() + ", "
+ + searchSuggestion.getValue() + ", " + searchSuggestion.getLabel());
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute(ATTR_ID, searchSuggestion.getValue());
+ if (null != searchSuggestion.getKind()) {
+ record.setAttribute(ATTR_KIND, searchSuggestion.getKind().getDisplayName());
+ }
+ record.setAttribute(ATTR_NAME, searchSuggestion.getLabel());
+ record.setAttribute(ATTR_VALUE, searchSuggestion.getValue());
+ String pattern = searchSuggestion.getOptional();
+ record.setAttribute(ATTR_PATTERN, (null == pattern) ? "" : pattern);
+ ds.addData(record);
+ }
- for (SearchSuggestion searchSuggestion : results) {
- Log.debug("search tab aware Suggestions: " + searchSuggestion.getKind() + ", "
- + searchSuggestion.getValue() + ", " + searchSuggestion.getLabel());
- ListGridRecord record = new ListGridRecord();
- record.setAttribute(ATTR_ID, searchSuggestion.getValue());
- if (null != searchSuggestion.getKind()) {
- record.setAttribute(ATTR_KIND, searchSuggestion.getKind().getDisplayName());
+ try {
+ searchBarPickListGrid.setData(new ListGridRecord[] {});
+ searchBarPickListGrid.fetchData();
+ } catch (Exception e) {
+ Log.debug("Caught exception on fetchData: " + e);
}
- record.setAttribute(ATTR_NAME, searchSuggestion.getLabel());
- record.setAttribute(ATTR_VALUE, searchSuggestion.getValue());
- String pattern = searchSuggestion.getOptional();
- record.setAttribute(ATTR_PATTERN, (null == pattern) ? "" : pattern);
- ds.addData(record);
- }
- try {
- searchBarPickListGrid.setData(new ListGridRecord[] {});
- searchBarPickListGrid.fetchData();
- } catch (Exception e) {
- Log.debug("Caught exception on fetchData: " + e);
- }
+ long suggestFetchTime = System.currentTimeMillis() - suggestStart;
+ Log.debug(results.size() + " suggestions searches fetched in: " + suggestFetchTime + "ms");
+
+ } finally {
+ // By the time we're done it's possible the results are already obsolete. If so, kick
+ // off another search.
+ Log.debug("Search End");
+
+ if (null == pendingSearchExpression) {
+ isSearchInProgress = false;
+
+ } else {
+ Log.debug("Performing pending search [" + pendingSearchExpression + "]");
- long suggestFetchTime = System.currentTimeMillis() - suggestStart;
- Log.debug(results.size() + " suggestions searches fetched in: " + suggestFetchTime + "ms");
+ String searchExpression = pendingSearchExpression;
+ pendingSearchExpression = null;
+ isSearchInProgress = false;
+ doSearch(searchExpression);
+ }
+ }
}
@Override
public void onFailure(Throwable caught) {
+ Log.debug("Search End");
+ isSearchInProgress = false;
+ pendingSearchExpression = null;
CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_suggest_failSuggest(), caught);
}
-
});
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
index dcc7bda..add7a01 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
@@ -88,7 +88,6 @@ public class EnhancedSearchBar extends ToolStrip {
IGNORED_KEYS.add("Arrow_Up");
IGNORED_KEYS.add("Arrow_Left");
IGNORED_KEYS.add("Arrow_Right");
- IGNORED_KEYS.add("Backspace");
}
enum SearchMode {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
index fdd8fa5..44f20e2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
@@ -50,6 +50,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
*/
public class FavoritesSearchStrategy extends AbstractSearchStrategy {
+ private boolean isSearchInProgress = false;
+
public FavoritesSearchStrategy(EnhancedSearchBar searchBar) {
super(searchBar);
}
@@ -97,7 +99,6 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
if (confirmed) {
Integer id = record.getAttributeAsInt(ATTR_ID);
-
GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
@Override
@@ -132,6 +133,11 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
private void populateSavedSearches() {
+ // avoid concurrent searches
+ if (isSearchInProgress) {
+ return;
+ }
+
Log.debug("Search Saved Searches");
SavedSearchCriteria savedSearchCriteria = new SavedSearchCriteria();
Subject subject = UserSessionManager.getSessionSubject();
@@ -140,51 +146,58 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
final long startTime = System.currentTimeMillis();
searchBar.getPickListGrid().setData(new ListGridRecord[] {});
+ isSearchInProgress = true;
+
searchService.findSavedSearchesByCriteria(savedSearchCriteria, new AsyncCallback<List<SavedSearch>>() {
@Override
public void onFailure(Throwable caught) {
+ isSearchInProgress = false;
CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failFetch(), caught);
}
@Override
public void onSuccess(List<SavedSearch> result) {
- long fetchTime = System.currentTimeMillis() - startTime;
- Log.debug(result.size() + " saved searches fetched in: " + fetchTime + "ms");
-
- ListGrid searchBarPickListGrid = searchBar.getPickListGrid();
- DataSource ds = searchBarPickListGrid.getDataSource();
-
- if (null == ds) {
- ds = new DataSource();
- ds.setClientOnly(true);
- DataSourceTextField valueField = new DataSourceTextField(ATTR_ID, "Id");
- valueField.setPrimaryKey(true);
- ds.setFields(valueField);
- searchBarPickListGrid.setDataSource(ds);
-
- } else {
- ds.invalidateCache();
- }
-
- for (SavedSearch savedSearch : result) {
- Log.debug("savedSearch: " + savedSearch.getName());
- ListGridRecord record = new ListGridRecord();
- record.setAttribute(ATTR_ID, savedSearch.getId());
- record.setAttribute(ATTR_KIND, "Saved");
- record.setAttribute(ATTR_NAME, savedSearch.getName());
- record.setAttribute(ATTR_DESCRIPTION, savedSearch.getDescription());
- record.setAttribute(ATTR_PATTERN, savedSearch.getPattern());
- if (savedSearch.getResultCount() != null)
- record.setAttribute(ATTR_RESULT_COUNT, savedSearch.getResultCount());
- ds.addData(record);
- }
-
try {
- searchBarPickListGrid.setData(new ListGridRecord[] {});
- searchBarPickListGrid.fetchData();
- } catch (Exception e) {
- Log.debug("Caught exception on fetchData: " + e);
+ long fetchTime = System.currentTimeMillis() - startTime;
+ Log.debug(result.size() + " saved searches fetched in: " + fetchTime + "ms");
+
+ ListGrid searchBarPickListGrid = searchBar.getPickListGrid();
+ DataSource ds = searchBarPickListGrid.getDataSource();
+
+ if (null == ds) {
+ ds = new DataSource();
+ ds.setClientOnly(true);
+ DataSourceTextField valueField = new DataSourceTextField(ATTR_ID, "Id");
+ valueField.setPrimaryKey(true);
+ ds.setFields(valueField);
+ searchBarPickListGrid.setDataSource(ds);
+
+ } else {
+ ds.invalidateCache();
+ }
+
+ for (SavedSearch savedSearch : result) {
+ Log.debug("savedSearch: " + savedSearch.getName());
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute(ATTR_ID, savedSearch.getId());
+ record.setAttribute(ATTR_KIND, "Saved");
+ record.setAttribute(ATTR_NAME, savedSearch.getName());
+ record.setAttribute(ATTR_DESCRIPTION, savedSearch.getDescription());
+ record.setAttribute(ATTR_PATTERN, savedSearch.getPattern());
+ if (savedSearch.getResultCount() != null)
+ record.setAttribute(ATTR_RESULT_COUNT, savedSearch.getResultCount());
+ ds.addData(record);
+ }
+
+ try {
+ searchBarPickListGrid.setData(new ListGridRecord[] {});
+ searchBarPickListGrid.fetchData();
+ } catch (Exception e) {
+ Log.debug("Caught exception on fetchData: " + e);
+ }
+ } finally {
+ isSearchInProgress = false;
}
}
});
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 24 +++++-----
1 file changed, 14 insertions(+), 10 deletions(-)
New commits:
commit f4a6e580fdf850d298863eba8a214803e3aa8c91
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Apr 8 18:14:34 2013 +0200
[BZ 823908] - User should be redirected to Operations->History tab after operation execution on autogroup - The getListViewPath method slightly modified. Now it takes into consideration the case when scheduling the operation for autogroups.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index f696d66..febc86d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -52,6 +52,7 @@ import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
import org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.operation.bean.OperationSchedule;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
@@ -66,21 +67,21 @@ import org.rhq.enterprise.gui.coregui.client.components.form.UnitType;
import org.rhq.enterprise.gui.coregui.client.components.trigger.JobTriggerEditor;
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.groups.detail.ResourceGroupDetailView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDataSource;
import org.rhq.enterprise.gui.coregui.client.util.FormUtility;
import org.rhq.enterprise.gui.coregui.client.util.TypeConversionUtility;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* A view for viewing or editing an RHQ {@link org.rhq.core.domain.operation.bean.OperationSchedule operation schedule}.
*
* @author Ian Springer
*/
-@SuppressWarnings("unchecked")
public abstract class AbstractOperationScheduleDetailsView extends
- AbstractRecordEditor<AbstractOperationScheduleDataSource> {
+ AbstractRecordEditor<AbstractOperationScheduleDataSource<? extends OperationSchedule>> {
private static final String FIELD_OPERATION_DESCRIPTION = "operationDescription";
private static final String FIELD_OPERATION_PARAMETERS = "operationParameters";
@@ -101,7 +102,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
private ViewPath viewPath;
private boolean isImmediateExecution;
- public AbstractOperationScheduleDetailsView(AbstractOperationScheduleDataSource dataSource,
+ public AbstractOperationScheduleDetailsView(AbstractOperationScheduleDataSource<? extends OperationSchedule> dataSource,
ResourceType resourceType, int scheduleId) {
super(dataSource, scheduleId, MSG.view_operationScheduleDetails_operationSchedule(), null);
@@ -126,14 +127,17 @@ public abstract class AbstractOperationScheduleDetailsView extends
// to the history page so that he can view the status/result of the operation;
// otherwise, the user will stay on the schedules list view.
if (isImmediateExecution) {
- // If the operation is scheduled from the context menu, the view path will
- // another entry appended to the end, the operation definition id.
- if (viewPath.getCurrentIndex() == 6) {
+ // If the operation is scheduled from the context menu, the view path will have
+ // another entry appended to the end, the operation definition id (viewPath.getCurrentIndex() == 6)
+ // Similarly, auto groups have another chunk of view path present ("AutoGroup").
+ // If the operation is scheduled for the auto group, the view path will include "Resource/AutoGroup"
+ // This was causing BZ 823908
+ boolean isAutogroup = viewPath.getParentViewPath().contains(ResourceGroupDetailView.AUTO_GROUP_VIEW);
+ if ((!isAutogroup && viewPath.getCurrentIndex() == 6) || (isAutogroup && viewPath.getCurrentIndex() == 7)) {
return viewPath.getPathToIndex(viewPath.getCurrentIndex() - 3) + "/History";
- } else {
- return viewPath.getPathToIndex(viewPath.getCurrentIndex() - 2) + "/History";
}
-
+ // common case (for resource, group not using context menu)
+ return viewPath.getPathToIndex(viewPath.getCurrentIndex() - 2) + "/History";
}
return super.getListViewPath();
}
1
0
08 Apr '13
modules/core/arquillian-integration/container/pom.xml | 3
modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml | 2
modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml | 2
modules/core/arquillian-integration/pom.xml | 1
modules/core/arquillian-integration/test-agent-plugin/README | 6
modules/core/arquillian-integration/test-agent-plugin/pom.xml | 58 ++
modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java | 25 +
modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java | 22
modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml | 12
modules/core/domain/pom.xml | 62 +-
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 31 -
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 17
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 37 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 117 ++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 185 --------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 225 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 133 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 165 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 59 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java | 2
modules/enterprise/server/itests-2/pom.xml | 30 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java | 142 +++++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java | 8
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 10
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 29 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 127 ++++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java | 4
51 files changed, 959 insertions(+), 697 deletions(-)
New commits:
commit 8acf5c72efec9b9d3c0fc85623894e3b032a5964
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Apr 8 16:31:03 2013 +0200
Make domain and itests also correctly unzip eap6.1alpha
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 91e83ff..04ba98e 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -16,14 +16,14 @@
<properties>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
- <jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+ <jboss.unzip.location>${basedir}/target/${jboss.eap.version}</jboss.unzip.location>
<rhq.internal>false</rhq.internal>
- <jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m</jboss.vm.args>
+ <jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m</jboss.vm.args>
<jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
<!-- These properties guide which datasources are used for integration tests. Only one should be true.
The default is Postgres, specify -Pitest.oracle to use Oracle -->
<skip.postgres>false</skip.postgres>
- <skip.oracle>true</skip.oracle>
+ <skip.oracle>true</skip.oracle>
</properties>
@@ -54,16 +54,16 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<!-- provided by AS7 -->
- <dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
-
+
<!-- needed if you want to use the logging JDBC wrapper
<dependency>
<groupId>org.rhq</groupId>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
- <artifactId>arquillian-testng-container</artifactId>
+ <artifactId>arquillian-testng-container</artifactId>
<scope>test</scope>
</dependency>
@@ -125,7 +125,7 @@
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
@@ -222,7 +222,7 @@
<replacetoken></extensions></replacetoken>
<replacevalue><![CDATA[
</extensions>
-
+
<!-- FOR RHQ TESTING -->
<system-properties>
<property name="jboss.socket.binding.port-offset" value="${jboss.socket.binding.port-offset}" />
@@ -292,7 +292,7 @@
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<id>prepare Postgres datasource</id>
<phase>process-test-resources</phase>
@@ -302,11 +302,11 @@
<property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
<echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
-
+
<replacefilter>
<replacetoken></datasource></replacetoken>
<replacevalue><![CDATA[
- </datasource>
+ </datasource>
<!-- FOR RHQ TESTING -->
<datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true">
<connection-url>${rhq.test.ds.connection-url}</connection-url>
@@ -355,19 +355,19 @@
</timeout>
<statement>
<prepared-statement-cache-size>75</prepared-statement-cache-size>
- </statement>
+ </statement>
</xa-datasource>]]></replacevalue>
</replacefilter>
-
+
</replace>
-
+
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<id>prepare Oracle datasource</id>
<phase>process-test-resources</phase>
@@ -377,11 +377,11 @@
<property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
<echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
-
+
<replacefilter>
<replacetoken></datasource></replacetoken>
<replacevalue><![CDATA[
- </datasource>
+ </datasource>
<!-- FOR RHQ TESTING -->
<datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true">
<connection-url>${rhq.test.ds.connection-url}</connection-url>
@@ -418,8 +418,8 @@
<!--
Oracle does not like XA connections getting used both inside and outside a JTA transaction.
To workaround the problem you can create separate sub-pools for the different contexts using <no-tx-separate-pools/>
- -->
- <no-tx-separate-pools>true</no-tx-separate-pools>
+ -->
+ <no-tx-separate-pools>true</no-tx-separate-pools>
</xa-pool>
<security>
<security-domain>RHQDSSecurityDomain</security-domain>
@@ -438,16 +438,16 @@
</statement>
</xa-datasource>]]></replacevalue>
</replacefilter>
-
+
</replace>
-
+
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
-
+
</executions>
</plugin>
@@ -473,7 +473,7 @@
<name>listener</name>
<value>org.rhq.test.testng.StdoutReporter</value>
</property>
- </properties>
+ </properties>
<systemProperties>
<property>
<name>ejbjarDirectory</name>
@@ -484,7 +484,7 @@
<value>${rhq.test.ds.hibernate-dialect}</value>
</property>
</systemProperties>
- <excludes>
+ <excludes>
<exclude>**/ResourceTypeTest.java</exclude> <!-- TODO: this should be fixed up and reinstated -->
</excludes>
<!-- The below is required for tests to run against Oracle. -->
@@ -577,7 +577,7 @@
Using it turned out not t be a current option since the instrumented class carries with
it hibernate imports that we can't put in the domain jar since it's used on the Agent and
in Remote Java Clients. But this worked, so here ya go...
- (update: this may no longer work given the upgrade to H4, also, deps would have changed)
+ (update: this may no longer work given the upgrade to H4, also, deps would have changed)
<taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
<classpath>
<path refid="maven.runtime.classpath" />
@@ -662,7 +662,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>itest.debug</id>
<activation>
@@ -675,8 +675,8 @@
</properties>
</profile>
- <!-- These two properties allow Arquillian to inspect AS7 through the mgmt port, to determine the ports it needs to interact
- with when spawning the AS7 instance. This allows the AS7 to run on non-default ports. If these properties are not set (for
+ <!-- These two properties allow Arquillian to inspect AS7 through the mgmt port, to determine the ports it needs to interact
+ with when spawning the AS7 instance. This allows the AS7 to run on non-default ports. If these properties are not set (for
example, in settings.xml) then we must set the defaults here. The offset is then provided via the standalone.xml properties -->
<profile>
<id>arquillian-ports</id>
@@ -690,7 +690,7 @@
<jboss.management.native.port>9999</jboss.management.native.port>
</properties>
</profile>
-
+
</profiles>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index 24fb17b..1f91fd9 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -22,11 +22,11 @@
<properties>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
- <jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+ <jboss.unzip.location>${basedir}/target/${jboss.eap.version}</jboss.unzip.location>
<jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m -Djava.security.manager
-Djava.security.policy==${jboss.unzip.location}/security.policy</jboss.vm.args>
<jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
- <!-- These properties guide which datasources are used for integration tests. Only one should be true. The default is
+ <!-- These properties guide which datasources are used for integration tests. Only one should be true. The default is
Postgres, specify -Pitest.oracle to use Oracle -->
<skip.postgres>false</skip.postgres>
<skip.oracle>true</skip.oracle>
@@ -86,7 +86,7 @@
<replacetoken></extensions></replacetoken>
<replacevalue><![CDATA[
</extensions>
-
+
<!-- FOR RHQ TESTING -->
<system-properties>
<property name="project.version" value="${project.version}"/>
@@ -98,7 +98,7 @@
<replacefilter>
<replacetoken></security-domains></replacetoken>
<replacevalue><![CDATA[
- <!-- FOR RHQ TESTING -->
+ <!-- FOR RHQ TESTING -->
<security-domain name="RHQDSSecurityDomain" cache-type="default">
<authentication>
<login-module code="ConfiguredIdentity" flag="required">
@@ -133,7 +133,7 @@
<replacefilter>
<replacetoken><socket-binding name="https" port="8443"/></replacetoken>
<replacevalue><![CDATA[
- <socket-binding name="https" port="8443"/>
+ <socket-binding name="https" port="8443"/>
<!-- FOR RHQ TESTING -->
<socket-binding name="messaging" port="${rhq.server.socket.binding.port.messaging:4445}"/>
<socket-binding name="messaging-throughput" port="${rhq.server.socket.binding.port.messaging-throughput:4455}"/>]]></replacevalue>
@@ -244,8 +244,8 @@
<replacefilter>
<replacetoken></drivers></replacetoken>
- <replacevalue><![CDATA[
- <!-- FOR RHQ TESTING -->
+ <replacevalue><![CDATA[
+ <!-- FOR RHQ TESTING -->
<driver name="postgres" module="org.rhq.postgres">
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
</driver>
@@ -320,7 +320,7 @@
<replacefilter>
<replacetoken></datasource></replacetoken>
<replacevalue><![CDATA[
- </datasource>
+ </datasource>
<!-- FOR RHQ TESTING -->
<datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true">
<connection-url>${rhq.test.ds.connection-url}</connection-url>
@@ -369,7 +369,7 @@
</timeout>
<statement>
<prepared-statement-cache-size>75</prepared-statement-cache-size>
- </statement>
+ </statement>
</xa-datasource>]]></replacevalue>
</replacefilter>
@@ -395,7 +395,7 @@
<replacefilter>
<replacetoken></datasource></replacetoken>
<replacevalue><![CDATA[
- </datasource>
+ </datasource>
<!-- FOR RHQ TESTING -->
<datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true">
<connection-url>${rhq.test.ds.connection-url}</connection-url>
@@ -432,7 +432,7 @@
<!--
Oracle does not like XA connections getting used both inside and outside a JTA transaction.
To workaround the problem you can create separate sub-pools for the different contexts using <no-tx-separate-pools/>
- -->
+ -->
<no-tx-separate-pools>true</no-tx-separate-pools>
</xa-pool>
<security>
@@ -534,7 +534,7 @@
<profiles>
<profile>
- <!-- This profile has been created to avoid unnecessary resolution of test dependencies during a build that does not
+ <!-- This profile has been created to avoid unnecessary resolution of test dependencies during a build that does not
run, compile or need tests. There are product build dependencies on this profile, don't remove. -->
<id>test.dependencies</id>
@@ -716,7 +716,7 @@
</properties>
<dependencies>
- <!-- The provided scope in the root pom is not sufficient, we need this fo shrinkwrap to resolve dependency and add
+ <!-- The provided scope in the root pom is not sufficient, we need this fo shrinkwrap to resolve dependency and add
the jar to the deployment. -->
<dependency>
<groupId>com.oracle</groupId>
@@ -739,8 +739,8 @@
</properties>
</profile>
- <!-- These two properties allow Arquillian to inspect AS7 through the mgmt port, to determine the ports it needs to interact
- with when spawning the AS7 instance. This allows the AS7 to run on non-default ports. If these properties are not set (for
+ <!-- These two properties allow Arquillian to inspect AS7 through the mgmt port, to determine the ports it needs to interact
+ with when spawning the AS7 instance. This allows the AS7 to run on non-default ports. If these properties are not set (for
example, in settings.xml) then we must set the defaults here. The offset is then provided via the standalone.xml properties -->
<profile>
<id>arquillian-ports</id>
commit 111159b1997ef97d1a0b126b1302c8181d2345ef
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Apr 8 15:28:26 2013 +0200
Get rid of the dependency on the JMX plugin in the Arquillian container tests.
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 9dc7a99..75a7a05 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -123,8 +123,9 @@
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
+ <artifactId>rhq-arquillian-container-test-plugin</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml b/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
index 09f3c7b..74b5245 100644
--- a/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
+++ b/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
@@ -9,7 +9,7 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" />
+ <depends plugin="ArquillianTestPlugin" />
<server name="TestServer"
discovery="TestDiscoveryComponent"
diff --git a/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml b/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
index 0f38779..4136504 100644
--- a/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
+++ b/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
@@ -9,7 +9,7 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" />
+ <depends plugin="ArquillianTestPlugin" />
<server name="TestServer"
discovery="TestDiscoveryComponent"
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index fb6f3ee..7e215a3 100644
--- a/modules/core/arquillian-integration/pom.xml
+++ b/modules/core/arquillian-integration/pom.xml
@@ -20,6 +20,7 @@
<description>parent POM for integration modules with Arquillian</description>
<modules>
+ <module>test-agent-plugin</module>
<module>container</module>
<module>archive</module>
<module>suite-extension</module>
diff --git a/modules/core/arquillian-integration/test-agent-plugin/README b/modules/core/arquillian-integration/test-agent-plugin/README
new file mode 100644
index 0000000..6670138
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/README
@@ -0,0 +1,6 @@
+This is a test plugin that is only used by the tests for the RHQ's Arquillian
+container.
+
+The purpose of this plugin is only to serve as a dependency for the plugins
+under test in the container that is being picked up from the maven classpath
+as opposed to the tests themselves.
\ No newline at end of file
diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
new file mode 100644
index 0000000..f086ca3
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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-arquillian-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-arquillian-container-test-plugin</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Test Plugin for RHQ's Arquillian container</name>
+
+ <description>
+ This is a test plugin that is only used by the tests for the RHQ's Arquillian
+ container.
+
+ The purpose of this plugin is only to serve as a dependency for the plugins
+ under test in the container that is being picked up from the maven classpath
+ as opposed to the tests themselves.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java
new file mode 100644
index 0000000..9d8c013
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java
@@ -0,0 +1,25 @@
+package org.rhq.plugins.arquillian.test;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+
+/**
+ * @author Lukas Krejci
+ */
+public class Component implements ResourceComponent<ResourceComponent<?>> {
+ @Override
+ public void start(ResourceContext<ResourceComponent<?>> context)
+ throws InvalidPluginConfigurationException, Exception {
+ }
+
+ @Override
+ public void stop() {
+ }
+
+ @Override
+ public AvailabilityType getAvailability() {
+ return AvailabilityType.UP;
+ }
+}
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java
new file mode 100644
index 0000000..09cec61
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java
@@ -0,0 +1,22 @@
+package org.rhq.plugins.arquillian.test;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * @author Lukas Krejci
+ */
+public class Discovery implements ResourceDiscoveryComponent<ResourceComponent<?>> {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<ResourceComponent<?>> context)
+ throws InvalidPluginConfigurationException, Exception {
+ return Collections.emptySet();
+ }
+}
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml b/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml
new file mode 100644
index 0000000..d22b8f4
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<plugin name="ArquillianTestPlugin"
+ displayName="Arquillian Test Plugin"
+ description="This plugin is a mere dependency for the Arquillian container tests. It serves no other functional purpose."
+ package="org.rhq.plugins.arquillian.test"
+ version="1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="Server" class="Component" discovery="Discovery" />
+</plugin>
commit 7c62b834f737f7ba3c3ab5a811575a00afcb3bba
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Apr 8 14:59:24 2013 +0200
Bug 846451, 949048, 949062 * createAlertDefinition() renamed to createAlertDefinitionInNewTransaction() (itest-2 module didn't compile)
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
index 3cd1044..af045ca 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
@@ -303,7 +303,7 @@ public class AlertManagerTest extends AbstractEJB3Test {
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
alertDefinition.setEnabled(true);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(), alertDefinition,
testData.getResource().getId(), true);
testData.setAlertDefinitionId(alertDefinitionId);
return alertDefinitionId;
commit d53956fec6fdad01e6459971d569a932ba062f78
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 15:14:08 2013 -0700
[BZ 949103] - On inventory detail summary metrics charts N+2 clicks of Set button stops firing.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 7d6cfdd..0dfaf8e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -78,6 +78,9 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
private int resourceId = -1;
+ private ChartViewWindow window;
+ private D3GraphListView graphView;
+
public ResourceMetricsPortlet(int resourceId) {
super(EntityContext.forResource(-1));
this.resourceId = resourceId;
@@ -273,9 +276,9 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
link.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- ChartViewWindow window = new ChartViewWindow(title);
+ window = new ChartViewWindow(title);
- final D3GraphListView graphView = D3GraphListView
+ graphView = D3GraphListView
.createSingleGraph(resourceComposite.getResource(),
md.getId(), true);
graphView.addSetButtonClickHandler(new ClickHandler() {
commit d32ad182a2b4d033afc5bd7e0a8709e3d5220d31
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 5 16:43:20 2013 -0400
Bug 949082
RFE: Allow alert ack/delete from recent alerts portlet and reporting view
Based on contribution from mark Addy (thanks!)
Change the "Delete" and "Acknowledge" alert buttons in the AlertHistoryView
to use "ResourceAuthorizedTableAction" rather than "AbstractTableAction".
This generates additional calls to the backend to check permissions on
row selections (for non-admins). But, it should likely not be noticeable.
I made one small optimization in ResourceAuthorizedTableAction. If
constructed with a requiredPermission=null it will ignore the authz check.
Using that we can make it perform like a standard table action. So, if in
fact the user is an admin or otherwise has write access then it should
act as before. I took away the isEnabled() overrides in the original
patch in favor of this approach. The overrides had a small issue because
they did not consider "enablement". Meaning the buttons would be active
(for admins) even if nothing was selected.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 9f28987..4c4c41f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -21,10 +21,13 @@ package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.LinkedHashMap;
+import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.ResultSet;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.SortDirection;
@@ -36,6 +39,7 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
@@ -43,7 +47,8 @@ import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
-import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
+import org.rhq.enterprise.gui.coregui.client.components.table.RecordExtractor;
+import org.rhq.enterprise.gui.coregui.client.components.table.ResourceAuthorizedTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
@@ -162,17 +167,35 @@ public class AlertHistoryView extends TableSection<AlertDataSource> implements H
}
protected void setupTableInteractions(final boolean hasWriteAccess) {
- TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY
- : TableActionEnablement.NEVER;
- addTableAction(MSG.common_button_delete(), MSG.view_alerts_delete_confirm(), new AbstractTableAction(
- singleTargetEnablement) {
+ addTableAction(MSG.common_button_delete(), MSG.view_alerts_delete_confirm(), new ResourceAuthorizedTableAction(
+ AlertHistoryView.this, TableActionEnablement.ANY, (hasWriteAccess ? null : Permission.MANAGE_ALERTS),
+ new RecordExtractor<Integer>() {
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("resourceId"));
+ }
+ return result;
+ }
+ }) {
+
public void executeAction(ListGridRecord[] selection, Object actionValue) {
delete(selection);
}
});
- addTableAction(MSG.common_button_ack(), MSG.view_alerts_ack_confirm(), new AbstractTableAction(
- singleTargetEnablement) {
+ addTableAction(MSG.common_button_ack(), MSG.view_alerts_ack_confirm(), new ResourceAuthorizedTableAction(
+ AlertHistoryView.this, TableActionEnablement.ANY, (hasWriteAccess ? null : Permission.MANAGE_ALERTS),
+ new RecordExtractor<Integer>() {
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("resourceId"));
+ }
+ return result;
+ }
+ }) {
+
public void executeAction(ListGridRecord[] selection, Object actionValue) {
acknowledge(selection);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
index 3050ecb..28df326 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
@@ -48,11 +48,23 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
private Boolean isAuthorized;
+ /**
+ * @param table
+ * @param enablement
+ * @param requiredPermission if null no check is performed and authorization always passes
+ * @param extractor
+ */
protected ResourceAuthorizedTableAction(Table<?> table, Permission requiredPermission,
RecordExtractor<Integer> extractor) {
this(table, TableActionEnablement.ALWAYS, requiredPermission, extractor);
}
+ /**
+ * @param table
+ * @param enablement
+ * @param requiredPermission if null no check is performed and authorization always passes
+ * @param extractor
+ */
protected ResourceAuthorizedTableAction(Table<?> table, TableActionEnablement enablement,
Permission requiredPermission, RecordExtractor<Integer> extractor) {
super(enablement);
@@ -61,7 +73,7 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
this.requiredPermission = requiredPermission;
this.extractor = extractor;
- if (Target.RESOURCE != this.requiredPermission.getTarget()) {
+ if (null != this.requiredPermission && Target.RESOURCE != this.requiredPermission.getTarget()) {
throw new IllegalArgumentException("Does not support Global permission");
}
}
@@ -73,6 +85,11 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
return false;
}
+ // if there is no required permission then no check is performed
+ if (null == requiredPermission) {
+ return true;
+ }
+
final Collection<Integer> selectedResourceIds = extractor.extract(selection);
boolean isNewSelection = !selectedResourceIds.equals(this.authorizedResourceIds);
commit b23ce9c82810197fc600525d2039c2a3b48bb4cd
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 5 16:14:33 2013 -0400
Bug 846451, 949048, 949062
* Users with just Resource Group access cannot access alerts on their Groups
* Failure adding member to group with alert definition
* Removing member from group with group alert definition removes all instances of the alert definition
Bug 846451
Change AlertDefinition.resourceGroup to AlertDefinition.group. This brings
the name into the convention we use everywhere else, and that the GriteriaGenerator
expects for group FK relations.
- Update all relevant queries and AlertDefinitionCriteria
- For back compat, keep existing setter/getter and deprecate. Refactor all
internal code to use the new setter/getter.
Bugs 949048, 949062
The handling of group member add/remove was berry berry broken. Various changes:
- Prevent the passing of Hibernate proxies across sessions when adding group
alert defs to new members.
- Fix logic around removing group alert defs when removing group members.
- Add new filterGroupAlertDefinitionGroupId and filterReadOnly to AlertDefinitionCriteria
- Rename alertDefManager.createAlertDefinition to alertDefManager.createAlertDefinitionInNewTransaction to
make it very clear what happens when you make this SLSB call. This is the
convention.
- Add some more integration tests and fix up some stuff in AlertDefinitionManagerBeanTest
- We had two SLSB methods named removeGroupAlertDefinitions. Rename the proper one
to removeGroupMemberAlertDefinitions and completely fix it as it did the
wrong thing (likely due to the wrong name).
- Deprecate a portal-war only Local SLSB method.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
index deeab01..b7d01cd 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
@@ -103,7 +103,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
@NamedQuery(name = AlertDefinition.QUERY_FIND_OPTION_ITEMS_BY_GROUP, query = "" //
+ " SELECT new org.rhq.core.domain.common.composite.IntegerOptionItem(ad.id, ad.name) " //
+ " FROM AlertDefinition ad " //
- + " WHERE ad.resourceGroup.id = :groupId " //
+ + " WHERE ad.group.id = :groupId " //
+ " AND ad.deleted = false"), //
@NamedQuery(name = AlertDefinition.QUERY_FIND_BY_RESOURCE, query = "" //
+ "SELECT a " //
@@ -118,7 +118,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
@NamedQuery(name = AlertDefinition.QUERY_FIND_BY_RESOURCE_GROUP, query = "" //
+ "SELECT a " //
+ " FROM AlertDefinition a " //
- + " WHERE a.resourceGroup.id = :groupId " //
+ + " WHERE a.group.id = :groupId " //
+ " AND a.deleted = false"),
@NamedQuery(name = AlertDefinition.QUERY_DELETE_BY_RESOURCES, query = "" //
+ "DELETE FROM AlertDefinition ad " //
@@ -195,7 +195,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
+ "SELECT ad.id " //
+ " FROM AlertDefinition ad " //
+ " WHERE ad.id = :alertDefinitionId " //
- + " AND ad.resourceGroup IS NOT NULL "), //
+ + " AND ad.group IS NOT NULL "), //
@NamedQuery(name = AlertDefinition.QUERY_IS_RESOURCE_ALERT_DEFINITION, query = "" //
+ "SELECT ad.id " //
+ " FROM AlertDefinition ad " //
@@ -317,7 +317,7 @@ public class AlertDefinition implements Serializable {
@JoinColumn(name = "RESOURCE_GROUP_ID", nullable = true)
@ManyToOne
@XmlTransient
- private ResourceGroup resourceGroup;
+ private ResourceGroup group;
@Column(name = "ENABLED", nullable = false)
private boolean enabled;
@@ -533,17 +533,26 @@ public class AlertDefinition implements Serializable {
}
}
+ /**
+ * @deprecated use getGroup()
+ */
public ResourceGroup getResourceGroup() {
- return resourceGroup;
+ return group;
}
+ /**
+ * @deprecated use setGroup(ResourceGroup)
+ */
public void setResourceGroup(ResourceGroup resourceGroup) {
- this.resourceGroup = resourceGroup;
- /*
- if (this.resourceGroup != null) {
- this.resourceGroup.getAlertDefinitions().add(this);
- }
- */
+ this.group = resourceGroup;
+ }
+
+ public ResourceGroup getGroup() {
+ return group;
+ }
+
+ public void setGroup(ResourceGroup group) {
+ this.group = group;
}
public ResourceType getResourceType() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
index 05e688b..a18f831 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
@@ -33,7 +33,7 @@ public enum AlertDefinitionContext {
return Type;
} else if (definition.getResource() != null) {
return Resource;
- } else if (definition.getResourceGroup() != null) {
+ } else if (definition.getGroup() != null) {
return Group;
} else {
throw new IllegalArgumentException("Unknown AlertDefinitionContext: " + definition);
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
index 6ddb395..20d1efa 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
@@ -54,7 +54,9 @@ public class AlertDefinitionCriteria extends Criteria {
private String filterAlertTemplateResourceTypeName; // requires overrides
private List<Integer> filterResourceIds; // requires overrides
private List<Integer> filterResourceGroupIds; // requires overrides
- private Integer filterGroupAlertDefinitionId;
+ private Integer filterGroupAlertDefinitionId; // requires overrides
+ private Integer filterGroupAlertDefinitionGroupId; // requires overrides
+ private Boolean filterReadOnly;
private Boolean filterEnabled;
private Boolean filterDeleted = false; // find enabled definitions by default
private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource
@@ -78,8 +80,9 @@ public class AlertDefinitionCriteria extends Criteria {
filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?");
filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?");
filterOverrides.put("resourceIds", "resource.id IN ( ? )");
- filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )");
+ filterOverrides.put("resourceGroupIds", "group.id IN ( ? )");
filterOverrides.put("groupAlertDefinitionId", "groupAlertDefinition.id = ?");
+ filterOverrides.put("groupAlertDefinitionGroupId", "groupAlertDefinition.group.id = ?");
filterOverrides.put("resourceOnly", "resource IS NOT NULL");
filterOverrides.put("notificationSenderNames", "id IN ("
+ "SELECT notif.alertDefinition.id FROM AlertNotification notif " + "WHERE notif.senderName IN ( ? ))");
@@ -152,7 +155,15 @@ public class AlertDefinitionCriteria extends Criteria {
public void addFilterGroupAlertDefinitionId(Integer groupAlertDefinitionId) {
this.filterGroupAlertDefinitionId = groupAlertDefinitionId;
}
-
+
+ public void addFilterGroupAlertDefinitionGroupId(Integer groupAlertDefinitionGroupId) {
+ this.filterGroupAlertDefinitionGroupId = groupAlertDefinitionGroupId;
+ }
+
+ public void addFilterReadOnly(Boolean readOnly) {
+ this.filterReadOnly = readOnly;
+ }
+
public void fetchAlerts(boolean fetchAlerts) {
this.fetchAlerts = fetchAlerts;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
index eda9d9f..951975e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
@@ -522,7 +522,7 @@ public class ResourceGroup extends Group {
private boolean visible = true;
// bulk delete @OneToMany(mappedBy = "resource", cascade = { CascadeType.ALL })
- @OneToMany(mappedBy = "resourceGroup", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ @OneToMany(mappedBy = "group", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
private Set<AlertDefinition> alertDefinitions = new LinkedHashSet<AlertDefinition>();
@ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
index 5fc0ea8..534fc74 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
@@ -97,7 +97,7 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
SingleAlertDefinitionView view = super.getDetailsView(id);
if (id == 0) {
// when creating a new alert def, make sure to set this in the new alert def
- view.getAlertDefinition().setResourceGroup(group);
+ view.getAlertDefinition().setGroup(group);
}
return view;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
index ef67483..a6d23ec 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
@@ -252,8 +252,8 @@ public class NewNotificationEditor extends DynamicForm {
Resource res = null;
if (alertDefinition.getResourceType() != null) {
rt = alertDefinition.getResourceType();
- } else if (alertDefinition.getResourceGroup() != null) {
- rt = alertDefinition.getResourceGroup().getResourceType();
+ } else if (alertDefinition.getGroup() != null) {
+ rt = alertDefinition.getGroup().getResourceType();
} else {
res = alertDefinition.getResource();
rt = res.getResourceType();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
index c6a4d3e..b322d5c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
@@ -99,7 +99,7 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions
this.resource.getResourceType().getId()) + "/" + parentId);
record.setLinkText(MSG.view_alert_definition_for_type());
} else {
- record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getResourceGroup().getId()
+ record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getGroup().getId()
+ "/Alerts/Definitions/" + groupAlertDefinition.getId());
record.setLinkText(MSG.view_alert_definition_for_group());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index a812334..84f37ba 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -247,9 +247,8 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
CoreGUI.goToView(LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId));
} else if (alertDef.getGroupAlertDefinition() != null) {
AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition();
- CoreGUI.goToView(LinkManager.getEntityTabLink(
- EntityContext.forGroup(groupAlertDef.getResourceGroup()), "Alert", "Definitions")
- + "/" + groupAlertDef.getId());
+ CoreGUI.goToView(LinkManager.getEntityTabLink(EntityContext.forGroup(groupAlertDef.getGroup()),
+ "Alert", "Definitions") + "/" + groupAlertDef.getId());
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
index 74c4d60..181eef5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
@@ -66,7 +66,7 @@ public class AlertDefinitionGWTServiceImpl extends AbstractGWTServiceImpl implem
@Override
public int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException {
try {
- int results = alertDefManager.createAlertDefinition(getSessionSubject(), alertDefinition, resourceId, true);
+ int results = alertDefManager.createAlertDefinitionInNewTransaction(getSessionSubject(), alertDefinition, resourceId, true);
return results;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
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 727577e..944aab3 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
@@ -98,7 +98,7 @@ public final class AlertDefUtil {
if (alertDefinitionManager.isTemplate(alertDefinitionId)) {
resourceTypeId = cond.getAlertDefinition().getResourceType().getId();
} else if (alertDefinitionManager.isGroupAlertDefinition(alertDefinitionId)) {
- resourceTypeId = cond.getAlertDefinition().getResourceGroup().getResourceType().getId();
+ resourceTypeId = cond.getAlertDefinition().getGroup().getResourceType().getId();
} else {
resourceTypeId = cond.getAlertDefinition().getResource().getResourceType().getId();
}
@@ -265,7 +265,7 @@ public final class AlertDefUtil {
if (context == AlertDefinitionContext.Type) {
RequestUtils.setResourceType(request, alertDefinition.getResourceType());
} else if (context == AlertDefinitionContext.Group) {
- RequestUtils.setResourceGroup(request, alertDefinition.getResourceGroup());
+ RequestUtils.setResourceGroup(request, alertDefinition.getGroup());
} else {
RequestUtils.setResource(request, alertDefinition.getResource());
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
index 1db7d05..4ade28d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
@@ -92,7 +92,7 @@ public class NewDefinitionAction extends BaseAction {
alertDefinitionId = alertTemplateManager.createAlertTemplate(subject, alertDef, defForm.getType());
} else if (context == FormContext.Resource) {
AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager();
- alertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, alertDef, defForm.getId(), true);
+ alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(subject, alertDef, defForm.getId(), true);
} else if (context == FormContext.Group) {
GroupAlertDefinitionManagerLocal groupAlertDefinitionManager = LookupUtil
.getGroupAlertDefinitionManager();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
index 588f04b..5e9620a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
@@ -22,6 +22,7 @@ package org.rhq.enterprise.server.alert;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,6 +35,7 @@ import org.rhq.core.domain.alert.BooleanExpression;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -55,6 +57,12 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class);
+ final private String prefix = this.getClass().getSimpleName() + "_";
+ final private String subjectName = prefix + "subject";
+ final private String roleName = prefix + "role";
+ final private String groupName = prefix + "group";
+ final private String resourceName = prefix + "resource";
+
private AlertDefinitionManagerLocal alertDefinitionManager;
private ResourceGroupManagerLocal resourceGroupManager;
@@ -79,20 +87,20 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
testData = executeInTransaction(false, new TransactionCallbackReturnable<TestData>() {
@Override
public TestData execute() throws Exception {
+
TestData newTestData = new TestData();
- Subject subject = SessionTestHelper.createNewSubject(em, "fake subject");
+ Subject subject = SessionTestHelper.createNewSubject(em, subjectName);
newTestData.setSubject(subject);
- Role role = SessionTestHelper.createNewRoleForSubject(em, subject, "fake role",
- Permission.MANAGE_ALERTS);
+ Role role = SessionTestHelper.createNewRoleForSubject(em, subject, roleName, Permission.MANAGE_ALERTS);
newTestData.setRole(role);
ResourceType resourceType = SessionTestHelper.createNewResourceType(em);
newTestData.setResourceType(resourceType);
- ResourceGroup resourceGroup = new ResourceGroup("fake group", resourceType);
+ ResourceGroup resourceGroup = new ResourceGroup(groupName, resourceType);
resourceGroup = resourceGroupManager.createPrivateResourceGroup(subject, resourceGroup);
newTestData.setResourceGroup(resourceGroup);
roleManager.setAssignedResourceGroups(subjectManager.getOverlord(), role.getId(),
new int[] { resourceGroup.getId() });
- Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, "fake resource");
+ Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, resourceName);
newTestData.setResource(resource);
return newTestData;
}
@@ -110,14 +118,19 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
private void deleteTestData() throws Exception {
if (testData != null) {
+ // use the SLSB here, not just EM
+ resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), testData.getResourceGroup().getId());
+
for (Integer alertDefinitionId : testData.getAlertDefinitionIds()) {
removeEntity(AlertDefinition.class, alertDefinitionId);
}
- removeEntity(ResourceGroup.class, testData.getResourceGroup().getId());
+
removeEntity(Resource.class, testData.getResource().getId());
removeEntity(ResourceType.class, testData.getResourceType().getId());
- removeEntity(Subject.class, testData.getSubject().getId());
- removeEntity(Role.class, testData.getRole().getId());
+
+ subjectManager.deleteSubjects(subjectManager.getOverlord(), new int[] { testData.getSubject().getId() });
+ roleManager.deleteRoles(subjectManager.getOverlord(), new int[] { testData.getRole().getId() });
+
testData = null;
}
}
@@ -132,6 +145,7 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
ResourceTreeHelper.deleteResource(em, (Resource) object);
} else {
em.remove(object);
+ em.flush();
}
}
});
@@ -147,7 +161,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
public void execute() throws Exception {
List<Integer> alertDefinitionIds = new LinkedList<Integer>();
for (int i = 0; i < 50; i++) {
- alertDefinitionIds.add(createAlertDefinitionAndGetId("fake alertdef-" + String.valueOf(i), false));
+ alertDefinitionIds.add(createAlertDefinitionAndGetId(prefix + "alertdef_" + String.valueOf(i),
+ false));
}
List<Integer> alertDefinitionToEnableIds = alertDefinitionIds.subList(12, 37);
int enabledCount = alertDefinitionManager.enableAlertDefinitions(testData.getSubject(),
@@ -164,7 +179,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
public void execute() throws Exception {
List<Integer> alertDefinitionIds = new LinkedList<Integer>();
for (int i = 0; i < 50; i++) {
- alertDefinitionIds.add(createAlertDefinitionAndGetId("fake alertdef-" + String.valueOf(i), true));
+ alertDefinitionIds
+ .add(createAlertDefinitionAndGetId(prefix + "alertdef_" + String.valueOf(i), true));
}
List<Integer> alertDefinitionToDisableIds = alertDefinitionIds.subList(17, 48);
int disabledCount = alertDefinitionManager.disableAlertDefinitions(testData.getSubject(),
@@ -179,8 +195,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
executeInTransaction(new TransactionCallback() {
@Override
public void execute() throws Exception {
- int resourceAlertDefinitionId = createAlertDefinitionAndGetId("fake resource alertdef", true);
- int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId("fake group alertdef");
+ int resourceAlertDefinitionId = createAlertDefinitionAndGetId(prefix + "resource_Alertdef", true);
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(prefix + "group_Alertdef");
assertTrue("Failed to detect a group alert definition",
alertDefinitionManager.isGroupAlertDefinition(groupAlertDefinitionId));
assertFalse("Should not have detected a group alert definition",
@@ -193,6 +209,98 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
});
}
+ @Test
+ void testBug846451() {
+ executeInTransaction(new TransactionCallback() {
+ @Override
+ public void execute() throws Exception {
+ String name = prefix + "group_Alertdef";
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(name);
+
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceGroupIds(testData.getResourceGroup().getId());
+
+ // tests the reported bug
+ List<AlertDefinition> result = alertDefinitionManager.findAlertDefinitionsByCriteria(
+ testData.getSubject(), criteria);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(name, result.get(0).getName());
+ }
+ });
+ }
+
+ @Test
+ void testAddRemoveGroupMembers() throws Exception {
+
+ Resource resource2 = null;
+ Resource resource3 = null;
+
+ try {
+
+ // creating alert definitions is performed in a new transaction. So, any involved entities must already be
+ // committed. Commit the additional test entities here. This stuff will get cleaned up in afterMethod
+ startTransaction();
+
+ String name = prefix + "group_Alertdef";
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(name);
+
+ String resource2Name = resourceName + "_2";
+ String resource3Name = resourceName + "_3";
+ resource2 = SessionTestHelper.createNewResource(em, resource2Name, testData.getResourceType());
+ resource3 = SessionTestHelper.createNewResource(em, resource3Name, testData.getResourceType());
+
+ commitTransaction();
+
+ // add new members and ensure the resource-level alert defs gets applied. Make sure to use the SLSB to add it
+ LookupUtil.getResourceGroupManager().addResourcesToGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), new int[] { resource2.getId() });
+ LookupUtil.getResourceGroupManager().addResourcesToGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), new int[] { resource3.getId() });
+
+ int[] ids = new int[] { resource2.getId(), resource3.getId() };
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceIds(ids[0], ids[1]);
+
+ List<AlertDefinition> result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(),
+ criteria);
+ assertNotNull(result);
+ assertEquals(2, result.size());
+ assertEquals(name, result.get(0).getName());
+ assertEquals(name, result.get(1).getName());
+ assertTrue(result.get(0).getId() != result.get(1).getId());
+
+ // remove member and ensure the alert def gets removed
+ LookupUtil.getResourceGroupManager().removeResourcesFromGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), ids);
+
+ result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(), criteria);
+ assertNotNull(result);
+ assertEquals(0, result.size());
+
+ } finally {
+ Resource[] resources = new Resource[] { resource2, resource3 };
+ try {
+ startTransaction();
+ for (Resource r : resources) {
+ if (null != r) {
+
+ r = em.find(Resource.class, r.getId());
+ Set<AlertDefinition> ads = r.getAlertDefinitions();
+ for (AlertDefinition ad : ads) {
+ em.remove(ad);
+ }
+ ResourceTreeHelper.deleteResource(em, r);
+ }
+ }
+ commitTransaction();
+
+ } catch (Exception e) {
+ rollbackTransaction();
+ }
+ }
+ }
+
private int createAlertDefinitionAndGetId(String name, boolean enabled) {
AlertDefinition alertDefinition = new AlertDefinition();
alertDefinition.setName(name);
@@ -201,8 +309,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
alertDefinition.setEnabled(enabled);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
- testData.getResource().getId(), true);
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(),
+ alertDefinition, testData.getResource().getId(), true);
testData.getAlertDefinitionIds().add(alertDefinitionId);
return alertDefinitionId;
}
@@ -214,10 +322,10 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
alertDefinition.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
- alertDefinition.setResourceGroup(testData.getResourceGroup());
+ alertDefinition.setGroup(testData.getResourceGroup());
alertDefinition.setEnabled(true);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
- null, true);
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(),
+ alertDefinition, null, true);
testData.getAlertDefinitionIds().add(alertDefinitionId);
return alertDefinitionId;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
index 69ffc44..fbbc86a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
@@ -205,7 +205,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
templateAlertDefinition.setResourceType(resourceType);
groupAlertDefinition = createDefinitionForTest(universalName + " group", true);
- groupAlertDefinition.setResourceGroup(resourceGroup);
+ groupAlertDefinition.setGroup(resourceGroup);
resourceAlertDefinition = createDefinitionForTest(universalName + " resource", true);
resourceAlertDefinition.setResource(resources.iterator().next());
@@ -413,7 +413,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
false);
def.setResource(resources.iterator().next());
- int id = adm.createAlertDefinition(subject, def, res.getId(), true);
+ int id = adm.createAlertDefinitionInNewTransaction(subject, def, res.getId(), true);
def.setId(id);
resourceLevelAlertDefinitionId = id;
@@ -432,7 +432,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation",
false);
- def.setResourceGroup(resourceGroup);
+ def.setGroup(resourceGroup);
int id = gadm.createGroupAlertDefinitions(subject, def, resourceGroup.getId());
def.setId(id);
@@ -456,7 +456,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation",
false);
- def.setResourceGroup(resourceGroup);
+ def.setGroup(resourceGroup);
int id = atm.createAlertTemplate(subject, def, resourceType.getId());
def.setId(id);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index 1eaea93..232171e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -470,7 +470,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -504,7 +504,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -537,7 +537,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -570,7 +570,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -604,7 +604,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
index 34f93f9..ebda2ef 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
@@ -342,7 +342,7 @@ public class AvailabilityInsertPurgeTest extends AbstractEJB3PerformanceTest {
def.setPriority(AlertPriority.MEDIUM);
def.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
def.setRecoveryId(0);
- alertDefinitionManager.createAlertDefinition(overlord, def, res.getId(), true);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(overlord, def, res.getId(), true);
for (int MULTI : ROUNDS) {
String round = String.format(ROUND__FORMAT, MULTI);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
index 4b51224..10b5dbc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
@@ -192,16 +192,19 @@ public class SessionTestHelper {
return newGroup;
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName) {
ResourceType type = group.getResourceType();
return createNewResourceForGroup(em, group, resourceName, type, true);
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName,
ResourceType type, boolean doFlush) {
return createNewResourceForGroup(em, group, resourceName, type, AvailabilityType.UP, doFlush);
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName,
ResourceType type, AvailabilityType avail, boolean doFlush) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
index 7105d7f..d00a969 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
@@ -94,8 +94,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
private boolean checkViewPermission(Subject subject, AlertDefinition alertDefinition) {
if (alertDefinition.getResourceType() != null) { // an alert template
return authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS);
- } else if (alertDefinition.getResourceGroup() != null) { // a groupAlertDefinition
- return authorizationManager.canViewGroup(subject, alertDefinition.getResourceGroup().getId());
+ } else if (alertDefinition.getGroup() != null) { // a groupAlertDefinition
+ return authorizationManager.canViewGroup(subject, alertDefinition.getGroup().getId());
} else { // an alert definition
return authorizationManager.canViewResource(subject, alertDefinition.getResource().getId());
}
@@ -112,9 +112,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
if (alertDefinition.getResourceType() != null) { // an alert template
return authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS);
- } else if (alertDefinition.getResourceGroup() != null) { // a groupAlertDefinition
+ } else if (alertDefinition.getGroup() != null) { // a groupAlertDefinition
return authorizationManager.hasGroupPermission(subject, Permission.MANAGE_ALERTS, alertDefinition
- .getResourceGroup().getId());
+ .getGroup().getId());
} else { // an alert definition
return authorizationManager.hasResourcePermission(subject, Permission.MANAGE_ALERTS, alertDefinition
.getResource().getId());
@@ -207,7 +207,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration)
+ public int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration)
throws InvalidAlertDefinitionException {
return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, validateNotificationConfiguration);
@@ -216,13 +216,13 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException {
checkAlertDefinition(subject, null, alertDefinition, resourceId, validateNotificationConfiguration);
- // if this is an alert definition, set up the link to a resource
+ // if this is an resource alert definition, set up the link to a resource
if (resourceId != null) {
// don't attach an alertTemplate or groupAlertDefinition to any particular resource
// they should have already been attached to the resourceType or resourceGroup by the caller
- //Resource resource = LookupUtil.getResourceManager().getResourceById(user, resourceId);
// use proxy trick to subvert having to load the entire resource into memory
+ // Resource resource = LookupUtil.getResourceManager().getResourceById(user, resourceId);
alertDefinition.setResource(new Resource(resourceId));
}
@@ -232,10 +232,11 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert templates for type ["
+ alertDefinition.getResourceType() + "]");
- } else if (alertDefinition.getResourceGroup() != null) {
+ } else if (alertDefinition.getGroup() != null) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert definitions for group ["
- + alertDefinition.getResourceGroup() + "]");
+ + alertDefinition.getGroup()
+ + "]");
} else {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert definitions for resource ["
@@ -333,8 +334,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
notifyAlertConditionCacheManager(subject, "removeAlertDefinitions", alertDefinition,
AlertDefinitionEvent.DELETED);
}
- if (alertDefinition.getResourceGroup() != null) {
- alertDefinition.setResourceGroup(null); // break bonds so corresponding ResourceGroup can be purged
+ if (alertDefinition.getGroup() != null) {
+ alertDefinition.setGroup(null); // break bonds so corresponding ResourceGroup can be purged
}
}
}
@@ -439,7 +440,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
newAlertDefinition.setParentId(alertDefinition.getParentId());
newAlertDefinition.setResource(alertDefinition.getResource());
newAlertDefinition.setResourceType(alertDefinition.getResourceType());
- newAlertDefinition.setResourceGroup(alertDefinition.getResourceGroup());
+ newAlertDefinition.setGroup(alertDefinition.getGroup());
newAlertDefinition.setGroupAlertDefinition(alertDefinition.getGroupAlertDefinition());
entityManager.persist(newAlertDefinition);
@@ -498,10 +499,10 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert templates for type ["
+ oldAlertDefinition.getResourceType() + "]");
- } else if (oldAlertDefinition.getResourceGroup() != null) {
+ } else if (oldAlertDefinition.getGroup() != null) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert definitions for group ["
- + oldAlertDefinition.getResourceGroup() + "]");
+ + oldAlertDefinition.getGroup() + "]");
} else {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert definitions for resource ["
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
index 94b877c..5afa1f9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
@@ -63,11 +63,11 @@ public interface AlertDefinitionManagerLocal {
* @return the id of the newly persisted alert definition
* @throws InvalidAlertDefinitionException
*/
- int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration)
+ int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration)
throws InvalidAlertDefinitionException;
/**
- * This is exactly the same as {@link #createAlertDefinition(Subject, AlertDefinition, Integer, boolean)} but
+ * This is exactly the same as {@link #createAlertDefinitionInNewTransaction(Subject, AlertDefinition, Integer, boolean)} but
* assumes the resource is part of a group (or has given resource type for templates) for which
* a group or template alert definition is being created.
* <p>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index 5b5c2ef..ee7bbf0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -123,7 +123,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
int alertTemplateId = 0;
try {
- alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null, true);
+ alertTemplateId = alertDefinitionManager.createAlertDefinitionInNewTransaction(user, alertTemplate, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create alertTemplate for " + type + " with data "
+ alertTemplate.toSimpleString(), t);
@@ -191,7 +191,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
// persist the child, user is known to be overlord at this point for this system side-effect
try {
- alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(user, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Failed to create child AlertDefinition for Resource[id="
+ resourceId + "] with template " + template.toSimpleString());
@@ -287,7 +287,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
childAlertDefinition.setParentId(alertTemplate.getId());
// persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(overlord, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index fb079f8..ef6770e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -45,7 +45,10 @@ import org.rhq.core.util.collection.ArrayUtils;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
+import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
+import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility.SerializationType;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
+import org.rhq.enterprise.server.util.CriteriaQueryRunner;
/**
* @author Joseph Marques
@@ -67,6 +70,8 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
private SubjectManagerLocal subjectManager;
@SuppressWarnings("unchecked")
+ @Deprecated
+ // remove along with portal war
public PageList<AlertDefinition> findGroupAlertDefinitions(Subject subject, int resourceGroupId,
PageControl pageControl) {
pageControl.initDefaultOrderingField("ctime", PageOrdering.DESC);
@@ -139,19 +144,21 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
public int createGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException {
ResourceGroup group = resourceGroupManager.getResourceGroupById(subject, resourceGroupId, null);
- groupAlertDefinition.setResourceGroup(group);
+ groupAlertDefinition.setGroup(group);
int groupAlertDefinitionId = 0;
try {
- groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null, true);
+ groupAlertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(subject,
+ groupAlertDefinition, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create groupAlertDefinitions for " + group
+ " with data " + groupAlertDefinition.toSimpleString(), t);
}
//get the alert definition we just created.. this is so that we can create copies of it
- AlertDefinition persistedDefinition = alertDefinitionManager.getAlertDefinition(subject, groupAlertDefinitionId);
-
+ AlertDefinition persistedDefinition = alertDefinitionManager
+ .getAlertDefinition(subject, groupAlertDefinitionId);
+
Throwable firstThrowable = null;
List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject,
@@ -241,7 +248,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
}
List<Integer> alertDefinitionIdsInError = new ArrayList<Integer>();
-
+
for (Integer alertDefinitionId : alertDefinitions) {
try {
alertDefinitionManager.updateDependentAlertDefinition(subject, alertDefinitionId, updated,
@@ -266,7 +273,8 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
// persist the child
- alertDefinitionManager.createAlertDefinition(subject, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(subject, childAlertDefinition, resourceId,
+ false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
@@ -289,27 +297,50 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return updated;
}
- public void addGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourcesIdsToAdd)
+ public void addGroupMemberAlertDefinitions(Subject subject, int resourceGroupId, int[] addedResourceIds)
throws AlertDefinitionCreationException {
- if (resourcesIdsToAdd == null || resourcesIdsToAdd.length == 0) {
+ if (addedResourceIds == null || addedResourceIds.length == 0) {
return;
}
- Subject overlord = subjectManager.getOverlord();
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
Throwable firstThrowable = null;
- List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId,
- PageControl.getUnlimitedInstance());
- List<Integer> resourceIdsInError = new ArrayList<Integer>();
+ // We want to copy the group level AlertDefinitions, so fetch them with the relevant lazy fields, so we
+ // have everything we need when calling the copy constructor, minimizing
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceGroupIds(resourceGroupId);
+ criteria.fetchGroupAlertDefinition(false);
+ criteria.fetchConditions(true);
+ criteria.fetchAlertNotifications(true);
+ // Apply paging when optionally fetching collections, to avoid duplicates. Hibernate seems to apply DISTINCT,
+ // which is what we want. Use a huge # because we want them all.
+ criteria.setPaging(0, Integer.MAX_VALUE);
+
+ List<AlertDefinition> groupAlertDefinitions = alertDefinitionManager.findAlertDefinitionsByCriteria(subject,
+ criteria);
+
for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) {
- for (Integer resourceId : resourcesIdsToAdd) {
+ for (Integer resourceId : addedResourceIds) {
try {
- // construct the child
+ // Construct the resource-level AlertDefinition by using the copy constructor.
AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
- childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
- // persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
+ // groupAlertDefinition is an attached entity. It is dangerous to pass attached entities (with
+ // Hibernate proxies for the current session) across sessions. Since the call to create the new
+ // AlertDefinition is performed in a new transaction, make sure not to pass the attached entity.
+ // Just use a simple stand-in to create the link to the group alert definition.
+ AlertDefinition groupAlertDefinitionPojo = new AlertDefinition();
+ groupAlertDefinitionPojo.setId(groupAlertDefinition.getId());
+ childAlertDefinition.setGroupAlertDefinition(groupAlertDefinitionPojo);
+
+ // Persist the resource-level (child) alert definition, cleanse any further proxies left
+ // over from the copy constructor.
+ HibernateDetachUtility.nullOutUninitializedFields(childAlertDefinition,
+ SerializationType.SERIALIZATION);
+
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(subjectManager.getOverlord(),
+ childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, create as many as possible
if (firstThrowable == null) {
@@ -347,35 +378,61 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return results;
}
- public void removeGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourceIdsToRemove) {
- if (resourceIdsToRemove == null || resourceIdsToRemove.length == 0) {
+ public void removeGroupMemberAlertDefinitions(Subject subject, int resourceGroupId, Integer[] removedResourceIds) {
+ if (removedResourceIds == null || removedResourceIds.length == 0) {
return;
}
- Integer[] groupAlertDefinitionIdsForResourceGroup = findGroupAlertDefinitionIds(resourceGroupId);
+ // fetch the resource-level AlertDefs tied to the Group from which resources are being removed
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceIds(removedResourceIds);
+ criteria.addFilterGroupAlertDefinitionGroupId(resourceGroupId);
+ criteria.addFilterDeleted(false);
+ criteria.clearPaging();
+
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
+ CriteriaQueryRunner<AlertDefinition> queryRunner = new CriteriaQueryRunner<AlertDefinition>(criteria,
+ generator, entityManager);
+ List<AlertDefinition> alertDefinitions = queryRunner.execute();
+
+ // No group alert defs, just return
+ if (alertDefinitions.isEmpty()) {
+ return;
+ }
- List<Integer> allChildrenDefinitionIds = new ArrayList<Integer>();
- Subject overlord = subjectManager.getOverlord();
- for (Integer nextGroupAlertDefinitionId : groupAlertDefinitionIdsForResourceGroup) {
- List<Integer> childDefinitions = getChildrenAlertDefinitionIds(subject, nextGroupAlertDefinitionId);
- allChildrenDefinitionIds.addAll(childDefinitions);
- alertDefinitionManager.removeAlertDefinitions(overlord, ArrayUtils.unwrapCollection(childDefinitions));
+ // 1) remove only the attached (i.e. non-protected) alert defs.
+ // 2) break all of the FK references to the group
+ List<Integer> allMemberAlertDefinitionIds = new ArrayList<Integer>(alertDefinitions.size());
+ List<Integer> attachedMemberAlertDefinitionIds = new ArrayList<Integer>(alertDefinitions.size());
+ for (AlertDefinition ad : alertDefinitions) {
+ Integer id = ad.getId();
+ allMemberAlertDefinitionIds.add(id);
+ if (!ad.isReadOnly()) {
+ attachedMemberAlertDefinitionIds.add(id);
+ }
}
- /*
- * break the Hibernate relationships used for navigating between the groupAlertDefinition and the
- * children alertDefinitions so that the async deletion mechanism can delete without FK violations
- */
- if (allChildrenDefinitionIds.size() > 0) {
- Query breakLinksQuery = entityManager.createNamedQuery(AlertDefinition.QUERY_UPDATE_SET_PARENTS_NULL);
- breakLinksQuery.setParameter("childrenDefinitionIds", allChildrenDefinitionIds);
- breakLinksQuery.executeUpdate();
+ // 1) remove only the attached (i.e. non-protected) alert defs.
+ if (!attachedMemberAlertDefinitionIds.isEmpty()) {
+ int[] groupMemberAlertDefinitionIdsArray = ArrayUtils.unwrapCollection(attachedMemberAlertDefinitionIds);
+
+ alertDefinitionManager.removeAlertDefinitions(subjectManager.getOverlord(),
+ groupMemberAlertDefinitionIdsArray);
}
+
+ // 2) break all of the references to the group
+ Query breakLinksQuery = entityManager.createNamedQuery(AlertDefinition.QUERY_UPDATE_SET_PARENTS_NULL);
+ breakLinksQuery.setParameter("childrenDefinitionIds", allMemberAlertDefinitionIds);
+ breakLinksQuery.executeUpdate();
+
+ alertDefinitions.clear();
+ allMemberAlertDefinitionIds.clear();
+ attachedMemberAlertDefinitionIds.clear();
}
private int getResourceGroupIdForAlertDefinitionId(int groupAlertDefinitionId) {
Query query = entityManager.createQuery("" //
- + "SELECT groupAlertDefinition.resourceGroup.id " //
+ + "SELECT groupAlertDefinition.group.id " //
+ " FROM AlertDefinition groupAlertDefinition " //
+ " WHERE groupAlertDefinition.id = :groupAlertDefinitionId");
query.setParameter("groupAlertDefinitionId", groupAlertDefinitionId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
index 13faf1d..1834c78 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
@@ -30,6 +30,8 @@ import org.rhq.core.domain.util.PageList;
*/
@Local
public interface GroupAlertDefinitionManagerLocal {
+ @Deprecated
+ // remove along with portal war
PageList<AlertDefinition> findGroupAlertDefinitions(Subject subject, int resourceGroupId, PageControl pageControl);
int createGroupAlertDefinitions(Subject subject, AlertDefinition alertDefinition, Integer resourceGroupId)
@@ -55,10 +57,10 @@ public interface GroupAlertDefinitionManagerLocal {
boolean resetMatching) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
// required to implement system side-effects as a result of modifying group membership or deleting groups
- void addGroupAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd)
+ void addGroupMemberAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd)
throws AlertDefinitionCreationException;
- void removeGroupAlertDefinitions(Subject subject, int groupId, int[] resourceIdsToRemove);
+ void removeGroupMemberAlertDefinitions(Subject subject, int groupId, Integer[] resourceIdsToRemove);
void purgeAllGroupAlertDefinitions(Subject subject, int groupId);
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
index 7fdff89..1dc0f03 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
@@ -482,7 +482,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
return;
}
int[] resourceIdsToAdd = ArrayUtils.unwrapCollection(nonMemberResources);
- groupAlertDefinitionManager.addGroupAlertDefinitions(subject, groupId, resourceIdsToAdd);
+ groupAlertDefinitionManager.addGroupMemberAlertDefinitions(subject, groupId, resourceIdsToAdd);
Connection conn = null;
PreparedStatement insertExplicitStatement = null;
@@ -627,14 +627,14 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
+ "] which are not part of the group[id=" + groupId + "]");
}
- int[] resourceIdsToRemove = ArrayUtils.unwrapArray(resourceIds);
- groupAlertDefinitionManager.removeGroupAlertDefinitions(subject, groupId, resourceIdsToRemove);
+ groupAlertDefinitionManager.removeGroupMemberAlertDefinitions(subject, groupId, resourceIds);
Connection conn = null;
PreparedStatement deleteExplicitStatement = null;
PreparedStatement deleteImplicitStatement = null;
try {
conn = rhqDs.getConnection();
+ int[] resourceIdsArray = ArrayUtils.unwrapArray(resourceIds);
// insert implicit resources, must occur before deleting explicit
if (isRecursive) {
@@ -642,7 +642,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
.prepareStatement(ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_IMPLICIT_RECURSIVE);
deleteImplicitStatement.setInt(1, groupId);
deleteImplicitStatement.setInt(9, groupId);
- for (int resourceId : resourceIdsToRemove) {
+ for (Integer resourceId : resourceIds) {
// no-op if this resource's ancestor is also in the explicit list
List<Integer> lineage = resourceManager.getResourceIdLineage(resourceId);
List<Integer> nonMembers = getNonMemberExplicitResources(groupId, lineage);
@@ -663,20 +663,20 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
} else {
String deleteImplicitQueryString = JDBCUtil.transformQueryForMultipleInParameters(
ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_IMPLICIT, "@@RESOURCE_IDS@@",
- resourceIdsToRemove.length);
+ resourceIds.length);
deleteImplicitStatement = conn.prepareStatement(deleteImplicitQueryString);
deleteImplicitStatement.setInt(1, groupId);
- JDBCUtil.bindNTimes(deleteImplicitStatement, resourceIdsToRemove, 2);
+ JDBCUtil.bindNTimes(deleteImplicitStatement, resourceIdsArray, 2);
deleteImplicitStatement.executeUpdate();
}
// delete explicit resources
String deleteExplicitQueryString = JDBCUtil.transformQueryForMultipleInParameters(
ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_EXPLICIT, "@@RESOURCE_IDS@@",
- resourceIdsToRemove.length);
+ resourceIds.length);
deleteExplicitStatement = conn.prepareStatement(deleteExplicitQueryString);
deleteExplicitStatement.setInt(1, groupId);
- JDBCUtil.bindNTimes(deleteExplicitStatement, resourceIdsToRemove, 2);
+ JDBCUtil.bindNTimes(deleteExplicitStatement, resourceIdsArray, 2);
deleteExplicitStatement.executeUpdate();
} catch (SQLException sqle) {
log.error("Error removing resources from group[id=" + groupId + "]: ", sqle);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
index 23c43e5..06bc8ae 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
@@ -218,7 +218,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
if (groupId!=null) {
ResourceGroup group = resourceGroupMgr.getResourceGroup(caller,groupId);
- alertDefinition.setResourceGroup(group);
+ alertDefinition.setGroup(group);
}
if (resourceTypeId!=null) {
ResourceType type = resourceTypeMgr.getResourceTypeById(caller,resourceTypeId);
@@ -258,7 +258,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
throw new StuffNotFoundException("Recovery alert with id " + adr.getRecoveryId());
}
- int definitionId = alertDefinitionManager.createAlertDefinition(caller, alertDefinition, resourceId, false);
+ int definitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(caller, alertDefinition, resourceId, false);
AlertDefinition updatedDefinition = alertDefinitionManager.getAlertDefinition(caller,definitionId);
AlertDefinitionRest uadr = definitionToDomain(updatedDefinition,true, uriInfo) ; // TODO param 'full' ?
@@ -823,8 +823,9 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
if (def.getResource()!=null) {
adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.RESOURCE_ALERT_DEF,def.getResource().getId(),adr.getId()));
- } else if (def.getResourceGroup()!=null) {
- adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.GROUP_ALERT_DEF,def.getResourceGroup().getId(),adr.getId()));
+ } else if (def.getGroup() != null) {
+ adr.getLinks().add(
+ createUILink(uriInfo, UILinkTemplate.GROUP_ALERT_DEF, def.getGroup().getId(), adr.getId()));
} else {
adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.TEMPLATE_ALERT_DEF,def.getResourceType().getId(),adr.getId()));
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
index 1fadcc6..7c6ec8f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
@@ -112,8 +112,8 @@ public class AlertDefinitionHandler extends AbstractRestBean implements AlertDef
return getBaseURL() + "/#Administration/Configuration/AlertDefTemplates/" +
alertDef.getResource().getResourceType().getId() + "/" + templateId;
} else if (alertDef.getGroupAlertDefinition() != null) {
- return getBaseURL() + "/#ResourceGroup/" +
- alertDef.getGroupAlertDefinition().getResourceGroup().getId() + "/Alerts/Definitions/" +
+ return getBaseURL() + "/#ResourceGroup/" + alertDef.getGroupAlertDefinition().getGroup().getId()
+ + "/Alerts/Definitions/" +
alertDef.getGroupAlertDefinition().getId();
} else {
return "";
commit ea2fc6610aa197c68b5da021f6fd1cfd3c19fe80
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:55:31 2013 -0700
Rename ResourceMetricD3Graph to MetricD3Graph to better reflect its new, more general, responsibilities.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
index 64643cb..1267dcd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
@@ -39,12 +39,10 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -63,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -75,7 +73,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index b99c200..1f305b5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -57,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -68,7 +68,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceMetricD3";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index f6b191a..c9ce8b7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -102,7 +102,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
function useSmallCharts() {
- console.info("Chart Width for : " + chartContext.chartHandle + " is " + getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
@@ -112,7 +111,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if window is too small server up small chart
if (useSmallCharts()) {
- console.log("Using Small Charts Profile");
+ console.log("Using Small Charts Profile for width: "+getChartWidth());
width = 250;
xTicks = 3;
xTickSubDivide = 2;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 54466cf..4729c99 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -195,7 +195,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
resourceGroup.getName(), measurementDefinition, data );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(MULTI_CHART_HEIGHT);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index f66ea33..0c071c4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -371,7 +371,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
measurementDefinition, data, measurementOOBCompositeList );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(height);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
new file mode 100644
index 0000000..e0fcd87
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
@@ -0,0 +1,165 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 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.monitoring;
+
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+
+/**
+ * A D3 graph implementation for graphing Resource metrics.
+ */
+public class MetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
+
+ /**
+ * This constructor is for the use case in the Dashboard where we dont actually
+ * have a entity or measurement yet.
+ */
+ public MetricD3Graph() {
+ super();
+ }
+
+ public MetricD3Graph(AbstractGraph graph) {
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
+ }
+
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ private static String getSvgDefs() {
+ return " <defs>"
+ + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">"
+ + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>"
+ + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>"
+ + " </linearGradient>"
+ + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>"
+ + " </pattern>"
+ + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>"
+ + " </pattern>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
+
+ @Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
+ /**
+ * Delegate the call to rendering the JSNI chart.
+ * This way the chart type can be swapped out at any time.
+ */
+ public void drawJsniChart() {
+ graph.drawJsniChart();
+ }
+
+ public HasD3MetricJsniChart getJsniChart() {
+ return graph;
+ }
+
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
deleted file mode 100644
index 055e6b6..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 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.monitoring;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * A D3 graph implementation for graphing Resource metrics.
- */
-public class ResourceMetricD3Graph extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- /**
- * This constructor is for the use case in the Dashboard where we dont actually
- * have a entity or measurement yet.
- */
- public ResourceMetricD3Graph() {
- super();
- }
-
- public ResourceMetricD3Graph(AbstractGraph graph) {
- super();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- private static String getSvgDefs() {
- return " <defs>"
- + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">"
- + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>"
- + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>"
- + " </linearGradient>"
- + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>"
- + " </pattern>"
- + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>"
- + " </pattern>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>" + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
- public HasD3MetricJsniChart getJsniChart() {
- return graph;
- }
-
- public String getFullChartId() {
- return "rChart-" + graph.getMetricGraphData().getChartId();
-
- }
-
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
commit 1bb9bf5aaf2041b04cd85f60d931ce67a2b4dc5e
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:31:44 2013 -0700
Fix issue with Resource Group Charts and refactor class hierarchy to make it flatter by eliminating AbstractMetricD3GraphView and ResourceGroupMetricD3GraphView.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
index 75e398e..64643cb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TitleOrientation;
@@ -33,8 +39,17 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.GroupCategory;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
@@ -44,19 +59,23 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
@@ -71,7 +90,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(MetricGraphData.createForDashboard(0)));
setOverflow(Overflow.HIDDEN);
}
@@ -90,7 +108,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("ResourceGroupPortlet.configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
@@ -104,15 +121,83 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
if (storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID) != null) {
- Integer integerValue = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID).getIntegerValue();
- if (integerValue != null)
- setEntityId(integerValue);
+ PropertySimple resourceIdProperty = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
+ PropertySimple measurementDefIdProperty = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
+ if (resourceIdProperty != null && measurementDefIdProperty != null) {
+ final Integer entityId = resourceIdProperty.getIntegerValue();
+ final Integer measurementDefId = measurementDefIdProperty.getIntegerValue();
+ if (entityId != null && measurementDefId != null) {
+ queryResourceGroup(entityId, measurementDefId);
+ }
- PropertySimple propertySimple = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
- if (propertySimple != null && propertySimple.getIntegerValue() != null)
- setDefinitionId(propertySimple.getIntegerValue());
+ }
}
- Log.debug("ResourceGroupPortlet.configure.done");
+ }
+
+
+ private void queryResourceGroup(Integer entityId, final Integer measurementDefId) {
+ ResourceGroupGWTServiceAsync resourceService = GWTServiceLookup.getResourceGroupService();
+
+ ResourceGroupCriteria resourceCriteria = new ResourceGroupCriteria();
+ resourceCriteria.addFilterId(entityId);
+ resourceService.findResourceGroupsByCriteria(resourceCriteria, new AsyncCallback<PageList<ResourceGroup>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(PageList<ResourceGroup> result) {
+ if (result.isEmpty()) {
+ return;
+ }
+ // only concerned with first resource since this is a query by id
+ final ResourceGroup resource = result.get(0);
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ typesSet.add(resource.getResourceType().getId());
+
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ typesSet.toArray(new Integer[typesSet.size()]),
+ EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
+ new ResourceTypeRepository.TypesLoadedCallback() {
+
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+ ResourceType type = types.get(resource.getResourceType().getId());
+ for (final MeasurementDefinition def : type.getMetricDefinitions()) {
+ if (def.getId() == measurementDefId) {
+ Log.debug("Found portlet measurement definition !" + def);
+
+ getJsniChart().setEntityId(resource.getId());
+ getJsniChart().setEntityName(resource.getName());
+ getJsniChart().setDefinition(def);
+ final long startTime = System.currentTimeMillis();
+
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ resource.getId(), new int[]{def.getId()}, 8, MeasurementUtils.UNIT_HOURS,
+ 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_resource_monitor_graphs_loadFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(
+ final List<List<MeasurementDataNumericHighLowComposite>> measurementData) {
+ Log.debug("Dashboard Metric data in: "
+ + (System.currentTimeMillis() - startTime) + " ms.");
+ graph.getMetricGraphData().setMetricData(measurementData.get(0));
+ drawGraph();
+ }
+ });
+ break;
+ }
+ }
+ }
+ });
+ }
+ });
}
public Canvas getHelpCanvas() {
@@ -215,7 +300,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
- if (simple == null | simple.getIntegerValue() == null) {
+ if (simple == null || simple.getIntegerValue() == null) {
addMember(new Label("<i>" + MSG.view_portlet_configure_needed() + "</i>"));
} else {
drawGraph();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
deleted file mode 100644
index 0a1155e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ /dev/null
@@ -1,185 +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.common;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * Provide common functionality for graph views. Such as setting up the divs with
- * specific ids that the jsni svn graphs can bind to and place their svg definitions
- * of the charts directly under this chart div. Essentially, it creates the placeholder
- * for the graphs to later render themselves.
- *
- * @author Mike Thompson
- */
-public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private int entityId;
- private int definitionId;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- public AbstractMetricD3GraphView() {
- super();
- }
-
- public AbstractMetricD3GraphView(AbstractGraph graph) {
- this();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- private static String getSvgDefs() {
- return " <defs>"
- + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">"
- + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>"
- + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>"
- + " </linearGradient>"
- + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>"
- + " </pattern>"
- + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>"
- + " </pattern>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>"
- + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- public void setEntityId(int entityId) {
- this.entityId = entityId;
- }
-
- public void setDefinitionId(int definitionId) {
- this.definitionId = definitionId;
- }
-
- public int getEntityId() {
- return entityId;
- }
-
- public int getDefinitionId() {
- return definitionId;
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + getFullChartId() + " "
- + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId();
-
- }
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
- public abstract void drawJsniChart();
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
-
- /**
- * This is only necessary to set this for the ResourceGraphPortlet case where
- * configuration is deferred.
- * @param metricGraphData
- */
- public void setMetricGraphData(MetricGraphData metricGraphData) {
- graph.setMetricGraphData(metricGraphData);
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
index 0b8cf7a..c921acf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
- * @deprecated see AbstractMetricD3GraphView
+ * @deprecated this code will go away once D3 graphs have been validated.
*/
@Deprecated
public abstract class AbstractMetricGraphView extends EnhancedVLayout {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 4ec734b..cfd904d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -267,7 +267,7 @@ public class MetricGraphData implements JsonMetricProducer {
*/
public String getYAxisUnits() {
if (adjustedMeasurementUnits == null) {
- Log.warn("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
+ Log.warn("ResourceMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
return "";
} else {
return adjustedMeasurementUnits.toString();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
deleted file mode 100644
index a436aa0..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 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.groups.detail.monitoring;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.MeasurementDefinition;
-import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceType;
-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.ResourceGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
-
-public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
-
-
-
- public ResourceGroupMetricD3GraphView(AbstractGraph graph) {
- super(graph);
- }
-
- protected void drawGraph() {
- if (null == graph.getMetricGraphData().getDefinition()) {
-
- ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
-
- ResourceCriteria resourceCriteria = new ResourceCriteria();
- resourceCriteria.addFilterId(graph.getMetricGraphData().getEntityId());
- resourceService.findResourcesByCriteria(resourceCriteria, new AsyncCallback<PageList<Resource>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
- }
-
- @Override
- public void onSuccess(PageList<Resource> result) {
- if (result.isEmpty()) {
- return;
- }
-
- final Resource resource = result.get(0);
- HashSet<Integer> typesSet = new HashSet<Integer>();
- typesSet.add(resource.getResourceType().getId());
- HashSet<String> ancestries = new HashSet<String>();
- ancestries.add(resource.getAncestry());
- // In addition to the types of the result resources, get the types of their ancestry
- typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
-
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(
- typesSet.toArray(new Integer[typesSet.size()]),
- EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
- new ResourceTypeRepository.TypesLoadedCallback() {
-
- @Override
- public void onTypesLoaded(Map<Integer, ResourceType> types) {
-
- ResourceType type = types.get(resource.getResourceType().getId());
- for (MeasurementDefinition def : type.getMetricDefinitions()) {
- if (def.getId() == graph.getMetricGraphData().getDefinitionId()) {
- graph.getMetricGraphData().setDefinition(def);
-
- GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
- graph.getEntityId(),
- new int[] { graph.getMetricGraphData().getDefinitionId() }, 8,
- MeasurementUtils.UNIT_HOURS, 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_resource_monitor_graphs_loadFailed(), caught);
- }
-
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> result) {
- graph.getMetricGraphData().setMetricData(result.get(0));
-
- drawGraph();
- }
- });
- }
- }
- }
- });
- }
- });
-
- } else {
- drawGraph();
- }
- }
-
- @Override
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
-
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index 962c341..055e6b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -18,14 +18,22 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* A D3 graph implementation for graphing Resource metrics.
*/
-public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
+public class ResourceMetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
/**
* This constructor is for the use case in the Dashboard where we dont actually
@@ -36,13 +44,88 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
}
public ResourceMetricD3Graph(AbstractGraph graph) {
-
- super(graph);
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
}
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ private static String getSvgDefs() {
+ return " <defs>"
+ + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">"
+ + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>"
+ + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>"
+ + " </linearGradient>"
+ + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>"
+ + " </pattern>"
+ + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>"
+ + " </pattern>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
@Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
/**
* Delegate the call to rendering the JSNI chart.
* This way the chart type can be swapped out at any time.
@@ -55,5 +138,28 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
return graph;
}
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index 9a3404d..099f23a 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -2,7 +2,7 @@
* CSS for the d3 SVG charts. This is SVG css not HTML css so some elements
* may look different from standard CSS.
* NOTE: the SVG <defs> section that contains gradients etc. is in the
- * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+ * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java
*
*/
commit 608b62b2202837c9e728d0a8ffe576d3008118f7
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 08:01:20 2013 -0700
Fix NPE condition when autorefreshing a dashboard portlet graph before it has been configured (it has been added but not configured).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
index 84177c0..75e398e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
@@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
@@ -80,15 +81,23 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
* combination to be valid in multiple dashboards.
*/
public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ if(portletWindow != null && graph != null && graph.getMetricGraphData() != null){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ } else {
+ // handle the case where the portlet has not been configured yet
+ return "";
+ }
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ Log.debug("ResourceGroupPortlet.configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
- setMetricGraphData(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId()));
+ destroyMembers();
+
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -103,6 +112,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
if (propertySimple != null && propertySimple.getIntegerValue() != null)
setDefinitionId(propertySimple.getIntegerValue());
}
+ Log.debug("ResourceGroupPortlet.configure.done");
}
public Canvas getHelpCanvas() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index d39f35a..b99c200 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -91,6 +91,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+ destroyMembers();
setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
@@ -170,7 +171,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
Log.debug("Dashboard Metric data in: "
+ (System.currentTimeMillis() - startTime) + " ms.");
graph.getMetricGraphData().setMetricData(measurementData.get(0));
- drawGraph();
+ drawGraph();
}
});
break;
@@ -285,6 +286,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue());
Log.debug("Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ simpleDefId.getIntegerValue());
+
drawGraph();
}
@@ -297,7 +299,12 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
* combination to be valid in multiple dashboards.
*/
public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ if(portletWindow != null && graph != null && graph.getMetricGraphData() != null){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ } else {
+ // handle the case where the portlet has not been configured yet
+ return "";
+ }
}
public static final class Factory implements PortletViewFactory {
@@ -328,7 +335,8 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
//Custom refresh operation as we are not directly extending Table
@Override
public void refresh() {
- if (isVisible() && !isRefreshing()) {
+ if (isVisible() && !isRefreshing() ){
+ //if (isVisible() && !isRefreshing() && (null != graph.getMetricGraphData().getJsonMetrics()) ) {
drawGraph();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index d3a00e6..4ec734b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -153,7 +153,12 @@ public class MetricGraphData implements JsonMetricProducer {
public String getChartId() {
if(isPortalGraph){
- return entityId + "-" + definition.getId();
+ if(definition != null){
+ return entityId + "-" + definition.getId();
+ }else {
+ // case when portlet has not been configured yet
+ return "";
+ }
}else {
return entityId + "-" + definitionId;
}
@@ -244,7 +249,13 @@ public class MetricGraphData implements JsonMetricProducer {
public String getChartTitle() {
- return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
+ if(definition != null){
+ return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
+ }else {
+ // handle case when dashboard portlet has not been configured yet.
+ return "";
+
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 763bfaa..f6b191a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -75,7 +75,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
var metricStackedBarGraph = function () {
"use strict";
// privates
-
var margin = {top: 10, right: 5, bottom: 5, left: 40},
width = 750 - margin.left - margin.right,
adjustedChartHeight = chartContext.chartHeight - 50,
@@ -99,111 +98,113 @@ public final class MetricStackedBarGraph extends AbstractGraph {
svg;
function getChartWidth() {
- return $wnd.jQuery("#"+chartContext.chartHandle).width();
+ return $wnd.jQuery("#" + chartContext.chartHandle).width();
}
function useSmallCharts() {
- console.info("Chart Width for : "+chartContext.chartHandle+" is "+getChartWidth());
+ console.info("Chart Width for : " + chartContext.chartHandle + " is " + getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
function determineScale() {
var xTicks, xTickSubDivide, numberOfBarsForSmallGraph = 20;
-
- // if window is too small server up small chart
- if (useSmallCharts()) {
- console.log("Using Small Charts Profile");
- width = 250;
- xTicks = 3;
- xTickSubDivide = 2;
- chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
- }
- else {
- console.log("Using Large Charts Profile");
- // we use the width already defined above
- xTicks = 12;
- xTickSubDivide = 5;
- chartData = chartContext.data;
- }
-
- avg = $wnd.d3.mean(chartContext.data.map(function (d) {
- return d.y;
- }));
- peak = $wnd.d3.max(chartContext.data.map(function (d) {
- if (d.high != undefined) {
- return d.high;
- }
- else {
- return 0;
- }
- }));
- min = $wnd.d3.min(chartContext.data.map(function (d) {
- if (d.low != undefined) {
- return d.low;
- }
- else {
- return Number.MAX_VALUE;
- }
- }));
- // adjust the min scale so blue low line is not in axis
- determineLowBound = function (min, peak) {
- var newLow = min - ((peak - min) * 0.1);
- if (newLow < 0) {
- return 0;
+ if (chartContext.data.length > 0) {
+
+ // if window is too small server up small chart
+ if (useSmallCharts()) {
+ console.log("Using Small Charts Profile");
+ width = 250;
+ xTicks = 3;
+ xTickSubDivide = 2;
+ chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
}
else {
- return newLow;
+ console.log("Using Large Charts Profile");
+ // we use the width already defined above
+ xTicks = 12;
+ xTickSubDivide = 5;
+ chartData = chartContext.data;
}
- };
- lowBound = determineLowBound(min, peak);
- highBound = peak + ((peak - min) * 0.1);
- oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
- if (d.baselineMax == undefined) {
- return 0;
- }
- else {
- return +d.baselineMax;
+
+ avg = $wnd.d3.mean(chartContext.data.map(function (d) {
+ return d.y;
+ }));
+ peak = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.high != undefined) {
+ return d.high;
+ }
+ else {
+ return 0;
+ }
+ }));
+ min = $wnd.d3.min(chartContext.data.map(function (d) {
+ if (d.low != undefined) {
+ return d.low;
+ }
+ else {
+ return Number.MAX_VALUE;
+ }
+ }));
+ // adjust the min scale so blue low line is not in axis
+ determineLowBound = function (min, peak) {
+ var newLow = min - ((peak - min) * 0.1);
+ if (newLow < 0) {
+ return 0;
+ }
+ else {
+ return newLow;
+ }
+ };
+ lowBound = determineLowBound(min, peak);
+ highBound = peak + ((peak - min) * 0.1);
+ oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.baselineMax == undefined) {
+ return 0;
+ }
+ else {
+ return +d.baselineMax;
+ }
+ }));
+ calcBarWidth = function () {
+ return (width / chartData.length - barOffset )
+ };
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([lowBound, highBound]);
+ yAxis = $wnd.d3.svg.axis()
+ .scale(yScale)
+ .tickSubdivide(1)
+ .ticks(5)
+ .tickSize(4, 4, 0)
+ .orient("left");
+
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain($wnd.d3.extent(chartData, function (d) {
+ return d.x;
+ }));
+
+ xAxis = $wnd.d3.svg.axis()
+ .scale(timeScale)
+ .ticks(xTicks)
+ .tickSubdivide(xTickSubDivide)
+ .tickSize(4, 4, 0)
+ .orient("bottom");
+
+ // create the actual chart group
+ chart = $wnd.d3.select("#" + chartContext.chartSelection);
+
+ svg = chart.append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
+
+ if (!useSmallCharts()) {
+ createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
}
- }));
- calcBarWidth = function () {
- return (width / chartData.length - barOffset )
- };
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([lowBound, highBound]);
- yAxis = $wnd.d3.svg.axis()
- .scale(yScale)
- .tickSubdivide(1)
- .ticks(5)
- .tickSize(4, 4, 0)
- .orient("left");
-
-
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain($wnd.d3.extent(chartData, function (d) {
- return d.x;
- }));
-
- xAxis = $wnd.d3.svg.axis()
- .scale(timeScale)
- .ticks(xTicks)
- .tickSubdivide(xTickSubDivide)
- .tickSize(4, 4, 0)
- .orient("bottom");
-
- // create the actual chart group
- chart = $wnd.d3.select("#"+chartContext.chartSelection);
-
- svg = chart.append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
-
- if (!useSmallCharts()) {
- createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
}
}
@@ -253,7 +254,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("y", yBase + yInc)
.text(avgValue.toFixed(decimalPlaces) + " " + uom);
-
// min
chart.append("text")
.attr("class", "minLabel")
@@ -600,23 +600,27 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// Public API
draw: function (chartContext) {
"use strict";
- console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
- console.time("chart");
-
- determineScale();
- createHeader(chartContext.chartTitle);
-
- createYAxisGridLines();
- createStackedBars();
- createXandYAxes();
- createAvgLines();
- if (oobMax > 0) {
- console.info("OOB Data Exists!");
- createOOBLines();
+ // Guard condition that can occur when a portlet has not been configured yet
+ if (chartContext.data.length > 0) {
+ console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
+ console.time("chart");
+
+
+ determineScale();
+ createHeader(chartContext.chartTitle);
+
+ createYAxisGridLines();
+ createStackedBars();
+ createXandYAxes();
+ createAvgLines();
+ if (oobMax > 0) {
+ console.info("OOB Data Exists!");
+ createOOBLines();
+ }
+ createHovers(chartContext);
+ console.timeEnd("chart");
+ console.groupEnd();
}
- createHovers(chartContext);
- console.timeEnd("chart");
- console.groupEnd();
}
}; // end public closure
}();
1
0
modules/core/arquillian-integration/container/pom.xml | 3
modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml | 2
modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml | 2
modules/core/arquillian-integration/pom.xml | 1
modules/core/arquillian-integration/test-agent-plugin/README | 6 +
modules/core/arquillian-integration/test-agent-plugin/pom.xml | 58 ++++++++++
modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java | 25 ++++
modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java | 22 +++
modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml | 12 ++
9 files changed, 128 insertions(+), 3 deletions(-)
New commits:
commit c669716d3aaba94cd3e6838dade1e7d6eff5bfb3
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Apr 8 15:28:26 2013 +0200
Get rid of the dependency on the JMX plugin in the Arquillian container tests.
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 9dc7a99..75a7a05 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -123,8 +123,9 @@
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
+ <artifactId>rhq-arquillian-container-test-plugin</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml b/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
index 09f3c7b..74b5245 100644
--- a/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
+++ b/modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml
@@ -9,7 +9,7 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" />
+ <depends plugin="ArquillianTestPlugin" />
<server name="TestServer"
discovery="TestDiscoveryComponent"
diff --git a/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml b/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
index 0f38779..4136504 100644
--- a/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
+++ b/modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml
@@ -9,7 +9,7 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" />
+ <depends plugin="ArquillianTestPlugin" />
<server name="TestServer"
discovery="TestDiscoveryComponent"
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index fb6f3ee..7e215a3 100644
--- a/modules/core/arquillian-integration/pom.xml
+++ b/modules/core/arquillian-integration/pom.xml
@@ -20,6 +20,7 @@
<description>parent POM for integration modules with Arquillian</description>
<modules>
+ <module>test-agent-plugin</module>
<module>container</module>
<module>archive</module>
<module>suite-extension</module>
diff --git a/modules/core/arquillian-integration/test-agent-plugin/README b/modules/core/arquillian-integration/test-agent-plugin/README
new file mode 100644
index 0000000..6670138
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/README
@@ -0,0 +1,6 @@
+This is a test plugin that is only used by the tests for the RHQ's Arquillian
+container.
+
+The purpose of this plugin is only to serve as a dependency for the plugins
+under test in the container that is being picked up from the maven classpath
+as opposed to the tests themselves.
\ No newline at end of file
diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
new file mode 100644
index 0000000..f086ca3
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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-arquillian-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-arquillian-container-test-plugin</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Test Plugin for RHQ's Arquillian container</name>
+
+ <description>
+ This is a test plugin that is only used by the tests for the RHQ's Arquillian
+ container.
+
+ The purpose of this plugin is only to serve as a dependency for the plugins
+ under test in the container that is being picked up from the maven classpath
+ as opposed to the tests themselves.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java
new file mode 100644
index 0000000..9d8c013
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Component.java
@@ -0,0 +1,25 @@
+package org.rhq.plugins.arquillian.test;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+
+/**
+ * @author Lukas Krejci
+ */
+public class Component implements ResourceComponent<ResourceComponent<?>> {
+ @Override
+ public void start(ResourceContext<ResourceComponent<?>> context)
+ throws InvalidPluginConfigurationException, Exception {
+ }
+
+ @Override
+ public void stop() {
+ }
+
+ @Override
+ public AvailabilityType getAvailability() {
+ return AvailabilityType.UP;
+ }
+}
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java
new file mode 100644
index 0000000..09cec61
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/java/org/rhq/plugins/arquillian/test/Discovery.java
@@ -0,0 +1,22 @@
+package org.rhq.plugins.arquillian.test;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * @author Lukas Krejci
+ */
+public class Discovery implements ResourceDiscoveryComponent<ResourceComponent<?>> {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<ResourceComponent<?>> context)
+ throws InvalidPluginConfigurationException, Exception {
+ return Collections.emptySet();
+ }
+}
diff --git a/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml b/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml
new file mode 100644
index 0000000..d22b8f4
--- /dev/null
+++ b/modules/core/arquillian-integration/test-agent-plugin/src/test/resources/META-INF/rhq-plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<plugin name="ArquillianTestPlugin"
+ displayName="Arquillian Test Plugin"
+ description="This plugin is a mere dependency for the Arquillian container tests. It serves no other functional purpose."
+ package="org.rhq.plugins.arquillian.test"
+ version="1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="Server" class="Component" discovery="Discovery" />
+</plugin>
1
0
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 642a7994097b0d04bf25f74a78b706827f0e3b0c
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Apr 8 14:59:24 2013 +0200
Bug 846451, 949048, 949062 * createAlertDefinition() renamed to createAlertDefinitionInNewTransaction() (itest-2 module didn't compile)
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
index 3cd1044..af045ca 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerTest.java
@@ -303,7 +303,7 @@ public class AlertManagerTest extends AbstractEJB3Test {
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
alertDefinition.setEnabled(true);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(), alertDefinition,
testData.getResource().getId(), true);
testData.setAlertDefinitionId(alertDefinitionId);
return alertDefinitionId;
1
0
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java | 2
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 34 ++
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java | 125 ++++++++++
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 82 +++---
4 files changed, 204 insertions(+), 39 deletions(-)
New commits:
commit a59177bc6e134e748df58574eaf3f8dc1c4e44df
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Apr 7 23:03:05 2013 -0400
initial commit for console command
This initial commit introduces the console command but it is not fully
functional yet. Also refactoring the stop command some so that it first checks
for a pid file before trying to stop a process. Also made some changes in the
stop command to get it do the right thing, which is stop whatever is installed
by default. There is still a bit of work to get that logic right.
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
index 09ac6b5..faa135d 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
@@ -32,6 +32,7 @@ import java.util.TreeMap;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.rhq.server.control.command.Console;
import org.rhq.server.control.command.Install;
import org.rhq.server.control.command.Start;
import org.rhq.server.control.command.Status;
@@ -54,6 +55,7 @@ public class Commands {
registerCommand(new Start());
registerCommand(new Stop());
registerCommand(new Status());
+ registerCommand(new Console());
}
private void registerCommand(ControlCommand command) {
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
index 1d5068f..edb2ec7 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
@@ -26,6 +26,8 @@
package org.rhq.server.control;
import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -38,6 +40,8 @@ import org.apache.commons.cli.PosixParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.rhq.core.util.stream.StreamUtil;
+
/**
* @author John Sanda
*/
@@ -122,4 +126,34 @@ public abstract class ControlCommand {
return new File(basedir, "storage").exists();
}
+ protected String getStoragePid() throws IOException {
+ File storageBasedir = new File(basedir, "storage");
+ File storageBinDir = new File(storageBasedir, "bin");
+ File pidFile = new File(storageBinDir, "cassandra.pid");
+
+ if (pidFile.exists()) {
+ return StreamUtil.slurp(new FileReader(pidFile));
+ }
+ return null;
+ }
+
+ protected String getServerPid() throws IOException {
+ File pidFile = new File(binDir, "rhq-server.pid");
+ if (pidFile.exists()) {
+ return StreamUtil.slurp(new FileReader(pidFile));
+ }
+ return null;
+ }
+
+ protected String getAgentPid() throws IOException {
+ File agentBasedir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentBasedir, "bin");
+ File pidFile = new File(agentBinDir, "rhq-agent.pid");
+
+ if (pidFile.exists()) {
+ return StreamUtil.slurp(new FileReader(pidFile));
+ }
+ return null;
+ }
+
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
new file mode 100644
index 0000000..650d066
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
@@ -0,0 +1,125 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control.command;
+
+import java.io.File;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+
+import org.rhq.server.control.ControlCommand;
+import org.rhq.server.control.RHQControlException;
+
+/**
+ * @author John Sanda
+ */
+public class Console extends ControlCommand {
+
+ private Options options;
+
+ public Console() {
+ options = new Options()
+ .addOption(null, "storage", false, "Start the RHQ storage node in the foreground")
+ .addOption(null, "server", false, "Start the RHQ server in the foreground")
+ .addOption(null, "agent", false, "Start the RHQ agent in the foreground");
+ }
+
+ @Override
+ public String getName() {
+ return "console";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Starts an RHQ service in the foreground. Only one of the following options should be specified.";
+ }
+
+ @Override
+ public Options getOptions() {
+ return options;
+ }
+
+ @Override
+ protected void exec(CommandLine commandLine) {
+ if (commandLine.getOptions().length != 1) {
+ printUsage();
+ } else {
+ String option = commandLine.getOptions()[0].getLongOpt();
+ try {
+ if (option.equals(STORAGE_OPTION)) {
+ startStorageInForeground();
+ } else if (option.equals(SERVER_OPTION)) {
+ startServerInForeground();
+ } else if (option.equals(AGENT_OPTION)) {
+ startAgentInForeground();
+ } else {
+ throw new IllegalArgumentException(option + " is not a supported option");
+ }
+ } catch (Exception e) {
+ throw new RHQControlException("Failed to execute console command", e);
+ }
+ }
+ }
+
+ private void startStorageInForeground() throws Exception {
+ log.debug("Starting RHQ storage node in foreground");
+
+ File storageBasedir = new File(basedir, "storage");
+ File storageBinDir = new File(storageBasedir, "bin");
+
+ new ProcessBuilder("./cassandra", "-f")
+ .directory(storageBinDir)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void startServerInForeground() throws Exception {
+ log.debug("Starting RHQ server in foreground");
+
+ new ProcessBuilder("./rhq-server.sh", "console")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void startAgentInForeground() throws Exception {
+ log.info("Starting RHQ agent in foreground");
+
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent.sh")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
index d53ee90..66d11fe 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
@@ -26,12 +26,10 @@
package org.rhq.server.control.command;
import java.io.File;
-import java.io.FileReader;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
-import org.rhq.core.util.stream.StreamUtil;
import org.rhq.server.control.ControlCommand;
import org.rhq.server.control.RHQControlException;
@@ -75,34 +73,34 @@ public class Stop extends ControlCommand {
stopServer = true;
stopAgent = true;
} else {
- stopStorage = commandLine.hasOption("storage");
- stopServer = commandLine.hasOption("server");
- stopAgent = commandLine.hasOption("agent");
+ stopStorage = commandLine.hasOption(STORAGE_OPTION);
+ stopServer = commandLine.hasOption(SERVER_OPTION);
+ stopAgent = commandLine.hasOption(AGENT_OPTION);
}
try {
if (stopStorage) {
- if (commandLine.hasOption(STORAGE_OPTION) && !isStorageInstalled()) {
+ if (isStorageInstalled()) {
+ stopStorage();
+ } else {
log.warn("It appears that the storage node is not installed. The --" + STORAGE_OPTION +
" option will be ignored.");
- } else {
- stopStorage();
}
}
if (stopServer) {
- if (commandLine.hasOption(SERVER_OPTION) && !isServerInstalled()) {
+ if (isServerInstalled()) {
+ stopRHQServer();
+ } else {
log.warn("It appears that the server is not installed. The --" + SERVER_OPTION +
" option will be ignored.");
- } else {
- stopRHQServer();
}
}
if (stopAgent) {
- if (commandLine.hasOption(AGENT_OPTION) && !isAgentInstalled()) {
+ if (isAgentInstalled()) {
+ stopAgent();
+ } else {
log.warn("It appears that the agent is not installed. The --" + AGENT_OPTION +
" option will be ignored.");
- } else {
- stopAgent();
}
}
} catch (Exception e) {
@@ -111,43 +109,49 @@ public class Stop extends ControlCommand {
}
private void stopStorage() throws Exception {
- log.info("Stopping RHQ storage node");
+ log.debug("Stopping RHQ storage node");
File storageBasedir = new File(basedir, "storage");
File storageBinDir = new File(storageBasedir, "bin");
- File pidFile = new File(storageBinDir, "cassandra.pid");
- String pid = StreamUtil.slurp(new FileReader(pidFile));
-
- new ProcessBuilder("kill", pid)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start()
- .waitFor();
+ String pid = getStoragePid();
+ if (pid != null) {
+ new ProcessBuilder("kill", pid)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
}
private void stopRHQServer() throws Exception {
- log.info("Stopping RHQ server");
-
- new ProcessBuilder("./rhq-server.sh", "stop")
- .directory(binDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start()
- .waitFor();
+ log.debug("Stopping RHQ server");
+
+ String pid = getServerPid();
+ if (pid != null) {
+ new ProcessBuilder("./rhq-server.sh", "stop")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
}
private void stopAgent() throws Exception {
- log.info("Stopping RHQ agent");
+ log.debug("Stopping RHQ agent");
File agentHomeDir = new File(basedir, "rhq-agent");
File agentBinDir = new File(agentHomeDir, "bin");
-
- new ProcessBuilder("./rhq-agent-wrapper.sh", "stop")
- .directory(agentBinDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start()
- .waitFor();
+ String pid = getAgentPid();
+
+ if (pid != null) {
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "stop")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
}
}
1
0
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java | 2
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Status.java | 154 ++++++++++
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 21 +
3 files changed, 174 insertions(+), 3 deletions(-)
New commits:
commit 3d16c01780b933725f0b2f96fdba3eeed843d7b3
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Apr 7 17:53:18 2013 -0400
initial commit for status command
This commit also updates the stop to check if a service is installed prior to
attempting to stop it.
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
index 0ae83f1..09ac6b5 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
@@ -34,6 +34,7 @@ import org.apache.commons.cli.Options;
import org.rhq.server.control.command.Install;
import org.rhq.server.control.command.Start;
+import org.rhq.server.control.command.Status;
import org.rhq.server.control.command.Stop;
/**
@@ -52,6 +53,7 @@ public class Commands {
registerCommand(new Install());
registerCommand(new Start());
registerCommand(new Stop());
+ registerCommand(new Status());
}
private void registerCommand(ControlCommand command) {
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Status.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Status.java
new file mode 100644
index 0000000..e3a8aa7
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Status.java
@@ -0,0 +1,154 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control.command;
+
+import java.io.File;
+import java.io.FileReader;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+
+import org.rhq.core.util.stream.StreamUtil;
+import org.rhq.server.control.ControlCommand;
+import org.rhq.server.control.RHQControlException;
+
+/**
+ * @author John Sanda
+ */
+public class Status extends ControlCommand {
+
+ private Options options;
+
+ public Status() {
+ options = new Options()
+ .addOption(null, STORAGE_OPTION, false, "Check status of RHQ storage node")
+ .addOption(null, SERVER_OPTION, false, "Check status of RHQ server")
+ .addOption(null, AGENT_OPTION, false, "Check status of RHQ agent");
+ }
+
+ @Override
+ public String getName() {
+ return "status";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Check status of RHQ services";
+ }
+
+ @Override
+ public Options getOptions() {
+ return options;
+ }
+
+ @Override
+ protected void exec(CommandLine commandLine) {
+ boolean checkStorage;
+ boolean checkServer;
+ boolean checkAgent;
+
+ if (commandLine.getOptions().length == 0) {
+ checkStorage = true;
+ checkServer = true;
+ checkAgent = true;
+ } else {
+ checkStorage = commandLine.hasOption(STORAGE_OPTION);
+ checkServer = commandLine.hasOption(SERVER_OPTION);
+ checkAgent = commandLine.hasOption(AGENT_OPTION);
+ }
+
+ try {
+ if (checkStorage) {
+ if (commandLine.hasOption(STORAGE_OPTION) && !isStorageInstalled()) {
+ log.warn("It appears that the storage node is not installed. The --" + STORAGE_OPTION +
+ " option will be ignored.");
+ } else {
+ checkStorageStatus();
+ }
+ }
+
+ if (checkServer) {
+ if (commandLine.hasOption(SERVER_OPTION) && !isServerInstalled()) {
+ log.warn("It appears that the server is not installed. The --" + SERVER_OPTION +
+ " option will be ignored.");
+ } else {
+ checkServerStatus();
+ }
+ }
+
+ if (checkAgent) {
+ if (commandLine.hasOption(AGENT_OPTION) && !isAgentInstalled()) {
+ log.warn("It appears that the agent is not installed. The --" + AGENT_OPTION +
+ " option will be ignored.");
+ } else {
+ checkAgentStatus();
+ }
+ }
+ } catch (Exception e) {
+ throw new RHQControlException("Failed to check statuses", e);
+ }
+ }
+
+ private void checkStorageStatus() throws Exception {
+ log.debug("Checking RHQ storage node status");
+
+ File storageBasedir = new File(basedir, "storage");
+ File storageBinDir = new File(storageBasedir, "bin");
+ File pidFile = new File(storageBinDir, "cassandra.pid");
+
+ if (pidFile.exists()) {
+ String pid = StreamUtil.slurp(new FileReader(pidFile));
+ System.out.println("RHQ storage node (pid " + pid + ") is running");
+ } else {
+ System.out.println("RHQ storage node (no pid file) is NOT running");
+ }
+ }
+
+ private void checkServerStatus() throws Exception {
+ log.debug("Checking RHQ server status");
+
+ new ProcessBuilder("./rhq-server.sh", "status")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void checkAgentStatus() throws Exception {
+ log.debug("Checking RHQ agent status");
+
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "status")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
index 6b9c45c..d53ee90 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
@@ -82,13 +82,28 @@ public class Stop extends ControlCommand {
try {
if (stopStorage) {
- stopStorage();
+ if (commandLine.hasOption(STORAGE_OPTION) && !isStorageInstalled()) {
+ log.warn("It appears that the storage node is not installed. The --" + STORAGE_OPTION +
+ " option will be ignored.");
+ } else {
+ stopStorage();
+ }
}
if (stopServer) {
- stopRHQServer();
+ if (commandLine.hasOption(SERVER_OPTION) && !isServerInstalled()) {
+ log.warn("It appears that the server is not installed. The --" + SERVER_OPTION +
+ " option will be ignored.");
+ } else {
+ stopRHQServer();
+ }
}
if (stopAgent) {
- stopAgent();
+ if (commandLine.hasOption(AGENT_OPTION) && !isAgentInstalled()) {
+ log.warn("It appears that the agent is not installed. The --" + AGENT_OPTION +
+ " option will be ignored.");
+ } else {
+ stopAgent();
+ }
}
} catch (Exception e) {
throw new RHQControlException("Failed to stop services", e);
1
0
[rhq] Branch 'feature/cassandra-backend' - 6 commits - modules/common modules/enterprise
by John Sanda 07 Apr '13
by John Sanda 07 Apr '13
07 Apr '13
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java | 2
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 20
modules/enterprise/pom.xml | 1
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh | 2
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh | 243 ++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 4
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 21
modules/enterprise/server/pom.xml | 1
modules/enterprise/server/server-control/pom.xml | 107
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java | 91
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 125 +
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java | 101
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java | 43
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 237 ++
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java | 150 +
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 138 +
modules/enterprise/server/server-control/src/main/resources/agent-configuration.xml | 1103 ++++++++++
modules/enterprise/server/server-control/src/main/resources/logging.properties | 28
modules/enterprise/server/server-control/src/main/resources/module/main/module.xml | 23
modules/enterprise/server/server-control/src/main/scripts/module-assembly.xml | 37
20 files changed, 2475 insertions(+), 2 deletions(-)
New commits:
commit 7a16c6808bd0cf0f2d252cfe20e810fde52a3a0c
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 22:28:03 2013 -0400
forgot to include InstallerServiceImpl in previous commit
This introduces the change to change the file marker during the server install.
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 71d834d..ae91705c 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -19,7 +19,9 @@
package org.rhq.enterprise.server.installer;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
+import java.io.StringReader;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
@@ -40,6 +42,7 @@ import org.rhq.common.jbossas.client.controller.WebJBossASClient;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.util.PropertiesFileUpdate;
import org.rhq.core.util.exception.ThrowableUtil;
+import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
@@ -304,7 +307,13 @@ public class InstallerServiceImpl implements InstallerService {
// deploy the main EAR app subsystem - this is the thing that contains and actually deploys the EAR
deployAppSubsystem();
- return;
+ // write a file marker so that rhqctl can easily determine that the server has been
+ // installed.
+ try {
+ writeInstalledFileMarker();
+ } catch (IOException e) {
+ log.warn("An error occurred while creating the installed file marker", e);
+ }
}
@Override
@@ -1215,4 +1224,14 @@ public class InstallerServiceImpl implements InstallerService {
return new SchemaManager(username, password, hosts);
}
+
+ private void writeInstalledFileMarker() throws IOException {
+ File basedir = new File(System.getProperty("rhq.server.basedir"));
+ File modulesDir = new File(basedir, "modules");
+ File metaInfDir = new File(modulesDir,
+ "org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/META-INF/");
+ File markerFile = new File(metaInfDir, ".installed");
+
+ StreamUtil.copy(new StringReader(""), new FileWriter(markerFile));
+ }
}
commit 0b6d81302f2f39d6a89effb8607bda59ed474d93
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 22:26:01 2013 -0400
adding logic to start command to check if a service installed before starting it
Also updating the RHQ installer to generate a installed file marker that rhctl
checks for to determine whether or not the server has been installed.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh
index ddcde6c..6766a3f 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh
@@ -214,7 +214,7 @@ else
_RHQ_LOGLEVEL="INFO"
fi
-RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.server.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.server.installer.loglevel=${_RHQ_LOGLEVEL}"
+RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.server.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.server.installer.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}"
# Sample JPDA settings for remote socket debugging
#RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
index 56d718e..1d5068f 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
@@ -43,6 +43,12 @@ import org.apache.commons.logging.LogFactory;
*/
public abstract class ControlCommand {
+ public static final String SERVER_OPTION = "server";
+
+ public static final String STORAGE_OPTION = "storage";
+
+ public static final String AGENT_OPTION = "agent";
+
protected final Log log = LogFactory.getLog(getClass().getName());
protected File basedir;
@@ -99,4 +105,21 @@ public abstract class ControlCommand {
return list;
}
+ protected boolean isServerInstalled() {
+ File modulesDir = new File(basedir, "modules");
+ File metaInfDir = new File(modulesDir,
+ "org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/META-INF/");
+ File markerFile = new File(metaInfDir, ".installed");
+
+ return markerFile.exists();
+ }
+
+ protected boolean isAgentInstalled() {
+ return new File(basedir, "rhq-agent").exists();
+ }
+
+ protected boolean isStorageInstalled() {
+ return new File(basedir, "storage").exists();
+ }
+
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
index 5f02810..19a6c01 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
@@ -42,9 +42,9 @@ public class Start extends ControlCommand {
public Start() {
options = new Options()
- .addOption(null, "storage", false, "Start RHQ storage node")
- .addOption(null, "server", false, "Start RHQ server")
- .addOption(null, "agent", false, "Start RHQ agent");
+ .addOption(null, STORAGE_OPTION, false, "Start RHQ storage node")
+ .addOption(null, SERVER_OPTION, false, "Start RHQ server")
+ .addOption(null, AGENT_OPTION, false, "Start RHQ agent");
}
@Override
@@ -73,20 +73,36 @@ public class Start extends ControlCommand {
startServer = true;
startAgent = true;
} else {
- startStorage = commandLine.hasOption("storage");
- startServer = commandLine.hasOption("server");
- startAgent = commandLine.hasOption("agent");
+ startStorage = commandLine.hasOption(STORAGE_OPTION);
+ startServer = commandLine.hasOption(SERVER_OPTION);
+ startAgent = commandLine.hasOption(AGENT_OPTION);
}
try {
if (startStorage) {
+ if (commandLine.hasOption(STORAGE_OPTION) && !isStorageInstalled()) {
+ log.warn("It appears that the storage node is not installed. The --" + STORAGE_OPTION +
+ " option will be ignored.");
+ } else {
+ startStorage();
+ }
startStorage();
}
if (startServer) {
- startRHQServer();
+ if (commandLine.hasOption(SERVER_OPTION) && !isServerInstalled()) {
+ log.warn("It appears that the server is not installed. The --" + SERVER_OPTION +
+ " option will be ignored.");
+ } else {
+ startRHQServer();
+ }
}
if (startAgent) {
- startAgent();
+ if (commandLine.hasOption(AGENT_OPTION) && !isAgentInstalled()) {
+ log.warn("It appears that the agent is not installed. The --" + AGENT_OPTION +
+ " option will be ignored.");
+ } else {
+ startAgent();
+ }
}
} catch (Exception e) {
throw new RHQControlException("Failed to stop services", e);
@@ -130,4 +146,5 @@ public class Start extends ControlCommand {
.waitFor();
}
+
}
commit 13fe64b479a01d940ded01297ef28ea6aae10deb
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 4 21:50:25 2013 -0400
initial support for start command
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh
index 702d162..8f25e0b 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh
@@ -8,7 +8,7 @@
#
# This script is customizable by setting the following environment variables:
#
-# RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug
+# RHQ_CONTROL_DEBUG - If this is defined, the script will emit debug
# messages. If this is not defined or set to "false"
# debug messages are not emitted.
#
@@ -38,16 +38,16 @@
# RHQ_SERVER_JAVA_HOME are not set, the
# Server's embedded JRE will be used.
#
-# RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be
+# RHQ_CONTROL_JAVA_OPTS - Java VM command line options to be
# passed into the Java VM. If this is not defined
# this script will pass in a default set of options.
# If you only want to add options to the defaults,
# then you will want to use
-# RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead.
+# RHQ_CONTROL_ADDITIONAL_JAVA_OPTS instead.
#
-# RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command
+# RHQ_CONTROL_ADDITIONAL_JAVA_OPTS - additional Java VM command
# line options to be passed into the VM.
-# This is added to RHQ_STORAGE_JAVA_OPTS; it
+# This is added to RHQ_CONTROL_JAVA_OPTS; it
# is mainly used to augment the
# default set of options. This can be
# left unset if it is not needed.
@@ -59,7 +59,7 @@
debug_msg ()
{
# if debug variable is set, it is assumed to be on, unless its value is false
- if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then
+ if [ -n "$RHQ_CONTROL_DEBUG" ] && [ "$RHQ_CONTROL_DEBUG" != "false" ]; then
echo $1
fi
}
@@ -202,25 +202,25 @@ fi
# Prepare the VM command line options to be passed in
# ----------------------------------------------------------------------
-if [ -z "$RHQ_STORAGE_INSTALLER_JAVA_OPTS" ]; then
- RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+if [ -z "$RHQ_CONTROL_JAVA_OPTS" ]; then
+ RHQ_CONTROL_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
fi
# Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS.
-if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then
+if [ -n "$RHQ_CONTROL_DEBUG" ] && [ "$RHQ_CONTROL_DEBUG" != "false" ]; then
_RHQ_LOGLEVEL="DEBUG"
else
_RHQ_LOGLEVEL="INFO"
fi
# debugging the logging level now for development/testing
-RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.control.logdir=${RHQ_SERVER_HOME}/logs -Drhq.control.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}"
+RHQ_CONTROL_JAVA_OPTS="${RHQ_CONTROL_JAVA_OPTS} -Djava.awt.headless=true -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.control.logdir=${RHQ_SERVER_HOME}/logs -Drhq.control.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}"
# Sample JPDA settings for remote socket debugging
-#RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+#RHQ_CONTROL_JAVA_OPTS="${RHQ_CONTROL_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
-debug_msg "RHQ_STORAGE_INSTALLER_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_JAVA_OPTS"
-debug_msg "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS"
+debug_msg "RHQ_CONTROL_JAVA_OPTS: $RHQ_CONTROL_JAVA_OPTS"
+debug_msg "RHQ_CONTROL_ADDITIONAL_JAVA_OPTS: $RHQ_CONTROL_ADDITIONAL_JAVA_OPTS"
# ----------------------------------------------------------------------
# We need to add our own modules to the core set of JBossAS modules.
@@ -237,7 +237,7 @@ debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH"
echo "Starting RHQ Control..."
# start the AS instance with our main installer module
-"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_STORAGE_INSTALLER_JAVA_OPTS} ${RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-server-control "$@"
+"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_CONTROL_JAVA_OPTS} ${RHQ_CONTROL_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-server-control "$@"
_EXIT_STATUS=$?
exit $_EXIT_STATUS
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
index 97d6559..56d718e 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
@@ -35,12 +35,16 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author John Sanda
*/
public abstract class ControlCommand {
+ protected final Log log = LogFactory.getLog(getClass().getName());
+
protected File basedir;
protected File binDir;
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
index 12fd303..a2072bf 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
@@ -25,41 +25,21 @@
package org.rhq.server.control;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.prefs.Preferences;
import org.apache.commons.cli.HelpFormatter;
-
-import org.rhq.core.util.TokenReplacingReader;
-import org.rhq.core.util.stream.StreamUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author John Sanda
*/
public class RHQControl {
- private Commands commands = new Commands();
-
- private File basedir;
+ private final Log log = LogFactory.getLog(RHQControl.class);
- private File binDir;
-
- public RHQControl() {
- basedir = new File(System.getProperty("rhq.server.basedir"));
- binDir = new File(basedir, "bin");
- }
+ private Commands commands = new Commands();
public void printUsage() {
HelpFormatter helpFormatter = new HelpFormatter();
@@ -73,14 +53,15 @@ public class RHQControl {
public void exec(String[] args) {
try {
if (args.length == 0) {
- throw new RHQControlException();
- }
- String commandName = findCommand(commands, args);
- ControlCommand command = commands.get(commandName);
+ printUsage();
+ } else {
+ String commandName = findCommand(commands, args);
+ ControlCommand command = commands.get(commandName);
- command.exec(getCommandLine(commandName, args));
+ command.exec(getCommandLine(commandName, args));
+ }
} catch (RHQControlException e) {
- printUsage();
+ log.error(e);
}
}
@@ -111,224 +92,10 @@ public class RHQControl {
return cmdLine;
}
- public void install() throws Exception {
- installStorageNode();
- startRHQServerForInstallation();
- installRHQServer();
- waitForRHQServerToInitialize();
- clearAgentPreferences();
- installAgent();
- configureAgent();
- startAgent();
- }
-
- private int installStorageNode() throws Exception {
- return new ProcessBuilder("./rhq-storage-installer.sh", "--commitlog", "../storage/commit_log", "--data",
- "../storage/data", "--saved-caches", "../storage/saved_caches")
- .directory(binDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start()
- .waitFor();
- }
-
- private void startRHQServerForInstallation() throws Exception {
- new ProcessBuilder("./rhq-server.sh", "start")
- .directory(binDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start();
-
- ProcessBuilder pb = new ProcessBuilder("./rhq-installer.sh", "--test")
- .directory(binDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT);
- Process process = pb.start();
- while (process.waitFor() != 0) {
- process = pb.start();
- }
- }
-
- private void installRHQServer() throws Exception {
- new ProcessBuilder("./rhq-installer.sh")
- .directory(binDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start();
- }
-
- private void waitForRHQServerToInitialize() throws Exception {
- while (!isRHQServerInitialized()) {
- Thread.sleep(5000);
- }
- }
-
- private boolean isRHQServerInitialized() throws Exception {
- File logDir = new File(basedir, "logs");
- BufferedReader reader = new BufferedReader(new FileReader(new File(logDir, "server.log")));
- String line = reader.readLine();
- while (line != null) {
- if (line.contains("Server started")) {
- return true;
- }
- line = reader.readLine();
- }
- return false;
- }
-
- private void installAgent() throws Exception {
- File agentInstallerJar = getAgentInstaller();
- new ProcessBuilder("java", "-jar", agentInstallerJar.getPath(), "--install")
- .directory(basedir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start()
- .waitFor();
-
- new File(basedir, "rhq-agent-update.log").delete();
- }
-
- private File getAgentInstaller() {
- File agentDownloadDir = new File(basedir,
- "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent");
- return agentDownloadDir.listFiles(new FileFilter() {
- @Override
- public boolean accept(File file) {
- return file.getName().contains("rhq-enterprise-agent");
- }
- })[0];
- }
-
- private void configureAgent() throws Exception {
- File agentHomeDir = new File(basedir, "rhq-agent");
- File agentBinDir = new File(agentHomeDir, "bin");
- File agentConfDir = new File(agentHomeDir, "conf");
- File agentConfigFile = new File(agentConfDir, "agent-configuration.xml");
- agentConfigFile.delete();
-
- Map<String, String> tokens = new TreeMap<String, String>();
- tokens.put("rhq.agent.server.bind-address", InetAddress.getLocalHost().getHostName());
-
- InputStream inputStream = RHQControl.class.getResourceAsStream("/agent-configuration.xml");
- TokenReplacingReader reader = new TokenReplacingReader(new InputStreamReader(inputStream), tokens);
- BufferedWriter writer = new BufferedWriter(new FileWriter(agentConfigFile));
-
- StreamUtil.copy(reader, writer);
- }
-
- private void clearAgentPreferences() throws Exception {
- Preferences agentPrefs = Preferences.userRoot().node("/rhq-agent");
- agentPrefs.removeNode();
- agentPrefs.flush();
- Preferences.userRoot().sync();
- }
-
- private void startAgent() throws Exception {
- File agentHomeDir = new File(basedir, "rhq-agent");
- File agentBinDir = new File(agentHomeDir, "bin");
-
- new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
- .directory(agentBinDir)
- .redirectOutput(ProcessBuilder.Redirect.INHERIT)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .start();
- }
-
public static void main(String[] args) throws Exception {
-// File basedir = new File(System.getProperty("rhq.server.basedir"));
-// File binDir = new File(basedir, "bin");
-//
-// // --commitlog=../storage/commit_log --data=../storage/data --saved-caches=../storage/saved_cache
-// StorageInstaller.main(new String[] {"--commitlog", "../commit_log", "--data", "../data",
-// "--saved-caches", "../saved_caches"});
-//
-// Process process = new ProcessBuilder("./rhq-server.sh", "start")
-// .directory(binDir)
-// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
-// .redirectError(ProcessBuilder.Redirect.INHERIT)
-// .start();
-// Thread.sleep(5000);
-//
-// initSysPropsForRHQInstaller(basedir, binDir);
-//
-// InstallerService installer = new InstallerServiceImpl(new InstallerConfiguration());
-// while (true) {
-// try {
-// installer.test();
-// break;
-// } catch (Exception e) {
-// Thread.sleep(1000);
-// }
-// }
-// final HashMap<String, String> serverProperties = installer.preInstall();
-// installer.install(serverProperties, null, null);
-//
-// while (!isRHQServerInitialized(basedir)) {
-// Thread.sleep(5000);
-// }
-// System.out.println("RHQ server is initialized");
-//
-// File agentDownloadDir = new File(basedir,
-// "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent");
-// File agentUpdateFile = agentDownloadDir.listFiles(new FileFilter() {
-// @Override
-// public boolean accept(File file) {
-// return file.getName().contains("rhq-enterprise-agent");
-// }
-// })[0];
-// File agentJarFile = new File(basedir, "rhq-agent.jar");
-// FileUtil.copyFile(agentUpdateFile, agentJarFile);
-//
-// new ProcessBuilder("java", "-jar", agentJarFile.getPath(), "--install")
-// .directory(basedir)
-// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
-// .redirectError(ProcessBuilder.Redirect.INHERIT)
-// .start()
-// .waitFor();
-//
-// new File(basedir, "rhq-agent-update.log").delete();
-// agentJarFile.delete();
-//
-// File agentHomeDir = new File(basedir, "rhq-agent");
-// File agentBinDir = new File(agentHomeDir, "bin");
-// File agentConfDir = new File(agentHomeDir, "conf");
-// File agentConfigFile = new File(agentConfDir, "agent-configuration.xml");
-// agentConfigFile.delete();
-//
-// Preferences agentPrefs = Preferences.userRoot().node("/rhq-agent");
-// agentPrefs.removeNode();
-// agentPrefs.flush();
-//
-// // update agent config
-// Map<String, String> tokens = new TreeMap<String, String>();
-// tokens.put("rhq.agent.server.bind-address", InetAddress.getLocalHost().getHostName());
-//
-// InputStream inputStream = RHQControl.class.getResourceAsStream("/agent-configuration.xml");
-// TokenReplacingReader reader = new TokenReplacingReader(new InputStreamReader(inputStream), tokens);
-// BufferedWriter writer = new BufferedWriter(new FileWriter(agentConfigFile));
-//
-// StreamUtil.copy(reader, writer);
-//
-// new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
-// .directory(agentBinDir)
-// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
-// .redirectError(ProcessBuilder.Redirect.INHERIT)
-// .start();
-
RHQControl control = new RHQControl();
-// control.install();
control.exec(args);
-
System.exit(0);
}
- private static void initSysPropsForRHQInstaller(File baseDir, File binDir) {
- File logDir = new File(baseDir, "logs");
-
- System.setProperty("i18nlog.logger-type", "commons");
- System.setProperty("rhq.server.properties-file", new File(binDir, "rhq-server.properties").getPath());
- System.setProperty("rhq.server.installer.logdir", logDir.getPath());
- System.setProperty("rhq.server.installer.loglevel", "INFO");
- }
-
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
index 0e5c147..325dabe 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
@@ -117,6 +117,8 @@ public class Install extends ControlCommand {
}
private int installStorageNode() throws Exception {
+ log.info("Installing RHQ storage node");
+
return new ProcessBuilder("./rhq-storage-installer.sh", "--commitlog", "../storage/commit_log", "--data",
"../storage/data", "--saved-caches", "../storage/saved_caches")
.directory(binDir)
@@ -144,6 +146,8 @@ public class Install extends ControlCommand {
}
private void installRHQServer() throws Exception {
+ log.info("Installing RHQ server");
+
new ProcessBuilder("./rhq-installer.sh")
.directory(binDir)
.redirectOutput(ProcessBuilder.Redirect.INHERIT)
@@ -171,6 +175,8 @@ public class Install extends ControlCommand {
}
private void installAgent() throws Exception {
+ log.info("Installing RHQ agent");
+
File agentInstallerJar = getAgentInstaller();
new ProcessBuilder("java", "-jar", agentInstallerJar.getPath(), "--install")
.directory(basedir)
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
index 2c604c6..5f02810 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
@@ -25,10 +25,13 @@
package org.rhq.server.control.command;
+import java.io.File;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.rhq.server.control.ControlCommand;
+import org.rhq.server.control.RHQControlException;
/**
* @author John Sanda
@@ -61,5 +64,70 @@ public class Start extends ControlCommand {
@Override
protected void exec(CommandLine commandLine) {
+ boolean startStorage;
+ boolean startServer;
+ boolean startAgent;
+
+ if (commandLine.getOptions().length == 0) {
+ startStorage = true;
+ startServer = true;
+ startAgent = true;
+ } else {
+ startStorage = commandLine.hasOption("storage");
+ startServer = commandLine.hasOption("server");
+ startAgent = commandLine.hasOption("agent");
+ }
+
+ try {
+ if (startStorage) {
+ startStorage();
+ }
+ if (startServer) {
+ startRHQServer();
+ }
+ if (startAgent) {
+ startAgent();
+ }
+ } catch (Exception e) {
+ throw new RHQControlException("Failed to stop services", e);
+ }
+ }
+
+ private void startStorage() throws Exception {
+ log.info("Starting RHQ storage node");
+
+ File storageBasedir = new File(basedir, "storage");
+ File storageBinDir = new File(storageBasedir, "bin");
+
+ new ProcessBuilder("./cassandra", "-p", "cassandra.pid")
+ .directory(storageBinDir)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
}
+
+ private void startRHQServer() throws Exception {
+ log.info("Starting RHQ server");
+
+ new ProcessBuilder("./rhq-server.sh", "start")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void startAgent() throws Exception {
+ log.info("Starting RHQ agent");
+
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
index 27bfd38..6b9c45c 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
@@ -96,6 +96,8 @@ public class Stop extends ControlCommand {
}
private void stopStorage() throws Exception {
+ log.info("Stopping RHQ storage node");
+
File storageBasedir = new File(basedir, "storage");
File storageBinDir = new File(storageBasedir, "bin");
@@ -110,6 +112,8 @@ public class Stop extends ControlCommand {
}
private void stopRHQServer() throws Exception {
+ log.info("Stopping RHQ server");
+
new ProcessBuilder("./rhq-server.sh", "stop")
.directory(binDir)
.redirectOutput(ProcessBuilder.Redirect.INHERIT)
@@ -119,6 +123,8 @@ public class Stop extends ControlCommand {
}
private void stopAgent() throws Exception {
+ log.info("Stopping RHQ agent");
+
File agentHomeDir = new File(basedir, "rhq-agent");
File agentBinDir = new File(agentHomeDir, "bin");
diff --git a/modules/enterprise/server/server-control/src/main/resources/logging.properties b/modules/enterprise/server/server-control/src/main/resources/logging.properties
index c663a32..c4ff207 100644
--- a/modules/enterprise/server/server-control/src/main/resources/logging.properties
+++ b/modules/enterprise/server/server-control/src/main/resources/logging.properties
@@ -1,9 +1,8 @@
# Additional logger names to configure (root logger is always configured)
-#loggers=org.rhq, org.rhq.storage.installer.StorageInstaller, org.rhq.cassandra.Deployer
loggers=org.rhq
# Root logger level
-logger.level=${rhq.control.loglevel:INFO}
+logger.level=${rhq.control.loglevel:DEBUG}
# Root logger handlers
logger.handlers=FILE,CONSOLE
@@ -16,10 +15,11 @@ handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${rhq.control.loglevel:INFO}
-handler.FILE.properties=autoFlush,fileName
+handler.FILE.level=${rhq.control.loglevel:DEBUG}
+handler.FILE.properties=autoFlush,append,fileName
handler.FILE.autoFlush=true
-handler.FILE.fileName=${rhq.control.logdir:.}/rhq-control.log
+handler.FILE.append=true
+handler.FILE.fileName=${rhq.control.logdir:.}/rhqctl.log
handler.FILE.formatter=PATTERN
# Formatter pattern configuration
diff --git a/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml b/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
index d58f5ee..9c5544d 100644
--- a/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
+++ b/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
@@ -5,12 +5,10 @@
<resources>
<resource-root path="${project.build.finalName}.jar"/>
- <resource-root path="rhq-cassandra-ccm-core-${project.version}.jar"/>
+ <resource-root path="rhq-core-util-${project.version}.jar"/>
</resources>
<dependencies>
- <module name="org.rhq.rhq-cassandra-installer"/>
- <module name="org.rhq.rhq-installer-util"/>
<module name="com.sun.xml.bind"/>
<module name="javax.api"/>
<module name="org.apache.commons.logging"/>
commit d9d164d4d62784a34b361c8ad7b90e5bf7eafcfc
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 4 15:31:55 2013 -0400
initial support for stop command
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
index e6126d1..97d6559 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
@@ -25,6 +25,7 @@
package org.rhq.server.control;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +41,15 @@ import org.apache.commons.cli.PosixParser;
*/
public abstract class ControlCommand {
+ protected File basedir;
+
+ protected File binDir;
+
+ public ControlCommand() {
+ basedir = new File(System.getProperty("rhq.server.basedir"));
+ binDir = new File(basedir, "bin");
+ }
+
public abstract String getName();
public abstract String getDescription();
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java
index 508414e..8bf4eec 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java
@@ -28,7 +28,7 @@ package org.rhq.server.control;
/**
* @author John Sanda
*/
-public class RHQControlException extends Exception {
+public class RHQControlException extends RuntimeException {
public RHQControlException() {
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
index eddedad..0e5c147 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
@@ -25,10 +25,26 @@
package org.rhq.server.control.command;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.prefs.Preferences;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
+import org.rhq.core.util.TokenReplacingReader;
+import org.rhq.core.util.stream.StreamUtil;
import org.rhq.server.control.ControlCommand;
+import org.rhq.server.control.RHQControlException;
/**
* @author John Sanda
@@ -61,5 +77,155 @@ public class Install extends ControlCommand {
@Override
protected void exec(CommandLine commandLine) {
+ boolean installStorage;
+ boolean installServer;
+ boolean installAgent;
+
+ if (commandLine.getOptions().length == 0) {
+ installStorage = true;
+ installServer = true;
+ installAgent = true;
+ } else {
+ installStorage = commandLine.hasOption("storage");
+ installServer = commandLine.hasOption("server");
+ installAgent = commandLine.hasOption("agent") || installStorage;
+ }
+
+ try {
+ if (installStorage) {
+ // We always install an agent with the storage node even if the user does
+ // not ask for it.
+ installAgent = true;
+ installStorageNode();
+ }
+
+ if (installServer) {
+ startRHQServerForInstallation();
+ installRHQServer();
+ waitForRHQServerToInitialize();
+ }
+
+ if (installAgent) {
+ clearAgentPreferences();
+ installAgent();
+ configureAgent();
+ startAgent();
+ }
+ } catch (Exception e) {
+ throw new RHQControlException("Installation failed", e);
+ }
+ }
+
+ private int installStorageNode() throws Exception {
+ return new ProcessBuilder("./rhq-storage-installer.sh", "--commitlog", "../storage/commit_log", "--data",
+ "../storage/data", "--saved-caches", "../storage/saved_caches")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void startRHQServerForInstallation() throws Exception {
+ new ProcessBuilder("./rhq-server.sh", "start")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+
+ ProcessBuilder pb = new ProcessBuilder("./rhq-installer.sh", "--test")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT);
+ Process process = pb.start();
+ while (process.waitFor() != 0) {
+ process = pb.start();
+ }
+ }
+
+ private void installRHQServer() throws Exception {
+ new ProcessBuilder("./rhq-installer.sh")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+ }
+
+ private void waitForRHQServerToInitialize() throws Exception {
+ while (!isRHQServerInitialized()) {
+ Thread.sleep(5000);
+ }
+ }
+
+ private boolean isRHQServerInitialized() throws Exception {
+ File logDir = new File(basedir, "logs");
+ BufferedReader reader = new BufferedReader(new FileReader(new File(logDir, "server.log")));
+ String line = reader.readLine();
+ while (line != null) {
+ if (line.contains("Server started")) {
+ return true;
+ }
+ line = reader.readLine();
+ }
+ return false;
}
+
+ private void installAgent() throws Exception {
+ File agentInstallerJar = getAgentInstaller();
+ new ProcessBuilder("java", "-jar", agentInstallerJar.getPath(), "--install")
+ .directory(basedir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+
+ new File(basedir, "rhq-agent-update.log").delete();
+ }
+
+ private File getAgentInstaller() {
+ File agentDownloadDir = new File(basedir,
+ "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent");
+ return agentDownloadDir.listFiles(new FileFilter() {
+ @Override
+ public boolean accept(File file) {
+ return file.getName().contains("rhq-enterprise-agent");
+ }
+ })[0];
+ }
+
+ private void configureAgent() throws Exception {
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+ File agentConfDir = new File(agentHomeDir, "conf");
+ File agentConfigFile = new File(agentConfDir, "agent-configuration.xml");
+ agentConfigFile.delete();
+
+ Map<String, String> tokens = new TreeMap<String, String>();
+ tokens.put("rhq.agent.server.bind-address", InetAddress.getLocalHost().getHostName());
+
+ InputStream inputStream = getClass().getResourceAsStream("/agent-configuration.xml");
+ TokenReplacingReader reader = new TokenReplacingReader(new InputStreamReader(inputStream), tokens);
+ BufferedWriter writer = new BufferedWriter(new FileWriter(agentConfigFile));
+
+ StreamUtil.copy(reader, writer);
+ }
+
+ private void clearAgentPreferences() throws Exception {
+ Preferences agentPrefs = Preferences.userRoot().node("/rhq-agent");
+ agentPrefs.removeNode();
+ agentPrefs.flush();
+ Preferences.userRoot().sync();
+ }
+
+ private void startAgent() throws Exception {
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+ }
+
}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
index 16982eb..27bfd38 100644
--- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
@@ -25,10 +25,15 @@
package org.rhq.server.control.command;
+import java.io.File;
+import java.io.FileReader;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
+import org.rhq.core.util.stream.StreamUtil;
import org.rhq.server.control.ControlCommand;
+import org.rhq.server.control.RHQControlException;
/**
* @author John Sanda
@@ -61,5 +66,67 @@ public class Stop extends ControlCommand {
@Override
protected void exec(CommandLine commandLine) {
+ boolean stopStorage;
+ boolean stopServer;
+ boolean stopAgent;
+
+ if (commandLine.getOptions().length == 0) {
+ stopStorage = true;
+ stopServer = true;
+ stopAgent = true;
+ } else {
+ stopStorage = commandLine.hasOption("storage");
+ stopServer = commandLine.hasOption("server");
+ stopAgent = commandLine.hasOption("agent");
+ }
+
+ try {
+ if (stopStorage) {
+ stopStorage();
+ }
+ if (stopServer) {
+ stopRHQServer();
+ }
+ if (stopAgent) {
+ stopAgent();
+ }
+ } catch (Exception e) {
+ throw new RHQControlException("Failed to stop services", e);
+ }
+ }
+
+ private void stopStorage() throws Exception {
+ File storageBasedir = new File(basedir, "storage");
+ File storageBinDir = new File(storageBasedir, "bin");
+
+ File pidFile = new File(storageBinDir, "cassandra.pid");
+ String pid = StreamUtil.slurp(new FileReader(pidFile));
+
+ new ProcessBuilder("kill", pid)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void stopRHQServer() throws Exception {
+ new ProcessBuilder("./rhq-server.sh", "stop")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void stopAgent() throws Exception {
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "stop")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
}
}
commit 8d3785664f1c365ad53550189ac5c3a0b1db8ecd
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 4 09:43:20 2013 -0400
initial commit for server-control module which will replace rhq.sh uber script
The server-control maven module is deployed as a JBoss module and is executed
via the rhqctl.sh script. It is a lightweight wrapper around the scripts used
to install/start/stop RHQ services. It provides platform independent support
for several non-trivial things like parsing options and checking to see that
the server is initialized.
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 8c04c84..402a115 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -71,6 +71,7 @@
<module>server/startup-subsystem</module>
<module>server/installer</module>
<module>server/appserver</module>
+ <module>server/server-control</module>
<module>server/client-api</module>
<module>server/itests-2</module>
</modules>
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh
new file mode 100755
index 0000000..702d162
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.sh
@@ -0,0 +1,243 @@
+#!/bin/sh
+
+# =============================================================================
+# RHQ Storage Installer Script
+#
+# This file is used to complete the installation of the RHQ storage Server on a
+# UNIX platform.
+#
+# This script is customizable by setting the following environment variables:
+#
+# RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug
+# messages. If this is not defined or set to "false"
+# debug messages are not emitted.
+#
+# RHQ_SERVER_HOME - Defines where the server's home install directory is.
+# If not defined, it will be assumed to be the parent
+# directory of the directory where this script lives.
+#
+# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will
+# host RHQ. If this is set, it overrides any
+# JBOSS_HOME that might be set. If this not
+# set, JBOSS_HOME is used as a fallback. If
+# neither is set, it is assumed the AS bundled
+# under RHQ_SERVER_HOME/jbossas is to be used.
+#
+# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will
+# use. This will be ignored if
+# RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
+# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
+# not set, the Server's embedded JRE will be used.
+#
+# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
+# executable to use. If this is set,
+# RHQ_SERVER_JAVA_HOME is ignored.
+# If this is not set, then
+# $RHQ_SERVER_JAVA_HOME/bin/java
+# is used. If this and
+# RHQ_SERVER_JAVA_HOME are not set, the
+# Server's embedded JRE will be used.
+#
+# RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be
+# passed into the Java VM. If this is not defined
+# this script will pass in a default set of options.
+# If you only want to add options to the defaults,
+# then you will want to use
+# RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead.
+#
+# RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command
+# line options to be passed into the VM.
+# This is added to RHQ_STORAGE_JAVA_OPTS; it
+# is mainly used to augment the
+# default set of options. This can be
+# left unset if it is not needed.
+#
+# If the embedded JRE is to be used but is not available, the fallback
+# JRE to be used will be determined by the JAVA_HOME environment variable.
+# =============================================================================
+
+debug_msg ()
+{
+ # if debug variable is set, it is assumed to be on, unless its value is false
+ if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then
+ echo $1
+ fi
+}
+
+# ----------------------------------------------------------------------
+# Determine what specific platform we are running on.
+# Set some platform-specific variables.
+# ----------------------------------------------------------------------
+
+case "`uname`" in
+ CYGWIN*) _CYGWIN=true
+ ;;
+ Linux*) _LINUX=true
+ ;;
+ Darwin*) _DARWIN=true
+ ;;
+ SunOS*) _SOLARIS=true
+ ;;
+ AIX*) _AIX=true
+ ;;
+esac
+
+# only certain platforms support the -e argument for readlink
+if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
+ _READLINK_ARG="-e"
+fi
+
+# ----------------------------------------------------------------------
+# Determine the RHQ Server installation directory.
+# If RHQ_SERVER_HOME is not defined, we will assume we are running
+# directly from the server installation's bin directory.
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_SERVER_HOME" ]; then
+ _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
+ RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/..
+else
+ if [ ! -d "$RHQ_SERVER_HOME" ]; then
+ echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory"
+ echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
+ exit 1
+ fi
+fi
+
+cd "$RHQ_SERVER_HOME"
+RHQ_SERVER_HOME=`pwd`
+
+debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
+
+# ----------------------------------------------------------------------
+# Determine what JBossAS instance to use.
+# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will
+# assume we are to run the embedded AS instance from the RHQ
+# installation directory - RHQ_SERVER_HOME/jbossas
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then
+ if [ -z "$JBOSS_HOME" ]; then
+ RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas"
+ else
+ if [ ! -d "$JBOSS_HOME" ]; then
+ echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory"
+ echo "JBOSS_HOME: $JBOSS_HOME"
+ exit 1
+ fi
+ RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}"
+ fi
+else
+ if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then
+ echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory"
+ echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME"
+ exit 1
+ fi
+fi
+
+cd "$RHQ_SERVER_JBOSS_HOME"
+RHQ_SERVER_JBOSS_HOME=`pwd`
+
+debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME"
+
+if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then
+ echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance"
+ echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar"
+ exit 1
+fi
+
+# we want the rest of this script to be able to assume cwd is the RHQ install dir
+cd "$RHQ_SERVER_HOME"
+
+# ----------------------------------------------------------------------
+# if we are on a Mac and JAVA_HOME is not set, then set it to /usr
+# as this is the default location.
+# ----------------------------------------------------------------------
+
+if [ -z "$JAVA_HOME" ]; then
+ if [ -n "$_DARWIN" ]; then
+ debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr"
+ JAVA_HOME=/usr
+ fi
+fi
+
+# ----------------------------------------------------------------------
+# Create the logs directory
+# ----------------------------------------------------------------------
+
+_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs"
+if [ -n "$_CYGWIN" ]; then
+ _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"`
+fi
+if [ ! -d "${_LOG_DIR_PATH}" ]; then
+ mkdir "${_LOG_DIR_PATH}"
+fi
+
+# ----------------------------------------------------------------------
+# Find the Java executable and verify we have a VM available
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
+ if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then
+ RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
+ if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then
+ debug_msg "Using the embedded JRE"
+ else
+ debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
+ RHQ_SERVER_JAVA_HOME="$JAVA_HOME"
+ fi
+ fi
+ debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME"
+ RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java"
+fi
+debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH"
+
+if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
+ echo "There is no JVM available."
+ echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately."
+ exit 1
+fi
+
+# ----------------------------------------------------------------------
+# Prepare the VM command line options to be passed in
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_STORAGE_INSTALLER_JAVA_OPTS" ]; then
+ RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+fi
+
+# Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS.
+if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then
+ _RHQ_LOGLEVEL="DEBUG"
+else
+ _RHQ_LOGLEVEL="INFO"
+fi
+
+# debugging the logging level now for development/testing
+RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.control.logdir=${RHQ_SERVER_HOME}/logs -Drhq.control.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}"
+
+# Sample JPDA settings for remote socket debugging
+#RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+
+debug_msg "RHQ_STORAGE_INSTALLER_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_JAVA_OPTS"
+debug_msg "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS"
+
+# ----------------------------------------------------------------------
+# We need to add our own modules to the core set of JBossAS modules.
+# ----------------------------------------------------------------------
+_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules"
+_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules"
+if [ -n "$_CYGWIN" ]; then
+ _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"`
+ _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"`
+fi
+_JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}"
+debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH"
+
+echo "Starting RHQ Control..."
+
+# start the AS instance with our main installer module
+"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_STORAGE_INSTALLER_JAVA_OPTS} ${RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-server-control "$@"
+
+_EXIT_STATUS=$?
+exit $_EXIT_STATUS
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 02631ef..4981d36 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -175,6 +175,10 @@
<unzip src="${settings.localRepository}/org/rhq/rhq-cassandra-installer/${project.version}/rhq-cassandra-installer-${project.version}.zip"
dest="${jboss.modules.dir}"/>
+ <echo>Adding RHQ Server Control module to ${jboss.modules.dir}...</echo>
+ <unzip src="${settings.localRepository}/org/rhq/rhq-server-control/${project.version}/rhq-server-control-${project.version}.zip"
+ dest="${jboss.modules.dir}"/>
+
<echo>Updating module descriptor for sun.jdk to work around https://issues.jboss.org/browse/AS7-2138</echo>
<copy file="src/main/bin-resources/jbossas/modules/sun/jdk/main/module.xml"
tofile="${jboss.home}/modules/sun/jdk/main/module.xml"
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 7598d2d..bbbe8af 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -32,6 +32,7 @@
<module>ear</module>
<module>startup-subsystem</module>
<module>installer</module>
+ <module>server-control</module>
<module>safe-invoker</module>
<module>client-api</module>
<module>itests-2</module>
diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
new file mode 100644
index 0000000..ea9012c
--- /dev/null
+++ b/modules/enterprise/server/server-control/pom.xml
@@ -0,0 +1,107 @@
+<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>4.7.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>rhq-server-control</artifactId>
+ <name>RHQ Server Control</name>
+
+ <properties>
+ <moduleName>org.rhq.${project.artifactId}</moduleName>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-cassandra-installer</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-installer-util</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/scripts/module-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>module-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-deps</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-cassandra-ccm-core</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-util</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-native-system</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
new file mode 100644
index 0000000..0ae83f1
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/Commands.java
@@ -0,0 +1,91 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+
+import org.rhq.server.control.command.Install;
+import org.rhq.server.control.command.Start;
+import org.rhq.server.control.command.Stop;
+
+/**
+ * @author John Sanda
+ */
+public class Commands {
+
+ private Map<String, ControlCommand> commands = new TreeMap<String, ControlCommand>(new Comparator<String>() {
+ @Override
+ public int compare(String s1, String s2) {
+ return s1.compareTo(s2);
+ }
+ });
+
+ public Commands() {
+ registerCommand(new Install());
+ registerCommand(new Start());
+ registerCommand(new Stop());
+ }
+
+ private void registerCommand(ControlCommand command) {
+ commands.put(command.getName(), command);
+ }
+
+ public Options getOptions() {
+ Options options = new Options();
+ for (ControlCommand cmd : commands.values()) {
+ if (cmd.getOptions().getOptions().isEmpty()) {
+ options.addOption(OptionBuilder.withDescription(cmd.getDescription()).create(cmd.getName()));
+ } else if (cmd.getOptions().getOptions().size() == 1) {
+ options.addOption(OptionBuilder
+ .withArgName("[options]")
+ .hasOptionalArg()
+ .withDescription(cmd.getDescription())
+ .create(cmd.getName()));
+ } else {
+ options.addOption(OptionBuilder
+ .withArgName("[options]")
+ .hasOptionalArgs()
+ .withDescription(cmd.getDescription())
+ .create(cmd.getName()));
+ }
+ }
+ return options;
+ }
+
+ public ControlCommand get(String name) {
+ return commands.get(name);
+ }
+
+ public boolean contains(String name) {
+ return commands.containsKey(name);
+ }
+
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
new file mode 100644
index 0000000..e6126d1
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
@@ -0,0 +1,88 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+/**
+ * @author John Sanda
+ */
+public abstract class ControlCommand {
+
+ public abstract String getName();
+
+ public abstract String getDescription();
+
+ public abstract Options getOptions();
+
+ protected abstract void exec(CommandLine commandLine);
+
+ public void exec(String[] args) {
+ Options options = getOptions();
+ try {
+ CommandLineParser parser = new PosixParser();
+ CommandLine cmdLine = parser.parse(options, args);
+ exec(cmdLine);
+ } catch (ParseException e) {
+ printUsage();
+ }
+ }
+
+ public void printUsage() {
+ Options options = getOptions();
+ HelpFormatter helpFormatter = new HelpFormatter();
+ String header = "\n" + getDescription() + "\n\n";
+ String syntax;
+
+ if (options.getOptions().isEmpty()) {
+ syntax = "rhqctl.sh " + getName();
+ } else {
+ syntax = "rhqctl.sh " + getName() + " [options]";
+ }
+
+ helpFormatter.setNewLine("\n");
+ helpFormatter.printHelp(syntax, header, options, null);
+ }
+
+ protected List<Integer> toIntList(String s) {
+ String[] args = s.split(",");
+ List<Integer> list = new ArrayList<Integer>(args.length);
+ for (String arg : args) {
+ list.add(Integer.parseInt(arg));
+ }
+
+ return list;
+ }
+
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
new file mode 100644
index 0000000..12fd303
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
@@ -0,0 +1,334 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.prefs.Preferences;
+
+import org.apache.commons.cli.HelpFormatter;
+
+import org.rhq.core.util.TokenReplacingReader;
+import org.rhq.core.util.stream.StreamUtil;
+
+/**
+ * @author John Sanda
+ */
+public class RHQControl {
+
+ private Commands commands = new Commands();
+
+ private File basedir;
+
+ private File binDir;
+
+ public RHQControl() {
+ basedir = new File(System.getProperty("rhq.server.basedir"));
+ binDir = new File(basedir, "bin");
+ }
+
+ public void printUsage() {
+ HelpFormatter helpFormatter = new HelpFormatter();
+ String syntax = "rhqctl.sh <cmd> [options]";
+ String header = "\nwhere <cmd> is one of:";
+
+ helpFormatter.setOptPrefix("");
+ helpFormatter.printHelp(syntax, header, commands.getOptions(), null);
+ }
+
+ public void exec(String[] args) {
+ try {
+ if (args.length == 0) {
+ throw new RHQControlException();
+ }
+ String commandName = findCommand(commands, args);
+ ControlCommand command = commands.get(commandName);
+
+ command.exec(getCommandLine(commandName, args));
+ } catch (RHQControlException e) {
+ printUsage();
+ }
+ }
+
+ private String findCommand(Commands commands, String[] args) throws RHQControlException {
+ List<String> commandNames = new LinkedList<String>();
+ for (String arg : args) {
+ if (commands.contains(arg)) {
+ commandNames.add(arg);
+ }
+ }
+
+ if (commandNames.size() != 1) {
+ throw new RHQControlException();
+ }
+
+ return commandNames.get(0);
+ }
+
+ private String[] getCommandLine(String cmd, String[] args) {
+ String[] cmdLine = new String[args.length - 1];
+ int i = 0;
+ for (String arg : args) {
+ if (arg.equals(cmd)) {
+ continue;
+ }
+ cmdLine[i++] = arg;
+ }
+ return cmdLine;
+ }
+
+ public void install() throws Exception {
+ installStorageNode();
+ startRHQServerForInstallation();
+ installRHQServer();
+ waitForRHQServerToInitialize();
+ clearAgentPreferences();
+ installAgent();
+ configureAgent();
+ startAgent();
+ }
+
+ private int installStorageNode() throws Exception {
+ return new ProcessBuilder("./rhq-storage-installer.sh", "--commitlog", "../storage/commit_log", "--data",
+ "../storage/data", "--saved-caches", "../storage/saved_caches")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+ }
+
+ private void startRHQServerForInstallation() throws Exception {
+ new ProcessBuilder("./rhq-server.sh", "start")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+
+ ProcessBuilder pb = new ProcessBuilder("./rhq-installer.sh", "--test")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT);
+ Process process = pb.start();
+ while (process.waitFor() != 0) {
+ process = pb.start();
+ }
+ }
+
+ private void installRHQServer() throws Exception {
+ new ProcessBuilder("./rhq-installer.sh")
+ .directory(binDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+ }
+
+ private void waitForRHQServerToInitialize() throws Exception {
+ while (!isRHQServerInitialized()) {
+ Thread.sleep(5000);
+ }
+ }
+
+ private boolean isRHQServerInitialized() throws Exception {
+ File logDir = new File(basedir, "logs");
+ BufferedReader reader = new BufferedReader(new FileReader(new File(logDir, "server.log")));
+ String line = reader.readLine();
+ while (line != null) {
+ if (line.contains("Server started")) {
+ return true;
+ }
+ line = reader.readLine();
+ }
+ return false;
+ }
+
+ private void installAgent() throws Exception {
+ File agentInstallerJar = getAgentInstaller();
+ new ProcessBuilder("java", "-jar", agentInstallerJar.getPath(), "--install")
+ .directory(basedir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ .waitFor();
+
+ new File(basedir, "rhq-agent-update.log").delete();
+ }
+
+ private File getAgentInstaller() {
+ File agentDownloadDir = new File(basedir,
+ "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent");
+ return agentDownloadDir.listFiles(new FileFilter() {
+ @Override
+ public boolean accept(File file) {
+ return file.getName().contains("rhq-enterprise-agent");
+ }
+ })[0];
+ }
+
+ private void configureAgent() throws Exception {
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+ File agentConfDir = new File(agentHomeDir, "conf");
+ File agentConfigFile = new File(agentConfDir, "agent-configuration.xml");
+ agentConfigFile.delete();
+
+ Map<String, String> tokens = new TreeMap<String, String>();
+ tokens.put("rhq.agent.server.bind-address", InetAddress.getLocalHost().getHostName());
+
+ InputStream inputStream = RHQControl.class.getResourceAsStream("/agent-configuration.xml");
+ TokenReplacingReader reader = new TokenReplacingReader(new InputStreamReader(inputStream), tokens);
+ BufferedWriter writer = new BufferedWriter(new FileWriter(agentConfigFile));
+
+ StreamUtil.copy(reader, writer);
+ }
+
+ private void clearAgentPreferences() throws Exception {
+ Preferences agentPrefs = Preferences.userRoot().node("/rhq-agent");
+ agentPrefs.removeNode();
+ agentPrefs.flush();
+ Preferences.userRoot().sync();
+ }
+
+ private void startAgent() throws Exception {
+ File agentHomeDir = new File(basedir, "rhq-agent");
+ File agentBinDir = new File(agentHomeDir, "bin");
+
+ new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
+ .directory(agentBinDir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start();
+ }
+
+ public static void main(String[] args) throws Exception {
+// File basedir = new File(System.getProperty("rhq.server.basedir"));
+// File binDir = new File(basedir, "bin");
+//
+// // --commitlog=../storage/commit_log --data=../storage/data --saved-caches=../storage/saved_cache
+// StorageInstaller.main(new String[] {"--commitlog", "../commit_log", "--data", "../data",
+// "--saved-caches", "../saved_caches"});
+//
+// Process process = new ProcessBuilder("./rhq-server.sh", "start")
+// .directory(binDir)
+// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+// .redirectError(ProcessBuilder.Redirect.INHERIT)
+// .start();
+// Thread.sleep(5000);
+//
+// initSysPropsForRHQInstaller(basedir, binDir);
+//
+// InstallerService installer = new InstallerServiceImpl(new InstallerConfiguration());
+// while (true) {
+// try {
+// installer.test();
+// break;
+// } catch (Exception e) {
+// Thread.sleep(1000);
+// }
+// }
+// final HashMap<String, String> serverProperties = installer.preInstall();
+// installer.install(serverProperties, null, null);
+//
+// while (!isRHQServerInitialized(basedir)) {
+// Thread.sleep(5000);
+// }
+// System.out.println("RHQ server is initialized");
+//
+// File agentDownloadDir = new File(basedir,
+// "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent");
+// File agentUpdateFile = agentDownloadDir.listFiles(new FileFilter() {
+// @Override
+// public boolean accept(File file) {
+// return file.getName().contains("rhq-enterprise-agent");
+// }
+// })[0];
+// File agentJarFile = new File(basedir, "rhq-agent.jar");
+// FileUtil.copyFile(agentUpdateFile, agentJarFile);
+//
+// new ProcessBuilder("java", "-jar", agentJarFile.getPath(), "--install")
+// .directory(basedir)
+// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+// .redirectError(ProcessBuilder.Redirect.INHERIT)
+// .start()
+// .waitFor();
+//
+// new File(basedir, "rhq-agent-update.log").delete();
+// agentJarFile.delete();
+//
+// File agentHomeDir = new File(basedir, "rhq-agent");
+// File agentBinDir = new File(agentHomeDir, "bin");
+// File agentConfDir = new File(agentHomeDir, "conf");
+// File agentConfigFile = new File(agentConfDir, "agent-configuration.xml");
+// agentConfigFile.delete();
+//
+// Preferences agentPrefs = Preferences.userRoot().node("/rhq-agent");
+// agentPrefs.removeNode();
+// agentPrefs.flush();
+//
+// // update agent config
+// Map<String, String> tokens = new TreeMap<String, String>();
+// tokens.put("rhq.agent.server.bind-address", InetAddress.getLocalHost().getHostName());
+//
+// InputStream inputStream = RHQControl.class.getResourceAsStream("/agent-configuration.xml");
+// TokenReplacingReader reader = new TokenReplacingReader(new InputStreamReader(inputStream), tokens);
+// BufferedWriter writer = new BufferedWriter(new FileWriter(agentConfigFile));
+//
+// StreamUtil.copy(reader, writer);
+//
+// new ProcessBuilder("./rhq-agent-wrapper.sh", "start")
+// .directory(agentBinDir)
+// .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+// .redirectError(ProcessBuilder.Redirect.INHERIT)
+// .start();
+
+ RHQControl control = new RHQControl();
+// control.install();
+ control.exec(args);
+
+ System.exit(0);
+ }
+
+ private static void initSysPropsForRHQInstaller(File baseDir, File binDir) {
+ File logDir = new File(baseDir, "logs");
+
+ System.setProperty("i18nlog.logger-type", "commons");
+ System.setProperty("rhq.server.properties-file", new File(binDir, "rhq-server.properties").getPath());
+ System.setProperty("rhq.server.installer.logdir", logDir.getPath());
+ System.setProperty("rhq.server.installer.loglevel", "INFO");
+ }
+
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java
new file mode 100644
index 0000000..508414e
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControlException.java
@@ -0,0 +1,43 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control;
+
+/**
+ * @author John Sanda
+ */
+public class RHQControlException extends Exception {
+
+ public RHQControlException() {
+ }
+
+ public RHQControlException(String message) {
+ super(message);
+ }
+
+ public RHQControlException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
new file mode 100644
index 0000000..eddedad
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control.command;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+
+import org.rhq.server.control.ControlCommand;
+
+/**
+ * @author John Sanda
+ */
+public class Install extends ControlCommand {
+
+ private Options options;
+
+ public Install() {
+ options = new Options()
+ .addOption(null, "storage", false, "Install RHQ storage node")
+ .addOption(null, "server", false, "Install RHQ server")
+ .addOption(null, "agent", false, "Install RHQ agent");
+ }
+
+ @Override
+ public String getName() {
+ return "install";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Installs RHQ services.";
+ }
+
+ @Override
+ public Options getOptions() {
+ return options;
+ }
+
+ @Override
+ protected void exec(CommandLine commandLine) {
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
new file mode 100644
index 0000000..2c604c6
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control.command;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+
+import org.rhq.server.control.ControlCommand;
+
+/**
+ * @author John Sanda
+ */
+public class Start extends ControlCommand {
+
+ private Options options;
+
+ public Start() {
+ options = new Options()
+ .addOption(null, "storage", false, "Start RHQ storage node")
+ .addOption(null, "server", false, "Start RHQ server")
+ .addOption(null, "agent", false, "Start RHQ agent");
+ }
+
+ @Override
+ public String getName() {
+ return "start";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Starts RHQ services.";
+ }
+
+ @Override
+ public Options getOptions() {
+ return options;
+ }
+
+ @Override
+ protected void exec(CommandLine commandLine) {
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
new file mode 100644
index 0000000..16982eb
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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.server.control.command;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+
+import org.rhq.server.control.ControlCommand;
+
+/**
+ * @author John Sanda
+ */
+public class Stop extends ControlCommand {
+
+ private Options options;
+
+ public Stop() {
+ options = new Options()
+ .addOption(null, "storage", false, "Stop RHQ storage node")
+ .addOption(null, "server", false, "Stop RHQ server")
+ .addOption(null, "agent", false, "Stop RHQ agent");
+ }
+
+ @Override
+ public String getName() {
+ return "stop";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Stops RHQ services";
+ }
+
+ @Override
+ public Options getOptions() {
+ return options;
+ }
+
+ @Override
+ protected void exec(CommandLine commandLine) {
+ }
+}
diff --git a/modules/enterprise/server/server-control/src/main/resources/agent-configuration.xml b/modules/enterprise/server/server-control/src/main/resources/agent-configuration.xml
new file mode 100644
index 0000000..a45653a
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/resources/agent-configuration.xml
@@ -0,0 +1,1103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'>
+
+<!--
+==============================================================================
+RHQ Agent Configuration
+
+This configuration file defines the initial defaults for an agent that is not
+yet fully configured. Once the agent is completely configured (e.g. when
+you answer the setup questions asked by the agent when it starts up the
+very first time), this configuration file is no longer read or used to define
+the agent's behavior.
+
+After you provide the agent the answers to the setup questions, it will store
+the configuration in Java Preferences and will thereafter no longer need this
+configuration file. See the Java documentation on the Java Preferences API
+for more information as to where the persisted configuration is stored for
+your particular platform the agent is running on.
+
+When you start the agent for the very first time it will not yet have any
+configuration preferences defined. It is only under this condition when this
+configuration file is actually used automatically by the agent.
+Please keep this in mind whenever you make changes to this configuration file
+(to be more clear - do not assume that when you change this file that the
+agent's configuration will actually change - it normally will not).
+
+If you do want to change the agent's configuration by making changes to this
+file, you must tell the agent to re-configure itself with the file by
+passing in the command line option "-c agent-configuration.xml".
+
+If you want to fully configure the agent with this configuration file and
+not be asked those setup questions (even during the very first time you
+start the agent) make sure that you set the configuration preference named
+"rhq.agent.configuration-setup-flag" to the value of "true" in this file
+(of course, if you do this, you must make sure this configuration file
+contains all valid configuration for all settings since you opted not to be
+asked the setup questions).
+
+If you are interested in learning about additional ways in which you can
+configure the agent, please see the help documentation on the agent prompt
+commands named "config", "setconfig" and "setup" and the command line options
+-l (cleanconfig), -c (config), -p (prefs), -s (setup) and -a (advanced).
+==============================================================================
+-->
+
+<preferences EXTERNAL_XML_VERSION="1.0">
+ <root type="user">
+ <map />
+ <node name="rhq-agent">
+ <map />
+ <node name="\${rhq.agent.preferences-node}">
+ <map>
+ <!--
+ _______________________________________________________________
+ rhq.agent.configuration-schema-version
+
+ Defines what version of the agent configuration schema this
+ file conforms to. This is the schema for the rhq.agent
+ preferences.
+ -->
+ <entry key="rhq.agent.configuration-schema-version" value="6" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.configuration-setup-flag
+
+ If true, the agent will assume it is fully configured and
+ will not ask setup questions when it starts up. If false,
+ the agent assumes the configuration is not complete and
+ will ask a series of setup questions to the user in order
+ to be fully configured.
+
+ If you write your own custom agent configuration file, you
+ will probably want to set this flag to true since you
+ probably will set all of your configuration right in the
+ configuration file itself. However, you may wish to
+ distribute agent configuration files with only a subset
+ of configuration preferences set and rely on each agent's
+ startup setup mechanism to finish its configuration - in this
+ case, you'll want to leave this as false.
+ -->
+ <!--
+ <entry key="rhq.agent.configuration-setup-flag" value="false" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.name
+
+ Explicitly defines what the agent's name is. This will
+ default to the agent's fully qualified domain name (that is,
+ the FQDN of the platform where the agent is running). However,
+ you can set this to any value you want, so long as it is
+ unique among all other agents. You will need to explicitly set
+ this if the agent platform's FQDN cannot be reliably determined
+ at runtime.
+ -->
+ <!--
+ <entry key="rhq.agent.name" value="my.hostname.com"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.server.transport
+ rhq.agent.server.bind-address
+ rhq.agent.server.bind-port
+ rhq.agent.server.transport-params
+ rhq.agent.server.alias
+
+ The RHQ Server endpoint configuration.
+
+ Note that because this is an XML file, you must specify
+ "&" in the transport-params value when needing an ampersand
+ to separate the transport parameters.
+
+ Note that the server address is left undefined - the agent
+ will default to the DNS alias (see rhq.agent.server.alias)
+ and if that is not defined, it will default to the localhost
+ or 127.0.0.1.
+ -->
+ <entry key="rhq.agent.server.transport" value="servlet" />
+ <entry key="rhq.agent.server.bind-port" value="7080" />
+ <entry key="rhq.agent.server.bind-address" value="${rhq.agent.server.bind-address}" />
+ <entry key="rhq.agent.server.transport-params" value="/jboss-remoting-servlet-invoker/ServerInvokerServlet" />
+ <entry key="rhq.agent.server.alias" value="rhqserver" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.server-auto-detection
+
+ If true, the agent will attempt to auto-detect the RHQ Server
+ coming online and going offline. This is more efficient
+ than server polling but it requires multicast traffic to be
+ enabled on your network and also requires the multicast
+ detector be enabled.
+ -->
+ <entry key="rhq.agent.server-auto-detection" value="false" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.register-with-server-at-startup
+
+ If true, the agent will attempt to register itself with the
+ RHQ Server when the agent starts up. If false, the agent will
+ not automatically register itself at startup; the agent must
+ be manually registered via some other mechanism (e.g. the
+ 'register' prompt command). The agent must be registered
+ at least once in order to notify the RHQ Server about its
+ existence and to assign the agent a valid security token.
+ Note that even if this is true, the registration may not happen
+ immediately if the RHQ Server itself is not up - once the RHQ
+ Server comes up, the registration attempt will occur.
+ -->
+ <entry key="rhq.agent.register-with-server-at-startup" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.wait-for-server-at-startup-msecs
+
+ This defines how many milliseconds the agent should wait at
+ startup for the RHQ Server to be detected. If the RHQ Server
+ has not started up in the given amount of time, the agent will
+ continue initializing and expect the server to come up later.
+ If this is 0, the agent will not wait at all.
+ -->
+ <entry key="rhq.agent.wait-for-server-at-startup-msecs" value="60000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.update-plugins-at-startup
+
+ If true, the agent will attempt to update its current set
+ of plugins to their latest versions at startup. If false, the
+ agent will not automatically update the plugins; the agent
+ will use its current plugins. To update the plugins, you must
+ manually do so via some other mechanism (e.g. the
+ 'plugins' prompt command).
+ Note that even if this is true, the update may not happen
+ immediately if the RHQ Server itself is not up - once the RHQ
+ Server comes up, the update attempt will occur.
+ -->
+ <entry key="rhq.agent.update-plugins-at-startup" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.test-failover-list-at-startup
+
+ If true, the agent will test connectivity to all server
+ endpoints found in the agent's failover list. This helps
+ provide a mechanism to quickly detect problems with the
+ public endpoints configured for all RHQ Servers.
+ The default is false.
+ -->
+ <entry key="rhq.agent.test-failover-list-at-startup" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.enabled
+
+ If true, the agent will be allowed to update itself if it
+ finds there is a new agent update binary available.
+ If this feature is not enabled, the agent will never
+ be allowed to update itself.
+ -->
+ <entry key="rhq.agent.agent-update.enabled" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.version-url
+
+ If this is defined, it will be the URL the agent uses when it
+ needs to retrieve information about the latest available
+ agent update binary. If this is not defined, the agent will
+ ask its server for the agent update binary version information.
+ -->
+ <!--
+ <entry key="rhq.agent.agent-update.version-url" value="http://127.0.0.1:7080/agentupdate/version" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.download-url
+
+ If this is defined, it will be the URL the agent uses when it
+ needs to download the latest available agent update binary.
+ If this is not defined, the agent will download the agent
+ update binary from its server.
+ -->
+ <!--
+ <entry key="rhq.agent.agent-update.download-url" value="http://127.0.0.1:7080/agentupdate/download" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.primary-server-switchover-check-interval-msecs
+
+ The agent will periodically check to ensure that the server
+ it is connected to is its primary server (as opposed to one
+ of its failover servers). This preference defines how many
+ milliseconds the agent should wait in between these checks.
+ A side-effect of this check is that the agent will also
+ download an updated version of its failover list. So if
+ new servers have been added to the cloud, the agent will
+ now know about it.
+
+ If this is 0, this check is never performed. You should never
+ set this to 0 unless your agent will never participate in
+ an RHQ HA environment.
+ -->
+ <entry key="rhq.agent.primary-server-switchover-check-interval-msecs" value="3600000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.vm-health-check.interval-msecs
+
+ The agent will periodically check the health of its JVM if
+ this preference is larger than 0. This check will allow the
+ agent to attempt to correct possibly fatal problems that are
+ detected (such as the JVM getting critically low on memory).
+ The value of this preference, if larger than 0, is the number
+ of milliseconds the agent should wait in between checks.
+ -->
+ <entry key="rhq.agent.vm-health-check.interval-msecs" value="5000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.vm-health-check.low-heap-mem-threshold
+ rhq.agent.vm-health-check.low-nonheap-mem-threshold
+
+ The threshold percentage (as a floating decimal) that must be
+ crossed if the agent's VM health check thread is to consider
+ the JVM with critically low memory. For example, if
+ the agent's maximum heap size is 100MB and the heap
+ threshold is set to 0.90, the agent's VM health check thread
+ will consider the agent critically low on memory if the agent
+ is using over 90MB of heap space.
+ Note that the heap and non-heap memory thresholds are specified
+ as separate preferences.
+ -->
+ <entry key="rhq.agent.vm-health-check.low-heap-mem-threshold" value="0.90" />
+ <entry key="rhq.agent.vm-health-check.low-nonheap-mem-threshold" value="0.90" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.data-directory
+
+ Location of a directory where the agent can write its internal
+ cache of data.
+ -->
+ <entry key="rhq.agent.data-directory" value="data" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.queue-size
+
+ The maximum size of the client command queue - this is the
+ maximum number of commands that can be queued for sending to
+ the server. If this is 0, then the queue is unbounded.
+ WARNING! Setting this to 0 could lead to resources being used
+ up if for some reason commands keep getting queued but are
+ not getting sent.
+ -->
+ <entry key="rhq.agent.client.queue-size" value="50000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.max-concurrent
+
+ The maximum number of concurrent commands that can be in the
+ process of being sent to the server at any one time.
+ -->
+ <entry key="rhq.agent.client.max-concurrent" value="5" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-timeout-msecs
+
+ The time in milliseconds that the client sender will wait
+ before aborting a command. This is the amount of time in
+ milliseconds that the server has in order to process commands.
+ This value is only the default if a command has not specified
+ its own timeout. A command can override this by setting its
+ own timeout in the command's configuration, so this value may
+ not be used for all commands that are sent. If this value is
+ less than or equal to 0, there will be no default timeout
+ and commands will therefore be allowed to take as long as they
+ need (again, this is the default, individual commands may
+ override this and set their own timeout). While this infinite
+ timeout default could conceivably cause a thread to hang
+ waiting for a rogue command that never finishes, it also reduces
+ the amount of threads created by the system and may
+ slightly increase throughput.
+ -->
+ <entry key="rhq.agent.client.command-timeout-msecs" value="600000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.retry-interval-msecs
+
+ This is the minimum amount of time, in milliseconds, the client
+ sender will wait before trying to resend a guaranteed command
+ that previously failed. This is not a guarantee of when
+ a command is retried - all that can be inferred is that a
+ command that fails to be sent will not be retried until at
+ least this amount of time passes.
+ Note: if the sender is currently waiting in this retry pause
+ period, the agent will not be able to be shutdown until that
+ retry period is over. In other words, if the agent is asked
+ to shutdown, it will wait for those commands waiting in this
+ retry interval to wake up. This is to help ensure those
+ commands are not lost. Keep this time period short enough
+ to make agent shutdowns fairly responsive but long enough
+ to avoid spinning the process with continuous resending of
+ commands during periods of RHQ Server downtime. It is
+ recommended to use auto-detection or server polling in order
+ to automatically stop the client sender from continuously
+ trying to retry commands during long periods of RHQ
+ Server downtime.
+ -->
+ <entry key="rhq.agent.client.retry-interval-msecs" value="15000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.max-retries
+
+ If a guaranteed delivery message is sent, but the agent fails
+ to connect to the server and deliver the message, it will
+ always be retried. However, if the error was something other
+ than a "cannot connect" error, the command will only be retried
+ this amount of times before the command is dropped. When this
+ happens, the guaranteed command will never be delivered. This
+ will normally happen under very odd and rare circumstances.
+ Also, this setting only effects asynchronous messages that
+ are sent with guaranteed delivery. This setting has no effect
+ on other messages.
+ -->
+ <entry key="rhq.agent.client.max-retries" value="10" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.server-polling-interval-msecs
+
+ If this value is larger than 0, it indicates the client sender
+ should periodically poll the RHQ Server to make sure it's still
+ up or (if it was down) see when it comes back up. The value is
+ the number of milliseconds to wait in between polls. If the
+ value is 0 or less, server polling is disabled. Server polling
+ is less efficient that the agent's auto-detection mechanism,
+ but server polling does not use multicasting, and thus might
+ be the only way for the agent to detect the server.
+ -->
+ <entry key="rhq.agent.client.server-polling-interval-msecs" value="60000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.name
+
+ This defines the name of the command spool file. This
+ file must be located in the data directory (if one does not
+ exist, it will be created). Note that if you do not define
+ this setting, the default is to not spool commands to disk
+ and thus implicitly disable guaranteed delivery.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.name" value="command-spool.dat" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.params
+
+ This defines the parameters for the command spool file.
+ The spool file is where the agent persists commands that
+ are flagged for guaranteed delivery and need to be sent.
+ The format is defined as "max-file-size:purge-percentage".
+ The first number is the size, in bytes, of the maximum file
+ size threshold. If the spool file grows larger than this, a
+ "purge" will be triggered in order to shrink the file.
+ The second number is the purge percentage which indicates how
+ large the file is allowed to be after a purge. This is
+ specified as a percentage of the first parameter - the max
+ file size threshold. For example, if the max file size is
+ 100000 (i.e. 100KB) and the purge percentage is 90, then when
+ the spool file grows larger than 100KB, a purge will be
+ triggered and the file will be shrunk to no more than
+ 90% of 100KB - which is 90KB. In effect, 10KB will be freed
+ to allow room for new commands to be spooled. When this
+ occurs, unused space is freed first and if that does not
+ free up enough space, the oldest commands in the spool file
+ will be sacrificed in order to make room for the newer
+ commands.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.params" value="10000000:75" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.compressed
+
+ If this flag is true, the commands stored in the spool file
+ will be compressed. This can potentially save about 30%-40% in
+ disk space (give or take), however, it slows down the
+ persistence mechanism considerably. Recommended setting for
+ this should be true unless something on the agent deployment
+ box warrants persistence performance over disk-saving . The
+ performance hit will only appear when unusual conditions occur,
+ such as shutting down while some guaranteed commands have not
+ been sent yet or if the RHQ Server is down. It will not affect
+ the agent under normal conditions (while running with the RHQ
+ Server up and successfully communicating with the agent).
+ In those unusual/rare conditions, having performance degradation
+ may not be as important.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.compressed" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.send-throttling
+
+ If this setting is defined, it will enable send throttling to
+ occur while sending commands to the server. The format is
+ defined as "max-commands:quiet-period-milliseconds"
+ where the maximum commands defines the maximum number
+ of commands that will be sent before the start of a quiet
+ period. The quiet period defines the number of milliseconds
+ in which no commands should be sent. After this duration
+ expires, commands can again be sent, up to the maximum defined.
+ Note that send throttling only affects those commands that
+ are "throttle-able". Some commands are sent as soon as
+ possible, regardless of the throttling settings.
+
+ This affects sending commands synchronously and asynchronously.
+ -->
+ <entry key="rhq.agent.client.send-throttling" value="100:1000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.queue-throttling
+
+ If this setting is defined, it will enable queue throttling to
+ occur while sending commands to the server. The format is
+ defined as "max-commands-per-burst:burst-period-milliseconds"
+ where the maximum commands per burst defines the maximum number
+ of commands that can be dequeued within a burst period. The
+ burst period defines the number of milliseconds in which the
+ defined maximum number of commands can be dequeued. If more
+ than the maximum number of commands are queued within this
+ time period, they will wait until the next burst period starts
+ before being able to be dequeued.
+
+ This does not affect sending commands synchronously. It only
+ effects commands queued to be sent asynchronously.
+ -->
+ <entry key="rhq.agent.client.queue-throttling" value="200:2000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-preprocessors
+
+ Defines what class or classes will handle preprocessing of all
+ commands that are sent by the agent. To define multiple
+ classes, separate them with colon characters (:).
+ You should never have to change this unless you know what
+ you are doing.
+ -->
+ <entry key="rhq.agent.client.command-preprocessors" value="org.rhq.enterprise.agent.SecurityTokenCommandPreprocessor:org.rhq.enterprise.agent.ExternalizableStrategyCommandPreprocessor" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.disable-native-system
+
+ The agent has a native system (JNI native libraries) on certain
+ supported platforms to help the plugin container perform
+ discovery of native components on those platforms. If the
+ native libraries are causing errors within the agent or if you
+ simply do not want to load native components in the agent,
+ you can disable this native system by setting this preference
+ setting to true.
+ -->
+ <entry key="rhq.agent.disable-native-system" value="false"/>
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.directory
+
+ Defines where the plugins can be located.
+ -->
+ <entry key="rhq.agent.plugins.directory" value="plugins"/>
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.operation-invocation-timeout-secs
+
+ When an operation is invoked, it will be aborted if it takes
+ longer than the given amount of seconds. This is just the
+ default operation invocation timeout - a plugin can override
+ this default by defining its own timeout in the operation
+ metadata within its plugin descriptor.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.operation-invocation-timeout-secs" value="600"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.operation-invoker.threadpool-size
+
+ When an operation is to be invoked, the execution of the
+ operation will be performed by threads from a thread pool.
+ This defines the number of threads within that thread pool,
+ effectively defining the number of operations that can be
+ invoked concurrently.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.operation-invoker.threadpool-size" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.server-discovery.initial-delay-secs
+
+ Defines the delay before the first server discovery scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.server-discovery.initial-delay-secs" value="10"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.server-discovery.period-secs
+
+ Defines how often a server discovery scan is run. This type
+ of scan is used to determine changes in the platform
+ as well as to find new servers that have been added or
+ old server that have been removed. The value is specified
+ in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.server-discovery.period-secs" value="900"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.service-discovery.initial-delay-secs
+
+ Defines the delay before the first service discovery scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.service-discovery.initial-delay-secs" value="20"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.service-discovery.period-secs
+
+ Defines how often a service discovery scan is run. This type
+ of scan is used to find new services that have been added or
+ removed from existing platforms and servers. Technically,
+ this kind of discovery is used to find any child resource
+ to an existing parent resource (like a platform or server).
+ The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.service-discovery.period-secs" value="86400"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.child-discovery.delay-secs
+
+ Defines the delay between merging newly committed or modified resources with
+ the inventory and kicking off a discovery to discover their child resources.
+ Once the RHQ administrator imports a server or platform into the inventory,
+ or a connection settings change is made on a resource, the agent is notified
+ about that action and such resources are "merged" into the agent's inventory
+ with a "committed" status and updated details.
+ This setting defines the delay between the agent notifying such change and
+ performing the discovery to find if the change made any difference in the
+ children of the resources in question.
+ Note that in the case of newly imported resources, their immediate children
+ are discovered immediately. It is only the further levels that are governed
+ by this setting.
+ The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.child-discovery.delay-secs" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.availability-scan.initial-delay-secs
+
+ Defines the delay before the first availability scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.availability-scan.initial-delay-secs" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.availability-scan.period-secs
+
+ Defines how often an availability scan is run. This type
+ of scan is used to determine what resources are up and running
+ and what resources have gone down. The value is specified in
+ seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.availability-scan.period-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.measurement-collection.threadpool-size
+
+ When measurement's are scheduled for collection, the collection
+ will be performed by threads from a thread pool. This defines
+ the number of threads within that thread pool, effectively
+ defining the number of measurements that can be collected
+ concurrently.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.measurement-collection.threadpool-size" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.measurement-collection.initial-delay-secs
+
+ Defines the delay before the first measurement collection is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.measurement-collection.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.drift-detection.initial-delay-secs
+
+ Defines the delay before the first drift detection scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.drift-detection.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.drift-detection.period-secs
+
+ Defines how often a drift detection scan is run. This type
+ of scan is used to determine what, if any, file changes (such
+ as additions, deletions, modifications) occurred within
+ specific file system locations that are being monitored.
+ If this value is 0 or less, drift detection will be disabled.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.drift-detection.period-secs" value="60"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.threadpool-size
+
+ When plugins are scheduled to discover content, the discovery
+ will be performed by threads from a thread pool. This defines
+ the number of threads within that thread pool.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.threadpool-size" value="10"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.initial-delay-secs
+
+ Defines the delay before the first content discovery is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.initial-delay-secs" value="60"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.period-secs
+
+ Defines how often content discoveries are run. The value is
+ specified in seconds. If this value is 0 or less, content
+ discovery will be disabled. Content discovery is used to
+ detect new or changed content that are associated with
+ resources in inventory.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.period-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.configuration-discovery.initial-delay-secs
+
+ Defines the delay before the first configuration discovery is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.configuration-discovery.initial-delay-secs" value="300"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.configuration-discovery.period-secs
+
+ Defines how often configuration discoveries are run. The value is
+ specified in seconds. If this value is 0 or less, configuration
+ discovery will be disabled. Configuration discovery is
+ performed to detect changes in a managed resource's
+ configuration settings.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.configuration-discovery.period-secs" value="3600"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-sender.initial-delay-secs
+
+ Defines the delay before the first event report gets sent
+ to the server. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-sender.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-sender.period-secs
+
+ Defines how often event reports get sent to the server. The
+ value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-sender.period-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-report.max-per-source
+
+ Defines the maximum number of events for any given event source
+ that can be placed in a single event report that is sent up
+ to the server. If this number is larger than the max-total
+ setting, then this setting is ignored.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-report.max-per-source" value="200"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-report.max-total
+
+ Defines the total maximum number of events that can be placed
+ in a single event report that is sent up to the server.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-report.max-total" value="400"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.disabled
+
+ Defines the names of the plugins that are to be disabled.
+ This is a comma-separated list of plugin names, where a
+ plugin name is found in the name attribute in the root XML
+ element in the plugin descriptor. A disabled plugin will
+ simply not be loaded in the plugin container.
+
+ By default, all plugins are enabled. If a plugin was marked
+ as disabled by the server, the agent will not download it and
+ will not load it, regardless of the value of this preference.
+ If a plugin is enabled on the server, this
+ preference will override that enable setting (in other words,
+ an agent is able to disable a plugin, effectively overriding
+ the server setting, by placing the plugin name in this
+ preference). If the agent already has a plugin jar in
+ its local plugins directory, but that plugin is disabled
+ via this preference, that local plugin jar file will be
+ deleted and the plugin will not be loaded.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.disabled" value=""/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.disabled-resource-types
+
+ Defines the names of the resource types to be disabled.
+ This is a vertical-bar-separated list of type names, where a
+ type name is the plugin name (found in the name attribute
+ in the root XML element in the plugin descriptor) followed by
+ a series of ">" followed by type names (which follow the
+ type hierarchy defined in the plugin).
+
+ Example:
+ Platform>Network Adapter|JBossAS Server>Web Application (WAR)>Web Application Context
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.disabled-resource-types" value=""/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.configuration-schema-version
+
+ Defines what version of the agent configuration schema this
+ file conforms to. This is the schema for the
+ rhq.communications preferences.
+ -->
+ <entry key="rhq.communications.configuration-schema-version" value="1" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.service-container.mbean-server-name
+
+ Name of the MBean Server that houses the communications MBean
+ services. This is actually the default domain name of the
+ MBean Server and if an MBean Server has already been registered
+ with this name, it will be used to house the communications
+ services. If an MBean Server has not yet been registered with
+ this name as its default domain, one will be created. Typically
+ this can be left undefined which means the fallback MBeanServer
+ to be used is the built-in JVM platform MBeanServer.
+ -->
+ <!--
+ <entry key="rhq.communications.service-container.mbean-server-name" value="jboss-on" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.data-directory
+
+ The location where the communication services write internal
+ data files. If not defined, the data directory will be the
+ same as the agent's.
+ -->
+ <!--
+ <entry key="rhq.communications.data-directory" value="data" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.global-concurrency-limit
+
+ The maximum number of incoming commands that are allowed to be
+ received concurrently. Zero or less indicates there is to
+ be no limit and the agent can accept as many incoming
+ commands as possible. By default, there is no limit
+ and you typically did not have to change this from its
+ default.
+ -->
+ <entry key="rhq.communications.global-concurrency-limit" value="-1" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.multicast-detector.enabled
+ rhq.communications.multicast-detector.multicast-address
+ rhq.communications.multicast-detector.bind-address
+ rhq.communications.multicast-detector.port
+ rhq.communications.multicast-detector.default-time-delay
+ rhq.communications.multicast-detector.heartbeat-time-delay
+
+ The multicast detector configuration. This is the service that
+ listens for new remote servers coming on and going offline and
+ is required if you want server auto-detection. If you do not
+ have server auto-detection enabled or your network will not
+ support multicast traffic, you should disable the multicast
+ detector.
+
+ The multicast-address is used to broadcast detection messages.
+ To be more specific, it is the IP address of the
+ multicast group the detector will join. The bind-address
+ is the IP that is bound by the network interface.
+
+ The detector will send heartbeat messages every X milliseconds
+ (this is the heartbeat-time-delay). If external servers'
+ detectors do not send their heartbeat messages within the
+ default-time-delay, our detector will assume that external
+ server has gone down. These settings affect the timeliness
+ of our auto-detection mechanism.
+ -->
+ <entry key="rhq.communications.multicast-detector.enabled" value="false" />
+ <entry key="rhq.communications.multicast-detector.multicast-address" value="224.16.16.16" />
+ <entry key="rhq.communications.multicast-detector.bind-address" value="0.0.0.0" />
+ <entry key="rhq.communications.multicast-detector.port" value="16162" />
+ <entry key="rhq.communications.multicast-detector.default-time-delay" value="5000" />
+ <entry key="rhq.communications.multicast-detector.heartbeat-time-delay" value="1000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.connector.rhqtype
+ rhq.communications.connector.transport
+ rhq.communications.connector.bind-port
+ rhq.communications.connector.bind-address
+ rhq.communications.connector.transport-params
+ rhq.communications.connector.lease-period
+
+ The agent's connector configuration. This is the service that
+ listens for incoming client requests and passes them to the
+ appropriate server-side components for processing. See the
+ JBoss/Remoting documentation for a full list of options
+ that can be specified. Note that because this is an XML file,
+ you must specify "&" in the transport-params value
+ when needing an ampersand to separate the parameters.
+
+ If you do not define the bind-address, the agent will, at
+ runtime, pick an address to bind to based on the network
+ adapters that are available. If you want the agent to use
+ a specific IP or address, then you must define the
+ bind-address here.
+
+ Notice about bind-address and bind-port:
+ If you use transport param "serverBindAddress", that will
+ actually be the address the agent will use to bind its
+ socket and the rhq.communications.connector.bind-address
+ will be the public address the RHQ Server will use to
+ talk to the agent.
+ If you use transport param "serverBindPort", that will
+ actually be the port the agent will use for its server
+ socket and the rhq.communications.connector.bind-port
+ will be the public port the RHQ Server will use to
+ talk to the agent.
+ -->
+ <entry key="rhq.communications.connector.rhqtype" value="agent" />
+ <entry key="rhq.communications.connector.transport" value="socket" />
+ <entry key="rhq.communications.connector.bind-port" value="16163" />
+ <!--
+ <entry key="rhq.communications.connector.bind-address" value="127.0.0.1" />
+ <entry key="rhq.communications.connector.transport-params" value="serverBindAddress=127.0.0.1&serverBindPort=16163&numAcceptThreads=3&maxPoolSize=303&clientMaxPoolSize=304&socketTimeout=60000&enableTcpNoDelay=true&backlog=200" />
+ <entry key="rhq.communications.connector.lease-period" value="5000" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.connector.security.secure-socket-protocol
+ rhq.communications.connector.security.keystore.file
+ rhq.communications.connector.security.keystore.algorithm
+ rhq.communications.connector.security.keystore.type
+ rhq.communications.connector.security.keystore.password
+ rhq.communications.connector.security.keystore.key-password
+ rhq.communications.connector.security.keystore.alias
+ rhq.communications.connector.security.truststore.file
+ rhq.communications.connector.security.truststore.algorithm
+ rhq.communications.connector.security.truststore.type
+ rhq.communications.connector.security.truststore.password
+ rhq.communications.connector.security.client-auth-mode
+
+ rhq.agent.client.security.secure-socket-protocol
+ rhq.agent.client.security.keystore.file
+ rhq.agent.client.security.keystore.algorithm
+ rhq.agent.client.security.keystore.type
+ rhq.agent.client.security.keystore.password
+ rhq.agent.client.security.keystore.key-password
+ rhq.agent.client.security.keystore.alias
+ rhq.agent.client.security.truststore.file
+ rhq.agent.client.security.truststore.algorithm
+ rhq.agent.client.security.truststore.type
+ rhq.agent.client.security.truststore.password
+ rhq.agent.client.security.server-auth-mode-enabled
+
+ These are the settings that are used if SSL is to be used for
+ either the server or client communications. These can be left
+ unset since the defaults will normally suffice. These
+ properties are here just in case some use case occurs that
+ require one or more of these settings to be customized.
+
+ Note that if client-auth-mode is specified, it must be one of:
+ "none", "want", "need".
+ -->
+ <!--
+ <entry key="rhq.communications.connector.security.secure-socket-protocol" value="TLS" />
+ <entry key="rhq.communications.connector.security.keystore.file" value="data/keystore.dat" />
+ <entry key="rhq.communications.connector.security.keystore.algorithm" value="SunX509" />
+ <entry key="rhq.communications.connector.security.keystore.type" value="JKS" />
+ <entry key="rhq.communications.connector.security.keystore.password" value="rhqpwd" />
+ <entry key="rhq.communications.connector.security.keystore.key-password" value="rhqpwd" />
+ <entry key="rhq.communications.connector.security.keystore.alias" value="rhq" />
+ <entry key="rhq.communications.connector.security.truststore.file" value="data/truststore.dat" />
+ <entry key="rhq.communications.connector.security.truststore.algorithm" value="SunX509" />
+ <entry key="rhq.communications.connector.security.truststore.type" value="JKS" />
+ <entry key="rhq.communications.connector.security.truststore.password" value="" />
+ <entry key="rhq.communications.connector.security.client-auth-mode" value="none" />
+
+ <entry key="rhq.agent.client.security.secure-socket-protocol" value="TLS" />
+ <entry key="rhq.agent.client.security.keystore.file" value="data/keystore.dat" />
+ <entry key="rhq.agent.client.security.keystore.algorithm" value="SunX509" />
+ <entry key="rhq.agent.client.security.keystore.type" value="JKS" />
+ <entry key="rhq.agent.client.security.keystore.password" value="rhqpwd" />
+ <entry key="rhq.agent.client.security.keystore.key-password" value="rhqpwd" />
+ <entry key="rhq.agent.client.security.keystore.alias" value="rhq" />
+ <entry key="rhq.agent.client.security.truststore.file" value="data/truststore.dat" />
+ <entry key="rhq.agent.client.security.truststore.algorithm" value="SunX509" />
+ <entry key="rhq.agent.client.security.truststore.type" value="JKS" />
+ <entry key="rhq.agent.client.security.truststore.password" value="" />
+ <entry key="rhq.agent.client.security.server-auth-mode-enabled" value="false" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.remote-stream-max-idle-time-msecs
+
+ The maximum amount of milliseconds a remoted stream
+ is allowed to be idle before it is automatically closed and
+ removed from the server. This means that a client must
+ attempt to access the remoted stream every X milliseconds
+ (where X is the value of this setting) or that stream will no
+ longer be available. Note that this does not mean a client
+ must read or write the entire stream in this amount of time,
+ it only means a client must make a request on the stream every
+ X milliseconds (be it to read or write one byte, see how many
+ bytes are available to be read, etc).
+ -->
+ <entry key="rhq.communications.remote-stream-max-idle-time-msecs" value="300000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.command-service-directory.allow-dynamic-discovery
+
+ Flag to allow new command services to be added to the command
+ services directory during runtime. If this is false, only
+ those services defined in the
+ rhq.communications.command-services preference will be available
+ during the lifetime of the command service directory.
+ -->
+ <entry key="rhq.communications.command-service-directory.allow-dynamic-discovery" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.command-services
+
+ Command Services that are to be added immediately at startup.
+ -->
+ <entry key="rhq.communications.command-services" value="org.rhq.enterprise.communications.command.impl.echo.server.EchoCommandService, org.rhq.enterprise.communications.command.impl.identify.server.IdentifyCommandService" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.remote-pojos
+
+ Objects that are to be created and their remote interfaces
+ deployed immediately at startup. The format of the value is
+ a comma separated list of implementation/interface names:
+ class.to.instantiate.via.noarg.constructor:interface.to.expose
+ -->
+ <entry key="rhq.communications.remote-pojos" value="org.rhq.enterprise.communications.PingImpl:org.rhq.enterprise.communications.Ping" />
+
+ </map>
+ </node>
+ </node>
+ </root>
+</preferences>
diff --git a/modules/enterprise/server/server-control/src/main/resources/logging.properties b/modules/enterprise/server/server-control/src/main/resources/logging.properties
new file mode 100644
index 0000000..c663a32
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/resources/logging.properties
@@ -0,0 +1,28 @@
+# Additional logger names to configure (root logger is always configured)
+#loggers=org.rhq, org.rhq.storage.installer.StorageInstaller, org.rhq.cassandra.Deployer
+loggers=org.rhq
+
+# Root logger level
+logger.level=${rhq.control.loglevel:INFO}
+# Root logger handlers
+logger.handlers=FILE,CONSOLE
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=${rhq.control.loglevel:DEBUG}
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.level=${rhq.control.loglevel:INFO}
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${rhq.control.logdir:.}/rhq-control.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
diff --git a/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml b/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
new file mode 100644
index 0000000..d58f5ee
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.0" name="${moduleName}">
+ <main-class name="org.rhq.server.control.RHQControl"/>
+
+ <resources>
+ <resource-root path="${project.build.finalName}.jar"/>
+ <resource-root path="rhq-cassandra-ccm-core-${project.version}.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="org.rhq.rhq-cassandra-installer"/>
+ <module name="org.rhq.rhq-installer-util"/>
+ <module name="com.sun.xml.bind"/>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.apache.commons.cli"/>
+ <module name="org.apache.log4j"/>
+ <module name="javax.api"/>
+ <module name="org.jboss.as.naming"/>
+ <module name="sun.jdk"/>
+ <module name="org.jboss.logmanager" services="import"/>
+ <module name="org.jboss.logging"/>
+ </dependencies>
+</module>
\ No newline at end of file
diff --git a/modules/enterprise/server/server-control/src/main/scripts/module-assembly.xml b/modules/enterprise/server/server-control/src/main/scripts/module-assembly.xml
new file mode 100644
index 0000000..30dd591
--- /dev/null
+++ b/modules/enterprise/server/server-control/src/main/scripts/module-assembly.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly>
+ <id>module-assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-module</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}/module</directory>
+ <outputDirectory>/org/rhq/${artifactId}</outputDirectory>
+ <includes>
+ <include>main/module.xml</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/org/rhq/${artifactId}/main</outputDirectory>
+ <includes>
+ <include>${project.build.finalName}.jar</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/dependencies</directory>
+ <outputDirectory>/org/rhq/${artifactId}/main</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
commit 81be43bd30c8f0aa45b0c38e1b00275c46e5a86c
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 19:49:15 2013 -0400
adding logging
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
index 0e78326..a3ca04c 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
@@ -149,6 +149,8 @@ public class ClusterInitService {
socket.close();
if (connections == numHosts) {
try {
+ log.debug("Successdully connected to all nodes. Sleeping for 10 seconds to allow for the " +
+ "cassandra superuser set up to complete.");
Thread.sleep(10000);
} catch (InterruptedException e) {
}
diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
index e7673b2..4982c16 100644
--- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
+++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
@@ -41,12 +41,15 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.cassandra.CassandraNode;
+import org.rhq.core.util.StringUtil;
/**
* @author John Sanda
*/
public class SchemaManager {
+ private static final String RHQ_KEYSPACE = "rhq";
+
private final Log log = LogFactory.getLog(SchemaManager.class);
private Session session;
@@ -107,6 +110,12 @@ public class SchemaManager {
hostNames[i] = nodes.get(i).getHostName();
}
+ if (log.isDebugEnabled()) {
+ log.debug("Initializing session to connect to " + StringUtil.arrayToString(hostNames));
+ } else {
+ log.debug("Initializing session");
+ }
+
SimpleAuthInfoProvider authInfoProvider = new SimpleAuthInfoProvider();
authInfoProvider.add("username", "cassandra").add("password", "cassandra");
@@ -121,7 +130,10 @@ public class SchemaManager {
public void createSchema() {
try {
+ log.info("Preparing to create schema");
+ log.debug("Creating user [rhqadmin]");
session.execute("CREATE USER rhqadmin WITH PASSWORD 'rhqadmin' SUPERUSER");
+ log.debug("Creating keyspace [" + RHQ_KEYSPACE + "]");
session.execute(
"CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};");
} catch (NoHostAvailableException e) {
@@ -131,6 +143,7 @@ public class SchemaManager {
public void dropSchema() {
try {
+ log.info("Dropping keyspace [" + RHQ_KEYSPACE + "]");
session.execute("DROP KEYSPACE rhq");
} catch (NoHostAvailableException e) {
throw new RuntimeException(e);
@@ -148,7 +161,9 @@ public class SchemaManager {
}
public void updateSchema() {
+ log.info("Applying schema updates");
try {
+ log.debug("Creating table raw_metrics");
session.execute(
"CREATE TABLE rhq.raw_metrics (" +
"schedule_id int, " +
@@ -157,6 +172,7 @@ public class SchemaManager {
"PRIMARY KEY (schedule_id, time) " +
") WITH COMPACT STORAGE"
);
+ log.debug("Creating table one_hour_metrics");
session.execute(
"CREATE TABLE rhq.one_hour_metrics (" +
"schedule_id int, " +
@@ -166,6 +182,7 @@ public class SchemaManager {
"PRIMARY KEY (schedule_id, time, type) " +
") WITH COMPACT STORAGE"
);
+ log.debug("Creating table six_hour_metrics");
session.execute(
"CREATE TABLE rhq.six_hour_metrics (" +
"schedule_id int, " +
@@ -175,6 +192,7 @@ public class SchemaManager {
"PRIMARY KEY (schedule_id, time, type) " +
") WITH COMPACT STORAGE;"
);
+ log.debug("Creating table twenty_four_hour_metrics");
session.execute(
"CREATE TABLE rhq.twenty_four_hour_metrics (" +
"schedule_id int, " +
@@ -184,6 +202,7 @@ public class SchemaManager {
"PRIMARY KEY (schedule_id, time, type) " +
") WITH COMPACT STORAGE;"
);
+ log.debug("Creating table metrics_index");
session.execute(
"CREATE TABLE rhq.metrics_index (" +
"bucket varchar, " +
@@ -199,6 +218,7 @@ public class SchemaManager {
}
public void shutdown() {
+ log.info("Shutting down connections");
session.getCluster().shutdown();
}
1
0
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 18 +++++-----
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 975a6d5470bfd4e1b1dbfbe7d758fe9314b5636b
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 17:55:19 2013 -0400
register shutdown hook at start of run method
Previously the shutdown hook was registered after a bunch of other stuff was
done, and if an exception was thrown standing up the cluster or creating the
schema for example, the shutdown hook was registered and we would not get a
clean shutdown.
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
index 276f73f..083dd76 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
@@ -71,6 +71,16 @@ public class Simulator implements ShutdownManager {
private CassandraClusterManager ccm;
public void run(SimulationPlan plan) {
+ final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(plan.getThreadPoolSize(),
+ new SimulatorThreadFactory());
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ shutdown(executorService);
+ }
+ });
+
List<CassandraNode> nodes = initCluster(plan);
ProtocolOptions.Compression compression = Enum.valueOf(ProtocolOptions.Compression.class,
plan.getClientCompression().toUpperCase());
@@ -96,14 +106,6 @@ public class Simulator implements ShutdownManager {
Stats stats = new Stats();
StatsCollector statsCollector = new StatsCollector(stats);
- final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(plan.getThreadPoolSize(),
- new SimulatorThreadFactory());
- Runtime.getRuntime().addShutdownHook(new Thread() {
- @Override
- public void run() {
- shutdown(executorService);
- }
- });
log.info("Starting executor service");
executorService.scheduleAtFixedRate(statsCollector, 0, 1, TimeUnit.MINUTES);
1
0