modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
| 19 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java
| 42 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
| 55 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
| 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
| 34 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java
| 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
| 28 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
| 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 154 ++++++----
14 files changed, 248 insertions(+), 151 deletions(-)
New commits:
commit cd0f52d040eb50d790d6ec388bbd2a494a89ddfb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Feb 25 18:14:45 2011 -0500
i18n all operations views
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
index cfa4682..8ac85b5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
@@ -31,6 +31,8 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
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.selenium.Locatable;
@@ -48,6 +50,8 @@ import java.util.TreeSet;
*/
public class DurationItem extends CanvasItem {
+ private static final Messages MSG = CoreGUI.getMessages();
+
private static final String FIELD_VALUE = "value";
private static final String FIELD_UNITS = "units";
@@ -105,14 +109,13 @@ public class DurationItem extends CanvasItem {
ComboBoxItem unitsItem = new ComboBoxItem(FIELD_UNITS);
unitsItem.setShowTitle(false);
- // TODO: i18n valueMap values
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String,
String>();
if (this.supportedUnitTypes.contains(UnitType.ITERATIONS)) {
- valueMap.put("times", "times");
+ valueMap.put("times", MSG.common_unit_times());
}
if (this.supportedUnitTypes.contains(UnitType.TIME)) {
for (TimeUnit unit : supportedUnits) {
- valueMap.put(unit.name().toLowerCase(), unit.name().toLowerCase());
+ valueMap.put(unit.name().toLowerCase(), unit.getDisplayName());
}
}
unitsItem.setValueMap(valueMap);
@@ -139,17 +142,17 @@ public class DurationItem extends CanvasItem {
public void setValue(Integer value, UnitType unitType) {
if (!this.supportedUnitTypes.contains(unitType)) {
- throw new IllegalArgumentException("Unit type [" + unitType +
"] is not supported by this DurationItem.");
+ throw new
IllegalArgumentException(MSG.widget_durationItem_unitTypeNotSupported(unitType.name()));
}
this.unitType = unitType;
String unitString = null;
switch (unitType) {
case TIME:
- unitString = this.valueUnit.name().toLowerCase();
+ unitString = this.valueUnit.getDisplayName();
break;
case ITERATIONS:
- unitString = "times";
+ unitString = MSG.common_unit_times();
}
if (this.isReadOnly) {
@@ -190,7 +193,7 @@ public class DurationItem extends CanvasItem {
} else {
this.unitType = UnitType.TIME;
if (unit.compareTo(this.valueUnit) < 0) {
- throw new IllegalStateException("Input unit is less than target
unit.");
+ throw new
IllegalStateException(MSG.widget_durationItem_inputUnitLessThanTargetUnit());
}
switch (unit) {
case MILLISECONDS:
@@ -402,7 +405,7 @@ public class DurationItem extends CanvasItem {
String string;
if (value != null) {
TimeUnit timeUnit = getInputTimeUnit();
- String unitString = (timeUnit != null) ? timeUnit.name().toLowerCase() :
"times";
+ String unitString = (timeUnit != null) ? timeUnit.name().toLowerCase() :
MSG.common_unit_times();
string = value + " " + unitString;
} else {
string = "";
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java
index 0733712..c5a6fbb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java
@@ -18,12 +18,16 @@
*/
package org.rhq.enterprise.gui.coregui.client.components.form;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
+
/**
* A unit of time.
*
* @author Ian Springer
*/
public enum TimeUnit {
+
MILLISECONDS,
SECONDS,
MINUTES,
@@ -31,5 +35,41 @@ public enum TimeUnit {
DAYS,
WEEKS,
MONTHS,
- YEARS
+ YEARS;
+
+ private static final Messages MSG = CoreGUI.getMessages();
+
+ public String getDisplayName() {
+ String displayName;
+ switch (this) {
+ case MILLISECONDS:
+ displayName = MSG.common_unit_milliseconds();
+ break;
+ case SECONDS:
+ displayName = MSG.common_unit_seconds();
+ break;
+ case MINUTES:
+ displayName = MSG.common_unit_minutes();
+ break;
+ case HOURS:
+ displayName = MSG.common_unit_hours();
+ break;
+ case DAYS:
+ displayName = MSG.common_unit_days();
+ break;
+ case WEEKS:
+ displayName = MSG.common_unit_weeks();
+ break;
+ case MONTHS:
+ displayName = MSG.common_unit_months();
+ break;
+ case YEARS:
+ displayName = MSG.common_unit_years();
+ break;
+ default:
+ throw new IllegalStateException("Unsupported time unit: " +
this);
+ }
+ return displayName;
+ }
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
index b18c14e..13ebe7d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
@@ -183,10 +183,10 @@ public class JobTriggerEditor extends LocatableVLayout {
this.modeForm.setNumCols(3);
this.modeForm.setColWidths("140", "220", "*");
- RadioGroupItem modeItem = new RadioGroupItem(FIELD_MODE, "Schedule
using");
+ RadioGroupItem modeItem = new RadioGroupItem(FIELD_MODE,
MSG.widget_jobTriggerEditor_field_mode());
LinkedHashMap<String, String> modeValueMap = new LinkedHashMap<String,
String>();
- modeValueMap.put("calendar", "Calendar");
- modeValueMap.put("cron", "Cron Expression");
+ modeValueMap.put("calendar",
MSG.widget_jobTriggerEditor_value_calendar());
+ modeValueMap.put("cron",
MSG.widget_jobTriggerEditor_value_cronExpression());
modeItem.setValueMap(modeValueMap);
modeItem.setVertical(false);
modeItem.setShowTitle(true);
@@ -203,10 +203,10 @@ public class JobTriggerEditor extends LocatableVLayout {
calendarTypeItem.setWidth(440);
calendarTypeItem.setShowTitle(false);
LinkedHashMap<String, String> calendarTypeValueMap = new
LinkedHashMap<String, String>();
- calendarTypeValueMap.put("now", "Now");
- calendarTypeValueMap.put("nowAndRepeat", "Now &
Repeat");
- calendarTypeValueMap.put("later", "Later");
- calendarTypeValueMap.put("laterAndRepeat", "Later &
Repeat");
+ calendarTypeValueMap.put("now",
MSG.widget_jobTriggerEditor_value_now());
+ calendarTypeValueMap.put("nowAndRepeat",
MSG.widget_jobTriggerEditor_value_nowAndRepeat());
+ calendarTypeValueMap.put("later",
MSG.widget_jobTriggerEditor_value_later());
+ calendarTypeValueMap.put("laterAndRepeat",
MSG.widget_jobTriggerEditor_value_laterAndRepeat());
calendarTypeItem.setValueMap(calendarTypeValueMap);
calendarTypeItem.setVertical(false);
@@ -220,7 +220,8 @@ public class JobTriggerEditor extends LocatableVLayout {
this.cronForm = new
LocatableDynamicForm(this.cronModeLayout.extendLocatorId("Form"));
- TextItem cronExpressionItem = new TextItem(FIELD_CRON_EXPRESSION, "Cron
Expression");
+ TextItem cronExpressionItem = new TextItem(FIELD_CRON_EXPRESSION,
+ MSG.widget_jobTriggerEditor_field_cronExpression());
cronExpressionItem.setRequired(true);
cronExpressionItem.setWidth(340);
@@ -239,7 +240,7 @@ public class JobTriggerEditor extends LocatableVLayout {
});
cronHelpTabSet.setTabBarControls(closeIcon);
- Tab formatTab = new Tab("Format");
+ Tab formatTab = new Tab(MSG.widget_jobTriggerEditor_tab_format());
HTMLFlow formatPane = new HTMLFlow();
formatPane.setWidth100();
formatPane.setContents("<p>A cron expression is a string comprised of
6 or 7 fields separated by white space. Fields can contain any of the\n" +
@@ -405,7 +406,7 @@ public class JobTriggerEditor extends LocatableVLayout {
"</ul>");
formatTab.setPane(formatPane);
- Tab examplesTab = new Tab("Examples");
+ Tab examplesTab = new Tab(MSG.widget_jobTriggerEditor_tab_examples());
HTMLFlow examplesPane = new HTMLFlow();
examplesPane.setWidth100();
examplesPane.setContents("<table cellpadding=\"3\"
cellspacing=\"1\">\n" +
@@ -566,7 +567,7 @@ public class JobTriggerEditor extends LocatableVLayout {
this.isRecurring = true;
FormItem repeatIntervalItem = repeatForm.getItem(FIELD_REPEAT_INTERVAL);
- repeatIntervalItem.setTitle("Run now and every");
+
repeatIntervalItem.setTitle(MSG.widget_jobTriggerEditor_field_repeatInterval_now());
repeatIntervalItem.redraw();
} else if (calendarType.equals("later")) {
this.isStartLater = true;
@@ -577,7 +578,7 @@ public class JobTriggerEditor extends LocatableVLayout {
this.isRecurring = true;
FormItem repeatIntervalItem = repeatForm.getItem(FIELD_REPEAT_INTERVAL);
- repeatIntervalItem.setTitle("Repeat every");
+
repeatIntervalItem.setTitle(MSG.widget_jobTriggerEditor_field_repeatInterval_later());
repeatIntervalItem.redraw();
}
laterForm.setVisibility(this.isStartLater ? Visibility.VISIBLE :
Visibility.HIDDEN);
@@ -610,18 +611,19 @@ public class JobTriggerEditor extends LocatableVLayout {
supportedUnits.add(TimeUnit.WEEKS);
supportedUnits.add(TimeUnit.MONTHS);
supportedUnits.add(TimeUnit.YEARS);
- DurationItem repeatIntervalItem = new DurationItem(FIELD_REPEAT_INTERVAL,
"Run now and every",
+ DurationItem repeatIntervalItem = new DurationItem(FIELD_REPEAT_INTERVAL,
+ MSG.widget_jobTriggerEditor_field_repeatInterval_now(),
supportedUnits, false, this.isReadOnly, repeatForm);
repeatIntervalItem.setRequired(true);
- repeatIntervalItem.setContextualHelp("how often the operation should be
executed");
+
repeatIntervalItem.setContextualHelp(MSG.widget_jobTriggerEditor_fieldHelp_repeatInterval());
RadioGroupItem recurrenceTypeItem = new RadioGroupItem(FIELD_RECURRENCE_TYPE);
recurrenceTypeItem.setRequired(true);
recurrenceTypeItem.setShowTitle(false);
LinkedHashMap<String, String> recurrenceTypeValueMap = new
LinkedHashMap<String, String>();
- recurrenceTypeValueMap.put("for", "For");
- recurrenceTypeValueMap.put("until", "Until");
- recurrenceTypeValueMap.put("indefinitely", "Indefinitely");
+ recurrenceTypeValueMap.put("for",
MSG.widget_jobTriggerEditor_value_for());
+ recurrenceTypeValueMap.put("until",
MSG.widget_jobTriggerEditor_value_until());
+ recurrenceTypeValueMap.put("indefinitely",
MSG.widget_jobTriggerEditor_value_indefinitely());
recurrenceTypeItem.setValueMap(recurrenceTypeValueMap);
supportedUnits = new TreeSet<TimeUnit>();
@@ -636,7 +638,7 @@ public class JobTriggerEditor extends LocatableVLayout {
supportedUnits, true, this.isReadOnly, repeatForm);
repeatDurationItem.setShowTitle(false);
repeatDurationItem.setVisible(false);
- repeatDurationItem.setContextualHelp("keep running this operation this many
times or until this amount of time has elapsed");
+
repeatDurationItem.setContextualHelp(MSG.widget_jobTriggerEditor_fieldHelp_repeatDuration());
final DateTimeItem endTimeItem = createDateTimeItem(FIELD_END_TIME);
endTimeItem.setShowTitle(false);
@@ -689,10 +691,10 @@ public class JobTriggerEditor extends LocatableVLayout {
laterForm.setNumCols(4);
laterForm.setColWidths(140, 130, 130);
- RadioGroupItem startTypeItem = new RadioGroupItem(FIELD_START_TYPE,
"Run");
+ RadioGroupItem startTypeItem = new RadioGroupItem(FIELD_START_TYPE,
MSG.widget_jobTriggerEditor_field_startType());
LinkedHashMap<String, String> startTypeValueMap = new
LinkedHashMap<String, String>();
- startTypeValueMap.put("on", "on");
- startTypeValueMap.put("in", "in");
+ startTypeValueMap.put("on", MSG.widget_jobTriggerEditor_value_on());
+ startTypeValueMap.put("in", MSG.widget_jobTriggerEditor_value_in());
startTypeItem.setValueMap(startTypeValueMap);
startTypeItem.setShowTitle(true);
@@ -710,7 +712,7 @@ public class JobTriggerEditor extends LocatableVLayout {
supportedUnits, false, this.isReadOnly, laterForm);
startDelayItem.setShowTitle(false);
startDelayItem.setVisible(false);
- startDelayItem.setContextualHelp("start executing the operation after this
amount of time has elapsed");
+
startDelayItem.setContextualHelp(MSG.widget_jobTriggerEditor_fieldHelp_startDelay());
SpacerItem spacerItem = new SpacerItem();
@@ -848,14 +850,16 @@ public class JobTriggerEditor extends LocatableVLayout {
isValid = isValid && this.laterForm.validate();
if (startTime != null) {
if (startTime.before(currentTime)) {
- Message message = new Message("Start time must be in the
future.", Message.Severity.Error,
+ Message message = new
Message(MSG.widget_jobTriggerEditor_message_startTimeMustBeInFuture(),
+ Message.Severity.Error,
EnumSet.of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
isValid = false;
}
if (this.isRecurring && endTime != null) {
if (endTime.before(startTime)) {
- Message message = new Message("End time must be after start
time.", Message.Severity.Error,
+ Message message = new
Message(MSG.widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime(),
+ Message.Severity.Error,
EnumSet.of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
isValid = false;
@@ -867,7 +871,8 @@ public class JobTriggerEditor extends LocatableVLayout {
isValid = isValid && this.repeatForm.validate();
if (endTime != null) {
if (endTime.before(currentTime)) {
- Message message = new Message("End time must be in the
future.", Message.Severity.Error,
+ Message message = new
Message(MSG.widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime(),
+ Message.Severity.Error,
EnumSet.of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
isValid = false;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
index 6b8fcb4..c4f64a3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
@@ -79,29 +79,30 @@ public abstract class AbstractOperationHistoryDataSource<T extends
OperationHist
}
@Override
- // TODO: i18n
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID,
"ID");
+ DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID,
MSG.common_title_id());
idField.setPrimaryKey(true);
fields.add(idField);
- DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME,
"Operation");
+ DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME,
+ MSG.dataSource_operationHistory_field_operationName());
fields.add(nameField);
DataSourceTextField statusField = new DataSourceTextField(Field.STATUS,
MSG.common_title_status());
fields.add(statusField);
DataSourceDateTimeField createdTimeField = new
DataSourceDateTimeField(Field.CREATED_TIME,
- "Created Time");
+ MSG.dataSource_operationHistory_field_createdTime());
fields.add(createdTimeField);
DataSourceDateTimeField startedTimeField = new
DataSourceDateTimeField(Field.STARTED_TIME,
- MSG.dataSource_operationHistory_startedTime());
+ MSG.dataSource_operationHistory_field_startedTime());
fields.add(startedTimeField);
- DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT,
"Requester");
+ DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT,
+ MSG.dataSource_operationHistory_field_subject());
fields.add(subjectField);
return fields;
@@ -132,6 +133,4 @@ public abstract class AbstractOperationHistoryDataSource<T extends
OperationHist
return record;
}
-
-
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
index bb48230..c594103 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
@@ -88,7 +88,8 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
});
// TODO: i18n
- addTableAction(extendLocatorId("ForceDelete"), "Force
Delete", getDeleteConfirmMessage(), new TableAction() {
+ addTableAction(extendLocatorId("ForceDelete"),
MSG.view_operationHistoryList_button_forceDelete(),
+ getDeleteConfirmMessage(), new TableAction() {
public boolean isEnabled(ListGridRecord[] selection) {
int count = selection.length;
return (count >= 1 && hasControlPermission());
@@ -131,8 +132,6 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
protected ListGridField createStartedTimeField() {
ListGridField startedTimeField = new
ListGridField(AbstractOperationHistoryDataSource.Field.STARTED_TIME);
- //startedTimeField.setType(ListGridFieldType.DATE);
- //startedTimeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING);
startedTimeField.setAlign(Alignment.LEFT);
startedTimeField.setCellAlign(Alignment.LEFT);
startedTimeField.setCellFormatter(new CellFormatter() {
@@ -141,7 +140,7 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
Date date = (Date) value;
return DateTimeFormat.getMediumDateTimeFormat().format(date);
} else {
- return "<i>not yet started</i>";
+ return "<i>" +
MSG.view_operationHistoryList_notYetStarted() + "</i>";
}
}
});
@@ -159,20 +158,21 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
String statusStr =
record.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS);
OperationRequestStatus status =
OperationRequestStatus.valueOf(statusStr);
switch (status) {
- case SUCCESS: {
- return MSG.common_status_success();
- }
- case FAILURE: {
- return MSG.common_status_failed();
- }
- case INPROGRESS: {
- return MSG.common_status_inprogress();
- }
- case CANCELED: {
- return MSG.common_status_canceled();
- }
+ case SUCCESS: {
+ return MSG.common_status_success();
+ }
+ case FAILURE: {
+ return MSG.common_status_failed();
+ }
+ case INPROGRESS: {
+ return MSG.common_status_inprogress();
+ }
+ case CANCELED: {
+ return MSG.common_status_canceled();
+ }
}
- return "unknown"; // should never get here
+ // should never get here
+ return MSG.common_status_unknown();
}
});
statusField.setCellFormatter(new CellFormatter() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java
index 2e18af7..041c7db 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java
@@ -92,13 +92,14 @@ public abstract class AbstractOperationScheduleDataSource<T extends
OperationSch
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID,
"Schedule ID");
+ DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID,
+ MSG.dataSource_operationSchedule_field_id());
idField.setPrimaryKey(true);
idField.setCanEdit(false);
fields.add(idField);
- DataSourceTextField operationNameField = createTextField(Field.OPERATION_NAME,
"Operation", null, 100,
- true);
+ DataSourceTextField operationNameField = createTextField(Field.OPERATION_NAME,
+ MSG.dataSource_operationSchedule_field_operationName(), null, 100,
true);
Set<OperationDefinition> operationDefinitions =
this.resourceType.getOperationDefinitions();
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String,
String>();
for (OperationDefinition operationDefinition : operationDefinitions) {
@@ -107,23 +108,26 @@ public abstract class AbstractOperationScheduleDataSource<T
extends OperationSch
operationNameField.setValueMap(valueMap);
fields.add(operationNameField);
- DataSourceTextField operationDisplayNameField =
createTextField(Field.OPERATION_DISPLAY_NAME, "Operation", null,
- 100, true);
+ DataSourceTextField operationDisplayNameField =
createTextField(Field.OPERATION_DISPLAY_NAME,
+ MSG.dataSource_operationSchedule_field_operationDisplayName(), null, 100,
true);
fields.add(operationDisplayNameField);
- DataSourceField subjectField = new DataSourceField(Field.SUBJECT, FieldType.ANY,
"Owner");
+ DataSourceField subjectField = new DataSourceField(Field.SUBJECT, FieldType.ANY,
+ MSG.dataSource_operationSchedule_field_subject());
subjectField.setCanEdit(false);
fields.add(subjectField);
- DataSourceTextField descriptionField = createTextField(Field.DESCRIPTION,
"Notes", null, 100, false);
+ DataSourceTextField descriptionField = createTextField(Field.DESCRIPTION,
+ MSG.dataSource_operationSchedule_field_description(), null, 100, false);
fields.add(descriptionField);
DataSourceDateTimeField nextFireTimeField = new
DataSourceDateTimeField(Field.NEXT_FIRE_TIME,
- "Next Scheduled Execution");
+ MSG.dataSource_operationSchedule_field_nextFireTime());
nextFireTimeField.setCanEdit(false);
fields.add(nextFireTimeField);
- DataSourceIntegerField timeoutField = createIntegerField(Field.TIMEOUT,
"Timeout (in seconds)", 30, null, false);
+ DataSourceIntegerField timeoutField = createIntegerField(Field.TIMEOUT,
+ MSG.dataSource_operationSchedule_field_timeout(), 30, null, false);
fields.add(timeoutField);
return fields;
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 0600e5a..7dc0142 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
@@ -88,7 +88,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
public AbstractOperationScheduleDetailsView(String locatorId,
AbstractOperationScheduleDataSource dataSource,
ResourceType resourceType, int
scheduleId) {
- super(locatorId, dataSource, scheduleId, "Scheduled Operation", null);
+ super(locatorId, dataSource, scheduleId,
MSG.view_operationScheduleDetails_operationSchedule(), null);
Set<OperationDefinition> operationDefinitions =
resourceType.getOperationDefinitions();
for (OperationDefinition operationDefinition : operationDefinitions) {
@@ -144,11 +144,13 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
}
});
- this.operationDescriptionItem = new StaticTextItem(FIELD_OPERATION_DESCRIPTION,
"Description");
+ this.operationDescriptionItem = new StaticTextItem(FIELD_OPERATION_DESCRIPTION,
+ MSG.view_operationScheduleDetails_field_description());
this.operationDescriptionItem.setShowTitle(false);
items.add(this.operationDescriptionItem);
- this.operationParametersItem = new StaticTextItem(FIELD_OPERATION_PARAMETERS,
"Parameters");
+ this.operationParametersItem = new StaticTextItem(FIELD_OPERATION_PARAMETERS,
+ MSG.view_operationScheduleDetails_field_parameters());
this.operationParametersItem.setColSpan(2);
items.add(this.operationParametersItem);
@@ -180,22 +182,24 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
supportedUnits.add(TimeUnit.SECONDS);
supportedUnits.add(TimeUnit.MINUTES);
supportedUnits.add(TimeUnit.HOURS);
- DurationItem timeoutItem = new
DurationItem(AbstractOperationScheduleDataSource.Field.TIMEOUT, "Timeout",
+ DurationItem timeoutItem = new
DurationItem(AbstractOperationScheduleDataSource.Field.TIMEOUT,
+ MSG.view_operationScheduleDetails_field_timeout(),
supportedUnits, false, isReadOnly(), this.notesForm);
- timeoutItem.setContextualHelp("a time duration - if specified, if the
duration elapses before a scheduled operation execution has completed, the RHQ Server will
timeout the operation and consider it to have failed; note, it is usually not possible to
abort the underlying managed resource operation if it was already initiated");
+
timeoutItem.setContextualHelp(MSG.view_operationScheduleDetails_fieldHelp_timeout());
notesFields.add(timeoutItem);
if (!isNewRecord()) {
StaticTextItem nextFireTimeItem = new
StaticTextItem(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME,
- "Next Fire Time");
+ MSG.dataSource_operationSchedule_field_nextFireTime());
notesFields.add(nextFireTimeItem);
}
- TextAreaItem notesItem = new
TextAreaItem(ResourceOperationScheduleDataSource.Field.DESCRIPTION, "Notes");
+ TextAreaItem notesItem = new
TextAreaItem(ResourceOperationScheduleDataSource.Field.DESCRIPTION,
+ MSG.dataSource_operationSchedule_field_description());
notesItem.setWidth(450);
notesItem.setHeight(60);
notesItem.setShowTitle(true);
- FormUtility.addContextualHelp(notesItem, "an optional description of this
scheduled operation (e.g. \"nightly maintenance app server restart\")");
+ FormUtility.addContextualHelp(notesItem,
MSG.view_operationScheduleDetails_fieldHelp_description());
notesFields.add(notesItem);
this.notesForm.setFields(notesFields.toArray(new FormItem[notesFields.size()]));
@@ -306,7 +310,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
String operationName = getSelectedOperationName();
String value;
if (operationName == null) {
- value = "<i>Select an operation to see its
description.</i>";
+ value = "<i>" +
MSG.view_operationScheduleDetails_fieldDefault_description() + "</i>";
} else {
value = this.operationNameToDescriptionMap.get(operationName);
}
@@ -317,18 +321,18 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
String operationName = getSelectedOperationName();
String value;
if (operationName == null) {
- value = "<i>Select an operation to see its
parameters.</i>";
+ value = "<i>" +
MSG.view_operationScheduleDetails_fieldDefault_parameters() + "</i>";
} else {
ConfigurationDefinition parametersDefinition =
this.operationNameToParametersDefinitionMap.get(operationName);
if (parametersDefinition == null ||
parametersDefinition.getPropertyDefinitions().isEmpty()) {
- value = "<i>" +
MSG.view_operationCreateWizard_parametersStep_noParameters() + "</i>";
+ value = "<i>" +
MSG.view_operationScheduleDetails_noParameters() + "</i>";
for (Canvas child :
this.operationParametersConfigurationHolder.getChildren()) {
child.destroy();
}
this.operationParametersConfigurationHolder.hide();
} else {
- value = isNewRecord() ? "<i>Enter parameters
below...</i>" : "";
+ value = isNewRecord() ? "<i>" +
MSG.view_operationScheduleDetails_enterParametersBelow() + "</i>" :
"";
for (Canvas child :
this.operationParametersConfigurationHolder.getChildren()) {
child.destroy();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
index 8d9e354..b2c80ba 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
@@ -50,10 +50,8 @@ public abstract class AbstractOperationScheduleListView extends
TableSection<Abs
ListGridField subjectField = new
ListGridField(AbstractOperationScheduleDataSource.Field.SUBJECT, 110);
subjectField.setCellFormatter(new SubjectRecordCellFormatter());
- //ListGridField jobTriggerField = new
ListGridField(OperationScheduleDataSource.Field.JOB_TRIGGER, 300);
-
ListGridField nextFireTimeField = new
ListGridField(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME,
- "Next Scheduled Execution", 190);
+ 190);
ListGridField descriptionField = new
ListGridField(AbstractOperationScheduleDataSource.Field.DESCRIPTION);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
index 250c2c9..8132abd 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
@@ -32,7 +32,7 @@ public class GroupMemberResourceOperationHistoryListView
protected List<ListGridField> createFields() {
List<ListGridField> fields = new ArrayList<ListGridField>();
- ListGridField idField = new
ListGridField(AbstractOperationHistoryDataSource.Field.ID, MSG.common_title_id());
+ ListGridField idField = new
ListGridField(AbstractOperationHistoryDataSource.Field.ID);
idField.setWidth(38);
fields.add(idField);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
index bfed707..832acfe 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
@@ -30,6 +30,8 @@ import java.util.List;
import java.util.Set;
/**
+ * The details view of the Group Operations>Schedules subtab.
+ *
* @author Ian Springer
*/
public class GroupOperationScheduleDetailsView extends
AbstractOperationScheduleDetailsView {
@@ -64,7 +66,7 @@ public class GroupOperationScheduleDetailsView extends
AbstractOperationSchedule
resourceDatasource.fetchData(criteria, new DSCallback() {
public void execute(DSResponse response, Object rawData, DSRequest
request) {
if (response.getStatus() != DSResponse.STATUS_SUCCESS) {
- throw new RuntimeException("Failed to load group member
Resources.");
+ throw new
RuntimeException(MSG.view_group_operationScheduleDetails_failedToLoadMembers());
}
Record[] data = response.getData();
memberResourceRecords = new ListGridRecord[data.length];
@@ -92,15 +94,17 @@ public class GroupOperationScheduleDetailsView extends
AbstractOperationSchedule
this.executionModeForm.setNumCols(2);
this.executionModeForm.setColWidths(FIRST_COLUMN_WIDTH, "*");
- RadioGroupItem executionModeItem = new RadioGroupItem(FIELD_EXECUTION_MODE,
"Execute");
+ RadioGroupItem executionModeItem = new RadioGroupItem(FIELD_EXECUTION_MODE,
+ MSG.view_group_operationScheduleDetails_field_execute());
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String,
String>(2);
- valueMap.put(EXECUTION_ORDER_PARALLEL, "in parallel");
- valueMap.put(EXECUTION_ORDER_SEQUENTIAL, "in the order specified below (drag
and drop member Resources to change order)");
+ valueMap.put(EXECUTION_ORDER_PARALLEL,
MSG.view_group_operationScheduleDetails_value_parallel());
+ valueMap.put(EXECUTION_ORDER_SEQUENTIAL,
MSG.view_group_operationScheduleDetails_value_sequential());
executionModeItem.setValueMap(valueMap);
executionModeItem.setDefaultValue(EXECUTION_ORDER_PARALLEL);
executionModeItem.setShowTitle(true);
- final CheckboxItem haltOnFailureItem = new
CheckboxItem("haltOnFailure", "Halt on Failure?");
+ final CheckboxItem haltOnFailureItem = new
CheckboxItem(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE,
+ MSG.view_group_operationScheduleDetails_field_haltOnFailure());
haltOnFailureItem.setDefaultValue(false);
haltOnFailureItem.setVisible(false);
haltOnFailureItem.setLabelAsTitle(true);
@@ -119,7 +123,7 @@ public class GroupOperationScheduleDetailsView extends
AbstractOperationSchedule
this.memberExecutionOrderer = new
ReorderableList(extendLocatorId("MemberExecutionOrderer"),
this.memberResourceRecords, null, memberIcon);
this.memberExecutionOrderer.setVisible(false);
- this.memberExecutionOrderer.setNameFieldTitle("Member Resource");
+
this.memberExecutionOrderer.setNameFieldTitle(MSG.view_group_operationScheduleDetails_memberResource());
hLayout.addMember(this.memberExecutionOrderer);
contentPane.addMember(hLayout);
@@ -148,7 +152,7 @@ public class GroupOperationScheduleDetailsView extends
AbstractOperationSchedule
ListGridRecord[] resourceRecords =
resourceDatasource.buildRecords(executionOrder);
this.memberExecutionOrderer.setRecords(resourceRecords);
this.memberExecutionOrderer.show();
- FormItem haltOnFailureItem =
executionModeForm.getField("haltOnFailure");
+ FormItem haltOnFailureItem =
executionModeForm.getField(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE);
haltOnFailureItem.show();
} else {
this.executionModeForm.setValue(FIELD_EXECUTION_MODE,
EXECUTION_ORDER_PARALLEL);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
index f2183af..7f9c2f1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
@@ -24,6 +24,8 @@ import
org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleListView;
/**
+ * The list view of the Group Operations>Schedules subtab.
+ *
* @author Ian Springer
*/
public class GroupOperationScheduleListView extends AbstractOperationScheduleListView {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
index 22d89dd..bebe550 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
@@ -4,6 +4,8 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
/**
+ * The details view of the Resource Operations>Schedules subtab.
+ *
* @author Ian Springer
*/
public class ResourceOperationScheduleDetailsView extends
AbstractOperationScheduleDetailsView {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
index eec89cc..221390c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
@@ -25,7 +25,7 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleListView;
/**
- * A table that displays all of the operation schedules for a particular Resource.
+ * The details view of the Resource Operations>Schedules subtab.
*
* @author Ian Springer
*/
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 940b293..9fcd822 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -69,6 +69,18 @@ common_label_week = week
common_label_weeks = weeks
common_label_yesterday=Yesterday
+# Common Units
+#-------------
+common_unit_times = times
+common_unit_milliseconds = milliseconds
+common_unit_seconds = seconds
+common_unit_minutes = minutes
+common_unit_hours = hours
+common_unit_days = days
+common_unit_weeks = weeks
+common_unit_months = months
+common_unit_years = years
+
# Common Titles
#--------------
common_title_address = Address
@@ -211,6 +223,7 @@ common_status_success = Success
common_status_failed = Failed
common_status_inprogress = In Progress
common_status_canceled = Canceled
+common_status_unknown = Unknown
# 1st, 2nd, 3rd, 4th, etc.
common_val_n1st = {0}st
@@ -313,8 +326,42 @@ widget_typeTree_badTypeId = Invalid URL. Bad resource type ID [{0}]
widget_typeTree_loadFail = Failed to load resource types
# Color Picker
+#--------------
widget_colorPicker_tooltip = Click to select a new color
+# Job Trigger Editor
+#--------------------
+widget_jobTriggerEditor_field_mode = Schedule using
+widget_jobTriggerEditor_value_calendar = Calendar
+widget_jobTriggerEditor_value_cronExpression = Cron Expression
+widget_jobTriggerEditor_value_now = Now
+widget_jobTriggerEditor_value_nowAndRepeat = Now & Repeat
+widget_jobTriggerEditor_value_later = Later
+widget_jobTriggerEditor_value_laterAndRepeat = Later & Repeat
+widget_jobTriggerEditor_field_cronExpression = Cron Expression
+widget_jobTriggerEditor_tab_format = Format
+widget_jobTriggerEditor_tab_examples = Examples
+widget_jobTriggerEditor_field_repeatInterval_now = Run now and every
+widget_jobTriggerEditor_field_repeatInterval_later = Repeat every
+widget_jobTriggerEditor_fieldHelp_repeatInterval = how often the operation should be
executed
+widget_jobTriggerEditor_value_for = For
+widget_jobTriggerEditor_value_until = Until
+widget_jobTriggerEditor_value_indefinitely = Indefinitely
+widget_jobTriggerEditor_fieldHelp_repeatDuration = keep running this operation this many
times or until this amount of time has elapsed
+widget_jobTriggerEditor_field_startType = Run
+widget_jobTriggerEditor_value_on = on
+widget_jobTriggerEditor_value_in = in
+widget_jobTriggerEditor_fieldHelp_startDelay = start executing the operation after this
amount of time has elapsed
+widget_jobTriggerEditor_message_startTimeMustBeInFuture = Start time must be in the
future.
+widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = End time must be after
start time.
+widget_jobTriggerEditor_message_endTimeMustBeInFuture = End time must be in the future.
+
+# Duration Item
+#---------------
+widget_durationItem_inputUnitLessThanTargetUnit = Input unit is less than target unit.
+widget_durationItem_unitTypeNotSupported = Unit type [{0}] is not supported by this
DurationItem.
+
+
#===================== Utils ======================
# Disambiguation Report Decorator
@@ -443,12 +490,10 @@ dataSource_schedules_updateSuccessful_concise = A new collection
interval of [{0
dataSource_schedules_updateSuccessful_full_resource = A new collection interval of [{0}]
seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated
measurements are: [{3}]
dataSource_schedules_updateSuccessful_full_group = A new collection interval of [{0}]
seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated
measurements are: [{3}]
-
# Resource Groups
#-----------------------
dataSource_resourceGroups_loadFailed = Failed to load Resource Groups
-
# Problem Resources
#------------------------------
dataSource_problemResources_field_resource = Resource
@@ -466,19 +511,31 @@ dataSource_recentOperations_field_time = Date/Time
dataSource_recentOperations_field_status = Status
dataSource_recentOperations_error_fetchFailure = Failed to load recently completed
operations.
-# Scheduled Operations
-#---------------------------------
+# Scheduled Operations (ResourceOperationScheduleComposites)
+#------------------------------------------------------------
dataSource_scheduledOperations_field_resource = Resource
dataSource_scheduledOperations_field_location = Location
dataSource_scheduledOperations_field_operation = Operation
dataSource_scheduledOperations_field_time = Date/Time
dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations.
-# Operation History
-#---------------------------
+# Operation Schedules
+#--------------------
+dataSource_operationSchedule_field_id = Schedule ID
+dataSource_operationSchedule_field_operationName = Operation
+dataSource_operationSchedule_field_operationDisplayName = Operation
+dataSource_operationSchedule_field_subject = Owner
+dataSource_operationSchedule_field_description = Notes
+dataSource_operationSchedule_field_nextFireTime = Next Scheduled Execution
+dataSource_operationSchedule_field_timeout = Timeout (in seconds)
+
+# Operation Histories
+#--------------------
+dataSource_operationHistory_field_operationName = Operation Name
+dataSource_operationHistory_field_createdTime = Created Time
+dataSource_operationHistory_field_startedTime = Started Time
+dataSource_operationHistory_field_subject = Requester
dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.
-dataSource_operationHistory_operationName = Operation Name
-dataSource_operationHistory_startedTime = Started Time
# Configuration History
#-------------------------------
@@ -1769,13 +1826,41 @@ view_configurationHistoryList_table_clickStatusIcon = Click the
status icon for
#------------------------------------------
view_configurationHistoryDetails_error_loadFailure = Unable to load configuration
history.
+
+# Operation Schedule List
+#------------------------
+xxx =
+
+# Operation Schedule Details
+#---------------------------
+view_operationScheduleDetails_operationSchedule = Operation Schedule
+view_operationScheduleDetails_field_description = Description
+view_operationScheduleDetails_field_parameters = Parameters
+view_operationScheduleDetails_field_timeout = Timeout
+view_operationScheduleDetails_fieldHelp_timeout = a time duration - if specified, if the
duration elapses before a scheduled operation execution has completed, the RHQ Server will
timeout the operation and consider it to have failed; note, it is usually not possible to
abort the underlying managed resource operation if it was already initiated
+view_operationScheduleDetails_fieldHelp_description = an optional description of this
scheduled operation (e.g. nightly maintenance app server restart)
+view_operationScheduleDetails_fieldDefault_description = Select an operation to see its
description.
+view_operationScheduleDetails_fieldDefault_parameters = Select an operation to see its
parameters.
+view_operationScheduleDetails_noParameters = This operation does not take any
parameters.
+view_operationScheduleDetails_enterParametersBelow = Enter parameters below...
+
+view_group_operationScheduleDetails_failedToLoadMembers = Failed to load group member
Resources.
+view_group_operationScheduleDetails_field_execute = Execute
+view_group_operationScheduleDetails_value_parallel = in parallel
+view_group_operationScheduleDetails_value_sequential = in the order specified below (drag
and drop member Resources to change order)
+view_group_operationScheduleDetails_field_haltOnFailure = Halt on Failure?
+view_group_operationScheduleDetails_memberResource = Member Resource
+
+
# Operation History List
-#---------------------------------
+#-----------------------
view_operationHistoryList_title = Operation History
view_operationHistoryList_button_runOperation = Run Operation
+view_operationHistoryList_button_forceDelete = Force Delete
+view_operationHistoryList_notYetStarted = not yet started
# Operation History Details
-#--------------------------------------
+#--------------------------
view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.
view_operationHistoryDetails_operation = Operation
view_operationHistoryDetails_dateSubmitted = Date Submitted
@@ -1785,55 +1870,6 @@ view_operationHistoryDetails_status = Status
view_operationHistoryDetails_parameters = Parameters
view_operationHistoryDetails_results = Results
-# Operation Create Wizard
-#-------------------------------------
-view_operationCreateWizard_title = Operation Wizard
-view_operationCreateWizard_header = Execute {0} on {1}
-view_operationCreateWizard_button_execute = Execute
-view_operationCreateWizard_button_executeImmediately = Execute Immediately
-view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation
execution.
-view_operationCreateWizard_message_scheduleOperationSuccess_short = You have scheduled
the operation [{0}] on this resource
-view_operationCreateWizard_message_scheduleOperationSuccess = You have scheduled the
operation [{0}] on resource [{1}] with the schedule [{2}].
-view_operationCreateWizard_parametersStep_name = Operation Parameters
-view_operationCreateWizard_parametersStep_noParameters = This operation does not take any
parameters.
-view_operationCreateWizard_schedulingStep_name = Schedule
-view_operationCreateWizard_schedulingStep_label_start = Start
-view_operationCreateWizard_schedulingStep_label_schedule = Schedule
-view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence
-view_operationCreateWizard_schedulingStep_label_runAt = Run At
-view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes
-view_operationCreateWizard_schedulingStep_label_hourly = Hourly
-view_operationCreateWizard_schedulingStep_label_daily = Daily
-view_operationCreateWizard_schedulingStep_label_weekly = Weekly
-view_operationCreateWizard_schedulingStep_label_monthly = Monthly
-view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period
-view_operationCreateWizard_schedulingStep_label_startDate = Start Date
-view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End
-view_operationCreateWizard_schedulingStep_label_endDate = End Date
-view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute
immediately
-view_operationCreateWizard_schedulingStep_label_onceAt = Once At
-view_operationCreateWizard_schedulingStep_label_date = Date
-view_operationCreateWizard_schedulingStep_label_time = Time
-view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes
-view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval
-view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At
-view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour
-view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At
-view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day
-view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On
-view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week
-view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On
-view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month
-view_operationCreateWizard_executionSchedule_willExecuteOnce = Will execute {0}~.
-view_operationCreateWizard_executionSchedule_willExecuteRecurring = Will execute {0},
starting on {1}~.
-view_operationCreateWizard_executionSchedule_willExecuteRecurringWithEnd = Will execute
{0}, starting on {1} and ending on {2}~.
-view_operationCreateWizard_executionSchedule_immediately = immediately
-view_operationCreateWizard_executionSchedule_onceAtGivenTime = once at {0}
-view_operationCreateWizard_executionSchedule_everyNMinutes = every {0} minutes
-view_operationCreateWizard_executionSchedule_everyHourOnNthMinute = every hour on the {0}
minute
-view_operationCreateWizard_executionSchedule_everyDayAtGivenTime = every day at {0}
-view_operationCreateWizard_executionSchedule_everyWeekOnGivenDayAtGivenTime = every week
on {0} at {1}
-view_operationCreateWizard_executionSchedule_everyMonthOnNthDayAtGivenTime = every month
on the {0} day at {1}
# Summary Overview
#-----------------------------