modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
| 18 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
| 2 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 8 ++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 9 +++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
| 1
modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png
|binary
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
| 8 +++-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
| 7 +++
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
| 8 +++-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
| 11 +++++-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp
| 7 +++
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
| 13 +++++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
| 10 ++++-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
| 8 +++-
14 files changed, 80 insertions(+), 30 deletions(-)
New commits:
commit bfdc984796b40483ca07bf6755ef8edb1265e6ed
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 25 16:50:19 2011 -0400
[BZ 748474] add a fixed criteria and blank out the search bar. users find this more
intuitive.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index 4365aa0..4c1a348 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -137,8 +137,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
}, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
autodiscoveryQueueItem.setRefreshRequired(true);
- // TODO: Specify an icon for this item.
- NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES, null,
new ViewFactory() {
+ NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES,
"resources/all_resources.png", new ViewFactory() {
public Canvas createView() {
return new
ResourceSearchView(extendLocatorId(PAGE_ALL_RESOURCES.getName()), null,
PAGE_ALL_RESOURCES
.getTitle(),
ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE),
@@ -155,7 +154,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
ResourceSearchView view = new
ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()),
initialCriteria, PAGE_PLATFORMS.getTitle(),
ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM,
Boolean.TRUE));
- view.setInitialSearchBarSearchText("category=" +
ResourceCategory.PLATFORM.name().toLowerCase());
+ //view.setInitialSearchBarSearchText("category=" +
ResourceCategory.PLATFORM.name().toLowerCase());
return view;
}
});
@@ -168,7 +167,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
ResourceSearchView view = new
ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()),
initialCriteria, PAGE_SERVERS.getTitle(),
ImageManager.getResourceLargeIcon(ResourceCategory.SERVER,
Boolean.TRUE));
- view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVER.name().toLowerCase());
+ //view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVER.name().toLowerCase());
return view;
}
});
@@ -181,7 +180,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
ResourceSearchView view = new
ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()),
initialCriteria, PAGE_SERVICES.getTitle(),
ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE,
Boolean.TRUE));
- view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVICE.name().toLowerCase());
+ //view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVICE.name().toLowerCase());
return view;
}
});
@@ -195,9 +194,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
ResourceSearchView view = new
ResourceSearchView(extendLocatorId(PAGE_UNAVAIL_SERVERS.getName()),
initialCriteria, MSG.view_inventory_unavailableServers(),
ImageManager.getResourceLargeIcon(
ResourceCategory.SERVER, Boolean.FALSE));
- // TODO (ips, 10/28/10): Should we include down platforms too?
- view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVER.name().toLowerCase()
- + " availability=" +
AvailabilityType.DOWN.name().toLowerCase());
+ //view.setInitialSearchBarSearchText("category=" +
ResourceCategory.SERVER.name().toLowerCase()
+ // + " availability=" +
AvailabilityType.DOWN.name().toLowerCase());
return view;
}
});
@@ -231,7 +229,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria(
ResourceGroupDataSourceField.CATEGORY.propertyName(),
GroupCategory.COMPATIBLE.name()),
PAGE_COMPATIBLE_GROUPS.getTitle(),
ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE));
-
view.setInitialSearchBarSearchText("groupCategory=compatible");
+
//view.setInitialSearchBarSearchText("groupCategory=compatible");
return view;
}
});
@@ -242,7 +240,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView
{
ResourceGroupListView view = new
ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()),
new Criteria(ResourceGroupDataSourceField.CATEGORY.propertyName(),
GroupCategory.MIXED.name()),
PAGE_MIXED_GROUPS.getTitle(),
ImageManager.getGroupLargeIcon(GroupCategory.MIXED));
- view.setInitialSearchBarSearchText("groupCategory=mixed");
+ //view.setInitialSearchBarSearchText("groupCategory=mixed");
return view;
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 3019d73..9ac2107 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -127,7 +127,7 @@ public class ResourceSearchView extends Table {
final RPCDataSource<Resource, ResourceCriteria> datasource =
getDataSourceInstance();
setDataSource(datasource);
- setInitialCriteriaFixed(false);
+ //setInitialCriteriaFixed(false);
}
// suppress unchecked warnings because the subclasses may have different generic
types for the datasource
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png
new file mode 100644
index 0000000..63121fd
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png
differ
commit 3d74362f9ea99bb0dd8a66ec85c012bbae6002df
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Oct 26 12:29:15 2011 -0400
[BZ 745456] catch exceptions in the EventJSON jsp pages so we don't blow up the
Timeline component
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
index 40aeac8..b9857c1 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
@@ -37,7 +37,13 @@
criteria.addFilterEndTime(end);
criteria.setPageControl(pc);
- PageList<Alert> alerts = alertManager.findAlertsByCriteria(user.getSubject(),
criteria);
+ PageList<Alert> alerts;
+ try {
+ alerts = alertManager.findAlertsByCriteria(user.getSubject(), criteria);
+ } catch (Exception e) {
+ alerts = new PageList<Alert>(0, PageControl.getUnlimitedInstance());
+ }
+
%>
{ "events":
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
index 34baadf..c0f4402 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
@@ -23,8 +23,13 @@
long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request,
"begin"));
ConfigurationManagerLocal configurationManager =
LookupUtil.getConfigurationManager();
- PageList<ResourceConfigurationUpdate> configurationUpdates =
configurationManager
+ PageList<ResourceConfigurationUpdate> configurationUpdates;
+ try {
+ configurationUpdates = configurationManager
.findResourceConfigurationUpdates(subject, resourceId, begin, end, true, new
PageControl(0,100));
+ } catch (Exception e) {
+ configurationUpdates = new PageList<ResourceConfigurationUpdate>(0,
PageControl.getUnlimitedInstance());
+ }
%>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
index 8edeebe..44515e5 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
@@ -26,8 +26,12 @@
ContentUIManagerLocal contentManager = LookupUtil.getContentUIManager();
- PageList<InstalledPackageHistory> history =
contentManager.getInstalledPackageHistoryForResource(resourceId, new PageControl(0,20, new
OrderingField("iph.timestamp",PageOrdering.DESC)));
-
+ PageList<InstalledPackageHistory> history;
+ try {
+ history = contentManager.getInstalledPackageHistoryForResource(resourceId, new
PageControl(0,20, new OrderingField("iph.timestamp",PageOrdering.DESC)));
+ } catch (Exception e) {
+ history = new PageList<InstalledPackageHistory>(0,
PageControl.getUnlimitedInstance());
+ }
%>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
index 114baf0..3951f1d 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
@@ -24,8 +24,15 @@
long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request,
"begin"));
ResourceFactoryManagerLocal resourceFactoryManager =
LookupUtil.getResourceFactoryManager();
- PageList<CreateResourceHistory> creates =
resourceFactoryManager.findCreateChildResourceHistory(subject, resourceId, begin, end, new
PageControl(0, 100));
- PageList<DeleteResourceHistory> deletes =
resourceFactoryManager.findDeleteChildResourceHistory(subject, resourceId, begin, end, new
PageControl(0, 100));
+ PageList<CreateResourceHistory> creates;
+ PageList<DeleteResourceHistory> deletes;
+ try {
+ creates = resourceFactoryManager.findCreateChildResourceHistory(subject,
resourceId, begin, end, new PageControl(0, 100));
+ deletes = resourceFactoryManager.findDeleteChildResourceHistory(subject,
resourceId, begin, end, new PageControl(0, 100));
+ } catch (Exception e) {
+ creates = new PageList<CreateResourceHistory>(0,
PageControl.getUnlimitedInstance());
+ deletes = new PageList<DeleteResourceHistory>(0,
PageControl.getUnlimitedInstance());
+ }
%>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp
index b2f42fb..f283a99 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp
@@ -27,7 +27,12 @@
criteria.addFilterResourceId(resourceId);
criteria.addFilterCreatedAfter(begin);
criteria.addFilterCreatedBefore(end);
- PageList<? extends DriftChangeSet<?>> results =
driftManager.findDriftChangeSetsByCriteria(subject, criteria);
+ PageList<? extends DriftChangeSet<?>> results;
+ try {
+ results = driftManager.findDriftChangeSetsByCriteria(subject, criteria);
+ } catch (Exception e) {
+ results = new PageList(0, PageControl.getUnlimitedInstance());
+ }
%>
{ "events": [
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
index d14ab93..62d9a07 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
@@ -32,9 +32,14 @@
boolean tooManyEvents = false;
- PageList<EventComposite> list =
- eventManager.findEventComposites(subject, EntityContext.forResource(resourceId),
begin, end, null,
+ PageList<EventComposite> list;
+ try {
+ list = eventManager.findEventComposites(subject,
EntityContext.forResource(resourceId), begin, end, null,
null, null, new PageControl(0,10000, new OrderingField("timestamp",
PageOrdering.ASC)));
+ } catch (Exception e) {
+ list = new PageList<EventComposite>(0,
PageControl.getUnlimitedInstance());
+ }
+
%>
<%! public String trimLength(String string, int length) {
@@ -154,14 +159,14 @@
if (grouped) {
link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History";
} else {
- link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History/" + event.getEventId();
+ link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History/" + event.getEventId();
}
String detail = null;
if (grouped) {
StringBuilder buf = new StringBuilder();
for (EventComposite childEvent : ((GroupedEventComposite)event).events)
{
- String childColor = eventColor(childEvent.getSeverity());
+ String childColor = eventColor(childEvent.getSeverity());
buf.append("<a
href='/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History/" + childEvent.getEventId() + "'>");
buf.append("<font color=\"" + childColor +
"\">" + escapeBackslashes(trimLength(childEvent.getEventDetail(),80)) +
"</font></a><br />");
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
index 49fd1cb..04d3c11 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
@@ -24,8 +24,14 @@
long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request,
"begin"));
OperationManagerLocal operationManager = LookupUtil.getOperationManager();
- PageList<ResourceOperationHistory> operations =
operationManager.findCompletedResourceOperationHistories(
- subject, resourceId, begin, end, new PageControl(0,100));
+ PageList<ResourceOperationHistory> operations;
+ try {
+ operations = operationManager.findCompletedResourceOperationHistories(
+ subject, resourceId, begin, end, new PageControl(0,100));
+ } catch (Exception e) {
+ operations = new PageList<ResourceOperationHistory>(0,
PageControl.getUnlimitedInstance());
+ }
+
%>
{ "events": [
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
index 17683c7..fe66e5e 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
@@ -22,7 +22,13 @@
long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request,
"begin"));
ConfigurationManagerLocal configurationManager =
LookupUtil.getConfigurationManager();
- PageList<PluginConfigurationUpdate> configurationUpdates =
configurationManager.findPluginConfigurationUpdates(subject, resourceId, begin, end, new
PageControl(0,100));
+ PageList<PluginConfigurationUpdate> configurationUpdates;
+ try {
+ configurationUpdates =
configurationManager.findPluginConfigurationUpdates(subject, resourceId, begin, end, new
PageControl(0,100));
+ } catch (Exception e) {
+ configurationUpdates = new PageList<PluginConfigurationUpdate>(0,
PageControl.getUnlimitedInstance());
+ }
+
%>
commit a94a8992b37b10a4224eef050911dd6759a7705e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Oct 27 12:23:23 2011 -0400
[BZ 749560] make it clear that "deleting" bundle entities only removes them
from the DB, the remote content is not purged.
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 e69994e..dd0902e 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
@@ -957,7 +957,7 @@ view_bundle_createWizard_uploadStepName = Upload Bundle Files
view_bundle_createWizard_urlOption = URL
view_bundle_createWizard_windowTitle = Bundle Creation Wizard
view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create
a bundle!
-view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions,
destinations and deployments for this bundle will also be deleted.
+view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions,
destinations and deployments for this bundle will also be deleted. However, this will not
remove any content from remote machines.
view_bundle_deploy = Deploy
view_bundle_deployDir = Deploy Directory
view_bundle_deployWizard_deployStep = Deploy Bundle to Destination Platforms
@@ -1011,7 +1011,7 @@ view_bundle_deployWizard_title = Bundle Deployment Wizard
view_bundle_deploy_action = Action
view_bundle_deploy_backButton = Back to Destination
view_bundle_deploy_clickForError = Click the icon for the error message
-view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle
deployment?
+view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle
deployment? This only deletes it from the database; all bundle content that was deployed
on remote machines will remain.
view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}]
view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment
[{0}]
view_bundle_deploy_deployedBy = Deployed By
@@ -1054,7 +1054,7 @@ view_bundle_fileListView_sha256 = SHA256
view_bundle_files = Files
view_bundle_latestVersion = Latest Version
view_bundle_list_backToAll = Back to All Bundles
-view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles?
+view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles?
This will delete all of their versions, destinations and deployments from the database.
However, this will not remove any content from remote machines.
view_bundle_list_deleteFailure = Failed to delete the bundle [{0}]
view_bundle_list_deleteSuccessful = You successfully deleted the bundle [{0}]
view_bundle_list_deletesFailure = Failed to delete the bundles
@@ -1099,7 +1099,7 @@ view_bundle_tree_loadFailure = Failed to load bundle data
view_bundle_version_backToBundle = Back to Bundle
view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags
view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the
bundle version tags
-view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version?
+view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version?
This will not remove any content from remote machines.
view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}]
view_bundle_version_deleteSuccessful = You successfully deleted the bundle version [{0}]
view_bundle_version_loadFailure = Failed to load bundle version
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 1f42dfc..be8be01 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -839,6 +839,7 @@ view_bundle_createWizard_uploadStepName = Bundle-Dateien hochladen
view_bundle_createWizard_urlOption = URL
##view_bundle_createWizard_windowTitle = Bundle Creation Wizard
##view_bundle_createWizard_youMustChooseOne = You must choose one option in order to
create a bundle!
+##view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions,
destinations and deployments for this bundle will also be deleted. However, this will not
remove any content from remote machines.
view_bundle_deploy = Deploy
view_bundle_deployDir = Deploy-Verzeichnis
view_bundle_deployWizard_deployStep = Bundle auf die Zielplattformen deployen
@@ -888,6 +889,11 @@ view_bundle_deployWizard_getOptions_deployTime =
Deployment-Zeitpunkt
##view_bundle_deployWizard_title = Bundle Deployment Wizard
view_bundle_deploy_action = Aktion
view_bundle_deploy_backButton = Zurück zum Ziel
+##view_bundle_deploy_clickForError = Click the icon for the error message
+##view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle
deployment? This only deletes it from the database; all bundle content that was deployed
on remote machines will remain.
+##view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}]
+##view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment
[{0}]
+##view_bundle_deploy_deployedBy = Deployed By
##view_bundle_deploy_deploymentPlatforms = Deployment Resource
##view_bundle_deploy_installDetails = Install Details
##view_bundle_deploy_loadBundleFailure = Failed to find bundle
@@ -961,6 +967,9 @@ view_bundle_revert = Zurückrollen
view_bundle_version_backToBundle = Zurück zum Bundle
##view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version
tags
##view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated
the bundle version tags
+##view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle
version? This will not remove any content from remote machines.
+##view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}]
+##view_bundle_version_deleteSuccessful = You successfully deleted the bundle version
[{0}]
##view_bundle_version_loadFailure = Failed to load bundle version
view_bundle_versions = Versionen
##view_configCompare_comparingConfigs = Comparing Configurations
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index bffa78a..3050a0f 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -1012,7 +1012,6 @@ view_bundle_deploy_loadBundleFailure = バンドルの検索に失敗しまし
view_bundle_deploy_loadDeployFailure = バンドルデプロイのロードに失敗しました
view_bundle_deploy_loadFailure = バンドルデプロイのロードに失敗しました
view_bundle_deploy_name = デプロイ名
-view_bundle_deploy_operatingSystem = オペレーティングシステム
view_bundle_deploy_selectARow = インストールの詳細を表示するために行を選択してください
view_bundle_deploy_tagUpdateFailure = バンドルデプロイタブの更新に失敗しました
view_bundle_deploy_tagUpdateSuccessful = バンドルデプロイタグの更新に成功しました