modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 15 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 32 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 28 +--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 58 +++++++--- 5 files changed, 82 insertions(+), 53 deletions(-)
New commits: commit 9f002f91f6f32eeed39f1cbfe66db7b268b0fd09 Author: John Mazzitelli mazz@redhat.com Date: Thu Nov 18 13:29:01 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java index e564499..48f6849 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java @@ -60,23 +60,24 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment> protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField id = new DataSourceIntegerField("id", "ID"); + DataSourceIntegerField id = new DataSourceIntegerField("id", MSG.common_title_id()); id.setPrimaryKey(true); fields.add(id);
- DataSourceTextField name = new DataSourceTextField("name", "Deployment Name"); + DataSourceTextField name = new DataSourceTextField("name", MSG.view_bundle_deploy_name()); fields.add(name);
- DataSourceTextField bundleVersion = new DataSourceTextField("bundleVersionVersion", "Bundle Version"); + DataSourceTextField bundleVersion = new DataSourceTextField("bundleVersionVersion", MSG + .view_bundle_bundleVersion()); fields.add(bundleVersion);
- DataSourceTextField description = new DataSourceTextField("description", "Description"); + DataSourceTextField description = new DataSourceTextField("description", MSG.common_title_description()); fields.add(description);
- DataSourceTextField status = new DataSourceTextField("status", "Status"); + DataSourceTextField status = new DataSourceTextField("status", MSG.common_title_status()); fields.add(status);
- DataSourceDateTimeField created = new DataSourceDateTimeField("deploymentTime", "Deployment Time"); + DataSourceDateTimeField created = new DataSourceDateTimeField("deploymentTime", MSG.view_bundle_deploy_time()); fields.add(created);
return fields; @@ -114,7 +115,7 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle deployments", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_loadDeployFailure(), caught); }
public void onSuccess(PageList<BundleDeployment> result) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java index e5dcc33..d2d2b9c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java @@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; public class BundleDeploymentListView extends Table {
public BundleDeploymentListView(String locatorId, Criteria criteria) { - super(locatorId, "Bundle Deployments", criteria); + super(locatorId, MSG.view_bundle_bundleDeployments(), criteria); setDataSource(new BundleDeploymentDataSource()); setHeaderIcon("subsystems/bundle/BundleDeployment_24.png"); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java index 54e425e..6d4df01 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java @@ -95,7 +95,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab this.version = bundleDeployment.getBundleVersion(); this.bundle = bundleDeployment.getBundleVersion().getBundle();
- addMember(new BackButton(extendLocatorId("BackButton"), "Back to Destination: " + addMember(new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_deploy_backButton() + ": " + deployment.getDestination().getName(), "Bundles/Bundle/" + version.getBundle().getId() + "/destinations/" + deployment.getDestination().getId()));
@@ -105,7 +105,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab form.setNumCols(4);
LinkItem bundleName = new LinkItem("bundle"); - bundleName.setTitle("Bundle"); + bundleName.setTitle(MSG.view_bundle_bundle()); bundleName.setValue("#Bundles/Bundle/" + bundle.getId()); bundleName.setLinkTitle(bundle.getName()); bundleName.setTarget("_self"); @@ -118,13 +118,13 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab GWTServiceLookup.getTagService().updateBundleDeploymentTags(deployment.getId(), tags, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update bundle deployment's tags", - caught); + CoreGUI.getErrorHandler() + .handleError(MSG.view_bundle_deploy_tagUpdateFailure(), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Bundle Deployment Tags updated", Message.Severity.Info)); + new Message(MSG.view_bundle_deploy_tagUpdateSuccessful(), Message.Severity.Info)); } }); } @@ -133,16 +133,16 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab tagItem.setCanvas(tagEditor); tagItem.setRowSpan(4);
- StaticTextItem deployed = new StaticTextItem("deployed", "Deployed"); + StaticTextItem deployed = new StaticTextItem("deployed", MSG.view_bundle_deployed()); deployed.setValue(new Date(deployment.getCtime()));
LinkItem destinationGroup = new LinkItem("group"); - destinationGroup.setTitle("Group"); + destinationGroup.setTitle(MSG.common_title_resource_group()); destinationGroup.setValue(LinkManager.getResourceGroupLink(deployment.getDestination().getGroup().getId())); destinationGroup.setLinkTitle(deployment.getDestination().getGroup().getName()); destinationGroup.setTarget("_self");
- StaticTextItem path = new StaticTextItem("path", "Path"); + StaticTextItem path = new StaticTextItem("path", MSG.view_bundle_deployDir()); path.setValue(deployment.getDestination().getDeployDir());
form.setFields(bundleName, tagItem, deployed, destinationGroup, path); @@ -158,9 +158,9 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab }
private Table addMemberDeploymentsTable() { - Table table = new Table(extendLocatorId("Deployments"), "Deployment Machines"); + Table table = new Table(extendLocatorId("Deployments"), MSG.view_bundle_deploy_deploymentPlatforms());
- table.setTitleComponent(new HTMLFlow("Select a row to show install details.")); + table.setTitleComponent(new HTMLFlow(MSG.view_bundle_deploy_selectARow()));
ListGridField resourceIcon = new ListGridField("resourceAvailability", ""); HashMap<String, String> icons = new HashMap<String, String>(); @@ -175,7 +175,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab }); resourceIcon.setWidth(30);
- ListGridField resource = new ListGridField("resource", "Platform"); + ListGridField resource = new ListGridField("resource", MSG.common_title_platform()); resource.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { return "<a href="" + LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("resourceId")) @@ -183,8 +183,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
} }); - ListGridField resourceVersion = new ListGridField("resourceVersion", "Operating System"); - ListGridField status = new ListGridField("status", "Status"); + ListGridField resourceVersion = new ListGridField("resourceVersion", MSG.view_bundle_deploy_operatingSystem()); + ListGridField status = new ListGridField("status", MSG.common_title_status()); HashMap<String, String> statusIcons = new HashMap<String, String>(); statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif"); statusIcons.put(BundleDeploymentStatus.FAILURE.name(), "subsystems/bundle/Warning_11.png"); @@ -276,7 +276,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab bundleService = GWTServiceLookup.getBundleService(); bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load budle version", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_loadFailure(), caught); }
public void onSuccess(PageList<BundleDeployment> result) { @@ -287,7 +287,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab bundleCriteria.addFilterId(deployment.getBundleVersion().getBundle().getId()); bundleService.findBundlesByCriteria(bundleCriteria, new AsyncCallback<PageList<Bundle>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to find bundle", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_loadBundleFailure(), caught); }
public void onSuccess(PageList<Bundle> result) { @@ -305,7 +305,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab new AsyncCallback<PageList<BundleResourceDeployment>>() {
public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load deployment detail", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_loadFailure(), caught); }
public void onSuccess(PageList<BundleResourceDeployment> result) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java index d9c00cd..9073dc9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java @@ -71,9 +71,9 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout { grid.setWidth100(); grid.setHeight100();
- ListGridField action = new ListGridField("action", "Action"); - ListGridField message = new ListGridField("info", "Info"); - ListGridField status = new ListGridField("status", "status"); + ListGridField action = new ListGridField("action", MSG.view_bundle_deploy_action()); + ListGridField message = new ListGridField("info", MSG.common_title_info()); + ListGridField status = new ListGridField("status", MSG.common_title_status());
HashMap<String, String> icons = new HashMap<String, String>(); icons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif"); @@ -89,7 +89,7 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout { grid.setExpansionMode(ExpansionMode.DETAIL_FIELD); grid.setDetailField("message");
- ListGridField details = new ListGridField("attachment", "Details"); + ListGridField details = new ListGridField("attachment", MSG.common_title_details()); details.setWidth(50); details.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { @@ -112,23 +112,23 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
DynamicForm form = new DynamicForm();
- StaticTextItem action = new StaticTextItem("action", "Action"); - StaticTextItem info = new StaticTextItem("info", "Info"); - StaticTextItem category = new StaticTextItem("category", "Category"); - StaticTextItem message = new StaticTextItem("message", "Message"); + StaticTextItem action = new StaticTextItem("action", MSG.view_bundle_deploy_action()); + StaticTextItem info = new StaticTextItem("info", MSG.common_title_info()); + StaticTextItem category = new StaticTextItem("category", MSG.common_title_category()); + StaticTextItem message = new StaticTextItem("message", MSG.common_title_message());
- AutoFitTextAreaItem detail = new AutoFitTextAreaItem("attachement", "Detail"); + AutoFitTextAreaItem detail = new AutoFitTextAreaItem("attachement", MSG.common_title_details()); detail.setTitleOrientation(TitleOrientation.TOP); detail.setColSpan(2);
- ButtonItem close = new ButtonItem("close", "Close"); + ButtonItem close = new ButtonItem("close", MSG.common_button_close());
form.setItems(action, info, category, message, detail, close);
form.editRecord(record);
final Window window = new Window(); - window.setTitle("Install Details"); + window.setTitle(MSG.view_bundle_deploy_installDetails()); window.setWidth(800); window.setHeight(600); window.setIsModal(true); @@ -149,12 +149,9 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout { ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>();
for (BundleResourceDeploymentHistory step : resourceDeployment.getBundleResourceDeploymentHistories()) { - ListGridRecord record = new ListGridRecord(); record.setAttribute("id", step.getId()); - record.setAttribute("action", step.getAction()); - record.setAttribute("info", step.getInfo());
if (step.getCategory() != null) { @@ -162,11 +159,8 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout { }
record.setAttribute("message", step.getMessage()); - record.setAttribute("attachment", step.getAttachment()); - record.setAttribute("status", step.getStatus().name()); - records.add(record); }
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 df253d2..4e7c1ed 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 @@ -53,11 +53,15 @@ common_label_milliseconds=milliseconds~ common_label_minutes=minutes~ common_label_month=month~ common_label_none = none~ +common_label_role = role~ +common_label_roles = roles~ common_label_search=Search~ common_label_scheduled_operations=scheduled operations~ common_label_seconds=seconds~ common_label_selected_resources = selected resources~ common_label_unlimited = unlimited~ +common_label_user = user~ +common_label_users = users~ common_label_week=week~
# Common Titles @@ -79,6 +83,7 @@ common_title_dashboard_name=Dashboard Name~ common_title_dateCreated=Date Created~ common_title_default=Default~ common_title_description=Description~ +common_title_details=Details~ common_title_display=Display~ common_title_display_name=Display Name~ common_title_duration=Duration~ @@ -91,12 +96,14 @@ common_title_group_def_total=Group Definition Total~ common_title_icon = icon~ common_title_id = ID~ common_title_id_parent = Parent ID~ +common_title_info = Info~ common_title_host = Host~ common_title_inventory = Inventory~ common_title_inventorySummary = Inventory Summary~ common_title_lastUpdated=Last Updated~ common_title_lastUpdatedBy=Last Updated By~ common_title_mashup=Mashup~ +common_title_message=Message~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_mixedGroups_total=Mixed Group Total~ @@ -108,6 +115,7 @@ common_title_operations_range=Operation Range~ common_title_over=Over~ common_title_password = Password~ common_title_path = Path~ +common_title_platform=Platform~ common_title_platform_total=Platform Total~ common_title_plugin = Plugin~ common_title_port = Port~ @@ -156,6 +164,7 @@ common_msg_noItemsToShow=No items to show~
# Common Values #-------------- +common_val_for=for~ common_val_no = No~ common_val_no_lower = no~ common_val_yes = Yes~ @@ -423,6 +432,11 @@ view_adminConfig_plugins = Plugins~ view_adminConfig_systemSettings = System Settings~ view_adminConfig_templates = Templates~
+# Administration/Security/Users +#-------------------------------- +view_adminUsersList_dataTypeName = user~ +view_adminUsersList_dataTypeNamePlural = users~ + # Administration/Security/Users/# #-------------------------------- view_adminUsersDetails_dataTypeName = user~ @@ -434,6 +448,7 @@ view_adminRoles_assignedSubjects = Assigned Subjects~ view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP.~ view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups.~ view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role.~ +view_adminRoles_failRoles = Failed to fetch roles.~ view_adminRoles_globalPerms = Global Permissions~ view_adminRoles_ldapGroups = LDAP Groups~ view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only~ @@ -441,7 +456,12 @@ view_adminRoles_noItems = No items to show~ view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP go to <a {0}>{1}</a>.~ view_adminRoles_perms = Permissions~ view_adminRoles_resourcePerms = Resource Permissions~ - +view_adminRoles_roleAdded = Role [{0}] added.~ +view_adminRoles_roleExists = A role named [{0}] already exists.~ +view_adminRoles_roleDeleteFailed = Failed to delete role [{0}].~ +view_adminRoles_roleDeleted = Role [{0}] deleted.~ +view_adminRoles_roleUpdateFailed = Failed to update role [{0}].~ +view_adminRoles_roleUpdated = Role [{0}] updated.~
# Administration/Topology/RemoteAgentInstall/# #-------------------------------- @@ -532,7 +552,7 @@ view_alert_common_tab_conditions_type_metric_status=with result status~ view_alert_common_tab_conditions_type_metric_resource_configuration=Resource Configuration Change~ view_alert_common_tab_conditions_type_metric_event=Event Detection~ view_alert_common_tab_conditions_type_metric_event_matching=with event source matching~ -view_alert_common_tab_conditions_type_invalid=Unsupported Category: {0} +view_alert_common_tab_conditions_type_invalid=Unsupported Category: {0}~ view_alert_common_tab_conditions_recovery_enabled=Triggered ''{0}'' to be re-enabled~ view_alert_common_tab_conditions_recovery_disabled=This alert caused its alert definition to be disabled~ view_alert_common_tab_notifications=Notifications~ @@ -572,19 +592,22 @@ view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~ # some common bundle terms view_bundle_bundle = Bundle~ view_bundle_bundles = Bundles~ -view_bundle_deployments=Deployments~ -view_bundle_bundleVersions=Bundle Versions~ -view_bundle_bundleVersion=Bundle Version~ -view_bundle_versions=Versions~ +view_bundle_bundleDestinations=Bundle Destinations~ +view_bundle_bundleDeployments=Bundle Deployments~ view_bundle_bundleFiles=Bundle Files~ +view_bundle_bundleType=Bundle Type~ +view_bundle_bundleVersion=Bundle Version~ +view_bundle_bundleVersions=Bundle Versions~ +view_bundle_deploy=Deploy~ +view_bundle_deployed=Deployed~ +view_bundle_deployDir=Deploy Directory~ +view_bundle_deployments=Deployments~ view_bundle_destinations=Destinations~ -view_bundle_bundleDestinations=Bundle Destinations~ view_bundle_files=Files~ +view_bundle_latestVersion=Latest Version~ view_bundle_recipe=Recipe~ -view_bundle_bundleType=Bundle Type~ -view_bundle_deploy=Deploy~ view_bundle_revert=Revert~ -view_bundle_latestVersion=Latest Version~ +view_bundle_versions=Versions~
# individual bundle views/wizards view_bundle_fileListView_fileSize=File Size~ @@ -614,8 +637,6 @@ view_bundle_revertWizard_revertStep_reverting=Reverting...~ view_bundle_revertWizard_revertStep_scheduled=You have successfully scheduled the revert deployment!~ view_bundle_revertWizard_revertStep_scheduledDetails=You have successfully scheduled to revert the bundle deployment [{0}] from resource group [{1}]~ view_bundle_revertWizard_revertStep_scheduledFailure=Failed to schedule revert deployment!~ -view_bundle_list_deleteFailure=Failed to delete bundle [{0}]~ -view_bundle_list_deleteSuccessful=You deleted the bundle named [{0}]~ view_bundle_list_loadFailure=Failed to load the bundle to be deployed [{0}]~ view_bundle_list_singleLoadFailure=Failed to get a single bundle to be deployed [{0}]~ view_bundle_list_versionsCount=Versions Count~ @@ -643,6 +664,19 @@ view_bundle_dest_backToBundle=Back to Bundle~ view_bundle_dest_tagUpdateFailure=Failed to update bundle destination tags~ view_bundle_dest_tagUpdateSuccessful=You have successfully updated the bundle destination tags~ view_bundle_resDeployDS_loadFailure=Failed to load bundle resource deployments~ +view_bundle_deploy_name=Deployment Name~ +view_bundle_deploy_time=Deployment Time~ +view_bundle_deploy_loadDeployFailure=Failed to load bundle deployments~ +view_bundle_deploy_action=Action~ +view_bundle_deploy_installDetails=Install Details~ +view_bundle_deploy_backButton=Back to Destination~ +view_bundle_deploy_tagUpdateFailure=Failed to update bundle deployment tags~ +view_bundle_deploy_tagUpdateSuccessful=You have successfully updated the bundle deployment tags~ +view_bundle_deploy_deploymentPlatforms=Deployment Platforms~ +view_bundle_deploy_selectARow=Select a row to show installation details~ +view_bundle_deploy_operatingSystem=Operating System~ +view_bundle_deploy_loadFailure=Failed to load bundle deployment~ +view_bundle_deploy_loadBundleFailure=Failed to find bundle~
#=================== Components =====================
rhq-commits@lists.fedorahosted.org