[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 22aff4ab0f6962d9113cd3ddf349165d0dfa862a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 22 16:02:31 2010 -0500
make sure ID field is hidden unless in debug mode
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 53ac7ef..3748bbf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -100,8 +100,6 @@ public class ResourceGroupListView extends Table {
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
- idField.setAutoFitWidth(true);
-
nameField.setWidth("50%");
descriptionField.setWidth("50%");
typeNameField.setWidth(75);
@@ -114,7 +112,7 @@ public class ResourceGroupListView extends Table {
availabilityDescendantsField.setAutoFitWidth(true);
availabilityDescendantsField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- setListGridFields(idField, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
+ setListGridFields(false, idField, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 31 +++++++---
1 file changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 7016d6a2c449b65fe960c0ca035faefdec53ed7d
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 22 15:43:18 2010 -0500
make the tabular view of the groups look good
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 0ecdbd2..53ac7ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -27,6 +27,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGro
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.AutoFitWidthApproach;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -74,7 +75,7 @@ public class ResourceGroupListView extends Table {
@Override
protected void configureTable() {
- ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 300);
+ ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title());
nameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int i, int i1) {
String groupId = record.getAttribute("id");
@@ -83,22 +84,37 @@ public class ResourceGroupListView extends Table {
}
});
+ ListGridField idField = new ListGridField("id", MSG.common_title_id());
ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(), DESCRIPTION.title());
- ListGridField typeNameField = new ListGridField(TYPE.propertyName(), TYPE.title(), 130);
- ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title(), 100);
- ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title(), 100);
+ ListGridField typeNameField = new ListGridField(TYPE.propertyName(), TYPE.title());
+ ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title());
+ ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title());
ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", MSG
- .view_inventory_groups_children(), 100);
+ .view_inventory_groups_children());
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
ListGridField availabilityDescendantsField = new ListGridField("availabilityDescendents", MSG
- .view_inventory_groups_descendants(), 100);
+ .view_inventory_groups_descendants());
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
- setListGridFields(nameField, descriptionField, typeNameField, pluginNameField, categoryField,
+ idField.setAutoFitWidth(true);
+
+ nameField.setWidth("50%");
+ descriptionField.setWidth("50%");
+ typeNameField.setWidth(75);
+ pluginNameField.setAutoFitWidth(true);
+ pluginNameField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
+ categoryField.setAutoFitWidth(true);
+ categoryField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
+ availabilityChildrenField.setAutoFitWidth(true);
+ availabilityChildrenField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
+ availabilityDescendantsField.setAutoFitWidth(true);
+ availabilityDescendantsField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
+
+ setListGridFields(idField, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
@@ -139,7 +155,6 @@ public class ResourceGroupListView extends Table {
}
});
-
}
// -------- Static Utility loaders ------------
13 years, 6 months
[rhq] 2 commits - modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java | 10 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit a354a40c418369af69b6ed6fb929510254117a69
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 22 15:01:01 2010 -0500
These classes were failing to get the proper Global Perms for the
user after the switch to UserPermissionsManager. Updated to use the
proper mechanism and now tab activation seems to be working correctly.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 9897828..3226afe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -234,6 +234,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
((TwoLevelTab) top).getLayout().destroyViews();
}
+ Set<Permission> globalPermissions = UserPermissionsManager.getInstance().getGlobalPermissions();
GroupCategory groupCategory = groupComposite.getResourceGroup().getGroupCategory();
Set<ResourceTypeFacet> facets = groupComposite.getResourceFacets().getFacets();
@@ -279,7 +280,6 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
updateSubTab(this.inventoryTab, this.inventoryConnHistory, new HistoryGroupPluginConfigurationView(
this.inventoryConnHistory.extendLocatorId("View"), this.groupComposite), facets
.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true);
- Set<Permission> globalPermissions = this.groupComposite.getResourcePermission().getPermissions();
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new ResourceGroupMembershipView(this.inventoryMembership.extendLocatorId("View"), groupId)
: null;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 190dda3..35a929b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -236,6 +236,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
((TwoLevelTab) top).getLayout().destroyViews();
}
+ Set<Permission> globalPermissions = UserPermissionsManager.getInstance().getGlobalPermissions();
ResourcePermission resourcePermissions = this.resourceComposite.getResourcePermission();
Set<ResourceTypeFacet> facets = this.resourceComposite.getResourceFacets().getFacets();
@@ -297,7 +298,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.inventoryTab, this.inventoryGroups, ResourceGroupListView.getGroupsOf(this.inventoryTab
.extendLocatorId("GroupsView"), resource.getId()), true, true);
- Set<Permission> globalPermissions = this.resourceComposite.getResourcePermission().getPermissions();
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new ResourceResourceGroupsView(this.inventoryTab.extendLocatorId("GroupMembershipView"),
resourceId) : null;
commit 6346a259a93c138537ecc4d75f91d3d742ad606e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 22 14:58:30 2010 -0500
minor - Add NamedTabSet.getTabByTitle as an improvement to falling through
to super's impl
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
index e7d4a98..494f815 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
@@ -42,4 +42,14 @@ public class NamedTabSet extends LocatableTabSet {
return null;
}
+ public NamedTab getTabByTitle(String title) {
+ NamedTab[] tabs = getTabs();
+ for (NamedTab tab : tabs) {
+ if (tab.getTitle().equals(title)) {
+ return tab;
+ }
+ }
+ return null;
+ }
+
}
13 years, 6 months
[rhq] modules/core
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 0e07e711e02884bc81f9b5929290bb448857aaf7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Nov 22 11:16:57 2010 -0500
Fix issue with render of empty groups. Protect ClusterFlyWeight when there
are no children.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
index 5e2e207..5422c95 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
@@ -23,6 +23,7 @@
package org.rhq.core.domain.resource.group.composite;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -38,7 +39,7 @@ public class ClusterFlyweight implements Serializable {
private String name;
- private List<ClusterFlyweight> children;
+ private List<ClusterFlyweight> children = new ArrayList<ClusterFlyweight>(0);
private int members;
@@ -70,7 +71,7 @@ public class ClusterFlyweight implements Serializable {
}
public void setChildren(List<ClusterFlyweight> clusterKeyFlyweights) {
- this.children = clusterKeyFlyweights;
+ this.children = (null != clusterKeyFlyweights) ? clusterKeyFlyweights : new ArrayList<ClusterFlyweight>(0);
}
public int getGroupId() {
13 years, 6 months
[rhq] Branch 'release-3.0.0' - modules/core modules/enterprise
by ips
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java | 3 +++
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java | 6 +++++-
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 6 ++++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 4 ++++
4 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 834e20735652dc70654b84e5eafdededa2112ad4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 19 15:07:27 2010 -0500
[BZ 655187]
I believe in the past Resource uninventory was using hibernate cascade
to remove bundle resource deployments. At some point in the data model
changes it looks like I took the relation off of Resource and did not
add the needed remove logic.
I've now added to bulk delete for efficient removal of BundleResourceDeployment
and BundleResourceDeploymentHistory.
(cherry picked from commit 9aeb5a00158b7d24dbb706522d8f8bb35e03bb07)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java
index 5638dc9..1bc3c25 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java
@@ -58,6 +58,8 @@ import org.rhq.core.domain.resource.Resource;
*/
@Entity
@NamedQueries( {
+ @NamedQuery(name = BundleResourceDeployment.QUERY_DELETE_BY_RESOURCES, query = "DELETE FROM BundleResourceDeployment brd "
+ + " WHERE brd.resource.id IN ( :resourceIds ) )"),
@NamedQuery(name = BundleResourceDeployment.QUERY_FIND_BY_DEPLOYMENT_ID_NO_FETCH, query = "SELECT brd FROM BundleResourceDeployment brd WHERE brd.bundleDeployment.id = :id "),
@NamedQuery(name = BundleResourceDeployment.QUERY_FIND_BY_RESOURCE_ID_NO_FETCH, query = "SELECT brd FROM BundleResourceDeployment brd WHERE brd.resource.id = :id ") })
@SequenceGenerator(name = "SEQ", sequenceName = "RHQ_BUNDLE_RES_DEPLOY_ID_SEQ")
@@ -66,6 +68,7 @@ import org.rhq.core.domain.resource.Resource;
public class BundleResourceDeployment implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String QUERY_DELETE_BY_RESOURCES = "BundleResourceDeployment.deleteByResources";
public static final String QUERY_FIND_BY_DEPLOYMENT_ID_NO_FETCH = "BundleResourceDeployment.findByDeploymentIdNoFetch";
public static final String QUERY_FIND_BY_RESOURCE_ID_NO_FETCH = "BundleResourceDeployment.findByResourceIdNoFetch";
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java
index d528f8b..eb00b26 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java
@@ -48,7 +48,10 @@ import javax.xml.bind.annotation.XmlType;
* @author Jay Shaughnessy
*/
@Entity
-@NamedQueries( { @NamedQuery(name = BundleResourceDeploymentHistory.QUERY_FIND_ALL, query = "SELECT brdh FROM BundleResourceDeploymentHistory brdh") //
+@NamedQueries( {
+ @NamedQuery(name = BundleResourceDeploymentHistory.QUERY_DELETE_BY_RESOURCES, query = "DELETE FROM BundleResourceDeploymentHistory brdh "
+ + " WHERE brdh.resourceDeployment IN ( SELECT brd FROM BundleResourceDeployment brd WHERE brd.resource.id IN ( :resourceIds ) ) )"),
+ @NamedQuery(name = BundleResourceDeploymentHistory.QUERY_FIND_ALL, query = "SELECT brdh FROM BundleResourceDeploymentHistory brdh") //
})
@SequenceGenerator(name = "SEQ", sequenceName = "RHQ_BUNDLE_RES_DEP_HIST_ID_SEQ")
@Table(name = "RHQ_BUNDLE_RES_DEP_HIST")
@@ -56,6 +59,7 @@ import javax.xml.bind.annotation.XmlType;
public class BundleResourceDeploymentHistory implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String QUERY_DELETE_BY_RESOURCES = "BundleResourceDeploymentHistory.deleteByResources";
public static final String QUERY_FIND_ALL = "BundleResourceDeploymentHistory.findAll";
@Column(name = "ID", nullable = false)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 52420f4..b35dfac 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -1032,8 +1032,10 @@ public class Resource implements Comparable<Resource>, Serializable {
@ManyToOne(fetch = FetchType.LAZY)
private ProductVersion productVersion;
- // @OneToMany(mappedBy = "resource", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- // private List<BundleResourceDeployment> resourceDeployments = new ArrayList<BundleResourceDeployment>();
+ // not currently needed, but could be added if we find a need to get deployment info via the resource
+ // bulk delete (already being done)
+ // @OneToMany(mappedBy = "resource", fetch = FetchType.LAZY)
+ // private List<BundleResourceDeployment> resourceDeployments = new ArrayList<BundleResourceDeployment>();
@ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 3687b5e..f033078 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -55,6 +55,8 @@ import org.rhq.core.domain.alert.notification.AlertNotification;
import org.rhq.core.domain.alert.notification.AlertNotificationLog;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
+import org.rhq.core.domain.bundle.BundleResourceDeployment;
+import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory;
import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.content.ContentServiceRequest;
@@ -396,6 +398,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
ResourceError.QUERY_DELETE_BY_RESOURCES, //
Event.DELETE_BY_RESOURCES, //
EventSource.QUERY_DELETE_BY_RESOURCES, //
+ BundleResourceDeploymentHistory.QUERY_DELETE_BY_RESOURCES, // resource deployment history BEFORE resource deployment
+ BundleResourceDeployment.QUERY_DELETE_BY_RESOURCES, //
PackageInstallationStep.QUERY_DELETE_BY_RESOURCES, // steps BEFORE installed package history
InstalledPackageHistory.QUERY_DELETE_BY_RESOURCES, // history BEFORE installed packages & content service requests
InstalledPackage.QUERY_DELETE_BY_RESOURCES, //
13 years, 6 months
[rhq] modules/cli-tests modules/core modules/enterprise modules/plugins
by ips
modules/cli-tests/pom.xml | 4 +--
modules/core/client-api/pom.xml | 7 +++---
modules/core/plugin-container/pom.xml | 4 +--
modules/enterprise/agent/pom.xml | 10 +++++----
modules/enterprise/agentupdate/pom.xml | 4 ++-
modules/enterprise/remoting/cli/pom.xml | 4 +--
modules/enterprise/remoting/client-deps/pom.xml | 8 +++----
modules/enterprise/remoting/webservices/pom.xml | 6 ++---
modules/enterprise/server/plugins/alert-operations/pom.xml | 1
modules/enterprise/server/plugins/rhnhosted/pom.xml | 1
modules/plugins/jboss-cache-v3/pom.xml | 14 +++----------
11 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit 2b0fa555cf71363da2d71deec1e4be8e657b7816
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 22 10:25:40 2010 -0500
minor fixes to poms to clear up various Maven 3 warnings
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index d593983..b97bbf1 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -22,9 +22,9 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>rhq-remoting-cli</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 68dfc58..aa5c7fe 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -97,8 +97,9 @@
</plugin>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -107,8 +108,8 @@
</goals>
</execution>
</executions>
-
</plugin>
+
</plugins>
</build>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 8d635c5..c2fc3f9 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -103,9 +103,9 @@
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>test-utils</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index caebb0d..b174311 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -150,8 +150,8 @@
<echo file="${project.build.outputDirectory}/rhq-agent-version.properties" append="false">Product-Name=${rhq.product.name}
Product-Version=${project.version}
-Module-Name=${pom.name}
-Module-Version=${pom.version}
+Module-Name=${project.name}
+Module-Version=${project.version}
Build-Date=${build.time}
Build-Jdk-Vendor=${java.vendor}
Build-Jdk=${java.version}
@@ -231,12 +231,13 @@ Build-Number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
</build>
-<profiles>
+ <profiles>
<profile>
<id>cobertura</id>
<activation>
@@ -320,7 +321,7 @@ Build-Number=${buildNumber}
</plugins>
</build>
</profile>
-</profiles>
+ </profiles>
<repositories>
<!-- This is for SIGAR 1.6.4. -->
@@ -339,6 +340,7 @@ Build-Number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 8d69060..3709fc1 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -140,6 +140,7 @@ rhq-agent.latest.build-number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
@@ -292,9 +293,10 @@ rhq-agent.latest.build-number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 2d8f486..d13cdc4 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -28,7 +28,7 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -106,7 +106,7 @@
<property name="project.groupId" value="${project.groupId}" />
<property name="project.version" value="${project.version}" />
<property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="rhq-remoting-ws.version" value="${version}" />
+ <property name="rhq-remoting-ws.version" value="${project.version}" />
<property name="commons-logging.version" value="${commons-logging.version}" />
<property name="opencsv.version" value="${opencsv.version}" />
<property name="concurrent.version" value="${concurrent.version}" />
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 3dd52ab..b4b53f7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -12,10 +12,10 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
- <artifactId>rhq-remoting-client-api</artifactId>
- <version>${version}</version>
- <exclusions>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-remoting-client-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
<exclusion>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 24af2b3..43f9d6d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -113,7 +113,7 @@
<property name="rhq.client.build.include.client.jar" value="${rhq.client.build.include.client.jar}" />
<property name="quartz.version" value="${quartz.version}" />
<property name="ant.contrib.version" value="${ant.contrib.version}" />
- <property name="webservice.version" value="${version}" />
+ <property name="webservice.version" value="${project.version}" />
</ant>
</tasks>
</configuration>
@@ -129,7 +129,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <classesDirectory>${project.build.directory}/rhq-remoting-webservices-${version}
+ <classesDirectory>${project.build.directory}/rhq-remoting-webservices-${project.version}
</classesDirectory>
<includes>
@@ -205,7 +205,7 @@
</systemProperties>
<additionalClasspathElements>
<additionalClasspathElement>
- ${project.build.directory}/rhq-remoting-webservices-${version}.jar
+ ${project.build.directory}/rhq-remoting-webservices-${project.version}.jar
</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6325a1d..8f07aca 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -79,6 +79,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
<executions>
<execution>
<!-- translate the tokens.xml file to confluence markup -->
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 4138e15..2a267a6 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -168,6 +168,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<goals>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 0b88999..38ee91c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jopr-jboss-as-5-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -80,15 +80,9 @@
</dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging-client</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
13 years, 6 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 253 +++++-----
1 file changed, 130 insertions(+), 123 deletions(-)
New commits:
commit d690b534583d0aea06b964caf379a1d401ffcf5e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Nov 22 11:30:56 2010 +0100
Add some more translations.
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 06f0b88..ff2b19e 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
@@ -13,12 +13,12 @@ common_buildInfo_gwtVersion = ${gwt.version}~
# Button Labels
#--------------
-common_button_ack = Ack~
-common_button_ack_all = Ack All~
+common_button_ack = Bestätigen
+common_button_ack_all = Alle bestätigen
common_button_add = Hinzufügen
common_button_advanced = Advanced...~
common_button_apply = Anwenden
-common_button_cancel = Cancel~
+common_button_cancel = Abbrechen
common_button_close = Schließen
common_button_compare = Vergleichen
common_button_create_child = Create Child~
@@ -28,14 +28,14 @@ common_button_disable = Disable~
common_button_edit = Bearbeiten
common_button_enable = Enable~
common_button_finish = Beenden
-common_button_import = Import~
+common_button_import = Importieren
common_button_new = Neu
common_button_next = Weiter
-common_button_ok = OK~
+common_button_ok = OK
common_button_previous = Zurück
common_button_purgeAll=Purge All~
-common_button_refresh = "Neu laden"
-common_button_reset = Reset~
+common_button_refresh = Neu laden
+common_button_reset = Zurücksetzen
common_button_save = Speichern
common_button_search = Suchen
common_button_showDetails = Details anzeigen...
@@ -43,9 +43,9 @@ common_button_uninventory = Uninventory~
# Common Labels
#------------------------
-common_label_all = ALL~
-common_label_all_resources = all resources~
-common_label_day=
+common_label_all = ALLE
+common_label_all_resources = Alle Ressourcen
+common_label_day= Tag
common_label_days=Tage
common_label_hour=Stunde
common_label_hours=Stunden
@@ -54,9 +54,9 @@ common_label_items=items~
common_label_milliseconds=Millisekunden
common_label_minutes=Minuten
common_label_month=Monat
-common_label_none = none~
-common_label_role = role~
-common_label_roles = roles~
+common_label_none = keine
+common_label_role = Rolle
+common_label_roles = Rollen
common_label_scheduled_operations=scheduled operations~
common_label_seconds=Sekunden
common_label_selected_resources = selected resources~
@@ -77,11 +77,11 @@ common_title_available_resources=Verfügbare Ressourcen
common_title_background=Hintergrund
common_title_category = Kategorie
common_title_columns=Spalten
-common_title_configuration = Configuration~
-common_title_compatibleGroups = Compatible Groups~
+common_title_configuration = Konfiguration
+common_title_compatibleGroups = Kompatible Gruppen
common_title_compatibleGroups_total=Compatible Group Total~
common_title_custom=Custom~
-common_title_dashboard_name=Dashboard Name~
+common_title_dashboard_name=Dashboard-Name
common_title_dateCreated=Date Created~
common_title_default=Default~
common_title_description=Beschreibung
@@ -92,16 +92,16 @@ common_title_duration=Dauer
common_title_edit_mode=Edit Mode~
common_title_enabled=Enabled?~
common_title_end = Ende
-common_title_favorites=Favorites~
+common_title_favorites=Lesezeichen
common_title_generalProp = General Properties~
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_host = Rechner
+common_title_inventory = Inventar
+common_title_inventorySummary = Inventar Zusammenfassung
common_title_lastUpdated=Zuletzt aktualisiert
common_title_lastUpdatedBy=Zuletzt aktualisiert durch
common_title_mashup=Mashup~
@@ -110,50 +110,50 @@ common_title_metric = Metrik
common_title_mixedGroups = Gemischte Gruppen
common_title_mixedGroups_total=Mixed Group Total~
common_title_name = Name
-common_title_new_dashboard=New Dashboard~
-common_title_numeric_type=Numeric Type~
+common_title_new_dashboard=Neues Dashboard
+common_title_numeric_type=Numerischer Typ
common_title_operations=Operations~
common_title_operations_range=Operation Range~
-common_title_over=Over~
+common_title_over=Über
common_title_password = Passwort
common_title_path = Pfad
common_title_platform=Platform~
common_title_platform_total=Platform Total~
-common_title_plugin = Plugin~
+common_title_plugin = Plugin
common_title_port = Port
common_title_providers=Providers~
common_title_recently_added = Kürzlich hinzugefügte Ressourcen
-common_title_recent_alerts = Recent Alerts~
-common_title_recent_operations=Recent Operations~
+common_title_recent_alerts = Kürzlich ausgelöste Alarme
+common_title_recent_operations=Kürzlich ausgeführte Operationen
common_title_remove_column=Spalte löschen
common_title_repositories=Repositories~
common_title_resource = Ressource
-common_title_resource_group = Resource Group~
+common_title_resource_group = Ressourcen-Gruppe
common_title_resource_inventory=Resource Inventory~
common_title_resource_id=Resource ID~
-common_title_resource_name=Resource Name~
+common_title_resource_name=Ressurcen-Name
common_title_search = Suche
-common_title_scheduled_operations=Scheduled Operations~
+common_title_scheduled_operations=Geplante Operationen
common_title_selected_resources=Ausgewählte Ressourcen
common_title_server_total=Server Total~
common_title_service_total=Service Total~
-common_title_settings=Settings~
-common_title_show=Show~
-common_title_start = Start~
-common_title_status=Status~
+common_title_settings=Einstellungen
+common_title_show=Anzeigen
+common_title_start = Start
+common_title_status=Status
common_title_summary=Zusammenfassung
-common_title_tag_cloud=Tag Cloud~
-common_title_the=The
+common_title_tag_cloud=Tag-Wolke
+common_title_the=Die
common_title_summary_counts=Summary Counts~
-common_title_timestamp =Date/Time~
-common_title_total=Total~
+common_title_timestamp =Zeitpunkt
+common_title_total=Total
common_title_type = Typ
common_title_units = Einheiten
common_title_user=Benutzer
common_title_value = Wert
common_title_version = Version
-common_title_view_mode=View Mode~
-common_title_web_address=Web Address~
+common_title_view_mode=Anzeigemodus
+common_title_web_address=Webaddresse
common_title_welcome=Wilkommen
# Common Messages
@@ -166,7 +166,7 @@ common_msg_noItemsToShow=No items to show~
# Common Values
#--------------
-common_val_for=for~
+common_val_for=für
common_val_no = Nein
common_val_no_lower = nein
common_val_yes = Ja
@@ -179,16 +179,16 @@ common_val_none = Kein(e)
#--------------
common_calendar_january_short= Jan
common_calendar_february_short=Feb
-common_calendar_march_short=Mar
+common_calendar_march_short=Mär
common_calendar_april_short=Apr
-common_calendar_may_short=May
+common_calendar_may_short=Mai
common_calendar_june_short=Jun
common_calendar_july_short=Jul
common_calendar_august_short=Aug
common_calendar_september_short=Sept
-common_calendar_october_short=Oct
+common_calendar_october_short=Okt
common_calendar_november_short=Nov
-common_calendar_december_short=Dec
+common_calendar_december_short=Dez
#=================== Widgets =====================
@@ -199,24 +199,24 @@ widget_recordEditor_title_view = View {0} [{1}]~
widget_recordEditor_title_edit = Edit {0} [{1}]~
widget_recordEditor_title_new = Create New {0}~
# // dup in common
-widget_recordEditor_label_loading = Loading...~
+widget_recordEditor_label_loading = Laden...~
widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}]~
widget_recordEditor_error_noRecords = No records were returned - expected exactly one.~
widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one.~
-widget_recordEditor_info_recordCreatedConcise = {0} created.~
-widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.~
-widget_recordEditor_info_recordUpdatedConcise = {0} updated.~
-widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.~
-widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~
-widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~
+widget_recordEditor_info_recordCreatedConcise = {0} angelegt.
+widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] angelegt.
+widget_recordEditor_info_recordUpdatedConcise = {0} aktualisiert.
+widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] aktualisiert.
+widget_recordEditor_info_recordsDeletedConcise = {0} {1} gelöscht.
+widget_recordEditor_info_recordsDeletedDetailed = {0} {1} gelöscht: {2}.
widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
# Resource Selector/Picker
#--------------------------------
widget_resourceSelector_selectResource=Wählen Sie eine Ressource aus
-widget_resourceSelector_pleaseSelectResource=Please select a resource~
+widget_resourceSelector_pleaseSelectResource=Bitte wählen sie eine Ressource aus
widget_resourceSelector_selectMultipleResources=Select Resources~
-widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~
+widget_resourceSelector_pleaseSelectMultipleResource=Bitte wählen Sie eine oder merere Ressourcen aus
widget_resourceSelector_groupCategory=Group Category~
# Resource Factory Wizard
@@ -233,7 +233,7 @@ widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templat
widget_resourceFactoryWizard_archPrompt=Package Architecture~
widget_resourceFactoryWizard_versionPrompt=Package Version~
widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~
-widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~
+widget_resourceFactoryWizard_importWizardTitle=Importieren von Ressourcen des Typs [{0}]
widget_resourceFactoryWizard_importFailure=Failed to manually import resource~
widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~
widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~
@@ -298,10 +298,10 @@ dataSource_ContentRepoTree_field_parentId = Parent ID~
# Users
#------
###### dup in common
-dataSource_users_field_id = ID~
+dataSource_users_field_id = ID
dataSource_users_field_name = Benutzername
-dataSource_users_field_ldap = LDAP Login?~
-dataSource_users_field_password = Passwort`
+dataSource_users_field_ldap = LDAP Login?
+dataSource_users_field_password = Passwort
dataSource_users_field_passwordVerify = Verify Password~
dataSource_users_field_firstName = Vorname~
dataSource_users_field_lastName = Nachname~
@@ -934,8 +934,8 @@ view_configEdit_tooltip_2 = Add an item to the list.~
view_groupConfigEdit_member = Member~
view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations.~
view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them.~
-view_groupConfigEdit_setAll = Set all values to:~
-view_groupConfigEdit_unset = Unset~
+view_groupConfigEdit_setAll = Alle Werte setzen auf:
+view_groupConfigEdit_unset = Ungesetzt
view_groupConfigEdit_valsDiff = member values differ~
view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
@@ -962,17 +962,17 @@ view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - pl
view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~
view_tags_tags = Tags
-view_tags_error_1 = Failed to load Tags~
-view_tags_title = Tags:~
+view_tags_error_1 = Konnte die Tags nicht laden
+view_tags_title = Tags:
view_tags_tooltip_1 = Click to remove this Tag~
view_tags_tooltip_2 = Click to edit Tags~
view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John)
# File Upload (various)
-view_upload_alreadyUploaded = File has already been uploaded~
+view_upload_alreadyUploaded = Datein wurde bereits hochgeladen
view_upload_bundleDistFile = Distribution File~
view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~
-view_upload_error_file = Error uploading file~
+view_upload_error_file = Fehler beim Hochladen der Datei
view_upload_error_fileName = Error uploading file [{0}]~
view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~
view_upload_error_packageVersionFile = Error uploading Package Version File~
@@ -983,23 +983,28 @@ view_upload_prompt_2 = File to Upload~
view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~
view_upload_tooltip_2 = File upload had previously failed~
view_upload_success = File successfully uploaded~
-view_upload_upload = Upload~
+view_upload_upload = Hochladen
view_upload_uploadFile = UploadFile~
# Group Create Wizard
-view_groupCreateWizard_membersStepName=Select Members~
+view_groupCreateWizard_membersStepName=Wählen Sie die Gruppenmitglieder aus
view_groupCreateWizard_createStepName=Group Settings~
-view_groupCreateWizard_createStep_recursive=Recursive~
-view_groupCreateWizard_title=Create Group~
-view_groupCreateWizard_windowTitle=Create Group~
-view_groupCreateWizard_createFailure=Failed to create the resource group~
-view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~
+view_groupCreateWizard_createStep_recursive=Rekursiv
+view_groupCreateWizard_title=Gruppe anlegen
+view_groupCreateWizard_windowTitle=Gruppe anlegen
+view_groupCreateWizard_createFailure=Konnte die Ressourcen-Gruppe nicht anlegen
+view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe angelegt. [<a href="{0}">Gruppe ansehen</a>]~
view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~
# Resource Type / Plugin View/Datasources
-view_type_resourceTypes=Resource Types~
+view_type_resourceTypes=Ressourcen-Typen
view_type_parentId=Parent ID~
-view_type_typeTreeLoadFailure=Failed to load resource type tree data~
+view_type_typeTreeLoadFailure=Failed to load resource type tree data~+# Tabs
+
+view_tabs_invalidSubTab = Invalid subtab: {0}~
+view_tabs_invalidTab = Ungültiger Reiter: {0}~
+
+
#=================== Dashboard =====================
view_dashboard_favorites_error1=Failed to load favorite Resources.~
@@ -1008,13 +1013,13 @@ view_dashboardManager_saved=Saved dashboard {0} to server~
view_dashboardManager_success=Saved dashboard~
view_dashboardManager_deleted=Successfully deleted dashboard {0}~
view_dashboards_title=Dashboard~
-view_dashboards_confirm1=Are you sure you want to delete~
+view_dashboards_confirm1=Sind Sie sicher, dass Sie löschen möchten
view_dashboardsManager_error1=Failed to add new dashboard~
# // dup in common
view_dashboardsManager_inventory_title=Inventory Summary~
view_dashboardsManager_mashup_title=RHQ Neuigkeiten
view_dashboardsManager_message_title=Wilkommen bei RHQ~
-view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~
+view_dashboardsManager_message_title_details=<h1>Wilkommen bei RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~
view_dashboardsManager_tagcloud_title=Tag Cloud~
view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~
view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~
@@ -1149,7 +1154,7 @@ view_tree_common_loadFailed_selection=Failed to select this node~
view_tree_common_loadFailed_node=Failed to load data for this node~
view_tree_common_loadFailed_create=Failed to create view for this node~
view_tree_common_loadFailed_update=Failed to update view for this node~
-view_tree_common_contextMenu_type_name_label=Type: {0}
+view_tree_common_contextMenu_type_name_label=Typ: {0}
view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~
view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~
view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~
@@ -1157,7 +1162,7 @@ view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Confi
view_tree_common_contextMenu_operations=Operations~
view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~
view_tree_common_contextMenu_measurements=Measurements~
-view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~
+view_tree_common_contextMenu_addChartToDashboard=Diagramm zum Dashboard [{0}] hinzufügen
view_tree_common_contextMenu_chart=Chart~
view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~
view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~
@@ -1167,33 +1172,34 @@ view_tabs_common_summary=Zusammenfassung
view_tabs_common_overview=Übersicht
view_tabs_common_dashboard=Dashboard~
view_tabs_common_timeline=Timeline~
-view_tabs_common_monitoring=Monitoring~
-view_tabs_common_graphs=Graphs~
+view_tabs_common_monitoring=Monitoring
+view_tabs_common_graphs=Diagramme
view_tabs_common_tables=Tabellen
view_tabs_common_traits=Traits~
view_tabs_common_availability=Verfügbarkeit
view_tabs_common_schedules=Schedules~
view_tabs_common_calltime=Calltime~
-view_tabs_common_inventory=Inventory~
+view_tabs_common_inventory=Inventar
view_tabs_common_groups=Gruppen
-view_tabs_common_group_membership=Group Membership~
-view_tabs_common_members=Members~
+view_tabs_common_group_membership=Gruppenmitgliedschaft
+view_tabs_common_members=Mitglieder
+view_tabs_common_membership=Mitgliedschaft
view_tabs_common_child_resources=Child Resources~
view_tabs_common_child_history=Child History~
view_tabs_common_connectionSettings=Connection Settings~
view_tabs_common_connectionSettingsHistory=Connection Settings History~
-view_tabs_common_operations=Operations~
-view_tabs_common_history=History~
-view_tabs_common_scheduled=Scheduled~
-view_tabs_common_alerts=Alerts~
-view_tabs_common_definitions=Definitions~
-view_tabs_common_current=Current~
-view_tabs_common_events=Events~
-view_tabs_common_configuration=Configuration~
+view_tabs_common_operations=Operationen
+view_tabs_common_history=Verlauf
+view_tabs_common_scheduled=Geplant
+view_tabs_common_alerts=Alarme
+view_tabs_common_definitions=Definitionen
+view_tabs_common_current=Aktuell
+view_tabs_common_events=Ereignisse
+view_tabs_common_configuration=Konfiguration
view_tabs_common_content=Content~
view_tabs_common_deployed=Deployed~
view_tabs_common_new=Neu
-view_tabs_common_subscriptions=Subscriptions~
+view_tabs_common_subscriptions=Abonnements
view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~
view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~
view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~
@@ -1205,16 +1211,16 @@ view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your fav
view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~
view_dynagroup_expressionSet=Expression Set~
view_dynagroup_recalculationInterval=Recalculation Interval~
-view_dynagroup_lastCalculationTime=Last Calculation Time~
-view_dynagroup_nextCalculationTime=Next Calculation Time~
+view_dynagroup_lastCalculationTime=Zeitpunkt letzte Berechnung
+view_dynagroup_nextCalculationTime=Zeitpunkt nächste Berechnung
view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~
view_dynagroup_definitionLoadFailure=Failed to load group definitions~
view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~
view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~
view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~
view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~
-view_dynagroup_saveAndRecalculate=Save & Recalculate~
-view_dynagroup_recalculate=Recalculate~
+view_dynagroup_saveAndRecalculate=Speichern & neu berechnen
+view_dynagroup_recalculate=Neu berechnen
view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~
view_dynagroup_recalcFailure=Failed to recalculated this group definition~
view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~
@@ -1222,15 +1228,15 @@ view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group
view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~
view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~
view_dynagroup_children=DynaGroup Children~
-view_dynagroup_newGroupDefinition=New Group Definition~
+view_dynagroup_newGroupDefinition=Neue Gruppen-Definition
view_dynagroup_editing=Editing [{0}]~
view_dynagroup_expression=Ausdruck
-view_dynagroup_recursive=Recursive~
-view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~
+view_dynagroup_recursive=Rekursiv
+view_dynagroup_loadDefinitionFailure=Konnte die Gruppen-Definition [{0}] nicht laden
view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~
view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~
view_dynagroup_permDenied=You do not have permission to view group definitions~
-view_dynagroup_definitions=DynaGroup Definitions~
+view_dynagroup_definitions=DynaGroup-Definitionen
view_group_membership_saveFailure=Failed to update membership of group [{0}]~
view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~
view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~
@@ -1241,7 +1247,7 @@ view_group_resConfig_edit_saveFailure=Failed to initiate group configuration upd
view_group_resConfig_edit_valid=All configuration properties have valid values, so the configuration can now be saved~
view_group_resConfig_edit_invalid=The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}]~
view_group_pluginConfig_view_noperm=You do not have permissions to see the connection settings~
-view_group_pluginConfig_view_groupProperties=Group Properties~
+view_group_pluginConfig_view_groupProperties=Gruppen-Eigenschaften
view_group_pluginConfig_table_title=Group Connection Settings History~
view_group_pluginConfig_table_statusDetails=Status Details~
view_group_pluginConfig_table_viewSettings=View Settings~
@@ -1255,7 +1261,7 @@ view_group_pluginConfig_table_statusNochange=No changes were made to this group
view_group_pluginConfig_table_statusFailure=This group configuration update failed~
view_group_pluginConfig_table_clickStatusIcon=Click the status icon for full details~
view_group_pluginConfig_members_title=Group Connection Settings Member Histories~
-view_group_pluginConfig_members_statusDetails=Status Details~
+view_group_pluginConfig_members_statusDetails=Status Details
view_group_pluginConfig_members_statusSuccess=This configuration update was successful~
view_group_pluginConfig_members_statusInprogress=This configuration update is still in progress~
view_group_pluginConfig_members_statusNochange=No changes were made to this configuration~
@@ -1272,11 +1278,11 @@ view_group_pluginConfig_edit_invalid=The following connection setting properties
view_group_meas_schedules_title=Group Metric Collection Schedules~
view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~
view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~
-view_group_summary_memberType=Member Type~
-view_group_summary_memberCount=Member Count~
-view_group_summary_dynamic=Dynamic~
-view_group_summary_recursive=Recursive~
-view_group_summary_groupDefinition=Group Definition~
+view_group_summary_memberType=Mitglieds-Typ
+view_group_summary_memberCount=Anzahl Mitglieder
+view_group_summary_dynamic=Dynamisch
+view_group_summary_recursive=Rekursiv
+view_group_summary_groupDefinition=Gruppen-Definition
view_group_summary_mixed=Gemischt
view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~
view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~
@@ -1300,9 +1306,9 @@ view_resourceResourceGroupList_message_updateSuccess = Group membership updated
# Configuration Details
#-------------------------------
view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~
-view_configurationDetails_error_updateFailure = Failed to update configuration.~
-view_configurationDetails_messageConcise = Configuration updated.~
-view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~
+view_configurationDetails_error_updateFailure = Konnte die Konfiguration nicht aktualisieren
+view_configurationDetails_messageConcise = Konfiguration aktualisiert
+view_configurationDetails_messageDetailed = Konfiguration der Ressource [{0}] aktualisiert.
view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~
view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~
@@ -1328,14 +1334,14 @@ view_operationHistoryDetails_error_fetchFailure = Failure loading operation hist
#-------------------------------------
view_operationCreateWizard_title = Operation Wizard~
view_operationCreateWizard_header = Execute {0} on {1}~
-view_operationCreateWizard_button_execute = Execute~
+view_operationCreateWizard_button_execute = Ausführen
view_operationCreateWizard_button_executeImmediately = Sofort ausführen
view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~
view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{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_start = Start
view_operationCreateWizard_schedulingStep_label_schedule = Schedule~
view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence~
view_operationCreateWizard_schedulingStep_label_runAt = Run At~
@@ -1345,16 +1351,16 @@ view_operationCreateWizard_schedulingStep_label_daily = Täglich
view_operationCreateWizard_schedulingStep_label_weekly = Wöchtentlich
view_operationCreateWizard_schedulingStep_label_monthly = Monatlich
view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period~
-view_operationCreateWizard_schedulingStep_label_startDate = Start Date~
+view_operationCreateWizard_schedulingStep_label_startDate = Startdatum
view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End~
-view_operationCreateWizard_schedulingStep_label_endDate = End Date~
+view_operationCreateWizard_schedulingStep_label_endDate = Enddatum
view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately~
view_operationCreateWizard_schedulingStep_label_onceAt = Einmalig um
view_operationCreateWizard_schedulingStep_label_date = Datum
view_operationCreateWizard_schedulingStep_label_time = Zeit
view_operationCreateWizard_schedulingStep_label_everyNMinutes = Alle n Minuten
view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval~
-view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At~
+view_operationCreateWizard_schedulingStep_label_hourlyAt = Stündlich um
view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour~
view_operationCreateWizard_schedulingStep_label_dailyAt = Stündlich um
view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day~
@@ -1391,18 +1397,19 @@ view_summaryOverviewForm_message_locationChangeSuccess = "Location of Resource w
#==================== Reports ======================
-view_reportsTop_title = Reports~
-view_reportsTop_description = This section provides access to global reports.~
+view_reportsTop_title = Berichte
+view_reportsTop_description = Dieser Abschnitt bietet Zugang zu applikationsweiten Berichten
view_reports_platforms = Cpu- und Speicherauslastung
view_reports_subsystems = Subsysteme
+view_reports_alertDefinitions=Alert Definitions
-view_measurementOob_title = Suspect Metrics~
+view_measurementOob_title = Verdächtige Metriken
-view_tagCloud_title = Tag Cloud~
-view_tagCloud_error_fetchFailure = Failed to load tags.~
-view_tagCloud_error_tagUsedCount = Tag used {0} times.~
+view_tagCloud_title = Tag-Wolke
+view_tagCloud_error_fetchFailure = Konnte die Tags nicht laden.
+view_tagCloud_error_tagUsedCount = Tag {0} ma verwendet.
-view_taggedResources_title = Tagged Resources~
+view_taggedResources_title = Markierte Ressourcen
#===================== Test =======================
@@ -1416,17 +1423,17 @@ view_testTop_description = This section contains pages for testing various GUI c
view_aboutBox_allRightsReserved = All Rights Reserved.~
view_aboutBox_buildNumber = Build-Nummer:
view_aboutBox_failedToLoad = Kann die Produktinformation nicht laden
-view_aboutBox_homepage = Homepage~
+view_aboutBox_homepage = Homepage
view_aboutBox_jbossByRedHat = JBoss by Red Hat~
view_aboutBox_title = Über {0}
view_aboutBox_version = Version:
# CoreGUI
#--------------
-view_core_error_1 = New Alerts lookup failed~
+view_core_error_1 = Konnte keine Alarminformationen laden
view_core_loggedInAs = Eingeloggt als {0}
view_core_loggedOut = Ausgeloggt
-view_core_recentAlerts = [{0}] recent alerts~
+view_core_recentAlerts = [{0}] kürzliche Alarme
view_core_uncaught = Globally uncaught exception~
# Login
13 years, 6 months
[rhq] 2 commits - etc/m2
by Heiko W. Rupp
etc/m2/settings.xml | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
New commits:
commit 536595c2bf85008e585702f551194c859f60b88b
Merge: d56e288... e23fb5d...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Nov 22 10:38:43 2010 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit d56e2887b1debf217b829730fd9fb148abdd2a95
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Nov 19 18:36:30 2010 +0100
Add a section about limiting gwt compile to certain browsers.
diff --git a/etc/m2/settings.xml b/etc/m2/settings.xml
index 64b6e35..fc7d47f 100644
--- a/etc/m2/settings.xml
+++ b/etc/m2/settings.xml
@@ -44,8 +44,8 @@
<profile>
<id>overrides</id>
<properties>
- <!-- NOTE: Add properties here that you always want set, to avoid
- having to explicitly pass them on the command line. Note,
+ <!-- NOTE: Add properties here that you always want set, to avoid
+ having to explicitly pass them on the command line. Note,
you can still override the values set here via the command
line. -->
@@ -70,12 +70,12 @@
<!-- Set the below properties to your fedorahosted.org username and
password (used to check in poms to RHQ git). -->
<username>SET_ME</username>
- <password>SET_ME</password>
+ <password>SET_ME</password>
</properties>
<repositories>
- <!-- Oracle Driver
+ <!-- Oracle Driver
To package the Oracle OJDBC driver set -Drhq.m2.repo.url.oracle and this repo definition will
be used to pick it up at build time. -->
<repository>
@@ -107,7 +107,7 @@
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
</properties>
</profile>
-
+
<profile>
<id>h2</id>
<properties>
@@ -128,7 +128,7 @@
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
</properties>
</profile>
-
+
<profile>
<id>sqlserver</id>
<properties>
@@ -188,7 +188,7 @@
<!-- Alternatively, if you don't want to use the default location of {rhq.rootDir}/dev-container/
for your dev container, then set the below prop to the desired location. -->
- <!--<rhq.containerDir>C:/home/bob/rhq-dev-container</rhq.containerDir>-->
+ <!--<rhq.containerDir>C:/home/bob/rhq-dev-container</rhq.containerDir>-->
<!-- Set the below prop to the location to your dev JBAS 4.2/4.3 deploy location for the admin console WAR.
e.g.: C:/opt/jboss-eap-4.3.0.GA_CP02/jboss-as/server/production -->
@@ -196,18 +196,25 @@
<!-- Set the below prop to the location to your dev JBAS 5.0 deploy location for the embedded console WAR.
e.g.: C:/opt/jboss-5.0.0.CR1/server/default -->
<jbas5.configDir>SET_ME</jbas5.configDir>
+
+ <!-- set browser(s) to compile the qwt stuff for
+ ~~ See http://rhq-project.org/display/RHQ/Advanced+Build+Notes#AdvancedBuildNote...
+ ~~ for details and browser versions
+ ~~ Possible engines are ie6,ie8,gecko,gecko1_8,safari,opera
+ -->
+ <gwt.userAgent>SET_ME</gwt.userAgent>
</properties>
</profile>
-
+
<profile>
<id>publish</id>
- <properties>
+ <properties>
<confluenceUrl>http://docs.example.com/confluence/</confluenceUrl>
<confluenceSpace>DOCS</confluenceSpace>
<confluenceUserName>SET_ME</confluenceUserName>
- <confluencePassword>SET_ME</confluencePassword>
- </properties>
- </profile>
+ <confluencePassword>SET_ME</confluencePassword>
+ </properties>
+ </profile>
</profiles>
@@ -229,22 +236,22 @@
<servers>
<server>
- <id>jboss-developer-repository-group</id>
- <!-- jboss.org username and password -->
+ <id>jboss-developer-repository-group</id>
+ <!-- jboss.org username and password -->
<username>SET_ME</username>
<password>SET_ME</password>
</server>
<server>
<id>jboss-snapshots-repository</id>
- <!-- jboss.org username and password -->
+ <!-- jboss.org username and password -->
<username>SET_ME</username>
<password>SET_ME</password>
</server>
<server>
<id>jboss-releases-repository</id>
- <!-- jboss.org username and password -->
+ <!-- jboss.org username and password -->
<username>SET_ME</username>
<password>SET_ME</password>
</server>
13 years, 6 months
[rhq] modules/core modules/enterprise
by ips
modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 72 ++--------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java | 38 ++---
2 files changed, 39 insertions(+), 71 deletions(-)
New commits:
commit e23fb5d0b2972dfafa9bb69ff58f9391a88ffcf9
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Sun Nov 21 20:11:19 2010 -0500
add description to each of the permissions on the role edit view (still need to i18n them); remove displayName and description fields from the Permission entity
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
index 6156cd4..4ccaa80 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
@@ -23,6 +23,7 @@
package org.rhq.core.domain.authz;
import java.util.HashSet;
+import java.util.Set;
import org.rhq.core.domain.auth.Subject;
@@ -40,99 +41,86 @@ public enum Permission {
/**
* can C/U/D users and roles (viewing is implied for everyone)
*/
- MANAGE_SECURITY(Target.GLOBAL, "Manage Security", "can C/U/D users and roles (viewing is implied for everyone)"), // 0
+ MANAGE_SECURITY(Target.GLOBAL), // 0
/**
* can C/R/U/D all resources, groups and can import auto-discovered resources
*/
- MANAGE_INVENTORY(Target.GLOBAL, "Manage Inventory",
- "can C/R/U/D all resources, groups and can import auto-discovered resources"), // 1
+ MANAGE_INVENTORY(Target.GLOBAL), // 1
/**
* can modify the RHQ Server configuration and perform any server-related functionality
*/
- MANAGE_SETTINGS(Target.GLOBAL, "Manage Settings",
- "can modify the RHQ Server configuration and perform any server-related functionality"), // 2
+ MANAGE_SETTINGS(Target.GLOBAL), // 2
+
/* ========= Resource Permissions ========= */
/**
* can view (but not C/U/D) all aspects of this Resource except its configuration ({@link #CONFIGURE_READ} is
* required to view that); this permission is implied just by having a Resource or Group in one's assigned Roles
*/
- VIEW_RESOURCE(
- Target.RESOURCE,
- "View Resource",
- "can view (but not C/U/D) all aspects of this Resource except its configuration (CONFIGURE_READ is"
- + "required to view that); this permission is implied just by having a Resource or Group in one's assigned Roles"), // 3
+ VIEW_RESOURCE(Target.RESOURCE), // 3
/**
* can modify resource name, description, and plugin config (e.g. set principal/credentials jboss-as plugin uses to
* access the managed JBossAS instance)
*/
- MODIFY_RESOURCE(Target.RESOURCE, "Modify Resource",
- "can modify resource name, description, and plugin config (e.g. set principal/credentials jboss-as plugin uses "
- + "to access the managed JBossAS instance)"), // 4
+ MODIFY_RESOURCE(Target.RESOURCE), // 4
/**
* can delete this resource (which also implies deleting all its descendant resources)
*/
- DELETE_RESOURCE(Target.RESOURCE, "Delete Resource",
- "can delete this resource (which also implies deleting all its descendant resources)"), // 5
+ DELETE_RESOURCE(Target.RESOURCE), // 5
/**
* can manually create new child servers or services
*/
- CREATE_CHILD_RESOURCES(Target.RESOURCE, "Create Child Resource",
- "can manually create new child servers or services"), // 6
+ CREATE_CHILD_RESOURCES(Target.RESOURCE), // 6
/**
* can C/U/D alert definitions (this implies {@link #MANAGE_MEASUREMENTS} and {@link #CONTROL})
*/
- MANAGE_ALERTS(Target.RESOURCE, "Manage Alerts",
- "can C/U/D alert definitions (this implies MANAGE_MEASUREMENTS and CONTROL)"), // 7
+ MANAGE_ALERTS(Target.RESOURCE), // 7
/**
* can C/U/D metric schedules
*/
- MANAGE_MEASUREMENTS(Target.RESOURCE, "Manage Measurements", "can C/U/D metric schedules"), // 8
+ MANAGE_MEASUREMENTS(Target.RESOURCE), // 8
/**
* can C/U/D content (package bits, software updates, etc.)
*/
- MANAGE_CONTENT(Target.RESOURCE, "Manage Content", "can C/U/D content (package bits, software updates, etc.)"), // 9
+ MANAGE_CONTENT(Target.RESOURCE), // 9
/**
* can invoke operations and delete operation history items
*/
- CONTROL(Target.RESOURCE, "Execute Operations", "can invoke operations and delete operation history items"), // 10
+ CONTROL(Target.RESOURCE), // 10
/**
* can C/U/D resource config (e.g. reconfiguring JBoss to listen for jnp on port 1199);
* having this permission implies having {@link #CONFIGURE_READ}
*/
- CONFIGURE_WRITE(Target.RESOURCE, "Update Configuration",
- "can C/U/D resource config (e.g. reconfiguring JBoss to listen for jnp on port 1199); "
- + "having this permission implies having CONFIGURE_READ"), // 11
+ CONFIGURE_WRITE(Target.RESOURCE), // 11
/**
* can C/U/D provisioning bundles
*/
// NOTE: This is a GLOBAL permission, but is defined down here so as to maintain the ordinal indexes of the other
// pre-existing permissions.
- MANAGE_BUNDLE(Target.GLOBAL, "Manage Bundles", "can C/U/D provisioning bundles"), // 12
+ MANAGE_BUNDLE(Target.GLOBAL), // 12
/**
* can view Resource configuration, but can not necessarily C/U/D unless {@link #CONFIGURE_WRITE} is also possessed
*/
- CONFIGURE_READ(Target.RESOURCE, "View Configuration",
- "can view Resource configuration, but can not necessarily C/U/D unless CONFIGURE_WRITE is also possessed"), // 13
+ CONFIGURE_READ(Target.RESOURCE), // 13
/**
* can C/U/D events
* (in the future, will also C/U/D event definitions)
*/
- MANAGE_EVENTS(Target.RESOURCE, "Manage Events", "can C/U/D events") // 14
+ MANAGE_EVENTS(Target.RESOURCE) // 14
;
@@ -149,20 +137,8 @@ public enum Permission {
private Target target;
- /**
- * a brief display name for the permission (TODO: i18n)
- */
- private String displayName;
-
- /**
- * a one or two sentence description of the permission (TODO: i18n)
- */
- private String description;
-
- Permission(Target target, String displayName, String description) {
+ Permission(Target target) {
this.target = target;
- this.displayName = displayName;
- this.description = description;
}
/**
@@ -174,16 +150,8 @@ public enum Permission {
return target;
}
- public String getDisplayName() {
- return displayName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static final HashSet<Permission> GLOBAL_ALL = new HashSet<Permission>();
- public static final HashSet<Permission> RESOURCE_ALL = new HashSet<Permission>();
+ public static final Set<Permission> GLOBAL_ALL = new HashSet<Permission>();
+ public static final Set<Permission> RESOURCE_ALL = new HashSet<Permission>();
static {
for (Permission permission : Permission.values()) {
switch (permission.getTarget()) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
index b7c8fce..830330a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
@@ -52,8 +52,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack;
/**
- * A complex form item for editing the set of RHQ {@link Permission permission}s associated with an RHQ
- * {@link Role role}.
+ * A complex form item for editing the set of RHQ {@link Permission permission}s associated with an RHQ {@link Role
+ * role}.
*
* @author Ian Springer
*/
@@ -201,65 +201,65 @@ public class PermissionsItem extends CanvasItem {
ListGridRecord record = createResourcePermissionRecord("Inventory", "subsystems/inventory/Inventory",
Permission.VIEW_RESOURCE,
- "view Resource properties (name, description, version, etc.), connection settings, and connection settings history (IMPLIED)",
+ "(IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history",
Permission.MODIFY_RESOURCE,
"update Resource name, version, description, and connection settings; delete connection settings history items");
records.add(record);
record = createResourcePermissionRecord("Manage Measurements", "subsystems/monitor/Monitor",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view metric data and collection schedules",
Permission.MANAGE_MEASUREMENTS,
- "TODO");
+ "update metric collection schedules");
records.add(record);
record = createResourcePermissionRecord("Manage Alerts", "subsystems/alert/Alerts",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view alert definitions and alert history",
Permission.MANAGE_ALERTS,
- "TODO");
+ "create, update, and delete alert definitions; acknowledge and delete alert history items");
records.add(record);
record = createResourcePermissionRecord("Configure", "subsystems/configure/Configure",
Permission.CONFIGURE_READ,
- "TODO",
+ "view Resource configuration and Resource configuration revision history",
Permission.CONFIGURE_WRITE,
- "TODO");
+ "update Resource configuration; delete Resource configuration revision history items");
records.add(record);
record = createResourcePermissionRecord("Control", "subsystems/control/Operation",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view available operations and operation execution history",
Permission.CONTROL,
- "TODO");
+ "execute operations; delete operation execution history items");
records.add(record);
record = createResourcePermissionRecord("Manage Events", "subsystems/event/Events",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view events",
Permission.MANAGE_EVENTS,
- "TODO");
+ "delete events");
records.add(record);
record = createResourcePermissionRecord("Manage Content", "subsystems/content/Content",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view installed and available packages; view package installation history",
Permission.MANAGE_CONTENT,
- "TODO");
+ "subscribe to content sources; install and uninstall packages");
records.add(record);
record = createResourcePermissionRecord("Create Child Resources", "subsystems/inventory/Inventory",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view child creation history",
Permission.CREATE_CHILD_RESOURCES,
- "TODO");
+ "create new child Resources (for child Resources of types that are creatable)");
records.add(record);
record = createResourcePermissionRecord("Delete Child Resources", "subsystems/inventory/Inventory",
Permission.VIEW_RESOURCE,
- "TODO (IMPLIED)",
+ "(IMPLIED) view child deletion history",
Permission.DELETE_RESOURCE,
- "TODO");
+ "delete child Resources (for child Resources of types that are deletable)");
records.add(record);
grid.setData(records.toArray(new ListGridRecord[records.size()]));
13 years, 6 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java | 33 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java | 45 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java | 26 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 16 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java | 13 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java | 14 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 109 +++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 120 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 6
13 files changed, 272 insertions(+), 138 deletions(-)
New commits:
commit 521531d4002b1bc7217a864ad6190af7ca84f728
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 19 21:27:41 2010 -0500
I18N Work: Tabs
- tabbed views had/have a problem similar to the issue we had with our
view ids. In short, Tab provides only a title, which we were using both
for display and for viewpaths. I added NamedTab to allow us to keep
localized strings out of our urls, and to provide separation between
internal name and external title. NamedTab uses the same ViewName class
introduced for the ViewId issue. Also, there is an analogous NamedTabSet.
Names are now used for all non-display needs that were using title.
(as an aside, I don't care for ViewName but couldn't think of anything
better. Maybe NamedView, NamedItem, NamedTitle... if you have a pref we can
change it).
I applied the change to the Resource and ResourceGroup detail views. But
note that NamedTabSets may need to be applied where we are currently
using LocatableTabSets. It depends on whether the titles are being used
in any bookmarkable way. Needing potential change:
- SingleAlertDefinitionView
- BundleView
- BundleVersionView
- ConfigurationEditor
- DashboardsView
- fixed use of wrong prop in BundleTreeDataSource
- added a few more missing props
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
index 7cdb894..e105374 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
@@ -188,7 +188,7 @@ public class BundleTreeDataSource extends RPCDataSource {
TreeNode deploymentsNode = new TreeNode(MSG.view_bundle_destinations());
deploymentsNode.setID(bundle.getId() + "_destinations");
deploymentsNode.setParentID(String.valueOf(bundle.getId()));
- deploymentsNode.setName(MSG.view_bundle_versions());
+ deploymentsNode.setName(MSG.view_bundle_destinations());
records.add(deploymentsNode);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
new file mode 100644
index 0000000..848d760
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
@@ -0,0 +1,33 @@
+package org.rhq.enterprise.gui.coregui.client.components.tab;
+
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
+
+/**
+ * A Wrapper for org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab allowing for a Tab that separates
+ * internal naming and external title.
+ *
+ * @author Jay Shaughnessy
+ */
+public class NamedTab extends LocatableTab {
+
+ private ViewName viewName;
+
+ public NamedTab(String locatorId, ViewName viewName, String icon) {
+ super(locatorId, viewName.getTitle(), icon);
+ this.viewName = viewName;
+ }
+
+ public ViewName getViewName() {
+ return viewName;
+ }
+
+ public String getName() {
+ return viewName.getName();
+ }
+
+ public String getTitle() {
+ return viewName.getTitle();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
new file mode 100644
index 0000000..e7d4a98
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
@@ -0,0 +1,45 @@
+package org.rhq.enterprise.gui.coregui.client.components.tab;
+
+import com.smartgwt.client.widgets.tab.Tab;
+
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
+
+/**
+ * A Wrapper for org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet allowing for a Set of NamedTabs.
+ *
+ * @author Jay Shaughnessy
+ */
+public class NamedTabSet extends LocatableTabSet {
+
+ public NamedTabSet(String locatorId) {
+ super(locatorId);
+ }
+
+ public void setTabs(NamedTab... tabs) {
+ super.setTabs(tabs);
+ }
+
+ public NamedTab[] getTabs() {
+ Tab[] tabs = super.getTabs();
+ NamedTab[] namedTabs = new NamedTab[tabs.length];
+ for (int i = 0, tabsLength = tabs.length; i < tabsLength; i++) {
+ Tab tab = tabs[i];
+ if (!(tab instanceof NamedTab)) {
+ throw new IllegalStateException("NamedTabSet contains a Tab that is not a NamedTab.");
+ }
+ namedTabs[i] = (NamedTab) tab;
+ }
+ return namedTabs;
+ }
+
+ public NamedTab getTabByName(String name) {
+ NamedTab[] tabs = getTabs();
+ for (NamedTab tab : tabs) {
+ if (tab.getName().equals(name)) {
+ return tab;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
index e149772..b6296d7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.components.tab;
import com.smartgwt.client.widgets.Canvas;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableButton;
@@ -31,13 +32,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableButton;
*/
public class SubTab implements Locatable {
private String locatorId;
- private String title;
+ private ViewName viewName;
private Canvas canvas;
private LocatableButton button;
- public SubTab(String locatorId, String title, Canvas canvas) {
+ public SubTab(String locatorId, ViewName viewName, Canvas canvas) {
this.locatorId = locatorId;
- this.title = title;
+ this.viewName = viewName;
this.canvas = canvas;
this.button = null;
}
@@ -46,10 +47,6 @@ public class SubTab implements Locatable {
return locatorId;
}
- public String getTitle() {
- return title;
- }
-
public Canvas getCanvas() {
return canvas;
}
@@ -66,6 +63,18 @@ public class SubTab implements Locatable {
this.button = button;
}
+ public ViewName getViewName() {
+ return viewName;
+ }
+
+ public String getName() {
+ return viewName.getName();
+ }
+
+ public String getTitle() {
+ return viewName.getTitle();
+ }
+
@Override
public String extendLocatorId(String extension) {
return this.locatorId + "_" + extension;
@@ -73,6 +82,7 @@ public class SubTab implements Locatable {
@Override
public String toString() {
- return "SubTab[title=" + this.title + ", locatorId=" + this.locatorId + "]";
+ return "SubTab[title=" + this.viewName.getTitle() + ", name=" + this.viewName.getName() + ", locatorId="
+ + this.locatorId + "]";
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
index 135dcee..4797641 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
@@ -42,9 +42,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class SubTabLayout extends LocatableVLayout {
- /** maps subTab locator IDs to SubTabs */
+ /** maps subTab locator IDs to SubTabs. Unlike names, locatorIDs are qualified by the Tab and therefore unique. */
private Map<String, SubTab> subTabs = new LinkedHashMap<String, SubTab>();
- /** locator IDs of subTabs that are disabled */
+ /** locator IDs of subTabs that are disabled. Unlike names, locator IDs are qualified by the Tab and therefore unique. */
private Set<String> disabledSubTabs = new HashSet<String>();
private SubTab currentlyDisplayed;
@@ -221,10 +221,10 @@ public class SubTabLayout extends LocatableVLayout {
return foundTab;
}
- public SubTab getSubTabByTitle(String title) {
+ public SubTab getSubTabByName(String name) {
for (String subTabLocatorId : this.subTabs.keySet()) {
SubTab subTab = this.subTabs.get(subTabLocatorId);
- if (subTab.getTitle().equals(title)) {
+ if (subTab.getName().equals(name)) {
return subTab;
}
}
@@ -242,14 +242,14 @@ public class SubTabLayout extends LocatableVLayout {
return null;
}
- public boolean selectSubTabByTitle(String title) {
- SubTab subTab = getSubTabByTitle(title);
+ public boolean selectSubTabByName(String name) {
+ SubTab subTab = getSubTabByName(name);
if (subTab == null) {
return false;
} else {
if (this.disabledSubTabs.contains(subTab.getLocatorId())) {
// Nice try - user tried to select a disabled tab, probably by going directly to a bookmark URL.
- CoreGUI.getErrorHandler().handleError(MSG.view_subTab_error_disabled(title));
+ CoreGUI.getErrorHandler().handleError(MSG.view_subTab_error_disabled(subTab.getTitle()));
return false;
}
this.currentlySelected = subTab.getLocatorId();
@@ -280,7 +280,7 @@ public class SubTabLayout extends LocatableVLayout {
}
public void fireSubTabSelection() {
- TwoLevelTabSelectedEvent event = new TwoLevelTabSelectedEvent("?", getCurrentSubTab().getTitle(), -1,
+ TwoLevelTabSelectedEvent event = new TwoLevelTabSelectedEvent("?", getCurrentSubTab().getName(), -1,
getCurrentCanvas());
hm.fireEvent(event);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
index 4468d93..fa62e45 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
@@ -20,16 +20,17 @@ package org.rhq.enterprise.gui.coregui.client.components.tab;
import com.smartgwt.client.widgets.Canvas;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
/**
* @author Greg Hinkle
+ * @author Jay Shaughnessy
*/
-public class TwoLevelTab extends LocatableTab {
+public class TwoLevelTab extends NamedTab {
private SubTabLayout layout;
- public TwoLevelTab(String locatorId, String title, String icon) {
- super(locatorId, title, icon);
+ public TwoLevelTab(String locatorId, ViewName viewName, String icon) {
+ super(locatorId, viewName, icon);
layout = new SubTabLayout(locatorId);
}
@@ -56,8 +57,8 @@ public class TwoLevelTab extends LocatableTab {
}
}
- public SubTab getSubTabByTitle(String title) {
- return this.layout.getSubTabByTitle(title);
+ public SubTab getSubTabByName(String name) {
+ return this.layout.getSubTabByName(name);
}
public SubTab getSubTabByLocatorId(String locatorId) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
index d8e29b2..e256299 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
@@ -24,14 +24,12 @@ import com.smartgwt.client.widgets.tab.Tab;
import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
-
/**
* A tab set where each {@link TwoLevelTab tab} has one or more {@link SubTab subtab}s.
*
* @author Greg Hinkle
*/
-public class TwoLevelTabSet extends LocatableTabSet implements TabSelectedHandler, TwoLevelTabSelectedHandler {
+public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, TwoLevelTabSelectedHandler {
public TwoLevelTabSet(String locatorId) {
super(locatorId);
@@ -73,8 +71,8 @@ public class TwoLevelTabSet extends LocatableTabSet implements TabSelectedHandle
TwoLevelTab tab = (TwoLevelTab) getSelectedTab();
SubTab currentSubTab = tab.getLayout().getCurrentSubTab();
if (null != currentSubTab) {
- TwoLevelTabSelectedEvent event = new TwoLevelTabSelectedEvent(tab.getTitle(), tab.getLayout()
- .getCurrentSubTab().getTitle(), tabSelectedEvent.getTabNum(), tab.getLayout().getCurrentCanvas());
+ TwoLevelTabSelectedEvent event = new TwoLevelTabSelectedEvent(tab.getName(), tab.getLayout()
+ .getCurrentSubTab().getName(), tabSelectedEvent.getTabNum(), tab.getLayout().getCurrentCanvas());
m.fireEvent(event);
}
}
@@ -82,7 +80,7 @@ public class TwoLevelTabSet extends LocatableTabSet implements TabSelectedHandle
public void onTabSelected(TwoLevelTabSelectedEvent tabSelectedEvent) {
tabSelectedEvent.setTabNum(getSelectedTabNumber());
Tab tab = getSelectedTab();
- tabSelectedEvent.setId(tab.getTitle());
+ tabSelectedEvent.setId(this.getTabByTitle(tab.getTitle()).getName());
m.fireEvent(tabSelectedEvent);
}
@@ -96,6 +94,10 @@ public class TwoLevelTabSet extends LocatableTabSet implements TabSelectedHandle
return null;
}
+ public TwoLevelTab getTabByName(String name) {
+ return (TwoLevelTab) super.getTabByName(name);
+ }
+
public TwoLevelTab getTabByTitle(String title) {
return (TwoLevelTab) super.getTabByTitle(title);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java
index ebececd..e174c63 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java
@@ -2,6 +2,12 @@ package org.rhq.enterprise.gui.coregui.client.components.view;
import org.rhq.core.domain.util.StringUtils;
+/**
+ * A simple class that ties a private name to a displayed title. The title may very well change with locale but
+ * the name will stay constant. It's useful any time a viewable item does not itself provide for a name.
+ *
+ * @author Jay Shaughnessy
+ */
public class ViewName {
private String name;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index a494a6b..f07f7dc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -175,27 +175,27 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
/**
* Select the tab/subtab with the specified titles (e.g. "Monitoring", "Graphs").
*
- * @param tabTitle the title of the tab to select - if null, the default tab (the leftmost non-disabled one) will be selected
- * @param subtabTitle the title of the subtab to select - if null, the default subtab (the leftmost non-disabled one) will be selected
+ * @param tabName the title of the tab to select - if null, the default tab (the leftmost non-disabled one) will be selected
+ * @param subtabName the title of the subtab to select - if null, the default subtab (the leftmost non-disabled one) will be selected
* @param viewPath the view path, which may have additional view items to be rendered
*/
- public void selectTab(String tabTitle, String subtabTitle, ViewPath viewPath) {
+ public void selectTab(String tabName, String subtabName, ViewPath viewPath) {
try {
- TwoLevelTab tab = (tabTitle != null) ? this.tabSet.getTabByTitle(tabTitle) : this.tabSet.getDefaultTab();
+ TwoLevelTab tab = (tabName != null) ? this.tabSet.getTabByName(tabName) : this.tabSet.getDefaultTab();
if (tab == null || tab.getDisabled()) {
- CoreGUI.getErrorHandler().handleError("Invalid tab name: " + tabTitle);
+ CoreGUI.getErrorHandler().handleError(MSG.view_tabs_invalidTab(tabName));
// TODO: Should we fire a history event here to redirect to a valid bookmark?
tab = this.tabSet.getDefaultTab();
if (tab == null) {
throw new IllegalStateException("No default tab is defined.");
}
- subtabTitle = null;
+ subtabName = null;
}
// Do *not* select the tab and trigger the tab selected event until the subtab has been selected first.
- SubTab subtab = (subtabTitle != null) ? tab.getSubTabByTitle(subtabTitle) : tab.getDefaultSubTab();
+ SubTab subtab = (subtabName != null) ? tab.getSubTabByName(subtabName) : tab.getDefaultSubTab();
if (subtab == null || tab.getLayout().isSubTabDisabled(subtab)) {
- CoreGUI.getErrorHandler().handleError("Invalid subtab name: " + subtabTitle);
+ CoreGUI.getErrorHandler().handleError(MSG.view_tabs_invalidSubTab(subtabName));
// TODO: Should we fire a history event here to redirect to a valid bookmark?
subtab = tab.getLayout().getDefaultSubTab();
}
@@ -214,7 +214,7 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
this.tabSet.markForRedraw();
} catch (Exception e) {
- com.allen_sauer.gwt.log.client.Log.info("Failed to select tab " + tabTitle + "/" + subtabTitle + ": " + e);
+ com.allen_sauer.gwt.log.client.Log.info("Failed to select tab " + tabName + "/" + subtabName + ": " + e);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 7c82422..9897828 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -47,6 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
import org.rhq.enterprise.gui.coregui.client.components.tab.SubTab;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTab;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedEvent;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwoLevelTabSetView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.event.EventCompositeHistoryView;
@@ -101,8 +102,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
private SubTab configHistory;
private SubTab eventHistory;
- private String currentTab;
- private String currentSubTab;
+ private String currentTabName;
+ private String currentSubTabName;
public ResourceGroupDetailView(String locatorId, String baseViewPath) {
super(locatorId, baseViewPath);
@@ -118,14 +119,14 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
public void onTabSelected(TwoLevelTabSelectedEvent tabSelectedEvent) {
// if moving from membership subtab then re-load the detail view as the membership and
// group type may have changed.
- if ((null != this.groupId) && this.inventoryTab.getTitle().equals(currentTab)
- && this.inventoryMembership.getTitle().equals(currentSubTab)) {
+ if ((null != this.groupId) && this.inventoryTab.getName().equals(currentTabName)
+ && this.inventoryMembership.getName().equals(currentSubTabName)) {
String tabPath = "/" + tabSelectedEvent.getId() + "/" + tabSelectedEvent.getSubTabId();
String path = this.getBaseViewPath() + "/" + getSelectedItemId() + tabPath;
- this.currentTab = null;
- this.currentSubTab = null;
+ this.currentTabName = null;
+ this.currentSubTabName = null;
this.groupId = null;
CoreGUI.goToView(path);
@@ -143,62 +144,76 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), MSG.view_tabs_common_summary(),
- "/images/icons/Service_up_16.png");
- summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), MSG.view_tabs_common_overview(), null);
- summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), MSG.view_tabs_common_timeline(), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
+ .view_tabs_common_overview()), null);
+ summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), MSG.view_tabs_common_monitoring(),
- "/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), MSG.view_tabs_common_graphs(), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), MSG.view_tabs_common_tables(), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), MSG.view_tabs_common_traits(), null);
-
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), MSG.view_tabs_common_schedules(), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), MSG.view_tabs_common_calltime(), null);
+ monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), MSG.view_tabs_common_inventory(),
- "/images/icons/Inventory_grey_16.png");
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), MSG.view_tabs_common_members(), null);
- inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), MSG
- .view_tabs_common_connectionSettings(), null);
- inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), MSG
- .view_tabs_common_connectionSettingsHistory(), null);
- inventoryMembership = new SubTab(inventoryTab.extendLocatorId("Membership"), "Membership", null); // TODO this will merge with Members
+ inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
+ .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
+ inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members", MSG
+ .view_tabs_common_members()), null);
+ inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
+ "ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
+ inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
+ "ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null);
+ inventoryMembership = new SubTab(inventoryTab.extendLocatorId("Membership"), new ViewName("Membership", MSG
+ .view_tabs_common_membership()), null); // TODO this will merge with Members
inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory,
this.inventoryMembership);
tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), MSG.view_tabs_common_operations(),
- "/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), MSG.view_tabs_common_scheduled(), null);
+ operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", MSG
+ .view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), MSG.view_tabs_common_alerts(),
- "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), MSG.view_tabs_common_definitions(), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
- configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), MSG
- .view_tabs_common_configuration(), "/images/icons/Configure_grey_16.png");
- this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), MSG.view_tabs_common_current(),
- null);
- this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), MSG.view_tabs_common_history(),
- null);
+ configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration",
+ MSG.view_tabs_common_configuration()), "/images/icons/Configure_grey_16.png");
+ this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), MSG.view_tabs_common_events(),
- "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
@@ -394,9 +409,9 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
}
@Override
- public void selectTab(String tabTitle, String subtabTitle, ViewPath viewPath) {
- currentTab = tabTitle;
- currentSubTab = subtabTitle;
- super.selectTab(tabTitle, subtabTitle, viewPath);
+ public void selectTab(String tabName, String subtabName, ViewPath viewPath) {
+ currentTabName = tabName;
+ currentSubTabName = subtabName;
+ super.selectTab(tabName, subtabName, viewPath);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 6064964..190dda3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.alert.definitions.ResourceAlertDefi
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
import org.rhq.enterprise.gui.coregui.client.components.tab.SubTab;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTab;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwoLevelTabSetView;
@@ -121,80 +122,97 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), MSG.view_tabs_common_summary(),
- "/images/icons/Service_up_16.png");
- summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), MSG.view_tabs_common_overview(), null);
- summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), MSG.view_tabs_common_dashboard(), null);
- summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), MSG.view_tabs_common_timeline(), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
+ .view_tabs_common_overview()), null);
+ summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), new ViewName("Dashboard", MSG
+ .view_tabs_common_dashboard()), null);
+ summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryDashboard, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), MSG.view_tabs_common_monitoring(),
- "/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), MSG.view_tabs_common_graphs(), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), MSG.view_tabs_common_tables(), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), MSG.view_tabs_common_traits(), null);
- monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), MSG.view_tabs_common_availability(),
- null);
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), MSG.view_tabs_common_schedules(), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), MSG.view_tabs_common_calltime(), null);
+ monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+ monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), new ViewName("Availability", MSG
+ .view_tabs_common_availability()), null);
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorAvail, monitorSched,
monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), MSG.view_tabs_common_inventory(),
- "/images/icons/Inventory_grey_16.png");
- inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"),
- MSG.view_tabs_common_child_resources(), null);
- inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), MSG
- .view_tabs_common_child_history(), null);
- inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), MSG
- .view_tabs_common_connectionSettings(), null);
- inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnSetHist"), MSG
- .view_tabs_common_connectionSettingsHistory(), null);
- inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), MSG.view_tabs_common_groups(), null);
- inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), MSG
- .view_tabs_common_group_membership(), null);
+ inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
+ .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
+ inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), new ViewName("Children", MSG
+ .view_tabs_common_child_resources()), null);
+ inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), new ViewName("ChildHistory", MSG
+ .view_tabs_common_child_history()), null);
+ inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
+ "ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
+ inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnSetHist"), new ViewName(
+ "ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null);
+ inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), new ViewName("Groups", MSG
+ .view_tabs_common_groups()), null);
+ inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), new ViewName(
+ "GroupMembership", MSG.view_tabs_common_group_membership()), null);
inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory, this.inventoryConn,
this.inventoryConnHistory, this.inventoryGroups, this.inventoryGroupMembership);
tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), MSG.view_tabs_common_operations(),
- "/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), MSG.view_tabs_common_scheduled(), null);
+ operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", MSG
+ .view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), MSG.view_tabs_common_alerts(),
- "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), MSG.view_tabs_common_definitions(), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
- configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), MSG
- .view_tabs_common_configuration(), "/images/icons/Configure_grey_16.png");
- this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), MSG.view_tabs_common_current(),
- null);
- this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), MSG.view_tabs_common_history(),
- null);
+ configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration",
+ MSG.view_tabs_common_configuration()), "/images/icons/Configure_grey_16.png");
+ this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), MSG.view_tabs_common_events(),
- "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
- contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), MSG.view_tabs_common_content(),
- "/images/icons/Content_grey_16.png");
- this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), MSG.view_tabs_common_deployed(), null);
- this.contentNew = new SubTab(contentTab.extendLocatorId("New"), MSG.view_tabs_common_new(), null);
- this.contentSubscrip = new SubTab(contentTab.extendLocatorId("Subscriptions"), MSG
- .view_tabs_common_subscriptions(), null);
- this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null);
+ contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), new ViewName("Content", MSG
+ .view_tabs_common_content()), "/images/icons/Content_grey_16.png");
+ this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), new ViewName("Deployed", MSG
+ .view_tabs_common_deployed()), null);
+ this.contentNew = new SubTab(contentTab.extendLocatorId("New"),
+ new ViewName("New", MSG.view_tabs_common_new()), null);
+ this.contentSubscrip = new SubTab(contentTab.extendLocatorId("Subscriptions"), new ViewName("Subscriptions",
+ MSG.view_tabs_common_subscriptions()), null);
+ this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip, contentHistory);
tabs.add(contentTab);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
index 0dda6bf..fee5e59 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
@@ -46,7 +46,7 @@ public class LocatableTabSet extends TabSet {
super.setTabs(tabs);
}
- public LocatableTab[] getTabs() {
+ public LocatableTab[] getTabs() {
Tab[] tabs = super.getTabs();
LocatableTab[] locatableTabs = new LocatableTab[tabs.length];
for (int i = 0, tabsLength = tabs.length; i < tabsLength; i++) {
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 5d5ca3f..1dc9f3a 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
@@ -1004,6 +1004,10 @@ view_type_resourceTypes=Resource Types~
view_type_parentId=Parent ID~
view_type_typeTreeLoadFailure=Failed to load resource type tree data~
+# Tabs
+view_tabs_invalidSubTab = Invalid subtab: {0}~
+view_tabs_invalidTab = Invalid tab: {0}~
+
#=================== Dashboard =====================
view_dashboard_favorites_error1=Failed to load favorite Resources.~
view_dashboardManager_error=Failed to save dashboard to server~
@@ -1190,6 +1194,7 @@ view_tabs_common_inventory=Inventory~
view_tabs_common_groups=Groups~
view_tabs_common_group_membership=Group Membership~
view_tabs_common_members=Members~
+view_tabs_common_membership=Membership~
view_tabs_common_child_resources=Child Resources~
view_tabs_common_child_history=Child History~
view_tabs_common_connectionSettings=Connection Settings~
@@ -1457,7 +1462,6 @@ view_login_registerUser = Register User~
view_login_welcome = Welcome~
view_login_welcomeMsg = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~
-
# Menu Bar
#--------------
view_menuBar_help = Help~
13 years, 7 months