modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
| 99 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java
| 40 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
| 31 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
| 17 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
| 83 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java
| 126 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java
| 12
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 43 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
| 43 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 50 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
| 41 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
| 45 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
| 43 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
| 28 ++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
| 43 ++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
| 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java
| 4
19 files changed, 681 insertions(+), 91 deletions(-)
New commits:
commit 8dfcad9d2bdb3138651e19e65e784c999106a5d6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jul 24 17:28:38 2013 -0400
Work in progress - getting new bundle perms integrated into role views
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 40e3150..5b009b5 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
@@ -145,15 +145,15 @@ public enum Permission {
/**
* Can create Bundle [Versions]s
+ * Can assign to viewable bundle groups
* Can create global Bundle [Versions] if holding Global.VIEW_BUNDLES
- * Can assign to viewable bundle groups
*/
CREATE_BUNDLES(Target.GLOBAL), // 19
/**
- * Can delete bundle [Versions]s from viewable groups
+ * Can delete viewable bundle [Versions]s
+ * Can unassign from viewable bundle groups
* Can delete global bundles if holding Global.VIEW_BUNDLES
- * Can unassign from viewable bundle groups
*/
DELETE_BUNDLES(Target.GLOBAL), // 20
@@ -188,7 +188,7 @@ public enum Permission {
/**
* Can delete bundle [version]s from the bundle group
*/
- DELETE_BUNDLES_IN_GROUP(Target.BUNDLE), // 26
+ DELETE_BUNDLES_FROM_GROUP(Target.BUNDLE), // 26
/**
* Implied - Can view bundles in the bundle group
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index d949617..cde2c6d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -48,8 +48,8 @@ import org.rhq.core.domain.authz.Role;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVStack;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* An editor for editing the set of RHQ {@link Permission permission}s associated with an
RHQ {@link Role role}.
@@ -62,6 +62,7 @@ public class PermissionsEditor extends EnhancedVStack {
private ListGrid globalPermissionsGrid;
private ListGrid resourcePermissionsGrid;
+ private ListGrid bundleGroupPermissionsGrid;
private Set<Permission> selectedPermissions;
private RoleEditView roleEditView;
private boolean isReadOnly;
@@ -99,6 +100,10 @@ public class PermissionsEditor extends EnhancedVStack {
this.resourcePermissionsGrid = createResourcePermissionsGrid();
addMember(this.resourcePermissionsGrid);
+
+ this.bundleGroupPermissionsGrid = createBundleGroupPermissionsGrid();
+ addMember(this.bundleGroupPermissionsGrid);
+
}
public void reset() {
@@ -162,31 +167,57 @@ public class PermissionsEditor extends EnhancedVStack {
grid.setFields(iconField, displayNameField, authorizedField, descriptionField);
List<ListGridRecord> records = new ArrayList<ListGridRecord>();
- ListGridRecord record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSecurity(),
+ ListGridRecord record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSecurity(),
"global/Locked", Permission.MANAGE_SECURITY,
MSG.view_adminRoles_permissions_permDesc_manageSecurity());
records.add(record);
- record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageInventory(),
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageInventory(),
"subsystems/inventory/Inventory", Permission.MANAGE_INVENTORY,
MSG.view_adminRoles_permissions_permDesc_manageInventory());
records.add(record);
- record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSettings(),
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSettings(),
"subsystems/configure/Configure", Permission.MANAGE_SETTINGS,
MSG.view_adminRoles_permissions_permDesc_manageSettings(productInfo.getShortName()));
records.add(record);
- record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundles(),
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageRepositories(),
+ "subsystems/content/Content", Permission.MANAGE_REPOSITORIES,
+ MSG.view_adminRoles_permissions_permDesc_manageRepositories());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundles(),
"subsystems/bundle/Bundle", Permission.MANAGE_BUNDLE,
MSG.view_adminRoles_permissions_permDesc_manageBundles());
records.add(record);
- record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageRepositories(),
- "subsystems/content/Content", Permission.MANAGE_REPOSITORIES,
- MSG.view_adminRoles_permissions_permDesc_manageRepositories());
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundleGroups(),
+ "subsystems/content/Content", Permission.MANAGE_BUNDLE_GROUPS,
+ MSG.view_adminRoles_permissions_permDesc_manageBundleGroups());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_createBundles(),
+ "subsystems/content/Content", Permission.CREATE_BUNDLES,
+ MSG.view_adminRoles_permissions_permDesc_createBundles());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_deleteBundles(),
+ "subsystems/content/Content", Permission.DELETE_BUNDLES,
+ MSG.view_adminRoles_permissions_permDesc_deleteBundles());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewBundles(),
+ "subsystems/content/Content", Permission.VIEW_BUNDLES,
+ MSG.view_adminRoles_permissions_permDesc_viewBundles());
records.add(record);
- record =
createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(),
"global/User",
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_deployBundles(),
+ "subsystems/content/Content", Permission.DEPLOY_BUNDLES,
+ MSG.view_adminRoles_permissions_permDesc_deployBundles());
+ records.add(record);
+
+
+ record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(),
"global/User",
Permission.VIEW_USERS,
MSG.view_adminRoles_permissions_permDesc_viewUsers());
records.add(record);
@@ -280,6 +311,54 @@ public class PermissionsEditor extends EnhancedVStack {
return grid;
}
+ private ListGrid createBundleGroupPermissionsGrid() {
+ ListGrid grid = createPermissionsGrid();
+ // TODO: Add table title.
+
+ ListGridField iconField = createIconField();
+
+ ListGridField displayNameField = new ListGridField("displayName",
MSG.common_title_name(), 130);
+
+ ListGridField descriptionField = new ListGridField("description",
MSG.common_title_description());
+ descriptionField.setWrap(true);
+
+ final ListGridField authorizedField =
createAuthorizedField("authorized",
+ MSG.view_adminRoles_permissions_isAuthorized(), "name", grid,
false);
+
+ grid.setFields(iconField, displayNameField, authorizedField, descriptionField);
+
+ List<ListGridRecord> records = new ArrayList<ListGridRecord>();
+
+ ListGridRecord record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_assignBundlesToGroup(),
+ "subsystems/bundle/Bundle", Permission.ASSIGN_BUNDLES_TO_GROUP,
+ MSG.view_adminRoles_permissions_permDesc_assignBundlesToGroup());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_unassignBundlesFromGroup(),
+ "subsystems/bundle/Bundle",
Permission.UNASSIGN_BUNDLES_FROM_GROUP,
+ MSG.view_adminRoles_permissions_permDesc_unassignBundlesFromGroup());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_createBundlesInGroup(),
+ "subsystems/bundle/Bundle", Permission.CREATE_BUNDLES_IN_GROUP,
+ MSG.view_adminRoles_permissions_permDesc_createBundlesInGroup());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_deleteBundlesFromGroup(),
+ "subsystems/bundle/Bundle", Permission.DELETE_BUNDLES_FROM_GROUP,
+ MSG.view_adminRoles_permissions_permDesc_deleteBundlesFromGroup());
+ records.add(record);
+
+ record =
createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewBundlesInGroup(),
+ "subsystems/bundle/Bundle", Permission.VIEW_BUNDLES_IN_GROUP,
+ MSG.view_adminRoles_permissions_permDesc_viewBundlesInGroup());
+ records.add(record);
+
+ grid.setData(records.toArray(new ListGridRecord[records.size()]));
+
+ return grid;
+ }
+
private ListGridField createIconField() {
ListGridField iconField = new ListGridField("icon",
" ", 28);
iconField.setShowDefaultContextMenu(false);
@@ -420,7 +499,7 @@ public class PermissionsEditor extends EnhancedVStack {
}
}
- private ListGridRecord createGlobalPermissionRecord(String displayName, String icon,
Permission globalPermission,
+ private ListGridRecord createPermissionRecord(String displayName, String icon,
Permission globalPermission,
String description) {
ListGridRecord record = new ListGridRecord();
record.setAttribute("displayName", displayName);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java
new file mode 100644
index 0000000..e3876ca
--- /dev/null
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java
@@ -0,0 +1,40 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.admin.roles;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupSelector;
+
+
+/**
+ * @author Jay Shaughnessy
+ */
+public class RoleBundleGroupSelector extends BundleGroupSelector {
+
+ public RoleBundleGroupSelector(ListGridRecord[] bundleGroupRecords, boolean
isReadOnly) {
+ super(isReadOnly);
+
+ setAssigned(bundleGroupRecords);
+ }
+
+}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index 941c7ee..63b6e3f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource;
+import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupSelector;
import org.rhq.enterprise.gui.coregui.client.components.form.AbstractRecordEditor;
import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm;
import
org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
@@ -75,6 +76,9 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
private Tab ldapGroupsTab;
private RoleLdapGroupSelector ldapGroupSelector;
+ private Tab bundleGroupsTab;
+ private BundleGroupSelector bundleGroupSelector;
+
private boolean hasManageSecurityPermission;
private boolean isLdapConfigured;
private boolean isSystemRole;
@@ -161,6 +165,9 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
if (!this.isSystemRole) {
this.resourceGroupsTab = buildResourceGroupsTab(tabSet);
tabSet.addTab(resourceGroupsTab);
+
+ this.bundleGroupsTab = buildBundleGroupsTab(tabSet);
+ tabSet.addTab(bundleGroupsTab);
}
this.subjectsTab = buildSubjectsTab(tabSet);
@@ -189,6 +196,13 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
return tab;
}
+ private Tab buildBundleGroupsTab(TabSet tabSet) {
+ Tab tab = new Tab(MSG.common_title_bundleGroups(),
ImageManager.getBundleIcon());
+ // NOTE: We will set the tab content to the bundle group selector later once the
Role has been fetched.
+
+ return tab;
+ }
+
private Tab buildSubjectsTab(TabSet tabSet) {
Tab tab = new Tab(MSG.common_title_users(), "global/User_16.png");
// NOTE: We will set the tab content to the subject selector later once the Role
has been fetched.
@@ -244,6 +258,18 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
}
});
updateTab(this.resourceGroupsTab, this.resourceGroupSelector);
+
+ Record[] bundleGroupRecords =
record.getAttributeAsRecordArray(RolesDataSource.Field.BUNDLE_GROUPS);
+ ListGridRecord[] bundleGroupListGridRecords =
toListGridRecordArray(bundleGroupRecords);
+ this.bundleGroupSelector = new
RoleBundleGroupSelector(bundleGroupListGridRecords,
+ !this.hasManageSecurityPermission);
+ this.bundleGroupSelector.addAssignedItemsChangedHandler(new
AssignedItemsChangedHandler() {
+ public void onSelectionChanged(AssignedItemsChangedEvent event) {
+ onItemChanged();
+ }
+ });
+ updateTab(this.resourceGroupsTab, this.resourceGroupSelector);
+
}
ListGridRecord[] subjectListGridRecords =
toListGridRecordArray(subjectRecords);
@@ -341,6 +367,11 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
getForm().setValue(RolesDataSource.Field.LDAP_GROUPS, ldapGroupRecords);
}
+ if (this.bundleGroupSelector != null) {
+ ListGridRecord[] bundleGroupRecords =
this.bundleGroupSelector.getSelectedRecords();
+ getForm().setValue(RolesDataSource.Field.BUNDLE_GROUPS, bundleGroupRecords);
+ }
+
// Submit the form values to the datasource.
super.save(requestProperties);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
index b454fad..047dacc 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
@@ -37,11 +37,13 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.bundle.BundleGroup;
import org.rhq.core.domain.criteria.RoleCriteria;
import org.rhq.core.domain.resource.group.LdapGroup;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource;
+import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupsDataSource;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.RoleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource;
@@ -61,6 +63,7 @@ public class RolesDataSource extends RPCDataSource<Role,
RoleCriteria> {
public static final String NAME = "name";
public static final String DESCRIPTION = "description";
public static final String RESOURCE_GROUPS = "resourceGroups";
+ public static final String BUNDLE_GROUPS = "bundleGroups";
public static final String PERMISSIONS = "permissions";
public static final String SUBJECTS = "subjects";
public static final String LDAP_GROUPS = "ldapGroups";
@@ -125,6 +128,10 @@ public class RolesDataSource extends RPCDataSource<Role,
RoleCriteria> {
MSG.datasource_roles_field_ldapGroups());
fields.add(ldapGroupsField);
+ DataSourceField bundleGroupsField = new DataSourceField(Field.BUNDLE_GROUPS,
FieldType.ANY,
+ MSG.common_title_bundleGroups());
+ fields.add(bundleGroupsField);
+
return fields;
}
@@ -223,6 +230,10 @@ public class RolesDataSource extends RPCDataSource<Role,
RoleCriteria> {
Set<LdapGroup> ldapGroups = new
RoleLdapGroupSelector.LdapGroupsDataSource().buildDataObjects(ldapGroupRecords);
to.setLdapGroups(ldapGroups);
+ Record[] bundleGroupRecords =
from.getAttributeAsRecordArray(Field.BUNDLE_GROUPS);
+ Set<BundleGroup> bundleGroups =
BundleGroupsDataSource.getInstance().buildDataObjects(bundleGroupRecords);
+ to.setBundleGroups(bundleGroups);
+
return to;
}
@@ -256,6 +267,12 @@ public class RolesDataSource extends RPCDataSource<Role,
RoleCriteria> {
ListGridRecord[] ldapGroupRecords = new
RoleLdapGroupSelector.LdapGroupsDataSource()
.buildRecords(ldapGroups);
targetRecord.setAttribute(Field.LDAP_GROUPS, ldapGroupRecords);
+
+ Set<BundleGroup> bundleGroups = sourceRole.getBundleGroups();
+ ListGridRecord[] bundleGroupRecords = BundleGroupsDataSource.getInstance()
+ .buildRecords(bundleGroups, false);
+ targetRecord.setAttribute(Field.BUNDLE_GROUPS, bundleGroupRecords);
+
}
return targetRecord;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
new file mode 100644
index 0000000..3a5c047
--- /dev/null
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
@@ -0,0 +1,83 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.bundle.group;
+
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.TextItem;
+
+import org.rhq.core.domain.bundle.BundleGroup;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
+import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+/**
+ * @author Jay Shaughnessy
+ */
+public class BundleGroupSelector extends AbstractSelector<BundleGroup,
BundleGroupCriteria> {
+
+
+ public BundleGroupSelector() {
+ this(false);
+ }
+
+ public BundleGroupSelector(boolean isReadOnly) {
+ super(isReadOnly);
+ }
+
+ protected DynamicForm getAvailableFilterForm() {
+ DynamicForm availableFilterForm = new DynamicForm();
+ availableFilterForm.setNumCols(4);
+ final TextItem search = new TextItem("search",
MSG.common_title_search());
+
+ availableFilterForm.setItems(search);
+
+ return availableFilterForm;
+ }
+
+ protected RPCDataSource<BundleGroup, BundleGroupCriteria> getDataSource() {
+ return new SelectedBundleGroupsDataSource();
+ }
+
+ protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
+ String search = (String) availableFilterForm.getValue("search");
+
+ Criteria latestCriteria = new Criteria();
+ latestCriteria.addCriteria("search", search);
+
+ return latestCriteria;
+ }
+
+ @Override
+ protected String getItemTitle() {
+ return MSG.common_title_bundleGroups();
+ }
+
+ public class SelectedBundleGroupsDataSource extends BundleGroupsDataSource {
+ @Override
+ protected BundleGroupCriteria getFetchCriteria(final DSRequest request) {
+ BundleGroupCriteria result = super.getFetchCriteria(request);
+ if (null != result) {
+ result.setStrict(false);
+ }
+ return result;
+ }
+ }
+}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java
new file mode 100644
index 0000000..4f76f06
--- /dev/null
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java
@@ -0,0 +1,126 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.bundle.group;
+
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.bundle.BundleGroup;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+/**
+ * @author Jay Shaughnessy
+ */
+public class BundleGroupsDataSource extends RPCDataSource<BundleGroup,
BundleGroupCriteria> {
+
+ private BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService();
+
+ private static BundleGroupsDataSource INSTANCE;
+
+ public static BundleGroupsDataSource getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new BundleGroupsDataSource();
+ }
+ return INSTANCE;
+ }
+
+ public BundleGroupsDataSource() {
+ super();
+ List<DataSourceField> fields = addDataSourceFields();
+ addFields(fields);
+ }
+
+ @Override
+ protected List<DataSourceField> addDataSourceFields() {
+ List<DataSourceField> fields = super.addDataSourceFields();
+
+ DataSourceIntegerField idField = new DataSourceIntegerField("id",
MSG.common_title_id());
+ idField.setPrimaryKey(true);
+ fields.add(idField);
+
+ DataSourceTextField nameField = new DataSourceTextField("name",
MSG.common_title_name());
+ fields.add(nameField);
+
+ DataSourceTextField descriptionField = new
DataSourceTextField("description", MSG.common_title_description());
+ fields.add(descriptionField);
+
+ return fields;
+ }
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response, final
BundleGroupCriteria criteria) {
+ bundleService.findBundleGroupsByCriteria(criteria, new
AsyncCallback<PageList<BundleGroup>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.dataSource_bundle_loadFailed(),
caught);
+ response.setStatus(DSResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(PageList<BundleGroup> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.getTotalSize());
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ @Override
+ protected BundleGroupCriteria getFetchCriteria(final DSRequest request) {
+ BundleGroupCriteria criteria = new BundleGroupCriteria();
+ // may support tags in future, but not in rev1
+ //criteria.addFilterTagNamespace(getFilter(request, "tagNamespace",
String.class));
+ //criteria.addFilterTagSemantic(getFilter(request, "tagSemantic",
String.class));
+ //criteria.addFilterTagName(getFilter(request, "tagName",
String.class));
+ //criteria.addFilterTagSemantic(getFilter(request, "tagSemantic",
String.class));
+ criteria.addFilterName(getFilter(request, "search", String.class));
+
+ return criteria;
+ }
+
+ @Override
+ public BundleGroup copyValues(Record from) {
+ return (BundleGroup) from.getAttributeAsObject("object");
+ }
+
+ @Override
+ public ListGridRecord copyValues(BundleGroup from) {
+ ListGridRecord record = new ListGridRecord();
+
+ record.setAttribute("id", from.getId());
+ record.setAttribute("name", from.getName());
+ record.setAttribute("description", from.getDescription());
+
+ record.setAttribute("object", from);
+
+ return record;
+ }
+}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java
index 54c3085..cd108b7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java
@@ -27,6 +27,7 @@ import org.rhq.core.domain.bundle.Bundle;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleDestination;
import org.rhq.core.domain.bundle.BundleFile;
+import org.rhq.core.domain.bundle.BundleGroup;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleType;
import org.rhq.core.domain.bundle.BundleVersion;
@@ -37,6 +38,7 @@ import org.rhq.core.domain.criteria.BundleCriteria;
import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.criteria.BundleFileCriteria;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.util.PageList;
@@ -70,6 +72,8 @@ public interface BundleGWTService extends RemoteService {
PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws
RuntimeException;
+ PageList<BundleGroup> findBundleGroupsByCriteria(BundleGroupCriteria criteria)
throws RuntimeException;
+
PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(BundleCriteria
criteria) throws RuntimeException;
PageList<BundleDeployment>
findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java
index e51383d..88458b8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java
@@ -25,6 +25,7 @@ import org.rhq.core.domain.bundle.Bundle;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleDestination;
import org.rhq.core.domain.bundle.BundleFile;
+import org.rhq.core.domain.bundle.BundleGroup;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleType;
import org.rhq.core.domain.bundle.BundleVersion;
@@ -35,6 +36,7 @@ import org.rhq.core.domain.criteria.BundleCriteria;
import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.criteria.BundleFileCriteria;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.util.PageList;
@@ -234,6 +236,16 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl
implements Bund
}
@Override
+ public PageList<BundleGroup> findBundleGroupsByCriteria(BundleGroupCriteria
criteria) throws RuntimeException {
+ try {
+ PageList<BundleGroup> results =
bundleManager.findBundleGroupsByCriteria(getSessionSubject(), criteria);
+ return SerialUtility.prepare(results,
"findBundleGroupsByCriteria");
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
+
+ @Override
public PageList<Bundle>
findBundlesByCriteriaWithDestinationFilter(BundleCriteria criteria) throws
RuntimeException {
try {
PageList<Bundle> results =
bundleManager.findBundlesByCriteriaWithDestinationFilter(getSessionSubject(), criteria);
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 19d3fa5..1f9c73c 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
@@ -43,17 +43,6 @@ common_button_ack_all = Acknowledge All
common_button_add = Add
common_button_advanced = Advanced...
common_button_apply = Apply
-common_buttonbar_custom_window_title= Date Range
-common_buttonbar_custom_window_subtitle= Custom
-common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-common_buttonbar_datetime_format_moment_js= MM/DD/YYYY h:mm a
-common_buttonbar_end_date= End Date
-common_buttonbar_end_time= End Time
-common_buttonbar_start_date= Start Date
-common_buttonbar_start_time= Start Time
-common_buttonbar_custom = Custom...
-common_buttonbar_custom_cancel = Cancel
-common_buttonbar_custom_save = Save
common_button_cancel = Cancel
common_button_close = Close
common_button_compare = Compare
@@ -86,6 +75,17 @@ common_button_set = Set
common_button_showDetails = Show Details...
common_button_unignore = Unignore
common_button_uninventory = Uninventory
+common_buttonbar_custom = Custom...
+common_buttonbar_custom_cancel = Cancel
+common_buttonbar_custom_save = Save
+common_buttonbar_custom_window_subtitle = Custom
+common_buttonbar_custom_window_title = Date Range
+common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+common_buttonbar_datetime_format_moment_js = MM/DD/YYYY h:mm a
+common_buttonbar_end_date = End Date
+common_buttonbar_end_time = End Time
+common_buttonbar_start_date = Start Date
+common_buttonbar_start_time = Start Time
common_calendar_april_short = apr
common_calendar_august_short = aug
common_calendar_december_short = dec
@@ -158,6 +158,7 @@ common_title_available_resources = Available Resources
common_title_average_metrics = Average Metrics per Minute
common_title_background = Background
common_title_bundle = Bundle
+common_title_bundleGroups = Bundle Groups
common_title_bundles = Bundles
common_title_category = Category
common_title_change_refresh_time = Refresh Interval
@@ -511,11 +512,21 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = Authorized?
view_adminRoles_permissions_isRead = Read?
view_adminRoles_permissions_isWrite = Write?
+view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to
the bundle group
+view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete
provisioning bundles (viewing is implied for everyone)
view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as
described below, for all Resources; can create, update, and delete groups; and can import
auto-discovered or manually discovered Resources
view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete
repositories of any user (everyone can create their own repositories), can associate
content sources to repositories.
view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete users
and roles - implies all other permissions
view_adminRoles_permissions_permDesc_manageSettings = can modify the {0} Server
configuration and perform any Server-related functionality
+view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete)
a bundle from the bundle group
+view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception
of their assigned roles
view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and
Resource configuration revision history
view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations
and operation execution history
@@ -537,12 +548,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = subscribe
to content s
view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift
definitions; and manage drift instances
view_adminRoles_permissions_permWriteDesc_manageEvents = delete events
view_adminRoles_permissions_permWriteDesc_manageMeasurements = update metric collection
schedules
+view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = Configure
view_adminRoles_permissions_perm_control = Control
+view_adminRoles_permissions_perm_createBundles = Create Bundles
+view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = Create Child Resources
+view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources
+view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = Inventory
view_adminRoles_permissions_perm_manageAlerts = Manage Alerts
+view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = Manage Bundles
view_adminRoles_permissions_perm_manageContent = Manage Content
view_adminRoles_permissions_perm_manageDrift = Manage Drift
@@ -552,6 +570,9 @@ view_adminRoles_permissions_perm_manageMeasurements = Manage
Measurements
view_adminRoles_permissions_perm_manageRepositories = Manage Repositories
view_adminRoles_permissions_perm_manageSecurity = Manage Security
view_adminRoles_permissions_perm_manageSettings = Manage Settings
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+view_adminRoles_permissions_perm_viewBundles = View Bundles
+view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
view_adminRoles_permissions_perm_viewUsers = View Users
view_adminRoles_permissions_read = Read:
view_adminRoles_permissions_readAccessImplied = Read access for the {0} permission is
implied and cannot be disabled.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index f71f907..4e73829 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -66,17 +66,6 @@ common_button_ack_all = Potvrdit všechny
common_button_add = Přidat
common_button_advanced = Rozšířené...
common_button_apply = Použít
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-common_buttonbar_datetime_format=dd.MM.yy hh:mm
-common_buttonbar_datetime_format_moment_js= DD.MM.YY HH:mm
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= Start Date
-##common_buttonbar_start_time= Start Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = Storno
common_button_close = Zavřít
common_button_compare = Porovnat
@@ -109,6 +98,17 @@ common_button_set = Nastavit
common_button_showDetails = Zobrazi detaily...
##common_button_unignore = Unignore
common_button_uninventory = Odstranit z inventáře
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+common_buttonbar_datetime_format = dd.MM.yy hh:mm
+common_buttonbar_datetime_format_moment_js = DD.MM.YY HH:mm
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = Start Date
+##common_buttonbar_start_time = Start Time
common_calendar_april_short = dub
common_calendar_august_short = srp
common_calendar_december_short = pro
@@ -180,6 +180,7 @@ common_title_available_resources = Dostupné zdroje
common_title_average_metrics = Průměrné metriky za minutu
common_title_background = Pozadí
common_title_bundle = Balík
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = Balíky
common_title_category = Kategorie
common_title_change_refresh_time = Obnovovací interval
@@ -530,11 +531,21 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = Autorizován?
view_adminRoles_permissions_isRead = Čtení?
view_adminRoles_permissions_isWrite = Zápis?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles = může vytvářet, měnit, mazat balíky
(zobrazovat může kdokoli)
view_adminRoles_permissions_permDesc_manageInventory = má všechna práva zdroje: může
vytvářet, měnit, mazat skupiny, může importovat automaticky nebo manuálně nalezené zdroje
view_adminRoles_permissions_permDesc_manageRepositories = může vytvářet, měnit, mazat
repozitáře jakýchkoli uživatelů (každý může vytvářet své repozitáře), může asociovat
zdroje obsahů s repozitáři
view_adminRoles_permissions_permDesc_manageSecurity = může vytvářet, měnit, mazat
uživatele a role - implikuje všechna ostatní povolení
view_adminRoles_permissions_permDesc_manageSettings = může modifikovat {0} serverovou
konfiguraci a provozovat jakékoli operace související se serverem
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
view_adminRoles_permissions_permDesc_viewUsers = může zobrazovat ostatní uživatele s
výjimkou jejich přiřazených rolí
view_adminRoles_permissions_permReadDesc_configure = zobrazí konfiguraci zdroje a
historii konfigurace zdroje
view_adminRoles_permissions_permReadDesc_control = (VÝCHOZÍ) zobrazí dostupné operace a
historii spouštění operací
@@ -556,12 +567,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = přihlásit
se k odbě
view_adminRoles_permissions_permWriteDesc_manageDrift = vytvořit, změnit a smazat
definici driftu
view_adminRoles_permissions_permWriteDesc_manageEvents = mazat události
view_adminRoles_permissions_permWriteDesc_manageMeasurements = měnit rozvrhy sběru
metrik
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = Konfigurovat
view_adminRoles_permissions_perm_control = Ovládání
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = Vytvářet potomky zdrojů
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = Vytvářet potomky zdrojů
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = Inventarizovat
view_adminRoles_permissions_perm_manageAlerts = Spravovat výstrahy
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = Spravovat balíky
view_adminRoles_permissions_perm_manageContent = Spravovat obsah
view_adminRoles_permissions_perm_manageDrift = Spravovat drift
@@ -571,6 +589,9 @@ view_adminRoles_permissions_perm_manageMeasurements = Spravovat
měření
view_adminRoles_permissions_perm_manageRepositories = Spravovat repozitáře
view_adminRoles_permissions_perm_manageSecurity = Spravovat bezpečnost
view_adminRoles_permissions_perm_manageSettings = Spravovat nastavení
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
view_adminRoles_permissions_perm_viewUsers = Zobrazit uživatelé
view_adminRoles_permissions_read = Číst:
view_adminRoles_permissions_readAccessImplied = Přístup pro čtení pro {0} je výchozí a
nemůže být zakázán.
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 524dcc0..0db1d05 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
@@ -46,17 +46,6 @@ common_button_ack_all = Alle bestätigen
common_button_add = Hinzufügen
common_button_advanced = Erweitert...
common_button_apply = Anwenden
-common_buttonbar_custom_window_title=Zeitbereich
-common_buttonbar_datetime_format=dd.MM.yy hh:mm
-common_buttonbar_datetime_format_moment_js= DD.MM.YY HH:mm
-common_buttonbar_end_date=Enddatum
-common_buttonbar_end_time=Endzeitpunkt
-common_buttonbar_start_date=Startdatum
-common_buttonbar_start_time=Startzeitpunkt
-common_buttonbar_custom_cancel=Abbrechen
-common_buttonbar_custom_save=Speichern
-common_buttonbar_custom_window_subtitle= Spezifisch
-common_buttonbar_custom = Spezifisch...
common_button_cancel = Abbrechen
common_button_close = Schließen
common_button_compare = Vergleichen
@@ -89,6 +78,17 @@ common_button_set = Setzen
common_button_showDetails = Details anzeigen...
common_button_unignore = Ignorieren aufheben
common_button_uninventory = Aus dem Inventar löschen
+common_buttonbar_custom = Spezifisch...
+common_buttonbar_custom_cancel = Abbrechen
+common_buttonbar_custom_save = Speichern
+common_buttonbar_custom_window_subtitle = Spezifisch
+common_buttonbar_custom_window_title = Zeitbereich
+common_buttonbar_datetime_format = dd.MM.yy hh:mm
+common_buttonbar_datetime_format_moment_js = DD.MM.YY HH:mm
+common_buttonbar_end_date = Enddatum
+common_buttonbar_end_time = Endzeitpunkt
+common_buttonbar_start_date = Startdatum
+common_buttonbar_start_time = Startzeitpunkt
common_calendar_april_short = Apr
common_calendar_august_short = Aug
common_calendar_december_short = Dez
@@ -160,6 +160,7 @@ common_title_available_resources = Verfügbare Ressourcen
common_title_average_metrics = Durchsch. Anzahl Metriken pro Minute
common_title_background = Hintergrund
common_title_bundle = Bundle
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = Bundles
common_title_category = Kategorie
common_title_change_refresh_time = Aktualisierungsintervall
@@ -502,10 +503,22 @@ view_adminRoles_permissions_globalPermissions = Globale Rechte
view_adminRoles_permissions_isAuthorized = Berechtigt?
view_adminRoles_permissions_isRead = Lesen?
view_adminRoles_permissions_isWrite = Schreiben?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles = Kann Bundles anlegen, aktualisieren
und löschen (Ansehen ist für alle implizit erlaubt).
view_adminRoles_permissions_permDesc_manageInventory = Hat alle Rechte auf alle
Ressourcen, wie unten beschrieben. Kann Gruppen anlegen, aktualisieren und löschen. Kann
Ressourcen in das Inventar aufnehmen.
+##view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete
repositories of any user (everyone can create their own repositories), can associate
content sources to repositories.
view_adminRoles_permissions_permDesc_manageSecurity = Kann Benutzer und Rollen anlegen,
aktualisieren oder löschen (Anschauen ist für alle implizit erlaubt)
view_adminRoles_permissions_permDesc_manageSettings = Kann die Konfiguration des
{0}-Servers ändern und jegliche Server-bezogene Funktionalität ausführen.
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
+##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the
exception of their assigned roles
view_adminRoles_permissions_permReadDesc_configure = Ansehen der Ressourcen-Konfiguration
und des Verlaufs derselben.
view_adminRoles_permissions_permReadDesc_control = (IMPLIZIT) Ansehen der verfügbaren
Operationen und des Verlaufs der ausgeführen Operationen
view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIZIT) Ansehen des
Verlaufs des Anlegens von Kind-Ressourcen
@@ -526,20 +539,32 @@ view_adminRoles_permissions_permWriteDesc_manageContent = Abonnieren
von Content
view_adminRoles_permissions_permWriteDesc_manageDrift = Anlegen, Bearbeiten und Löschen
von Drift-Definitionen und Management von Drift-Instanzen
view_adminRoles_permissions_permWriteDesc_manageEvents = Ereignisse löschen
view_adminRoles_permissions_permWriteDesc_manageMeasurements = Zeitplan für das
Monitoring bearbeiten
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = Konfiguration
view_adminRoles_permissions_perm_control = Operationen
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = Kind-Ressourcen erzeugen
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = Löschen von Kind-Ressourcen
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = Inventar
view_adminRoles_permissions_perm_manageAlerts = Alarme verwalten
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = Bundles verwalten
view_adminRoles_permissions_perm_manageContent = Content verwalten
view_adminRoles_permissions_perm_manageDrift = Drift verwalten
view_adminRoles_permissions_perm_manageEvents = Ereignisse verwalten
view_adminRoles_permissions_perm_manageInventory = Inventar verwalten
view_adminRoles_permissions_perm_manageMeasurements = Monitoring verwalten
+##view_adminRoles_permissions_perm_manageRepositories = Manage Repositories
view_adminRoles_permissions_perm_manageSecurity = Sicherheitseinstellungen verwalten
view_adminRoles_permissions_perm_manageSettings = Einstellungen verwalten
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
+##view_adminRoles_permissions_perm_viewUsers = View Users
view_adminRoles_permissions_read = Lesen
view_adminRoles_permissions_readAccessImplied = Lesezugriff für das Recht {0} ist
implizit und kann nicht abgeschaltet werden.
view_adminRoles_permissions_resourcePermissions = Rechte für Ressourcen
@@ -746,8 +771,7 @@ view_admin_systemSettings_AlertPurge_name = Bereinigen der Alarme, die
älter si
view_admin_systemSettings_AvailabilityPurge_name = Lösche Verfügbarkeitsdaten, die älter
sind als
##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files
must be before being purged from backend storage. This is specified in days.
view_admin_systemSettings_DriftFilePurge_name = Bereinige ungenutzte Drift-Dateine, die
älter sind als
-view_admin_systemSettings_LDAPBaseDN_name = \
-view_admin_systemSettings_LDAPBindPW_name = Passwort
+view_admin_systemSettings_LDAPBaseDN_name = view_admin_systemSettings_LDAPBindPW_name =
Passwort
##view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes
without any user interaction in the browser, the session is considered as expired and user
is aked to log in again. This value is specified in hours.
##view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout
view_admin_systemSettings_TraitPurge_name = Bereinigen der Trait-Daten, die älter sind
als
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index cb0c35f..626243e 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -46,16 +46,6 @@ common_button_ack_all = すべてを確認
common_button_add = 追加
common_button_advanced = 高度な設定...
common_button_apply = 適用
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= Start Date
-##common_buttonbar_start_time= Start Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = キャンセル
common_button_close = 閉じる
common_button_compare = 比較
@@ -88,6 +78,16 @@ common_button_set = 設定
common_button_showDetails = 詳細表示...
##common_button_unignore = Unignore
common_button_uninventory = アンインベントリ
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = Start Date
+##common_buttonbar_start_time = Start Time
common_calendar_april_short = 4月
common_calendar_august_short = 8月
common_calendar_december_short = 12月
@@ -160,6 +160,7 @@ common_title_available_resources = 利用可能リソース
common_title_average_metrics = 毎分の平均メトリックス
common_title_background = 背景色
common_title_bundle = バンドル
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = バンドル
common_title_category = カテゴリ
common_title_change_refresh_time = リフレッシュ間隔
@@ -508,11 +509,21 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = 権限があるか?
view_adminRoles_permissions_isRead = 読み出しですか?
view_adminRoles_permissions_isWrite = 書き込みですか?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles =
プロビジョニングバンドルの作成、更新、削除が可能です(誰でも暗黙的に閲覧可能です)
view_adminRoles_permissions_permDesc_manageInventory =
すべてのリソースについてすべてのリソース権限を持ちます。つまり、グループの作成、更新、削除、そして自動検出された、または手動で検出されたリソースのインポートが可能です
view_adminRoles_permissions_permDesc_manageRepositories =
ユーザーのリポジトリの作成、更新、削除が可能(誰でもリポジトリを作成可能)で、コンテントソースとリポジトリも関連づけができます。
view_adminRoles_permissions_permDesc_manageSecurity = ユーザーとロールの作成、更新、削除、その他すべての権限が可能です
view_adminRoles_permissions_permDesc_manageSettings = {0}サーバーの修正と任意のサーバー関連の機能の実行ができます
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
view_adminRoles_permissions_permDesc_viewUsers = 他のユーザーを閲覧できます。しかし、それらに割り当てられたロールは見えません。
view_adminRoles_permissions_permReadDesc_configure = リソース構成とリソース構成リビジョン履歴の閲覧
view_adminRoles_permissions_permReadDesc_control = 利用可能オペレーション; オペレーション実行履歴の(暗黙的な)閲覧
@@ -534,12 +545,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = コンテントソー
view_adminRoles_permissions_permWriteDesc_manageDrift = ドリフト定義の作成、更新、削除; ドリフトインスタンスの管理
view_adminRoles_permissions_permWriteDesc_manageEvents = イベントの削除
view_adminRoles_permissions_permWriteDesc_manageMeasurements = メトリック収集スケジュールの更新
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = 構成
view_adminRoles_permissions_perm_control = 制御
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = 子リソースの作成
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = 子リソースの削除
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = インベントリ
view_adminRoles_permissions_perm_manageAlerts = アラートの管理
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = バンドルの管理
view_adminRoles_permissions_perm_manageContent = コンテント管理
view_adminRoles_permissions_perm_manageDrift = ドリフト管理
@@ -549,6 +567,9 @@ view_adminRoles_permissions_perm_manageMeasurements = 測定の管理
view_adminRoles_permissions_perm_manageRepositories = リポジトリの管理
view_adminRoles_permissions_perm_manageSecurity = セキュリティの管理
view_adminRoles_permissions_perm_manageSettings = 設定の管理
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
view_adminRoles_permissions_perm_viewUsers = ユーザー閲覧
view_adminRoles_permissions_read = Read:
view_adminRoles_permissions_readAccessImplied = [{0}] 権限のための読み取りアクセスを暗示されていて無効にできません
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index 32dc73d..0da2a6e 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -44,16 +44,6 @@ common_button_ack_all = 전체 확인
common_button_add = 추가
common_button_advanced = 고급 설정...
common_button_apply = 적용
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= Start Date
-##common_buttonbar_start_time= Start Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = 취소
common_button_close = 닫기
common_button_compare = 비교
@@ -85,6 +75,16 @@ common_button_set = 설정
common_button_showDetails = 자세히보기...
##common_button_unignore = Unignore
common_button_uninventory = 인벤토리 제거
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = Start Date
+##common_buttonbar_start_time = Start Time
common_calendar_april_short = 4월
common_calendar_august_short = 8월
common_calendar_december_short = 12월
@@ -153,6 +153,7 @@ common_title_available_resources = 사용 가능한 자원
common_title_average_metrics = 분당 평균 통계
common_title_background = 배경색
common_title_bundle = 번들
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = 번들
common_title_change_refresh_time = 새로고침 주기
common_title_columns = 컬럼
@@ -452,8 +453,21 @@
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelecti
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 권한은 선택
해제 할 수 없습니다. 다른 모든 자원을 암시하는 관리 인벤토리가 먼저 선택 해제되어야 그것은 수행할 수 있습니다.
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 권한은 선택
해제 할 수 없습니다. 다른 모든 권한을 암시하는 관리 보안 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다.
view_adminRoles_permissions_isAuthorized = 권한이 있습니까?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
+##view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete
provisioning bundles (viewing is implied for everyone)
view_adminRoles_permissions_permDesc_manageInventory = 모든 자원의 모든 자원 권한을 갖습니다. 즉, 그룹의 생성,
삭제, 자동감지 또는 수동으로 검출된 자원을 가져올수 있습니다.
+##view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete
repositories of any user (everyone can create their own repositories), can associate
content sources to repositories.
+##view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete
users and roles - implies all other permissions
view_adminRoles_permissions_permDesc_manageSettings = {0} 서버의 수정 및 모든 서버 관련 기능을 수행할 수
있습니다.
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
view_adminRoles_permissions_permDesc_viewUsers = 다른 사용자를 볼 수 있습니다. 그러나 그들에게 할당된 역할은 보이지
않습니다.
view_adminRoles_permissions_permReadDesc_configure = 자원 설정 및 자원 설정 수정 기록 보기
view_adminRoles_permissions_permReadDesc_createChildResources = (암시적) 자식 리소스 만들기 기록 보기
@@ -469,13 +483,21 @@ view_adminRoles_permissions_permWriteDesc_manageAlerts = 경고 정의를 만들
view_adminRoles_permissions_permWriteDesc_manageDrift = 드리프트 정의 만들기, 수정, 삭제; 드리프트 인스턴스
관리
view_adminRoles_permissions_permWriteDesc_manageEvents = 이벤트 삭제
view_adminRoles_permissions_permWriteDesc_manageMeasurements = 통계 수집 스케쥴 수정
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = 구성
view_adminRoles_permissions_perm_control = 제어
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = 자식 리소스 만들기
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = 자식 리소스 삭제
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = 인벤토리
view_adminRoles_permissions_perm_manageAlerts = 경고 관리
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = 번들 관리
+##view_adminRoles_permissions_perm_manageContent = Manage Content
view_adminRoles_permissions_perm_manageDrift = 드리프트 관리
view_adminRoles_permissions_perm_manageEvents = 이벤트 관리
view_adminRoles_permissions_perm_manageInventory = 인벤토리 관리
@@ -483,6 +505,9 @@ view_adminRoles_permissions_perm_manageMeasurements = 측정 관리
view_adminRoles_permissions_perm_manageRepositories = 저장소 관리
view_adminRoles_permissions_perm_manageSecurity = 보안 관리
view_adminRoles_permissions_perm_manageSettings = 설정 관리
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
view_adminRoles_permissions_perm_viewUsers = 사용자 보기
view_adminRoles_permissions_read = 읽기:
view_adminRoles_permissions_readAccessImplied = {0} 권한에 대한 읽기 엑세스를 암시해 해제 할 수 없습니다.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index f4419e1..6d74d41 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -43,16 +43,6 @@ common_button_ack_all = Confirmar Todos
common_button_add = Adicionar
common_button_advanced = Avan\u00E7ado...
common_button_apply = Aplicar
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= Start Date
-##common_buttonbar_start_time= Start Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = Cancelar
common_button_close = Fechar
common_button_compare = Comparar
@@ -85,6 +75,16 @@ common_button_set = Definir
common_button_showDetails = Mostrar Detalhes...
##common_button_unignore = Unignore
common_button_uninventory = Remover do Invent\u00E1rio
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = Start Date
+##common_buttonbar_start_time = Start Time
common_calendar_april_short = abr
common_calendar_august_short = ago
common_calendar_december_short = dez
@@ -157,6 +157,7 @@ common_title_available_resources = Recursos Dispon\u00EDveis
common_title_average_metrics = M\u00E9tricas da m\u00E9dia por Minuto
common_title_background = Fundo (background)
common_title_bundle = Bundle
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = Bundles
common_title_category = Categoria
common_title_change_refresh_time = Atualizar Intervalo
@@ -513,11 +514,22 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = Autorizado?
view_adminRoles_permissions_isRead = Leitura?
view_adminRoles_permissions_isWrite = Escrita?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles = pode criar, atualizar, ou excluir o
provisionamento de bundles (a visualiza\u00E7\u00E3 \u00E9 implicita para todos)
view_adminRoles_permissions_permDesc_manageInventory = possui todas as permiss\u00F5es de
Recurso, como descrito abaixo, pode criar, atualizar, excluir grupos e importar Recursos
descobertos automaticamente ou manualmente.
view_adminRoles_permissions_permDesc_manageRepositories = pode criar, atualizar, ou
excluir reposit\u00F3rios de qualquer usu\u00E1rio (todos podem criar seus pr\u00F3prios
reposit\u00F3rios), pode associar fontes de conte\u00FAdos a reposit\u00F3rios.
view_adminRoles_permissions_permDesc_manageSecurity = pode criar, atualizar, ou excluir
usu\u00E1rios e perfis (visualiza\u00E7\u00E3o \u00E9 padr\u00E3o para todos)
##view_adminRoles_permissions_permDesc_manageSettings = pode modificar a
configura\u00E7\u00E3o do RHQ Server e utilizar qualquer funcionalidade relacionada ao
Servidor
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
+##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the
exception of their assigned roles
view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and
Resource configuration revision history
view_adminRoles_permissions_permReadDesc_control = (IMPL\u00CDCITO) visualizar
opera\u00E7\u00F5es dispon\u00EDveis e o hist\u00F3rico da execu\u00E7\u00E3o de
opera\u00E7\u00F5es
view_adminRoles_permissions_permReadDesc_createChildResources = (IMPL\u00CDCITO)
visualizar o hist\u00F3rico de cria\u00E7\u00E3o do recurso filho
@@ -538,12 +550,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent =
inscrever-se no reposi
##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete
drift definitions; and manage drift instances
view_adminRoles_permissions_permWriteDesc_manageEvents = excluir eventos
view_adminRoles_permissions_permWriteDesc_manageMeasurements = atualizar agendamento de
coleta de m\u00E9tricas
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = Configurar
view_adminRoles_permissions_perm_control = Controlar
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = Criar Recurso filho
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = Excluir Recursos filhos
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = Invent\u00E1rio
view_adminRoles_permissions_perm_manageAlerts = Gerenciar Alertas
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = Gerenciar Bundles
view_adminRoles_permissions_perm_manageContent = Gerenciar Conte\u00FAdo
##view_adminRoles_permissions_perm_manageDrift = Manage Drift
@@ -553,6 +572,10 @@ view_adminRoles_permissions_perm_manageMeasurements = Gerenciar
M\u00E9tricas
view_adminRoles_permissions_perm_manageRepositories = Gerenciar Reposit\u00F3rios
view_adminRoles_permissions_perm_manageSecurity = Gerenciar Seguran\u00E7a
view_adminRoles_permissions_perm_manageSettings = Gerenciar Configura\u00E7\u00F5es
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
+##view_adminRoles_permissions_perm_viewUsers = View Users
view_adminRoles_permissions_read = Leitura:
view_adminRoles_permissions_readAccessImplied = Acesso de leitura para a permiss\u00E3o
{0} \u00E9 impl\u00EDcita e n\u00E3o pode ser desabilitada.
view_adminRoles_permissions_resourcePermissions = Permiss\u00F5es de Recurso
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index d75b76e..f31b829 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2271,6 +2271,7 @@ common_title_available_resources = Доступные ресурсы
common_title_average_metrics = Среднее количество метрик в минуту
common_title_background = Фон
common_title_bundle = Пакет
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = Пакеты
common_title_category = Категория
common_title_change_refresh_time = Интервал обновления
@@ -2591,9 +2592,22 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = Авторизованы?
view_adminRoles_permissions_isRead = Читать?
view_adminRoles_permissions_isWrite = Запись?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles = Можно создавать, обновлять и удалять
узлы предоставления (просмотр предоставляется всем)
+##view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as
described below, for all Resources; can create, update, and delete groups; and can import
auto-discovered or manually discovered Resources
view_adminRoles_permissions_permDesc_manageRepositories = можно создавать, обновлять или
удалять репозитории любого пользователя (каждый может создавать свои собственные
репозитории), можно ассоциировать источники контента с резпозиториями.
view_adminRoles_permissions_permDesc_manageSecurity = можно создавать, обновлять или
удалять пользователей и роли - включает все другие полномочия
+##view_adminRoles_permissions_permDesc_manageSettings = can modify the {0} Server
configuration and perform any Server-related functionality
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
+##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the
exception of their assigned roles
view_adminRoles_permissions_permReadDesc_configure = просмотр конфигурации ресурса и
историю версий конфигурации ресурса
view_adminRoles_permissions_permReadDesc_createChildResources = (ПОДРАЗУМЕВАЕМЫЙ)
просмотр истории создания дочернего ресурса
view_adminRoles_permissions_permReadDesc_deleteChildResources = (ПОДРАЗУМЕВАЕМЫЙ)
просмотр истории удаления дочернего ресурса
@@ -2608,18 +2622,32 @@ view_adminRoles_permissions_permWriteDesc_manageAlerts = создать,
обн
view_adminRoles_permissions_permWriteDesc_manageContent = подписаться на источники
контента; устанавливать и удалять пакеты
view_adminRoles_permissions_permWriteDesc_manageEvents = удалять события
view_adminRoles_permissions_permWriteDesc_manageMeasurements = обновление метрик
коллекции планировщиков
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = Конфигурация
view_adminRoles_permissions_perm_control = Управление
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
+##view_adminRoles_permissions_perm_createChildResources = Create Child Resources
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
+##view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = Инвентаризация
view_adminRoles_permissions_perm_manageAlerts = Управление предупреждениями
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = Управление узлами
view_adminRoles_permissions_perm_manageContent = Управление контентом
+##view_adminRoles_permissions_perm_manageDrift = Manage Drift
view_adminRoles_permissions_perm_manageEvents = Управление событиями
view_adminRoles_permissions_perm_manageInventory = Управление инвентаризацией
view_adminRoles_permissions_perm_manageMeasurements = Управление измерениями
view_adminRoles_permissions_perm_manageRepositories = Управление репозиториями
view_adminRoles_permissions_perm_manageSecurity = Управление безопасностью
view_adminRoles_permissions_perm_manageSettings = Управление настройками
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
+##view_adminRoles_permissions_perm_viewUsers = View Users
view_adminRoles_permissions_read = Чтение\:
view_adminRoles_permissions_readAccessImplied = Доступ чтения для {0} полномочия
подразумевается и не может быть закрыт.
view_adminRoles_permissions_resourcePermissions = Полномчия ресурса
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index a9a24df..1aeb1a1 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -43,16 +43,6 @@ common_button_ack_all = \u786e\u8ba4\u6240\u6709
common_button_add = \u6dfb\u52a0
common_button_advanced = \u9ad8\u7ea7...
common_button_apply = \u63a5\u53d7
-##common_buttonbar_custom_window_title= Date Range
-##common_buttonbar_custom_window_subtitle= Custom
-##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a
-##common_buttonbar_end_date= End Date
-##common_buttonbar_end_time= End Time
-##common_buttonbar_start_date= Start Date
-##common_buttonbar_start_time= Start Time
-##common_buttonbar_custom = Custom...
-##common_buttonbar_custom_cancel = Cancel
-##common_buttonbar_custom_save = Save
common_button_cancel = \u53d6\u6d88
common_button_close = \u5173\u95ed
common_button_compare = \u5bf9\u6bd4
@@ -85,6 +75,16 @@ common_button_set = Set
common_button_showDetails = \u67e5\u770b\u8be6\u60c5...
##common_button_unignore = Unignore
common_button_uninventory = Uninventory
+##common_buttonbar_custom = Custom...
+##common_buttonbar_custom_cancel = Cancel
+##common_buttonbar_custom_save = Save
+##common_buttonbar_custom_window_subtitle = Custom
+##common_buttonbar_custom_window_title = Date Range
+##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a
+##common_buttonbar_end_date = End Date
+##common_buttonbar_end_time = End Time
+##common_buttonbar_start_date = Start Date
+##common_buttonbar_start_time = Start Time
common_calendar_april_short = \u56db\u6708
common_calendar_august_short = \u516b\u6708
common_calendar_december_short = \u5341\u4e8c\u6708
@@ -157,6 +157,7 @@ common_title_available_resources = \u53ef\u7528\u7684\u8d44\u6e90
common_title_average_metrics = \u5e73\u5747\u6bcf\u5206\u949f\u6307\u6807
common_title_background = \u80cc\u666f\u8272
common_title_bundle = Bundle
+##common_title_bundleGroups = Bundle Groups
common_title_bundles = Bundles
common_title_category = \u7c7b\u522b
common_title_change_refresh_time = \u5237\u65b0\u95f4\u9694
@@ -502,11 +503,22 @@
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
view_adminRoles_permissions_isAuthorized = \u6388\u6743?
view_adminRoles_permissions_isRead = \u8bfb?
view_adminRoles_permissions_isWrite = \u5199?
+##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
+##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
+##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
+##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable
bundle [version]s
+##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle
[version]s from the bundle group (implicitly deleting then from other assigned groups)
+##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle
version to any viewable, deployable, compatible, resource group
+##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete
bundle groups
view_adminRoles_permissions_permDesc_manageBundles =
\u80fd\u521b\u5efa,\u66f4\u65b0\u6216\u8005\u5220\u9664\u63d0\u4f9b\u7684bundles(\u4efb\u4f55\u4eba\u90fd\u80fd\u67e5\u770b)
view_adminRoles_permissions_permDesc_manageInventory =
\u62e5\u6709\u6240\u6709\u8d44\u6e90\u6743\u9650, \u5982\u4e0b\u6240\u8ff0,
\u5bf9\u6240\u6709\u8d44\u6e90; \u5177\u6709\u521b\u5efa, \u66f4\u65b0,
\u5220\u9664\u7ec4;
\u80fd\u5bfc\u5165\u81ea\u52a8\u53d1\u73b0\u6216\u624b\u52a8\u53d1\u73b0\u7684\u8d44\u6e90
view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete
repositories of any user (everyone can create their own repositories), can associate
content sources to repositories.
view_adminRoles_permissions_permDesc_manageSecurity =
\u80fd\u521b\u5efa,\u66f4\u65b0,\u6216\u5220\u9664\u7528\u6237\u548c\u89d2\u8272
(\u4efb\u4f55\u4eba\u90fd\u6709\u67e5\u770b\u6743\u9650)
##view_adminRoles_permissions_permDesc_manageSettings =
\u80fd\u4fee\u6539RHQ\u670d\u52a1\u5668\u914d\u7f6e\u800c\u4e14\u80fd\u64cd\u4f5c\u4efb\u4f55\u76f8\u5173\u7684\u670d\u52a1\u5668\u529f\u80fd
+##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not
delete) a bundle from the bundle group
+##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global
bundles (those not assigned to any bundle group)
+##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
+##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the
exception of their assigned roles
view_adminRoles_permissions_permReadDesc_configure =
\u67e5\u770b\u8d44\u6e90\u914d\u7f6e\u548c\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u5386\u53f2
view_adminRoles_permissions_permReadDesc_control = (IMPLIED)
\u67e5\u770b\u53ef\u7528\u64cd\u4f5c\u548c\u64cd\u4f5c\u6267\u884c\u5386\u53f2
view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED)
\u67e5\u770b\u5b50\u8d44\u6e90\u521b\u5efa\u5386\u53f2
@@ -527,12 +539,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent =
\u8ba2\u9605\u5185\u5b
##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete
drift definitions; and manage drift instances
view_adminRoles_permissions_permWriteDesc_manageEvents = \u5220\u9664\u4e8b\u4ef6
view_adminRoles_permissions_permWriteDesc_manageMeasurements =
\u66f4\u65b0\u6307\u6807\u96c6\u8ba1\u5212\u4efb\u52a1
+##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
view_adminRoles_permissions_perm_configure = \u914d\u7f6e
view_adminRoles_permissions_perm_control = \u63a7\u5236
+##view_adminRoles_permissions_perm_createBundles = Create Bundles
+##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group
view_adminRoles_permissions_perm_createChildResources = \u521b\u5efa\u5b50\u8d44\u6e90
+##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles
+##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group
view_adminRoles_permissions_perm_deleteChildResources = \u5220\u9664\u5b50\u8d44\u6e90
+##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles
view_adminRoles_permissions_perm_inventory = \u6e05\u5355
view_adminRoles_permissions_perm_manageAlerts = \u7ba1\u7406\u544a\u8b66
+##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups
view_adminRoles_permissions_perm_manageBundles = \u7ba1\u7406Bundles
view_adminRoles_permissions_perm_manageContent = \u7ba1\u7406\u5185\u5bb9
##view_adminRoles_permissions_perm_manageDrift = Manage Drift
@@ -542,6 +561,10 @@ view_adminRoles_permissions_perm_manageMeasurements =
\u7ba1\u7406\u6307\u6807
view_adminRoles_permissions_perm_manageRepositories = \u7ba1\u7406\u5e93
view_adminRoles_permissions_perm_manageSecurity = \u7ba1\u7406\u6743\u9650
view_adminRoles_permissions_perm_manageSettings = \u7ba1\u7406\u914d\u7f6e
+view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group
+##view_adminRoles_permissions_perm_viewBundles = View Bundles
+##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group
+##view_adminRoles_permissions_perm_viewUsers = View Users
view_adminRoles_permissions_read = \u8bfb:
view_adminRoles_permissions_readAccessImplied =
\u9ed8\u8ba4\u6709\u8bbf\u95ee{0}\u7684\u6743\u9650\u800c\u4e14\u65e0\u6cd5\u7981\u7528.
view_adminRoles_permissions_resourcePermissions = \u8d44\u6e90\u6388\u6743
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index f61782a..dbecb26 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -43,7 +43,6 @@ import javax.persistence.EntityNotFoundException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import org.apache.commons.httpclient.params.DefaultHttpParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpResponse;
@@ -55,7 +54,6 @@ import org.apache.http.client.params.HttpClientParams;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.DefaultedHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.maven.artifact.versioning.ComparableVersion;
@@ -72,6 +70,7 @@ import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.core.domain.bundle.BundleDestination;
import org.rhq.core.domain.bundle.BundleFile;
+import org.rhq.core.domain.bundle.BundleGroup;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory;
import org.rhq.core.domain.bundle.BundleType;
@@ -90,6 +89,7 @@ import org.rhq.core.domain.criteria.BundleCriteria;
import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.criteria.BundleFileCriteria;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -1622,6 +1622,14 @@ public class BundleManagerBean implements BundleManagerLocal,
BundleManagerRemot
return queryRunner.execute();
}
+ @Override
+ public PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject,
BundleGroupCriteria criteria) {
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject,
criteria);
+ CriteriaQueryRunner<BundleGroup> queryRunner = new
CriteriaQueryRunner<BundleGroup>(criteria, generator,
+ entityManager);
+ return queryRunner.execute();
+ }
+
/**
* Fetch bundles by criteria and then filter destination on the result objects to
limit what the user can see
* @param subject Caller
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java
index 2387833..b72d6b5 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java
@@ -30,6 +30,7 @@ import org.rhq.core.domain.bundle.Bundle;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleDestination;
import org.rhq.core.domain.bundle.BundleFile;
+import org.rhq.core.domain.bundle.BundleGroup;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleType;
import org.rhq.core.domain.bundle.BundleVersion;
@@ -41,6 +42,7 @@ import org.rhq.core.domain.criteria.BundleCriteria;
import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.criteria.BundleFileCriteria;
+import org.rhq.core.domain.criteria.BundleGroupCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.util.PageList;
@@ -259,6 +261,8 @@ public interface BundleManagerRemote {
PageList<Bundle> findBundlesByCriteria(Subject subject, BundleCriteria
criteria);
+ PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject,
BundleGroupCriteria criteria);
+
PageList<BundleDeployment> findBundleDeploymentsByCriteria(Subject subject,
BundleDeploymentCriteria criteria);
PageList<BundleDestination> findBundleDestinationsByCriteria(Subject subject,
BundleDestinationCriteria criteria);