modules/cli-tests/pom.xml | 2 modules/common/ant-bundle/pom.xml | 2 modules/common/drift/pom.xml | 2 modules/common/filetemplate-bundle/pom.xml | 2 modules/common/jboss-as/pom.xml | 2 modules/common/pom.xml | 2 modules/core/client-api/pom.xml | 2 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 1 modules/core/domain/pom.xml | 2 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java | 21 + modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 110 +++++++++ modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java | 9 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java | 19 - modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/util/LDAPStringUtil.java | 100 -------- modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 37 +-- modules/core/domain/src/test/java/org/rhq/core/domain/util/LDAPStringUtilTest.java | 48 ---- modules/core/gui/pom.xml | 2 modules/core/native-system/pom.xml | 2 modules/core/plugin-api/pom.xml | 2 modules/core/plugin-container/pom.xml | 2 modules/core/plugin-validator/pom.xml | 2 modules/core/pom.xml | 2 modules/core/util/pom.xml | 2 modules/enterprise/agent/pom.xml | 2 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/binding/pom.xml | 4 modules/enterprise/comm/pom.xml | 2 modules/enterprise/gui/base-perspective-jar/pom.xml | 2 modules/enterprise/gui/base-perspective-war/pom.xml | 2 modules/enterprise/gui/content_http-war/pom.xml | 2 modules/enterprise/gui/coregui/pom.xml | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 45 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 18 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 26 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 16 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 73 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 61 ++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java | 51 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 14 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java | 32 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 18 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 32 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 18 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 14 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 12 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 9 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png |binary modules/enterprise/gui/installer-war/pom.xml | 2 modules/enterprise/gui/pom.xml | 2 modules/enterprise/gui/portal-war/pom.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 8 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 8 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 11 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 13 - modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 10 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 8 modules/enterprise/gui/rest-war/pom.xml | 2 modules/enterprise/pom.xml | 2 modules/enterprise/remoting/cli/pom.xml | 2 modules/enterprise/remoting/client-api/pom.xml | 2 modules/enterprise/remoting/client-deps/pom.xml | 2 modules/enterprise/remoting/pom.xml | 2 modules/enterprise/remoting/webservices/pom.xml | 2 modules/enterprise/server/client-api/pom.xml | 4 modules/enterprise/server/container-lib/pom.xml | 2 modules/enterprise/server/container/pom.xml | 2 modules/enterprise/server/ear/pom.xml | 2 modules/enterprise/server/jar/pom.xml | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 16 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 29 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 40 +-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java | 100 ++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 1 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 79 ++++-- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 5 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 16 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 39 +-- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 9 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginService.java | 113 ++++++++++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginServiceMBean.java | 25 ++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java | 50 ++++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 2 modules/enterprise/server/plugins/alert-cli/pom.xml | 4 modules/enterprise/server/plugins/alert-email/pom.xml | 4 modules/enterprise/server/plugins/alert-irc/pom.xml | 4 modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 modules/enterprise/server/plugins/alert-operations/pom.xml | 4 modules/enterprise/server/plugins/alert-roles/pom.xml | 4 modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 modules/enterprise/server/plugins/alert-subject/pom.xml | 4 modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 modules/enterprise/server/plugins/cobbler/pom.xml | 4 modules/enterprise/server/plugins/disk/pom.xml | 2 modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 modules/enterprise/server/plugins/groovy-script/pom.xml | 4 modules/enterprise/server/plugins/jboss-software/pom.xml | 2 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 modules/enterprise/server/plugins/pom.xml | 2 modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 modules/enterprise/server/plugins/url/pom.xml | 2 modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 modules/enterprise/server/plugins/yum/pom.xml | 2 modules/enterprise/server/pom.xml | 2 modules/enterprise/server/safe-invoker/pom.xml | 2 modules/enterprise/server/sars/agent-sar/pom.xml | 2 modules/enterprise/server/sars/pom.xml | 2 modules/enterprise/server/xml-schemas/pom.xml | 2 modules/helpers/bundleGen/pom.xml | 4 modules/helpers/perftest-support/pom.xml | 4 modules/helpers/pom.xml | 2 modules/helpers/rtfilter/pom.xml | 2 modules/integration-tests/apache-plugin-test/pom.xml | 2 modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 modules/integration-tests/pom.xml | 2 modules/plugins/aliases/pom.xml | 2 modules/plugins/ant-bundle/pom.xml | 2 modules/plugins/apache/pom.xml | 2 modules/plugins/augeas/pom.xml | 2 modules/plugins/byteman/pom.xml | 2 modules/plugins/cobbler/pom.xml | 2 modules/plugins/cron/pom.xml | 2 modules/plugins/database/pom.xml | 2 modules/plugins/filetemplate-bundle/pom.xml | 2 modules/plugins/grub/pom.xml | 2 modules/plugins/hadoop/pom.xml | 2 modules/plugins/hibernate/pom.xml | 2 modules/plugins/hosts/pom.xml | 2 modules/plugins/hudson/pom.xml | 4 modules/plugins/iis/pom.xml | 2 modules/plugins/irc/pom.xml | 2 modules/plugins/jboss-as-5/pom.xml | 2 modules/plugins/jboss-as-7/pom.xml | 2 modules/plugins/jboss-as/pom.xml | 2 modules/plugins/jboss-cache-v3/pom.xml | 2 modules/plugins/jboss-cache/pom.xml | 2 modules/plugins/jmx/pom.xml | 2 modules/plugins/kickstart/pom.xml | 2 modules/plugins/mod-cluster/pom.xml | 2 modules/plugins/mysql/pom.xml | 2 modules/plugins/netservices/pom.xml | 2 modules/plugins/oracle/pom.xml | 2 modules/plugins/pattern-generator/pom.xml | 2 modules/plugins/perftest/pom.xml | 2 modules/plugins/platform/pom.xml | 2 modules/plugins/pom.xml | 4 modules/plugins/postfix/pom.xml | 2 modules/plugins/postgres/pom.xml | 2 modules/plugins/rhq-agent/pom.xml | 2 modules/plugins/rhq-server/pom.xml | 2 modules/plugins/samba/pom.xml | 2 modules/plugins/script/pom.xml | 2 modules/plugins/script2/pom.xml | 2 modules/plugins/snmptrapd/pom.xml | 2 modules/plugins/sshd/pom.xml | 2 modules/plugins/sudoers/pom.xml | 2 modules/plugins/tomcat/pom.xml | 2 modules/plugins/twitter/pom.xml | 2 modules/plugins/validate-all-plugins/pom.xml | 2 modules/plugins/virt/pom.xml | 2 modules/pom.xml | 10 modules/test-utils/pom.xml | 2 pom.xml | 2 publish_release.sh | 67 ++--- release.sh | 90 ++++++- rhq_bash.lib | 26 ++ 197 files changed, 1222 insertions(+), 742 deletions(-) New commits: commit 96101e631e5a47b11c5da4390f91967b6a4feb6e Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Tue Oct 25 16:50:19 2011 -0400 [BZ 748474] add a fixed criteria and blank out the search bar. users find this more intuitive. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index 4365aa0..4c1a348 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -137,8 +137,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { }, this.globalPermissions.contains(Permission.MANAGE_INVENTORY)); autodiscoveryQueueItem.setRefreshRequired(true); - // TODO: Specify an icon for this item. - NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES, null, new ViewFactory() { + NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES, "resources/all_resources.png", new ViewFactory() { public Canvas createView() { return new ResourceSearchView(extendLocatorId(PAGE_ALL_RESOURCES.getName()), null, PAGE_ALL_RESOURCES .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE), @@ -155,7 +154,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), initialCriteria, PAGE_PLATFORMS.getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE)); - view.setInitialSearchBarSearchText("category=" + ResourceCategory.PLATFORM.name().toLowerCase()); + //view.setInitialSearchBarSearchText("category=" + ResourceCategory.PLATFORM.name().toLowerCase()); return view; } }); @@ -168,7 +167,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()), initialCriteria, PAGE_SERVERS.getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVER, Boolean.TRUE)); - view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVER.name().toLowerCase()); + //view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVER.name().toLowerCase()); return view; } }); @@ -181,7 +180,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()), initialCriteria, PAGE_SERVICES.getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE, Boolean.TRUE)); - view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVICE.name().toLowerCase()); + //view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVICE.name().toLowerCase()); return view; } }); @@ -195,9 +194,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_UNAVAIL_SERVERS.getName()), initialCriteria, MSG.view_inventory_unavailableServers(), ImageManager.getResourceLargeIcon( ResourceCategory.SERVER, Boolean.FALSE)); - // TODO (ips, 10/28/10): Should we include down platforms too? - view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVER.name().toLowerCase() - + " availability=" + AvailabilityType.DOWN.name().toLowerCase()); + //view.setInitialSearchBarSearchText("category=" + ResourceCategory.SERVER.name().toLowerCase() + // + " availability=" + AvailabilityType.DOWN.name().toLowerCase()); return view; } }); @@ -231,7 +229,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria( ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), PAGE_COMPATIBLE_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE)); - view.setInitialSearchBarSearchText("groupCategory=compatible"); + //view.setInitialSearchBarSearchText("groupCategory=compatible"); return view; } }); @@ -242,7 +240,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria(ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), PAGE_MIXED_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.MIXED)); - view.setInitialSearchBarSearchText("groupCategory=mixed"); + //view.setInitialSearchBarSearchText("groupCategory=mixed"); return view; } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 3019d73..9ac2107 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -127,7 +127,7 @@ public class ResourceSearchView extends Table { final RPCDataSource<Resource, ResourceCriteria> datasource = getDataSourceInstance(); setDataSource(datasource); - setInitialCriteriaFixed(false); + //setInitialCriteriaFixed(false); } // suppress unchecked warnings because the subclasses may have different generic types for the datasource diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png new file mode 100644 index 0000000..63121fd Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png differ commit 94f82c50704ec9f3d93b92adad0af5380e31e63a Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Wed Oct 26 12:29:15 2011 -0400 [BZ 745456] catch exceptions in the EventJSON jsp pages so we don't blow up the Timeline component diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp index 40aeac8..b9857c1 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp @@ -37,7 +37,13 @@ criteria.addFilterEndTime(end); criteria.setPageControl(pc); - PageList<Alert> alerts = alertManager.findAlertsByCriteria(user.getSubject(), criteria); + PageList<Alert> alerts; + try { + alerts = alertManager.findAlertsByCriteria(user.getSubject(), criteria); + } catch (Exception e) { + alerts = new PageList<Alert>(0, PageControl.getUnlimitedInstance()); + } + %> { "events": diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp index 34baadf..c0f4402 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp @@ -23,8 +23,13 @@ long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "begin")); ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - PageList<ResourceConfigurationUpdate> configurationUpdates = configurationManager + PageList<ResourceConfigurationUpdate> configurationUpdates; + try { + configurationUpdates = configurationManager .findResourceConfigurationUpdates(subject, resourceId, begin, end, true, new PageControl(0,100)); + } catch (Exception e) { + configurationUpdates = new PageList<ResourceConfigurationUpdate>(0, PageControl.getUnlimitedInstance()); + } %> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp index 8edeebe..44515e5 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp @@ -26,8 +26,12 @@ ContentUIManagerLocal contentManager = LookupUtil.getContentUIManager(); - PageList<InstalledPackageHistory> history = contentManager.getInstalledPackageHistoryForResource(resourceId, new PageControl(0,20, new OrderingField("iph.timestamp",PageOrdering.DESC))); - + PageList<InstalledPackageHistory> history; + try { + history = contentManager.getInstalledPackageHistoryForResource(resourceId, new PageControl(0,20, new OrderingField("iph.timestamp",PageOrdering.DESC))); + } catch (Exception e) { + history = new PageList<InstalledPackageHistory>(0, PageControl.getUnlimitedInstance()); + } %> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp index 114baf0..3951f1d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp @@ -24,8 +24,15 @@ long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "begin")); ResourceFactoryManagerLocal resourceFactoryManager = LookupUtil.getResourceFactoryManager(); - PageList<CreateResourceHistory> creates = resourceFactoryManager.findCreateChildResourceHistory(subject, resourceId, begin, end, new PageControl(0, 100)); - PageList<DeleteResourceHistory> deletes = resourceFactoryManager.findDeleteChildResourceHistory(subject, resourceId, begin, end, new PageControl(0, 100)); + PageList<CreateResourceHistory> creates; + PageList<DeleteResourceHistory> deletes; + try { + creates = resourceFactoryManager.findCreateChildResourceHistory(subject, resourceId, begin, end, new PageControl(0, 100)); + deletes = resourceFactoryManager.findDeleteChildResourceHistory(subject, resourceId, begin, end, new PageControl(0, 100)); + } catch (Exception e) { + creates = new PageList<CreateResourceHistory>(0, PageControl.getUnlimitedInstance()); + deletes = new PageList<DeleteResourceHistory>(0, PageControl.getUnlimitedInstance()); + } %> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp index b2f42fb..f283a99 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp @@ -27,7 +27,12 @@ criteria.addFilterResourceId(resourceId); criteria.addFilterCreatedAfter(begin); criteria.addFilterCreatedBefore(end); - PageList<? extends DriftChangeSet<?>> results = driftManager.findDriftChangeSetsByCriteria(subject, criteria); + PageList<? extends DriftChangeSet<?>> results; + try { + results = driftManager.findDriftChangeSetsByCriteria(subject, criteria); + } catch (Exception e) { + results = new PageList(0, PageControl.getUnlimitedInstance()); + } %> { "events": [ diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp index d14ab93..62d9a07 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp @@ -32,9 +32,14 @@ boolean tooManyEvents = false; - PageList<EventComposite> list = - eventManager.findEventComposites(subject, EntityContext.forResource(resourceId), begin, end, null, + PageList<EventComposite> list; + try { + list = eventManager.findEventComposites(subject, EntityContext.forResource(resourceId), begin, end, null, null, null, new PageControl(0,10000, new OrderingField("timestamp", PageOrdering.ASC))); + } catch (Exception e) { + list = new PageList<EventComposite>(0, PageControl.getUnlimitedInstance()); + } + %> <%! public String trimLength(String string, int length) { @@ -154,14 +159,14 @@ if (grouped) { link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History"; } else { - link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History/" + event.getEventId(); + link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History/" + event.getEventId(); } String detail = null; if (grouped) { StringBuilder buf = new StringBuilder(); for (EventComposite childEvent : ((GroupedEventComposite)event).events) { - String childColor = eventColor(childEvent.getSeverity()); + String childColor = eventColor(childEvent.getSeverity()); buf.append("<a href='/coregui/CoreGUI.html#Resource/" + resourceId + "/Events/History/" + childEvent.getEventId() + "'>"); buf.append("<font color=\"" + childColor + "\">" + escapeBackslashes(trimLength(childEvent.getEventDetail(),80)) + "</font></a><br />"); } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp index 49fd1cb..04d3c11 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp @@ -24,8 +24,14 @@ long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "begin")); OperationManagerLocal operationManager = LookupUtil.getOperationManager(); - PageList<ResourceOperationHistory> operations = operationManager.findCompletedResourceOperationHistories( - subject, resourceId, begin, end, new PageControl(0,100)); + PageList<ResourceOperationHistory> operations; + try { + operations = operationManager.findCompletedResourceOperationHistories( + subject, resourceId, begin, end, new PageControl(0,100)); + } catch (Exception e) { + operations = new PageList<ResourceOperationHistory>(0, PageControl.getUnlimitedInstance()); + } + %> { "events": [ diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp index 17683c7..fe66e5e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp @@ -22,7 +22,13 @@ long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "begin")); ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - PageList<PluginConfigurationUpdate> configurationUpdates = configurationManager.findPluginConfigurationUpdates(subject, resourceId, begin, end, new PageControl(0,100)); + PageList<PluginConfigurationUpdate> configurationUpdates; + try { + configurationUpdates = configurationManager.findPluginConfigurationUpdates(subject, resourceId, begin, end, new PageControl(0,100)); + } catch (Exception e) { + configurationUpdates = new PageList<PluginConfigurationUpdate>(0, PageControl.getUnlimitedInstance()); + } + %> commit 49564f7bc2b834721c0ed6ecc0ef7aa57d99dcb0 Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Thu Oct 27 12:23:23 2011 -0400 [BZ 749560] make it clear that "deleting" bundle entities only removes them from the DB, the remote content is not purged. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index e69994e..dd0902e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -957,7 +957,7 @@ view_bundle_createWizard_uploadStepName = Upload Bundle Files view_bundle_createWizard_urlOption = URL view_bundle_createWizard_windowTitle = Bundle Creation Wizard view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create a bundle! -view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions, destinations and deployments for this bundle will also be deleted. +view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions, destinations and deployments for this bundle will also be deleted. However, this will not remove any content from remote machines. view_bundle_deploy = Deploy view_bundle_deployDir = Deploy Directory view_bundle_deployWizard_deployStep = Deploy Bundle to Destination Platforms @@ -1011,7 +1011,7 @@ view_bundle_deployWizard_title = Bundle Deployment Wizard view_bundle_deploy_action = Action view_bundle_deploy_backButton = Back to Destination view_bundle_deploy_clickForError = Click the icon for the error message -view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? +view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? This only deletes it from the database; all bundle content that was deployed on remote machines will remain. view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}] view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment [{0}] view_bundle_deploy_deployedBy = Deployed By @@ -1054,7 +1054,7 @@ view_bundle_fileListView_sha256 = SHA256 view_bundle_files = Files view_bundle_latestVersion = Latest Version view_bundle_list_backToAll = Back to All Bundles -view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles? +view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles? This will delete all of their versions, destinations and deployments from the database. However, this will not remove any content from remote machines. view_bundle_list_deleteFailure = Failed to delete the bundle [{0}] view_bundle_list_deleteSuccessful = You successfully deleted the bundle [{0}] view_bundle_list_deletesFailure = Failed to delete the bundles @@ -1099,7 +1099,7 @@ view_bundle_tree_loadFailure = Failed to load bundle data view_bundle_version_backToBundle = Back to Bundle view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags -view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version? +view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version? This will not remove any content from remote machines. view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}] view_bundle_version_deleteSuccessful = You successfully deleted the bundle version [{0}] view_bundle_version_loadFailure = Failed to load bundle version diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 1f42dfc..be8be01 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -839,6 +839,7 @@ view_bundle_createWizard_uploadStepName = Bundle-Dateien hochladen view_bundle_createWizard_urlOption = URL ##view_bundle_createWizard_windowTitle = Bundle Creation Wizard ##view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create a bundle! +##view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions, destinations and deployments for this bundle will also be deleted. However, this will not remove any content from remote machines. view_bundle_deploy = Deploy view_bundle_deployDir = Deploy-Verzeichnis view_bundle_deployWizard_deployStep = Bundle auf die Zielplattformen deployen @@ -888,6 +889,11 @@ view_bundle_deployWizard_getOptions_deployTime = Deployment-Zeitpunkt ##view_bundle_deployWizard_title = Bundle Deployment Wizard view_bundle_deploy_action = Aktion view_bundle_deploy_backButton = Zurück zum Ziel +##view_bundle_deploy_clickForError = Click the icon for the error message +##view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? This only deletes it from the database; all bundle content that was deployed on remote machines will remain. +##view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}] +##view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment [{0}] +##view_bundle_deploy_deployedBy = Deployed By ##view_bundle_deploy_deploymentPlatforms = Deployment Resource ##view_bundle_deploy_installDetails = Install Details ##view_bundle_deploy_loadBundleFailure = Failed to find bundle @@ -961,6 +967,9 @@ view_bundle_revert = Zurückrollen view_bundle_version_backToBundle = Zurück zum Bundle ##view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags ##view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags +##view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version? This will not remove any content from remote machines. +##view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}] +##view_bundle_version_deleteSuccessful = You successfully deleted the bundle version [{0}] ##view_bundle_version_loadFailure = Failed to load bundle version view_bundle_versions = Versionen ##view_configCompare_comparingConfigs = Comparing Configurations diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index bffa78a..3050a0f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1012,7 +1012,6 @@ view_bundle_deploy_loadBundleFailure = バンドルの検索に失敗しまし view_bundle_deploy_loadDeployFailure = バンドルデプロイのロードに失敗しました view_bundle_deploy_loadFailure = バンドルデプロイのロードに失敗しました view_bundle_deploy_name = デプロイ名 -view_bundle_deploy_operatingSystem = オペレーティングシステム view_bundle_deploy_selectARow = インストールの詳細を表示するために行を選択してください view_bundle_deploy_tagUpdateFailure = バンドルデプロイタブの更新に失敗しました view_bundle_deploy_tagUpdateSuccessful = バンドルデプロイタグの更新に成功しました commit c65f9cf713b010c97475359eba641ffa0569aefc Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Mon Oct 31 07:39:27 2011 -0500 Add tag override to the release script to replace an existing tag with this new one. diff --git a/release.sh b/release.sh index 65a9596..8b48df2 100755 --- a/release.sh +++ b/release.sh @@ -62,6 +62,9 @@ USAGE: release.sh OPTIONS --debug=[true|false] [OPTIONAL] Set maven in debug mode. Default is false; true if option specified without argument. + --override-tag=[true|false] + Override the tag if it already exists remotely. Default is false; true if option specified without argument. + EOF ) @@ -84,9 +87,10 @@ parse_and_validate_options() SCM_STRATEGY="tag" EXTRA_MAVEN_PROFILE= DEBUG_MODE=false + OVERRIDE_TAG=false short_options="h" - long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::" + long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::,override-tag::" PROGNAME=${0##*/} ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" ) @@ -169,6 +173,28 @@ parse_and_validate_options() ;; esac ;; + --override-tag) + shift + case "$1" in + true) + OVERRIDE_TAG=true + shift + ;; + false) + OVERRIDE_TAG=false + shift + ;; + "") + OVERRIDE_TAG=true + shift + ;; + *) + OVERRIDE_TAG=false + shift + ;; + esac + ;; + --) shift break @@ -322,9 +348,14 @@ run_release_version_and_tag_process() # 7) Commit the change in version (if everything went well so far then this is a good tag) git add -u git commit -m "tag $RELEASE_TAG" - + # 8) Tag the current source - git tag "$RELEASE_TAG" + if [ "$OVERRIDE_TAG" ]; + then + git tag --force "$RELEASE_TAG" + else + git tag "$RELEASE_TAG" + fi # 9) If everything went well so far than means all the changes can be pushed!!! git push origin "$BUILD_BRANCH" @@ -364,7 +395,12 @@ verify_tags() EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` if [ -n "$EXISTING_REMOTE_TAG" ]; then - abort "A remote tag named $RELEASE_TAG already exists - aborting" + if[ "$OVERRIDE_TAG" ]; + then + echo "A remote tag named $RELEASE_TAG already exists, but will be overriden." + else + abort "A remote tag named $RELEASE_TAG already exists - aborting" + fi fi # See if the specified tag already exists locally - if so, delete it (even if in production mode). commit f41888af3d54bca114c1f15d1e48087835e74690 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Sat Oct 29 06:43:18 2011 -0500 Avoid having the settings file wiped out because of git clean commands. diff --git a/publish_release.sh b/publish_release.sh index 3eb6c98..3720a6b 100755 --- a/publish_release.sh +++ b/publish_release.sh @@ -53,7 +53,7 @@ set_variables() echo "We appear to be running in a Hudson job." WORKING_DIR="$WORKSPACE" MAVEN_LOCAL_REPO_DIR="$WORKSPACE/.m2/repository" - #MAVEN_SETTINGS_FILE="$HOME/.m2/hudson-$JOB_NAME-settings.xml" + MAVEN_SETTINGS_FILE="$WORKSPACE/.m2/settings.xml" elif [ -z "$WORKING_DIR" ]; then WORKING_DIR="$HOME/release/rhq" MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository" @@ -61,7 +61,7 @@ set_variables() MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml" fi - MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml" + #MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml" PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git" commit cbe421b556347db94b6828bbb86be02ea2ce771b Author: Hudson <jboss-qa-internal(a)redhat.com&gt; Date: Fri Oct 28 19:02:37 2011 -0400 development RHQ_4.3.0-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index b080025..3a5f116 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 13cd80a..550ddfd 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a5c0981..6a9bcf2 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 6273a4f..d645c7a 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index dfd8e5a..a999e68 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd88fa0..d7eedff 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f5f66a..c0ca9be 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5a8b356..7eab16a 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa20853..dd75181 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-dbutils</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index bd0fdb4..164f5ad 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index bb4dc2c..e2b1d14 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 4a24392..151521d 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 6b633bb..e01941d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 25ae021..9718b0e 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index f2953a6..c143c00 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62a73be..002912b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d388ca8..11efd74 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 199a996..88827a8 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8b7ffe8..83aefb4 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index a6d3985..798353c 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index f424704..af241d2 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index cebd439..ce48f40 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index b66da2c..e47afba 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index db7d757..e0c53c8 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index afb2fec..cecb704 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 900d476..0e65e6a 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index ecb02d5..bfac4e7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 4e2ac9f..6c48f27 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 9ab5090..e828fbf 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 01fb7f6..2627ebf 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 24fbb60..d2990f3 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index bacb64b..344f171 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 3fe07b7..d3dcb79 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index f4b1866..70333b1 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index dee43bc..28a0f43 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index c57eaba..e777e21 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 1aebae1..2139374 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 8b3a73a..1e55e08 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 18a7436..32ce3d3 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index f0e2b36..c8a2707 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index b380393..3d64b03 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index e1e1890..103f28f 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c38aff4..a63eeaf 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 1a27831..4bfdad5 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 8574c9f..d9f7e6e 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0adccaf..3a50667 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 2c9bcfa..0fe30c2 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 06bab65..86907a4 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index bdee60f..8d255a1 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index bb595b5..8ba0b56 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 26f4409..65eccd7 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index bdfe647..be0f5ef 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 403ef41..17ca168 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 9c9d3b6..9100ee7 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 8cae6d5..936f60d 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 83bb64a..742e49c 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index dacaec2..327171a 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 9a51242..de0163a 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index f73ecb8..94a0f6c 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index c2d5c7e..34e879a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3fa05d3..1e7d64d 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 04df0b8..4dff432 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 79ccf2b..6669606 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9e221a0..1cfef10 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ce8468c..d24447a 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 517be69..fed4410 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 05cb339..22faa19 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 00344d4..9d67aa1 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2377858..0b54ce9 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 90c0da6..b071f6f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9e80f1f..9be012c 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e488bb0..3b75eec 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 0c73fd3..92da29b 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 417a3df..93928a6 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 206a7a7..9feecf3 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 95c697b..2744b37 100644 --- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml +++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 1b41b08..277fdc3 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d983b6a..270330d 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index c62f40e..0c5505d 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 95ab8f8..e5d95e2 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index ff7d21f..f8e88f8 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 5037c78..331acc2 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index cb99a8c..9c12590 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 370b2de..d2c9331 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6c1812b..a9be07c 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 700e775..1d6f220 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d197727..f964998 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 840e619..af68966 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 08f6555..6c647fb 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 0c7ec29..33eee7a 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b097071..fd0b274 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2cdc32a..d3eaebb 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 3632ceb..506ffeb 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index aba88a7..cfd2e9c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 389eba3..826861b 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 3e3432d..bd22e2f 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 56efc5b..84d7f79 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ae06793..30ee17f 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index e042824..989825b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dc87ed7..bcbb309 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 3a6deaa..7364fe3 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 835c57b..4919620 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 970f3ed..8b00d6a 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index ea74b9f..deb44d3 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6b0791d..eb40cae 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 63dd974..670f437 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 003e77e..87206a7 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 0a74452..3fd1b88 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2a0eb28..dc905e9 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d70ba83..d3ad8ac 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 19776c2..27aa74e 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index b1c3d22..0d72160 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 90337ed..cdb7869 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index d31afb9..c1b3fb2 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index e218ca8..472c868 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index a52a978..8317bdc 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3a1df45..649d707 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 78ad464..ecf8343 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1ae57af..01b7c6e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index a13f91c..be036d3 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 6565a7b..b83736c 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index e2fb957..116bbe5 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 5131fdc..f802f23 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5c6e85c..0b19530 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 45a9c14..040e7e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 1a84eb70bac0fd6cc7a211ca90622620dc329462 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Fri Oct 28 17:02:55 2011 -0400 [BZ 749415] Making the pinned field editable When editing a definition created from an unpinned template the pinned field in the editor should be editable. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java index c2398e1..4337010 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java @@ -184,7 +184,7 @@ public class DriftConfigurationDefinition implements Serializable { INSTANCE_FOR_EXISTING_CONFIGS.put(createExcludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createExcludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createAttached(INSTANCE_FOR_EXISTING_CONFIGS, false)); - INSTANCE_FOR_EXISTING_CONFIGS.put(createPinned(INSTANCE_FOR_EXISTING_CONFIGS, true)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createPinned(INSTANCE_FOR_EXISTING_CONFIGS, false)); NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createName(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, false)); commit 9019fab386213a9dfcd675d40c9a9b372d672bd2 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Fri Oct 28 15:24:57 2011 -0400 fixing failing tests Tests in AvailabilityManagerTest were failing because of a call in AgentManagerBean to load the system settings. A list of the drift server plugins is stored as part of the system settings. To obtain that list SystemManagerBean attempts to access DriftServerPluginContainer via the server plugin service. I have supplied AvailabilityManagerTest with a stubbed out server plugin service so that the SystemManagerBean is able to load the default settings without error. diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java index 37c5992..3fbc4f7 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java @@ -73,6 +73,8 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { private Availability availability2; private Availability availability3; + private DriftServerPluginService driftServerPluginService; + @BeforeMethod public void beforeMethod() { try { @@ -83,6 +85,11 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { this.resourceManager = LookupUtil.getResourceManager(); this.overlord = LookupUtil.getSubjectManager().getOverlord(); additionalResources = new ArrayList<Resource>(); + + driftServerPluginService = new DriftServerPluginService(); + prepareCustomServerPluginService(driftServerPluginService); + driftServerPluginService.masterConfig.getPluginDirectory().mkdirs(); + driftServerPluginService.startMasterPluginContainer(); } catch (Throwable t) { // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! @@ -131,6 +138,8 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { finally { unprepareScheduler(); + unprepareServerPluginService(); + driftServerPluginService.stopMasterPluginContainer(); } } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginService.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginService.java new file mode 100644 index 0000000..b20155a --- /dev/null +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginService.java @@ -0,0 +1,113 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 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.server.measurement.test; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.rhq.core.domain.plugin.PluginKey; +import org.rhq.core.domain.plugin.ServerPlugin; +import org.rhq.enterprise.server.plugin.pc.AbstractTypeServerPluginContainer; +import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer; +import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainerConfiguration; +import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment; +import org.rhq.enterprise.server.plugin.pc.ServerPluginManager; +import org.rhq.enterprise.server.plugin.pc.ServerPluginService; +import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginContainer; +import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginManager; +import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType; + +public class DriftServerPluginService extends ServerPluginService implements DriftServerPluginServiceMBean { + + public TestMasterServerPluginContainer master; + public MasterServerPluginContainerConfiguration masterConfig; + + public DriftServerPluginService() { + // build the config at constructor time so tests have it even before the PC is initialized + File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins"); + this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null); + } + + @Override + public MasterServerPluginContainer createMasterPluginContainer() { + this.master = new TestMasterServerPluginContainer(); + this.master.initialize(this.masterConfig); + return this.master; + } + + class TestMasterServerPluginContainer extends MasterServerPluginContainer { + @Override + protected ClassLoader createRootServerPluginClassLoader() { + return getClass().getClassLoader(); + } + + @Override + protected Map<URL, ? extends ServerPluginDescriptorType> preloadAllPlugins() throws Exception { + return Collections.emptyMap(); + } + + @Override + protected List<PluginKey> getDisabledPluginKeys() { + // in the real world, the db is checked for enable flag, here we say all plugins are enabled + return new ArrayList<PluginKey>(); + } + + @Override + protected List<AbstractTypeServerPluginContainer> createPluginContainers() { + ArrayList<AbstractTypeServerPluginContainer> pcs = new ArrayList<AbstractTypeServerPluginContainer>(1); + DriftServerPluginContainer driftPC = new TestDriftServerPluginContainer(this); + pcs.add(driftPC); + + return pcs; + } + } + + class TestDriftServerPluginContainer extends DriftServerPluginContainer { + public TestDriftServerPluginContainer(MasterServerPluginContainer master) { + super(master); + } + + @Override + protected ServerPluginManager createPluginManager() { + return new TestDriftServerPluginManager(this); + } + } + + class TestDriftServerPluginManager extends DriftServerPluginManager { + public TestDriftServerPluginManager(DriftServerPluginContainer pc) { + super(pc); + } + + @Override + public Collection<ServerPluginEnvironment> getPluginEnvironments() { + return Collections.emptyList(); + } + + @Override + protected ServerPlugin getPlugin(ServerPluginEnvironment env) { + return null; + } + } +} diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginServiceMBean.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginServiceMBean.java new file mode 100644 index 0000000..8473cf0 --- /dev/null +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/DriftServerPluginServiceMBean.java @@ -0,0 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 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.server.measurement.test; + +import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement; + +public interface DriftServerPluginServiceMBean extends ServerPluginServiceManagement { +} commit b3a6c8da4a5cee195a87214b1088e1cd7bc3329e Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Fri Oct 28 11:38:27 2011 -0400 [BZ 749824] fix login logo so it isn't clipped. we now have two logo files - one 40px high and the other 28px high (40 for login screen, 28 for top menu bar) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index 82e2d93..d691e0e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -35,7 +35,6 @@ import com.google.gwt.http.client.URL; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.FormErrorOrientation; -import com.smartgwt.client.types.ImageStyle; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.IButton; @@ -121,14 +120,11 @@ public class LoginView extends LocatableCanvas { form.setErrorOrientation(FormErrorOrientation.BOTTOM); // NOTE: This image will either be an RHQ logo or a JON logo. - Img logoImg = new Img("header/rhq_logo_28px.png"); - // NOTE: Don't explicitly specify a width, so the width will be scaled proportionally to the height. - logoImg.setImageType(ImageStyle.NORMAL); - logoImg.setImageHeight(40); + // but must be 80x40 + Img logoImg = new Img("header/rhq_logo_40px.png", 80, 40); CanvasItem logo = new CanvasItem(); logo.setShowTitle(false); - logo.setHeight(logoImg.getImageHeight() + 4); logo.setCanvas(logoImg); HeaderItem header = new HeaderItem(); @@ -334,8 +330,7 @@ public class LoginView extends LocatableCanvas { public void onFailure(Throwable caught) { inputForm.setFieldErrors(FIRST, MSG.view_login_noLdap(), true); - Log - .debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur."); + Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur."); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index 3bd11d2..7f14273 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -18,11 +18,13 @@ */ package org.rhq.enterprise.gui.coregui.client.menu; +import java.util.HashMap; +import java.util.Map; + import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.History; import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.ImageStyle; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; @@ -47,9 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHStack; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; -import java.util.HashMap; -import java.util.Map; - /** * @author Greg Hinkle * @author Joseph Marques @@ -104,11 +103,8 @@ public class MenuBarView extends LocatableVLayout { HLayout logoSection = new HLayout(); logoSection.setOverflow(Overflow.VISIBLE); - // NOTE: This image will either be an RHQ logo or a JON logo. - Img logo = new Img("header/rhq_logo_28px.png"); - // NOTE: Don't explicitly specify a width, so the width will be scaled proportionally to the height. - logo.setImageType(ImageStyle.NORMAL); - logo.setImageHeight(28); + // NOTE: This image will either be an RHQ logo or a JON logo, but must be 80x28 + Img logo = new Img("header/rhq_logo_28px.png", 80, 28); logo.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { aboutModalWindow.show(); @@ -136,7 +132,7 @@ public class MenuBarView extends LocatableVLayout { lineLabel.setAlign(Alignment.CENTER); String contents = "<a href='#" + LOGOUT_VIEW_ID.getName() + "' style='white-space: nowrap'>" - + LOGOUT_VIEW_ID.getTitle() + "</a>"; + + LOGOUT_VIEW_ID.getTitle() + "</a>"; LocatableLabel logoutLink = new LocatableLabel(this.extendLocatorId("LogoutLink"), contents); logoutLink.setAutoWidth(); @@ -167,7 +163,7 @@ public class MenuBarView extends LocatableVLayout { linkVLayout.setAlign(VerticalAlignment.CENTER); String contents = "<a class='menuBar' href='#" + sectionName.getName() + "'>" + sectionName.getTitle() - + "</a>"; + + "</a>"; LocatableLabel link = new LocatableLabel(extendLocatorId(sectionName.getName()), contents); link.setAutoHeight(); link.setAlign(Alignment.CENTER); diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png b/modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png new file mode 100644 index 0000000..16eb22e Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png differ commit e8e80ae63b1505d9952894accc8cf3737387d386 Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Fri Oct 28 10:26:54 2011 -0400 fix ordering of modules so a clean mvn install can be done from the root dir without having to build certain individual modules separately first diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f32159e..0a74452 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -106,8 +106,8 @@ <modules> <!-- core plugins --> <module>platform</module> - <module>rhq-agent</module> <module>jmx</module> + <module>rhq-agent</module> </modules> <profiles> diff --git a/modules/pom.xml b/modules/pom.xml index c846655..5131fdc 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -24,6 +24,10 @@ <properties> </properties> + <modules> + <module>test-utils</module> + </modules> + <profiles> <profile> @@ -168,7 +172,5 @@ </profile> </profiles> - <modules> - <module>test-utils</module> - </modules> </project> + commit 8289307ab638f7d138aa853c0f08248561c62323 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Fri Oct 28 10:18:52 2011 -0400 Temporarily disabling drift tests due to test dependency issue There is a dependency issue in drift tests where tests need a drift server plugin, but the plugins are not built until after server/jar. Temporarily disabling tests so we can get a release build. A fix for the problem is in progress. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index f5ba55f..f0e2b36 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -610,6 +610,7 @@ Build-OS-Version=${os.version} <excludes> <exclude>com/**/*.java</exclude> <exclude>org/rhq/**/performance/**/*.java</exclude> + <exclude>**/drift/*.java</exclude> </excludes> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <groups>${rhq.testng.includedGroups}</groups> commit 88ada0fc9fa943d7f9d597f22c235daac5140e8c Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Fri Oct 28 09:13:30 2011 -0500 Revert "development RHQ_4.3.0-SNAPSHOT" This reverts commit ef0818dff9a528b71ac354ae1968077118037751. diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 3a5f116..b080025 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 550ddfd..13cd80a 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 6a9bcf2..a5c0981 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index d645c7a..6273a4f 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index a999e68..dfd8e5a 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d7eedff..bd88fa0 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index c0ca9be..9f5f66a 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 7eab16a..5a8b356 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index dd75181..aa20853 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-dbutils</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 164f5ad..bd0fdb4 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e2b1d14..bb4dc2c 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 151521d..4a24392 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index e01941d..6b633bb 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 9718b0e..25ae021 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index c143c00..f2953a6 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 002912b..62a73be 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 11efd74..d388ca8 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 88827a8..199a996 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 83aefb4..8b7ffe8 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 798353c..a6d3985 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index af241d2..f424704 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index ce48f40..cebd439 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index e47afba..b66da2c 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index e0c53c8..db7d757 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index cecb704..afb2fec 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 0e65e6a..900d476 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index bfac4e7..ecb02d5 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 6c48f27..4e2ac9f 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index e828fbf..9ab5090 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 2627ebf..01fb7f6 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d2990f3..24fbb60 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 344f171..bacb64b 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index d3dcb79..3fe07b7 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 70333b1..f4b1866 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 28a0f43..dee43bc 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index e777e21..c57eaba 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 2139374..1aebae1 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 1e55e08..8b3a73a 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 32ce3d3..18a7436 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 7206726..f5ba55f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 3d64b03..b380393 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 103f28f..e1e1890 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index a63eeaf..c38aff4 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 4bfdad5..1a27831 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index d9f7e6e..8574c9f 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 3a50667..0adccaf 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 0fe30c2..2c9bcfa 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 86907a4..06bab65 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 8d255a1..bdee60f 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 8ba0b56..bb595b5 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 65eccd7..26f4409 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index be0f5ef..bdfe647 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 17ca168..403ef41 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 9100ee7..9c9d3b6 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 936f60d..8cae6d5 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 742e49c..83bb64a 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 327171a..dacaec2 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index de0163a..9a51242 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 94a0f6c..f73ecb8 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 34e879a..c2d5c7e 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 1e7d64d..3fa05d3 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 4dff432..04df0b8 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 6669606..79ccf2b 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 1cfef10..9e221a0 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d24447a..ce8468c 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index fed4410..517be69 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 22faa19..05cb339 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 9d67aa1..00344d4 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 0b54ce9..2377858 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index b071f6f..90c0da6 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9be012c..9e80f1f 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 3b75eec..e488bb0 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 92da29b..0c73fd3 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 93928a6..417a3df 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 9feecf3..206a7a7 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 2744b37..95c697b 100644 --- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml +++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 277fdc3..1b41b08 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 270330d..d983b6a 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 0c5505d..c62f40e 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index e5d95e2..95ab8f8 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f8e88f8..ff7d21f 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 331acc2..5037c78 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 9c12590..cb99a8c 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index d2c9331..370b2de 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index a9be07c..6c1812b 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 1d6f220..700e775 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index f964998..d197727 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index af68966..840e619 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 6c647fb..08f6555 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 33eee7a..0c7ec29 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index fd0b274..b097071 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d3eaebb..2cdc32a 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 506ffeb..3632ceb 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index cfd2e9c..aba88a7 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 826861b..389eba3 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index bd22e2f..3e3432d 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 84d7f79..56efc5b 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 30ee17f..ae06793 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 989825b..e042824 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index bcbb309..dc87ed7 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 7364fe3..3a6deaa 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 4919620..835c57b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 8b00d6a..970f3ed 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index deb44d3..ea74b9f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index eb40cae..6b0791d 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 670f437..63dd974 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 87206a7..003e77e 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 1ebba64..f32159e 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index dc905e9..2a0eb28 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d3ad8ac..d70ba83 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 27aa74e..19776c2 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 0d72160..b1c3d22 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index cdb7869..90337ed 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c1b3fb2..d31afb9 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 472c868..e218ca8 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 8317bdc..a52a978 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 649d707..3a1df45 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index ecf8343..78ad464 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 01b7c6e..1ae57af 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index be036d3..a13f91c 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index b83736c..6565a7b 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 116bbe5..e2fb957 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 179a29d..c846655 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0b19530..5c6e85c 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 040e7e6..45a9c14 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 23b3caab6c9a64b9acded0ed3265305c83239fa1 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Fri Oct 28 08:55:35 2011 -0500 Checkout the release branch regardless... diff --git a/publish_release.sh b/publish_release.sh index 359c084..3eb6c98 100755 --- a/publish_release.sh +++ b/publish_release.sh @@ -139,39 +139,32 @@ print_program_versions "${program_versions[@]}" echo "===============================================================================" -# We only need to worry about cloning the repo if we are not running on hudson -if [ ! "$HUDSON_URL" ]; then - # Clone and/or checkout the source from git. - - if [ -d "$WORKING_DIR" ]; then - cd "$WORKING_DIR" - git status >/dev/null 2>&1 - GIT_STATUS_EXIT_CODE=$? - # Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes, - # and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if $WORKING_DIR - # is truly a git working copy. - if [ "$GIT_STATUS_EXIT_CODE" -le 1 ]; then - echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..." - git fetch origin "$RELEASE_BRANCH" - [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)." - git checkout "$RELEASE_BRANCH" 2>/dev/null - if [ "$?" -ne 0 ]; then - git checkout --track -b "$RELEASE_BRANCH" "origin/$RELEASE_BRANCH" - fi - [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)." - git reset --hard "origin/$RELEASE_BRANCH" - [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)." - git clean -dxf - [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)." - git pull - [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)." - else - echo "$WORKING_DIR does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..." - cd .. - rm -rf "$WORKING_DIR" - [ "$?" -ne 0 ] && abort "Failed to remove bogus working directory ($WORKING_DIR)." - fi - fi +# Checkout the source from git. +git status >/dev/null 2>&1 +GIT_STATUS_EXIT_CODE=$? +# Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there are any uncommitted changes, +# and git 1.7 returns 0, so we check if the exit code is less than or equal to 1 to determine if $WORKING_DIR +# is truly a git working copy. +if [ "$GIT_STATUS_EXIT_CODE" -le 1 ]; then + echo "Checking out a clean copy of the release branch ($RELEASE_BRANCH)..." + git fetch origin "$RELEASE_BRANCH" + [ "$?" -ne 0 ] && abort "Failed to fetch release branch ($RELEASE_BRANCH)." + git checkout "$RELEASE_BRANCH" 2>/dev/null + if [ "$?" -ne 0 ]; then + git checkout --track -b "$RELEASE_BRANCH" "origin/$RELEASE_BRANCH" + fi + [ "$?" -ne 0 ] && abort "Failed to checkout release branch ($RELEASE_BRANCH)." + git reset --hard "origin/$RELEASE_BRANCH" + [ "$?" -ne 0 ] && abort "Failed to reset release branch ($RELEASE_BRANCH)." + git clean -dxf + [ "$?" -ne 0 ] && abort "Failed to clean release branch ($RELEASE_BRANCH)." + git pull + [ "$?" -ne 0 ] && abort "Failed to update release branch ($RELEASE_BRANCH)." +else + echo "$WORKING_DIR does not appear to be a git working directory ('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly clone the repo..." + cd .. + rm -rf "$WORKING_DIR" + [ "$?" -ne 0 ] && abort "Failed to remove bogus working directory ($WORKING_DIR)." fi commit 56cb7b1b9e00f3a9ab7e74ef68e69a4360d67642 Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Fri Oct 28 09:36:23 2011 -0400 minor - fix a couple typos 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 e8212d4..e69994e 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 @@ -1307,8 +1307,8 @@ view_dynagroup_mixed = Mixed view_dynagroup_newGroupDefinition = New Group Definition view_dynagroup_nextCalculationTime = Next Calculation Time view_dynagroup_permDenied = You do not have permission to view group definitions -view_dynagroup_recalcFailure = Failed to recalculated this group definition -view_dynagroup_recalcFailureSelection = Failed to recalculated the selected group definitions +view_dynagroup_recalcFailure = Failed to recalculate this group definition +view_dynagroup_recalcFailureSelection = Failed to recalculate the selected group definitions view_dynagroup_recalcSuccessful = You have successfully recalculated this group definition view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group definitions view_dynagroup_recalculate = Recalculate commit bb078c65d9b87f149f239a75254780aa7d532576 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Fri Oct 28 01:16:08 2011 -0500 Update the publish script to use a maven repo folder under the workspace folder. diff --git a/publish_release.sh b/publish_release.sh index 8ffc1ac..359c084 100755 --- a/publish_release.sh +++ b/publish_release.sh @@ -52,7 +52,7 @@ set_variables() if [ -n "$HUDSON_URL" ] && [ -n "$WORKSPACE" ]; then echo "We appear to be running in a Hudson job." WORKING_DIR="$WORKSPACE" - MAVEN_LOCAL_REPO_DIR="$HOME/.m2/hudson-release-$RELEASE_TYPE-repository" + MAVEN_LOCAL_REPO_DIR="$WORKSPACE/.m2/repository" #MAVEN_SETTINGS_FILE="$HOME/.m2/hudson-$JOB_NAME-settings.xml" elif [ -z "$WORKING_DIR" ]; then WORKING_DIR="$HOME/release/rhq" @@ -65,7 +65,7 @@ set_variables() PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git" - MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Prhq-publish-release,enterprise,dist" + MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Prhq-publish-release,enterprise,dist -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR" if [ "$MODE" = "test" ]; then MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true" commit e676d0f871f70a8dd9ad2d5ecfe9239d0d8e3cd7 Author: Hudson <jboss-qa-internal(a)redhat.com&gt; Date: Fri Oct 28 00:51:30 2011 -0400 development RHQ_4.3.0-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index b080025..3a5f116 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 13cd80a..550ddfd 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a5c0981..6a9bcf2 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 6273a4f..d645c7a 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index dfd8e5a..a999e68 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd88fa0..d7eedff 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f5f66a..c0ca9be 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5a8b356..7eab16a 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa20853..dd75181 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-dbutils</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index bd0fdb4..164f5ad 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index bb4dc2c..e2b1d14 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 4a24392..151521d 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 6b633bb..e01941d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 25ae021..9718b0e 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index f2953a6..c143c00 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62a73be..002912b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d388ca8..11efd74 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 199a996..88827a8 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8b7ffe8..83aefb4 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index a6d3985..798353c 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index f424704..af241d2 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index cebd439..ce48f40 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index b66da2c..e47afba 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index db7d757..e0c53c8 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index afb2fec..cecb704 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 900d476..0e65e6a 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index ecb02d5..bfac4e7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 4e2ac9f..6c48f27 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 9ab5090..e828fbf 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 01fb7f6..2627ebf 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 24fbb60..d2990f3 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index bacb64b..344f171 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 3fe07b7..d3dcb79 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index f4b1866..70333b1 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index dee43bc..28a0f43 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index c57eaba..e777e21 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 1aebae1..2139374 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 8b3a73a..1e55e08 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 18a7436..32ce3d3 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index f5ba55f..7206726 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index b380393..3d64b03 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index e1e1890..103f28f 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c38aff4..a63eeaf 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 1a27831..4bfdad5 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 8574c9f..d9f7e6e 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0adccaf..3a50667 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 2c9bcfa..0fe30c2 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 06bab65..86907a4 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index bdee60f..8d255a1 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index bb595b5..8ba0b56 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 26f4409..65eccd7 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index bdfe647..be0f5ef 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 403ef41..17ca168 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 9c9d3b6..9100ee7 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 8cae6d5..936f60d 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 83bb64a..742e49c 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index dacaec2..327171a 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 9a51242..de0163a 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index f73ecb8..94a0f6c 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index c2d5c7e..34e879a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3fa05d3..1e7d64d 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 04df0b8..4dff432 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 79ccf2b..6669606 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9e221a0..1cfef10 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ce8468c..d24447a 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 517be69..fed4410 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 05cb339..22faa19 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 00344d4..9d67aa1 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2377858..0b54ce9 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 90c0da6..b071f6f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9e80f1f..9be012c 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e488bb0..3b75eec 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 0c73fd3..92da29b 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 417a3df..93928a6 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 206a7a7..9feecf3 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 95c697b..2744b37 100644 --- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml +++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 1b41b08..277fdc3 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d983b6a..270330d 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index c62f40e..0c5505d 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 95ab8f8..e5d95e2 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index ff7d21f..f8e88f8 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 5037c78..331acc2 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index cb99a8c..9c12590 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 370b2de..d2c9331 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6c1812b..a9be07c 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 700e775..1d6f220 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d197727..f964998 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 840e619..af68966 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 08f6555..6c647fb 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 0c7ec29..33eee7a 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b097071..fd0b274 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2cdc32a..d3eaebb 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 3632ceb..506ffeb 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index aba88a7..cfd2e9c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 389eba3..826861b 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 3e3432d..bd22e2f 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 56efc5b..84d7f79 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ae06793..30ee17f 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index e042824..989825b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dc87ed7..bcbb309 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 3a6deaa..7364fe3 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 835c57b..4919620 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 970f3ed..8b00d6a 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index ea74b9f..deb44d3 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6b0791d..eb40cae 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 63dd974..670f437 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 003e77e..87206a7 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f32159e..1ebba64 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2a0eb28..dc905e9 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d70ba83..d3ad8ac 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 19776c2..27aa74e 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index b1c3d22..0d72160 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 90337ed..cdb7869 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index d31afb9..c1b3fb2 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index e218ca8..472c868 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index a52a978..8317bdc 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3a1df45..649d707 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 78ad464..ecf8343 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1ae57af..01b7c6e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index a13f91c..be036d3 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 6565a7b..b83736c 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index e2fb957..116bbe5 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index c846655..179a29d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5c6e85c..0b19530 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 45a9c14..040e7e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit e15fb248d89279f63b71a823228c7dae08caf0b3 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Thu Oct 27 19:36:30 2011 -0500 Activate profiles in a consistent order with other the build environments. diff --git a/release.sh b/release.sh index 27da8aa..65a9596 100755 --- a/release.sh +++ b/release.sh @@ -242,13 +242,16 @@ set_local_and_environment_variables() MAVEN_SETTINGS_FILE="$HOME/.m2/settings.xml" fi - MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR --batch-mode --errors -Penterprise,dist,release" + MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR --batch-mode --errors" if [ -n "$EXTRA_MAVEN_PROFILE" ]; then - MAVEN_ARGS="$MAVEN_ARGS,$EXTRA_MAVEN_PROFILE" + MAVEN_ARGS="$MAVEN_ARGS --activate-profiles $EXTRA_MAVEN_PROFILE,enterprise,dist,release" + else + MAVEN_ARGS="$MAVEN_ARGS --activate-profiles enterprise,dist,release" fi + if [ "$RELEASE_TYPE" = "enterprise" ]; then MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav " commit 3693aedd8f816837b66c72fbb4101dc226d45dde Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Thu Oct 27 16:53:07 2011 -0400 [BZ 749657] display not-all-available-records-loaded warning message within selector widget itself, rather than in the main message bar (https://bugzilla.redhat.com/show_bug.cgi?id=749657) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index b75fe75..4ed99cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -38,6 +38,7 @@ import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.ImgProperties; +import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.TransferImgButton; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; @@ -62,9 +63,7 @@ import com.smartgwt.client.widgets.layout.SectionStack; import com.smartgwt.client.widgets.layout.SectionStackSection; import com.smartgwt.client.widgets.layout.VStack; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTransferImgButton; @@ -103,6 +102,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria protected Criteria latestCriteria; private boolean isReadOnly; + private Label messageLayout; public AbstractSelector(String locatorId) { this(locatorId, false); @@ -187,6 +187,9 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria if (!this.isReadOnly) { // LEFT SIDE + this.messageLayout = new Label(); + this.messageLayout.setMargin(3); + addMember(this.messageLayout); this.availableFilterForm = getAvailableFilterForm(); if (this.availableFilterForm != null) { addMember(this.availableFilterForm); @@ -373,13 +376,16 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria int totalAvailableRecords = totalRecords - assignedRecords.length; if (availableRecords.size() < totalAvailableRecords) { // TODO: i18n - Message message = new Message("Only " + availableRecords.size() + " out of " + messageLayout.setContents("<b>Note:</b> Only " + availableRecords.size() + " out of " + totalAvailableRecords + " available " + getItemTitle() - + " are listed - please specify one or more filters to find the " + getItemTitle() - + " for which you are looking.", - Message.Severity.Warning); - CoreGUI.getMessageCenter().notify(message); + + " are listed - please specify more specific filters below to find the " + getItemTitle() + + " for which you are looking."); + } else { + // Clear the warning message, if any, from the previous fetch. + // Note, surprisingly, setContents(null) doesn't work. + messageLayout.setContents("&nbsp;"); } + messageLayout.markForRedraw(); availableGrid.setData(availableRecords.toArray(new Record[availableRecords.size()])); } finally { updateButtonEnablement(); commit c8eab981af2f3b99c73f2017706295c77110f49e Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Thu Oct 27 15:45:03 2011 -0400 [BZ 749654] (stopgap workaround for RHQ 4.2) for selectors with no filters, set the available record page size to 500, rather than 100, to minimize the chances of use not being able to view some available items (https://bugzilla.redhat.com/show_bug.cgi?id=749654) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java index bf82a12..d1358e5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java @@ -60,6 +60,11 @@ public class RoleSubjectSelector extends AbstractSelector<Subject, SubjectCriter } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java index 1c27994..44c2188 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java @@ -49,6 +49,11 @@ public class SubjectRoleSelector extends AbstractSelector<Role, RoleCriteria> { } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected RPCDataSource<Role, RoleCriteria> getDataSource() { return new RolesDataSource(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java index c4a7c51..2ba41e1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java @@ -181,6 +181,11 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java index e7139a7..dbf1a8c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java @@ -192,6 +192,11 @@ public class SystemUsersNotificationSenderForm extends AbstractNotificationSende } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 9b9f4c4..b75fe75 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -315,7 +315,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }); } this.datasource = getDataSource(); - this.datasource.setDataPageSize(MAX_AVAILABLE_RECORDS); + this.datasource.setDataPageSize(getMaxAvailableRecords()); populateAvailableGrid((null == latestCriteria) ? new Criteria() : latestCriteria); // Add event handlers. commit 1df6f96ac51f6216ed0f1915ff6f40a606b568c5 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Thu Oct 27 15:28:16 2011 -0400 [BZ 749415] check the right entity context to determine which drift config def to use diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java index 9b0c9d9..0815405 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.Canvas; +import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.drift.DriftConfigurationDefinition; @@ -64,7 +65,7 @@ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep { } private ConfigurationDefinition getDriftConfigDef() { - if (wizard.getEntityContext().isSubsystemView()) { + if (wizard.getEntityContext().getType() == EntityContext.Type.ResourceTemplate) { return DriftConfigurationDefinition.getNewTemplateInstance(); } commit 1ada648fd2f19e4fb3c6d401fe6161e322165cf6 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Thu Oct 27 14:50:14 2011 -0400 fixing/updating tests In a previous commit, the JPADrift.changeSet property was made required. This required a number of tests to be updated. diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java index 89789ff..b2eddb3 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java @@ -119,35 +119,38 @@ public class JPADriftChangeSetTest extends DriftDataAccessTest { @Test(groups = {"JPADriftChangeSet", "drift.ejb"}) public void saveAndLoadInitialChangeSet() { - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, null); - drift.setDirectory("/basedir"); - - JPADriftSet driftSet = new JPADriftSet(); - driftSet.addDrift(drift); - - final JPADriftChangeSet changeSet = new JPADriftChangeSet(); - changeSet.setCategory(COVERAGE); - changeSet.setVersion(0); - changeSet.setDriftDefinition(definition); - changeSet.setDriftHandlingMode(DriftHandlingMode.normal); - changeSet.setResource(resource); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + + JPADriftChangeSet changeSet = new JPADriftChangeSet(); + changeSet.setCategory(COVERAGE); + changeSet.setVersion(0); + changeSet.setDriftDefinition(definition); + changeSet.setDriftHandlingMode(DriftHandlingMode.normal); + changeSet.setResource(resource); + em.persist(changeSet); em.flush(); + + JPADriftSet driftSet = new JPADriftSet(); + driftSet.addDrift(new JPADrift(changeSet, "drift.1", FILE_ADDED, null, null)); + + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); + em.flush(); em.clear(); + JPADriftChangeSet savedChangeSet = em .find(JPADriftChangeSet.class, Integer.parseInt(changeSet.getId())); assertNotNull("Failed to persist change set", savedChangeSet); - JPADriftSet driftSet = savedChangeSet.getInitialDriftSet(); - assertNotNull("Failed to persist drift set", driftSet); - assertEquals("Failed to persist drift belonging to drift set", 1, driftSet.getDrifts().size()); + JPADriftSet savedDriftSet = savedChangeSet.getInitialDriftSet(); + assertNotNull("Failed to persist drift set", savedDriftSet); + assertEquals("Failed to persist drift belonging to drift set", 1, savedDriftSet.getDrifts().size()); } }); } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java index a39faa0..125dfb3 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java @@ -278,15 +278,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false); // create initial change set from which the snapshot will be generated + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); + driftFile1 = new JPADriftFile("a1b2c3"); - drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); - changeSet0.setInitialDriftSet(driftSet); - // create change set v1 driftFile2 = new JPADriftFile("1a2b3c"); final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT, attachedDef1); @@ -296,13 +295,19 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + em.persist(attachedDef1); + em.persist(driftFile1); em.persist(driftFile2); - em.persist(drift1); - em.persist(drift2); + em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); + em.persist(changeSet1); + em.persist(drift2); em.persist(attachedDef2); em.persist(detachedDef1); @@ -404,39 +409,44 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false); // create some change sets + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); + driftFile1 = new JPADriftFile("a1b2c3"); - drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet0 = new JPADriftSet(); + final JPADriftSet driftSet0 = new JPADriftSet(); driftSet0.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); - changeSet0.setInitialDriftSet(driftSet0); - + final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 0, DRIFT, detachedDef1); driftFile2 = new JPADriftFile("1a2b3c"); - drift2 = new JPADrift(null, "drift.2", FILE_ADDED, null, driftFile2); + drift2 = new JPADrift(changeSet1, "drift.2", FILE_ADDED, null, driftFile2); - JPADriftSet driftSet1 = new JPADriftSet(); + final JPADriftSet driftSet1 = new JPADriftSet(); driftSet1.addDrift(drift2); - final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 0, DRIFT, detachedDef1); - changeSet1.setInitialDriftSet(driftSet1); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + em.persist(attachedDef1); em.persist(attachedDef2); em.persist(detachedDef1); em.persist(detachedDef2); + em.persist(driftFile1); em.persist(driftFile2); - em.persist(drift1); - em.persist(drift2); + em.persist(changeSet0); + em.persist(driftSet0); + changeSet0.setInitialDriftSet(driftSet0); + em.merge(changeSet0); + em.persist(changeSet1); + em.persist(driftSet1); + changeSet1.setInitialDriftSet(driftSet1); + em.merge(changeSet1); } }); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java index 5afca31..2b3b33a 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java @@ -260,10 +260,11 @@ public class JPADriftServerBeanTest extends DriftServerTest { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); - em.persist(driftSet); - changeSet.setInitialDriftSet(driftSet); em.persist(changeSet); em.persist(driftDef); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } }); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java index cfcc4ba..1353293 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java @@ -103,20 +103,19 @@ public class ManageDriftDefinitionsTest extends DriftServerTest { // and persisting the pinned change set. // first create the change set + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE, null); + changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c"); - JPADrift drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); - JPADrift drift2 = new JPADrift(null, "drift.2", FILE_ADDED, null, driftFile2); + JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift2 = new JPADrift(changeSet0, "drift.2", FILE_ADDED, null, driftFile2); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); driftSet.addDrift(drift2); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE, null); - changeSet0.setInitialDriftSet(driftSet); - changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal); - // create the template final DriftDefinition templateDef = new DriftDefinition(new Configuration()); templateDef.setName("test_createUnpinnedDefinition"); @@ -137,6 +136,9 @@ public class ManageDriftDefinitionsTest extends DriftServerTest { em.persist(driftFile1); em.persist(driftFile2); em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); // setting the change set id on the template is the last and the // most important step in making the template pinned diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java index dbab012..190df2f 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java @@ -45,11 +45,8 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria; import org.rhq.core.domain.drift.Drift; import org.rhq.core.domain.drift.DriftChangeSet; -import org.rhq.core.domain.drift.DriftConfigurationDefinition; import org.rhq.core.domain.drift.DriftDefinition; -import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.drift.DriftSnapshot; -import org.rhq.core.domain.drift.DriftSnapshotRequest; import org.rhq.core.domain.drift.JPADrift; import org.rhq.core.domain.drift.JPADriftChangeSet; import org.rhq.core.domain.drift.JPADriftFile; @@ -74,21 +71,23 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag"); // create initial change set + final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift); - final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); em.persist(driftFile1); em.persist(changeSet); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } }); @@ -104,15 +103,14 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::makeSnapshotVersionZero"); // create initial change set + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet0.setInitialDriftSet(driftSet); - // create change set v1 final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c"); final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT, driftDef); @@ -125,6 +123,9 @@ public class ManageSnapshotsTest extends DriftServerTest { em.persist(driftFile1); em.persist(driftFile2); em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); em.persist(changeSet1); em.persist(drift2); } @@ -168,21 +169,23 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag"); // create initial change set + final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift); - final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); em.persist(driftFile1); em.persist(changeSet); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } }); commit 2b78703a764489575b6fb81f9673bdc132c60f9a Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:52:10 2011 -0400 A post 4.2 TODO for Table diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 8d6e3a4..2fa8985 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -228,6 +228,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements this.flexRowDisplay = flexRowDisplay; } + // TODO: I think this should just be a simple getter. Returning the canvas before we're initialized is likely + // a bad thing. -Jay. Will do after the 4.2 release as it doesn't seem to bite us at the moment. /** * Returns the encompassing canvas that contains all content for this table component. * This content includes the list grid, the buttons, etc. @@ -407,7 +409,6 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements drawFooter(); } - if (!autoFetchData && (initialCriteria != null)) { refresh(); } @@ -1073,7 +1074,6 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements field.setHidden(true); } - // -------------- Inner utility classes ------------- // /** commit 9e4f630b62a42667fdc18b57c2e9443fcbf78126 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:51:58 2011 -0400 [BZ 749432 - Drift detail view navigation issues] Provide a temporary solution for navigating to Drift detail from various places in the drift gui. As it stands the DriftSnapshotView does not offer support for proper Master-Detail and this is complicated by the various ways in which the SnapshotView is embedded into the gui, at the resource and template levels. The basic fallout is that the backButton for the drift detail page is not going to bring you back to the snapshot page, but rather that page's parent view. My plan is to hopefully embed the detail view into the snapshot view (via expanding rows), making the whole navigation issue moot. But that is post RHQ 4.2 diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java index 4bc881d..1985cd4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java @@ -25,6 +25,7 @@ package org.rhq.enterprise.gui.coregui.client; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView; +import org.rhq.enterprise.gui.coregui.client.admin.templates.DriftDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView; import org.rhq.enterprise.gui.coregui.client.components.table.StringIDTableSection; @@ -395,7 +396,7 @@ public class LinkManager { } } - public static String getAdminTemplatesEditLink(String viewName, String typeId) { + public static String getAdminTemplatesEditLink(String viewName, int typeId) { if (GWT) { return "#Administration/Configuration/" + viewName + "/" + typeId; } else { @@ -516,15 +517,51 @@ public class LinkManager { return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Edit"; } - public static String getDriftHistoryLink(int resourceId, int driftDefId, String driftId) { + public static String getDriftCarouselDriftLink(int resourceId, int driftDefId, String driftId) { if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { driftId = StringIDTableSection.ID_PREFIX + driftId; } - return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/History/" + driftId; + return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Drift/" + driftId; } - public static String getDriftSnapshotLink(int resourceId, int driftDefId, int version) { + public static String getDriftCarouselSnapshotLink(int resourceId, int driftDefId, int version) { return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Snapshot/" + version; } + public static String getDriftCarouselSnapshotDriftLink(int resourceId, int driftDefId, int version, String driftId) { + if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { + driftId = StringIDTableSection.ID_PREFIX + driftId; + } + + // TODO: for now, just make this the same as the carousel drift link. The downside is that the back button + // will bring us back to the carousel and not the snapshot view. Eventually would like another + // master-detail relationship here, but it's hairy to get this working. + // + // return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Snapshot/" + version + "/" + driftId; + + return getDriftCarouselDriftLink(resourceId, driftDefId, driftId); + } + + public static String getDriftTemplateLink(int typeId, int templateId) { + String result = getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID.getName(), typeId); + + return result + "/" + templateId; + } + + public static String getDriftTemplateSnapshotLink(int typeId, int templateId) { + String result = getDriftTemplateLink(typeId, templateId); + + return result + "/Snapshot"; + } + + public static String getDriftTemplateSnapshotDriftLink(int typeId, int templateId, String driftId) { + String result = getDriftTemplateSnapshotLink(typeId, templateId); + + if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { + driftId = StringIDTableSection.ID_PREFIX + driftId; + } + + return result + "/" + driftId; + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java index 0c495b5..a4da48b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java @@ -71,7 +71,7 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java index 72f11a2..ea18a4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java @@ -74,7 +74,7 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java index 6296c42..858bc8d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java @@ -69,7 +69,7 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java index d8371db..7872a0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java @@ -94,8 +94,7 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions } else { if (parentId != null && parentId.intValue() != 0) { record.setAttribute(FIELD_PARENT, LinkManager.getAdminTemplatesEditLink( - AlertDefinitionTemplateTypeView.VIEW_ID.getName(), String.valueOf(this.resource.getResourceType() - .getId())) + AlertDefinitionTemplateTypeView.VIEW_ID.getName(), this.resource.getResourceType().getId()) + "/" + parentId); record.setLinkText(MSG.view_alert_definition_for_type()); } else { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java index fbf4123..47b5d3d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java @@ -103,7 +103,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); Integer driftDefId = record.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_DEF_ID); String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String url = LinkManager.getDriftCarouselDriftLink(resourceId, driftDefId, driftId); CoreGUI.goToView(url); } } @@ -149,7 +149,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse public void updateTitleCanvas(String titleString) { int resourceId = getContext().getResourceId(); String imageHtml = Canvas.imgHTML(ImageManager.getViewIcon()); - String link = LinkManager.getDriftSnapshotLink(resourceId, changeSet.getDriftDefinitionId(), changeSet + String link = LinkManager.getDriftCarouselSnapshotLink(resourceId, changeSet.getDriftDefinitionId(), changeSet .getVersion()); StringBuilder sb = new StringBuilder(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java index 7239ef6..4489472 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java @@ -72,7 +72,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi private boolean hasWriteAccess; private Integer maxCarouselEndFilter; private ArrayList<Record> selectedRecords = new ArrayList<Record>(); - private boolean useHistoryDetailsView; + private boolean useDriftDetailsView; private DriftGWTServiceAsync driftService = GWTServiceLookup.getDriftService(); @@ -397,16 +397,16 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi return true; } - // this class is somewhat unusual in that it is a detail view for the drift defs list view, but also a pseudo- - // master view for snapshot and drift detail views. It's "pseudo" in that there is no master-detail infrastructure + // this class is somewhat unusual in that it is a detail view for the drift defs list view, but also a pseudo-master + // view for snapshot and drift detail views. It's "pseudo" in that there is no master-detail infrastructure // like that found in TableSection. The following paths must be handled (starting at the ^): - // #Resource/10001/Drift/Definitions/10001/History/driftId + // #Resource/10001/Drift/Definitions/10001/Drift/driftId // #Resource/10001/Drift/Definitions/10001/Snapshot/version // ^ @Override public void renderView(ViewPath viewPath) { if (!viewPath.isEnd() && !viewPath.isNextEnd()) { - this.useHistoryDetailsView = !viewPath.isNextEnd() && "History".equals(viewPath.getNext().getPath()); + this.useDriftDetailsView = !viewPath.isNextEnd() && "Drift".equals(viewPath.getNext().getPath()); } super.renderView(viewPath); @@ -414,8 +414,8 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi @Override public Canvas getDetailsView(String id) { - if (this.useHistoryDetailsView) { - return new DriftDetailsView(extendLocatorId("History"), id); + if (this.useDriftDetailsView) { + return new DriftDetailsView(extendLocatorId("Drift"), id); } return new DriftSnapshotView(extendLocatorId("Snapshot"), null, context.getResourceId(), driftDefId, Integer diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java index 69335e3..71ffeca 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java @@ -108,8 +108,8 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp public void onRecordClick(RecordClickEvent event) { switch (entityContext.getType()) { case Resource: - CoreGUI.goToView(LinkManager.getDriftSnapshotLink(entityContext.getResourceId(), event.getRecord() - .getAttributeAsInt(ATTR_ID), 0)); + CoreGUI.goToView(LinkManager.getDriftCarouselSnapshotLink(entityContext.getResourceId(), event + .getRecord().getAttributeAsInt(ATTR_ID), 0)); break; default: throw new IllegalArgumentException("Entity Type not supported"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java index 034a039..ffcbf5e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java @@ -115,7 +115,7 @@ public class DriftDefinitionTemplateDataSource extends if (event.getRecord().getAttributeAsBoolean(ATTR_IS_PINNED)) { CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID - .getName(), String.valueOf(resourceTypeId)) + .getName(), resourceTypeId) + "/" + event.getRecord().getAttribute(ATTR_ID) + "/Snapshot"); } } @@ -157,7 +157,7 @@ public class DriftDefinitionTemplateDataSource extends public void onRecordClick(RecordClickEvent event) { CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID - .getName(), String.valueOf(resourceTypeId)) + .getName(), resourceTypeId) + "/" + event.getRecord().getAttribute(ATTR_ID) + "/Edit"); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java index 0d61047..8b0e4d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java @@ -54,6 +54,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe private boolean hasWriteAccess; private DriftDefinitionTemplateDataSource dataSource; private boolean useSnapshotDetailsView; + private String snapshotDriftDetailsId; static { DriftCategory[] categoryValues = DriftCategory.values(); @@ -147,10 +148,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe } private void add() { - - DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(EntityContext.forSubsystemView(), this.type, - this); - wizard.startWizard(); + DriftAddDefinitionWizard.showWizard(EntityContext.forTemplate(type.getId()), this); // we can refresh the table buttons immediately since the wizard is a dialog, the // user can't access enabled buttons anyway. @@ -192,6 +190,11 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe // one we're dealing with. The default is the editor. if (!viewPath.isEnd()) { this.useSnapshotDetailsView = !viewPath.isNextEnd() && "Snapshot".equals(viewPath.getNext().getPath()); + snapshotDriftDetailsId = null; + if (viewPath.viewsLeft() > 1) { + snapshotDriftDetailsId = viewPath.getViewForIndex(viewPath.getCurrentIndex() + 2).getPath().substring( + "0id_".length()); + } } super.renderView(viewPath); @@ -200,7 +203,10 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe @Override public Canvas getDetailsView(Integer driftTemplateId) { if (this.useSnapshotDetailsView) { - return new DriftDefinitionTemplateSnapshotView(extendLocatorId("TemplateSnapshot"), driftTemplateId); + if (null == snapshotDriftDetailsId) { + return new DriftDefinitionTemplateSnapshotView(extendLocatorId("TemplateSnapshot"), driftTemplateId); + } + return new DriftDetailsView(extendLocatorId("TemplateSnapshotDrift"), snapshotDriftDetailsId); } return new DriftDefinitionTemplateEditView(extendLocatorId("TemplateEdit"), driftTemplateId, hasWriteAccess); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java index f95cf77..801b258 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java @@ -158,7 +158,7 @@ public class DriftHistoryView extends StringIDTableSection<DriftDataSource> { Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); Integer driftDefId = record.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_DEF_ID); String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String url = LinkManager.getDriftCarouselDriftLink(resourceId, driftDefId, driftId); String formattedValue = TimestampCellFormatter.format(value); return SeleniumUtility.getLocatableHref(url, formattedValue, null); } @@ -166,77 +166,8 @@ public class DriftHistoryView extends StringIDTableSection<DriftDataSource> { } protected void setupTableInteractions(final boolean hasWriteAccess) { - - /* - * TODO add ack - * - TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY - : TableActionEnablement.NEVER; - - addTableAction("AcknowledgeDrift", MSG.common_button_ack(), MSG.view_drift_ack_confirm(), - new AbstractTableAction(singleTargetEnablement) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - acknowledge(selection); - } - }); - - addTableAction("AcknowledgeAll", MSG.common_button_ack_all(), MSG.view_drift_ack_confirm_all(), - new TableAction() { - public boolean isEnabled(ListGridRecord[] selection) { - ListGrid grid = getListGrid(); - ResultSet resultSet = (null != grid) ? grid.getResultSet() : null; - return (hasWriteAccess && grid != null && resultSet != null && !resultSet.isEmpty()); - } - - public void executeAction(ListGridRecord[] selection, Object actionValue) { - acknowledgeAll(); - } - }); - * - * - */ - } - - /* - * TODO add ack - * - private void acknowledge(ListGridRecord[] records) { - final int[] alertIds = new int[records.length]; - for (int i = 0, selectionLength = records.length; i < selectionLength; i++) { - ListGridRecord record = records[i]; - Integer alertId = record.getAttributeAsInt(DriftDataSource.ATTR_ID); - alertIds[i] = alertId; - } - - GWTServiceLookup.getDriftService().acknowledgeDrifts(alertIds, new AsyncCallback<Integer>() { - public void onSuccess(Integer resultCount) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_ack_success(String.valueOf(resultCount)), Message.Severity.Info)); - refresh(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_drift_ack_failure(Arrays.toString(alertIds)), caught); - } - }); - } - - private void acknowledgeAll() { - GWTServiceLookup.getDriftService().acknowledgeDriftsByContext(context, new AsyncCallback<Integer>() { - public void onSuccess(Integer resultCount) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_ack_success(String.valueOf(resultCount)), Message.Severity.Info)); - refresh(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_drift_ack_failure_all(), caught); - } - }); + // currently no buttons, etc } - * - * - */ @Override public Canvas getDetailsView(String driftId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java index 570f6f0..e0996eb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java @@ -32,6 +32,8 @@ import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.ExpansionMode; import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; @@ -70,8 +72,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Jay Shaughnessy */ +// TODO: Make this extend an abstract table so we can set up true master-detail +//public class DriftSnapshotView extends StringIDTableSection<DriftSnapshotDataSource> { public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { - private static final String DEFAULT_TITLE = MSG.view_drift_table_snapshot(); private Integer templateId; @@ -81,6 +84,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { private boolean hasWriteAccess; private String templateChangeSetId; + private int templateResourceTypeId; protected DriftSnapshotDataSource dataSource; protected DriftSnapshotListGrid listGrid; @@ -159,6 +163,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { } else { DriftDefinitionTemplateCriteria templateCriteria = new DriftDefinitionTemplateCriteria(); templateCriteria.addFilterId(templateId); + templateCriteria.fetchResourceType(true); DriftGWTServiceAsync driftService = GWTServiceLookup.getDriftService(); driftService.findDriftDefinitionTemplatesByCriteria(templateCriteria, @@ -172,6 +177,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { String templateName = template.getName(); String title = MSG.view_drift_table_title_templateSnapshot(templateName); setTitleString(title); + templateResourceTypeId = template.getResourceType().getId(); DriftSnapshotView.super.onDraw(); } }); @@ -288,6 +294,23 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); super.configureTable(); + + // TODO: when we have true detail support then we'll want to remove this. + setListGridDoubleClickHandler(new DoubleClickHandler() { + @Override + public void onDoubleClick(DoubleClickEvent event) { + ListGrid listGrid = (ListGrid) event.getSource(); + ListGridRecord[] selectedRows = listGrid.getSelection(); + if (selectedRows != null && selectedRows.length == 1) { + String driftId = getId(selectedRows[0]); + String link = (null == templateId) ? LinkManager.getDriftCarouselSnapshotDriftLink(resourceId, + driftDefId, version, driftId) : LinkManager.getDriftTemplateSnapshotDriftLink( + templateResourceTypeId, templateId, driftId); + CoreGUI.goToView(link); + + } + } + }); } @Override @@ -302,9 +325,12 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { return new CellFormatter() { public String format(Object value, ListGridRecord record, int i, int i1) { String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String link = (null == templateId) ? LinkManager.getDriftCarouselSnapshotDriftLink(resourceId, + driftDefId, version, driftId) : LinkManager.getDriftTemplateSnapshotDriftLink( + templateResourceTypeId, templateId, driftId); + String formattedValue = TimestampCellFormatter.format(value); - return SeleniumUtility.getLocatableHref(url, formattedValue, null); + return SeleniumUtility.getLocatableHref(link, formattedValue, null); } }; } else { @@ -488,4 +514,20 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { return (i < 0) ? path.trim() : path.substring(++i).trim(); } + // TODO: Make this extend an abstract table so we can set up true master-detail + + /* + @Override + public void renderView(ViewPath viewPath) { + viewPath.next(); + super.renderView(viewPath); + } + + + @Override + public Canvas getDetailsView(String driftId) { + return new DriftDetailsView(extendLocatorId("Details"), driftId); + } + */ + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java index c9c3a2f..5521ef5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java @@ -175,7 +175,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D } else { int typeId = result.get(0).getResourceType().getId(); CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink( - AlertDefinitionTemplateTypeView.VIEW_ID.getName(), String.valueOf(typeId)) + AlertDefinitionTemplateTypeView.VIEW_ID.getName(), typeId) + "/" + templateId); } } commit 63a5553e1160bf7088fa891c8336a7d9a01cd172 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:41:13 2011 -0400 Coregui: add ability to get the current viewpath index. Without this viewsLeft() and getViewForIndex() are not very useful. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java index 47b1f91..e448610 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java @@ -53,7 +53,7 @@ public class ViewPath { public String getParentViewPath() { return getPathToIndex(this.index - 1); } - + public ViewPath next() { index++; return this; @@ -75,6 +75,10 @@ public class ViewPath { } } + public int getCurrentIndex() { + return index; + } + public String getPathToCurrent() { return getPathToIndex(this.index); } @@ -102,13 +106,12 @@ public class ViewPath { return !(isEnd() || providedViewId == null || !getCurrent().equals(providedViewId)); } - public boolean isNext(ViewId providedViewId) { return ((index + 1) < viewPath.size() && providedViewId != null && getNext().equals(providedViewId)); } public boolean isNextEnd() { - return viewPath.size() <= index+1; + return viewPath.size() <= index + 1; } public int viewsLeft() { @@ -135,4 +138,3 @@ public class ViewPath { return path; } } - commit 4b7939e0b72c3d2a220b58e97dde8d8a63f4c021 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:39:54 2011 -0400 Fix subtle caching issues suffered by the drift template wizards because of the way we were gathering a type's drift def templates. Now always gather this through the typerepository mechanism, which has been updated to handle things correctly. - also, fix the message supplied for a successful template pinning diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java index ee9016a..cb59f03 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java @@ -19,12 +19,12 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import java.util.ArrayList; +import java.util.EnumSet; import com.google.gwt.user.client.rpc.AsyncCallback; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** @@ -42,7 +43,7 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { private Table<?> table; - public DriftAddDefinitionWizard(EntityContext context, ResourceType type, Table<?> table) { + protected DriftAddDefinitionWizard(EntityContext context, ResourceType type, Table<?> table) { super(context, type); this.table = table; @@ -110,7 +111,7 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { break; - case SubsystemView: + case ResourceTemplate: GWTServiceLookup.getDriftService().createTemplate(getType().getId(), getNewDriftDefinition(), new AsyncCallback<DriftDefinitionTemplate>() { public void onSuccess(DriftDefinitionTemplate result) { @@ -150,30 +151,8 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { throw new IllegalArgumentException("Entity not found [" + context + "]"); } - final Resource resource = result.get(0); - - // bypass type cache because this is infrequent and we don't need to cache the - // drift def templates - ResourceTypeCriteria rtc = new ResourceTypeCriteria(); - rtc.addFilterId(resource.getResourceType().getId()); - rtc.fetchDriftDefinitionTemplates(true); - GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(rtc, - new AsyncCallback<PageList<ResourceType>>() { - public void onSuccess(PageList<ResourceType> result) { - if (result.isEmpty()) { - throw new IllegalArgumentException("Resource Type not found [" - + resource.getResourceType().getId() + "]"); - } - - DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(context, result.get(0), - table); - wizard.startWizard(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.widget_typeTree_loadFail(), caught); - } - }); + Resource resource = result.get(0); + showWizard(context, resource.getResourceType().getId(), table); } public void onFailure(Throwable caught) { @@ -183,11 +162,29 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { break; + case ResourceTemplate: + showWizard(context, context.getResourceTypeId(), table); + + break; + default: throw new IllegalArgumentException("Entity Context Type not supported [" + context + "]"); } } + private static void showWizard(final EntityContext context, int resourceTypeId, final Table<?> table) { + + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceTypeId, + EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates), + new ResourceTypeRepository.TypeLoadedCallback() { + + public void onTypesLoaded(ResourceType type) { + DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(context, type, table); + wizard.startWizard(); + } + }); + } + @Override public void cancel() { super.cancel(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java index 77fd037..2a24e9b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java @@ -19,11 +19,11 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import java.util.ArrayList; +import java.util.EnumSet; import com.google.gwt.user.client.rpc.AsyncCallback; import org.rhq.core.domain.criteria.DriftDefinitionCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.drift.DriftDefinition; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.resource.Resource; @@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** @@ -104,15 +105,15 @@ public class DriftPinTemplateWizard extends AbstractDriftPinTemplateWizard { public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_wizard_addTemplate_success(template.getName()), + new Message(MSG.view_drift_wizard_pinTemplate_success(template.getName()), Message.Severity.Info)); getView().closeDialog(); DriftPinTemplateWizard.this.table.refresh(); } public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_drift_wizard_addDef_failure(template.getName()), caught); + CoreGUI.getErrorHandler().handleError(MSG.view_drift_wizard_addDef_failure(template.getName()), + caught); getView().closeDialog(); } }); @@ -146,25 +147,12 @@ public class DriftPinTemplateWizard extends AbstractDriftPinTemplateWizard { final DriftDefinition driftDef = result.get(0); final Resource resource = driftDef.getResource(); - // bypass type cache because this is infrequent and we don't need to cache the - // drift def templates - ResourceTypeCriteria rtc = new ResourceTypeCriteria(); - rtc.addFilterId(resource.getResourceType().getId()); - rtc.fetchDriftDefinitionTemplates(true); - GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(rtc, - new AsyncCallback<PageList<ResourceType>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.widget_typeTree_loadFail(), caught); - } - - public void onSuccess(PageList<ResourceType> result) { - if (result.isEmpty()) { - throw new IllegalArgumentException("Resource Type not found [" - + resource.getResourceType().getId() + "]"); - } + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), + EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates), + new ResourceTypeRepository.TypeLoadedCallback() { - DriftPinTemplateWizard wizard = new DriftPinTemplateWizard(result.get(0), driftDef, + public void onTypesLoaded(ResourceType type) { + DriftPinTemplateWizard wizard = new DriftPinTemplateWizard(type, driftDef, snapshotVersion, table); wizard.startWizard(); } commit d2d837f9831b06c4d4f8c34ea58837466a6f18da Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:31:21 2011 -0400 Coregui: Add the ability for the ResourceType cache to provide non-cached data. This means for non-cached metadata types we'll always call to the db. This is basically a convenience such that we can make a single call through this mechanism to gather all the needed data for a type. Whether it merges cached and uncached data remains a black box to the caller. - set driftDefinitionTemplates as non-cached metadata because the drift templates available on a type can change as user-defined templates come and go. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index 6a38d89..2b3dbb1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -57,8 +57,29 @@ public class ResourceTypeRepository { private static ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService(); + /** + * The following MetadadaTypes are not cached and will always be queried from the database:<br/> + * driftDefinitionTemplates + * + * @author Jay Shaughnessy + */ public enum MetadataType { - children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition, subCategory, parentTypes, processScans, productVersions, driftDefinitionTemplates + children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition, subCategory, parentTypes, processScans, productVersions, driftDefinitionTemplates( + false); + + private boolean isCachedMetadata; + + private MetadataType() { + this.isCachedMetadata = true; + } + + private MetadataType(boolean isCachedMetadata) { + this.isCachedMetadata = isCachedMetadata; + } + + public boolean isCachedMetadata() { + return isCachedMetadata; + } } public static class Cache { @@ -248,8 +269,7 @@ public class ResourceTypeRepository { criteria.fetchDriftDefinitionTemplates(true); break; default: - Log.error("Metadata type [" + metadataType.name() - + "] not incorporated into ResourceType criteria."); + Log.error("Metadata type [" + metadataType.name() + "] not incorporated into ResourceType criteria."); } } @@ -375,7 +395,11 @@ public class ResourceTypeRepository { if (typeCacheLevel.containsKey(type.getId())) { typeCacheLevel.get(type.getId()).addAll(metadataTypes); } else { - typeCacheLevel.put(type.getId(), EnumSet.copyOf(metadataTypes)); + for (MetadataType metadataType : metadataTypes) { + if (metadataType.isCachedMetadata) { + typeCacheLevel.put(type.getId(), EnumSet.copyOf(metadataTypes)); + } + } } } } commit d48b81b3a66b24e3bf4727650bd8ce05ab68fbab Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:26:54 2011 -0400 Add optional fetch for DriftDefinitionTemplate.resourceType diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java index ce1c017..d4ff131 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java @@ -29,6 +29,7 @@ public class DriftDefinitionTemplateCriteria extends Criteria { private String filterName; private Integer filterResourceTypeId; + private boolean fetchResourceType; private boolean fetchDriftDefinitions; public DriftDefinitionTemplateCriteria() { @@ -40,19 +41,23 @@ public class DriftDefinitionTemplateCriteria extends Criteria { return DriftDefinitionTemplate.class; } - public void addFilterId(Integer id) { - filterId = id; + public void addFilterId(Integer filterId) { + this.filterId = filterId; } - public void addFilterName(String name) { - filterName = name; + public void addFilterName(String filterName) { + this.filterName = filterName; } - public void addFilterResourceTypeId(Integer resourceTypeId) { - filterResourceTypeId = resourceTypeId; + public void addFilterResourceTypeId(Integer filterResourceTypeId) { + this.filterResourceTypeId = filterResourceTypeId; } - public void fetchDriftDefinitions(boolean fetchDefinitions) { - fetchDriftDefinitions = fetchDefinitions; + public void fetchResourceType(boolean fetchResourceType) { + this.fetchResourceType = fetchResourceType; + } + + public void fetchDriftDefinitions(boolean fetchDriftDefinitions) { + this.fetchDriftDefinitions = fetchDriftDefinitions; } } commit b318ac65980530c4f2cd3c79657b82c4baf7b655 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Thu Oct 27 11:25:27 2011 -0400 Drift - Make JPADrift.changeSet not null. This field should never be null so define it that way. For a while nulls were allowed but that is no longer the case as every drift should refer to either a pinned template's change set or a drift definition's change set. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml index 76613d2..d6975d5 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml @@ -728,7 +728,7 @@ <column name="CTIME" type="LONG" required="true"/> <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/> <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/> - <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_CHANGE_SET"/> + <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/> <!-- the file path not including the base directory --> <column name="PATH" type="VARCHAR2" size="1024" required="true"/> <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search. diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index bd040c6..9221532 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -3617,6 +3617,7 @@ <schema-addColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" columnType="VARCHAR2" precision="1024" /> <schema-alterColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT" column="DRIFT_CHANGE_SET_ID" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_DRIFT" column="DRIFT_CHANGE_SET_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT" column="DRIFT_SET_ID" columnType="INTEGER"/> <schema-directSQL> <statement desc="Creating RHQ_DRIFT foreign key relation to RHQ_DRIFT_CHANGE_SET"> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java index acfc55d..049dc6f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java @@ -84,8 +84,8 @@ public class JPADrift implements Serializable, Drift<JPADriftChangeSet, JPADrift @Enumerated(EnumType.STRING) private String directory; - @JoinColumn(name = "DRIFT_CHANGE_SET_ID", referencedColumnName = "ID", nullable = true) - @ManyToOne(fetch = FetchType.LAZY, optional = true) + @JoinColumn(name = "DRIFT_CHANGE_SET_ID", referencedColumnName = "ID", nullable = false) + @ManyToOne(fetch = FetchType.LAZY, optional = false) private JPADriftChangeSet changeSet; @JoinColumn(name = "OLD_DRIFT_FILE", referencedColumnName = "HASH_ID", nullable = true) diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index 8c7b506..882d22e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -233,11 +233,14 @@ public class JPADriftServerBean implements JPADriftServerLocal { for (Drift<?, ?> drift : changeSet.getDrifts()) { JPADrift jpaDrift = new JPADrift(jpaChangeSet, drift.getPath(), drift.getCategory(), toJPADriftFile(drift .getOldDriftFile()), toJPADriftFile(drift.getNewDriftFile())); + driftSet.addDrift(jpaDrift); } + entityManager.persist(jpaChangeSet); + entityManager.persist(driftSet); + jpaChangeSet.setInitialDriftSet(driftSet); - entityManager.persist(jpaChangeSet); return jpaChangeSet.getId(); } @@ -322,9 +325,9 @@ public class JPADriftServerBean implements JPADriftServerLocal { + "]. Change set cannot be saved."); return false; } - // Commenting out the following line for now. We want to set the - // version to the value specified in the headers, but we also - // want to get the latest version we have in the database so that + // TODO: Commenting out the following line for now. We want to set the + // version to the value specified in the headers, but we may want to also + // validate it against the latest version we have in the database so that // we can make sure that the agent is in sync with the server. // //int version = getChangeSetVersion(resource, config); @@ -370,7 +373,11 @@ public class JPADriftServerBean implements JPADriftServerLocal { for (FileEntry entry : reader) { JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles); String path = FileUtil.useForwardSlash(entry.getFile()); - driftSet.addDrift(new JPADrift(null, path, entry.getType(), null, newDriftFile)); + // A Drift always has a changeSet. Note that in this code section the changeset is + // always going to be set to a DriftDefinition's changeSet. But that is not always the + // case, it could also be set to a DriftDefinitionTemplate's changeSet. + driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null, + newDriftFile)); } entityManager.persist(driftSet); driftChangeSet.setInitialDriftSet(driftSet); commit 8cc09ef54e6dcef2a37bbdec98d5490d07877f9a Author: John Sanda <jsanda(a)redhat.com&gt; Date: Wed Oct 26 21:39:39 2011 -0400 [BZ 749415] Control drift def fields that are rendered and editable Depending on the type of definition you are creating/editing, certain fields should either be read-only or not rendered at all. See https://bugzilla.redhat.com/show_bug.cgi?id=749415 a detailed description and specification of what should be read-only and rendered and when. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java index a5e54ca..c2398e1 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java @@ -100,6 +100,22 @@ public class DriftConfigurationDefinition implements Serializable { private static final ConfigurationDefinition INSTANCE_FOR_EXISTING_CONFIGS = new ConfigurationDefinition( "GLOBAL_DRIFT_CONFIG_DEF", "The drift detection definition"); + private static final ConfigurationDefinition NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE = new ConfigurationDefinition( + "NEW_RESOURCE_DRIFT_DEF_BY_PINNED_TEMPLATE", "A new resource drift definition created from a pinned template"); + + private static final ConfigurationDefinition EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE = + new ConfigurationDefinition("EXISTING_RESOURCE_DRIFT_DEF_BY_PINNED_TEMPLATE", + "An existing resource drift definition created from a pinned template"); + + private static final ConfigurationDefinition NEW_TEMPLATE_INSTANCE = new ConfigurationDefinition( + "NEW_TEMPLATE_DRIFT_CONFIG_DEF", "A new template drift definition"); + + private static final ConfigurationDefinition EXISTING_TEMPLATE_INSTANCE = new ConfigurationDefinition( + "EXISTING_TEMPLATE_DRIFT_CONFIG_DEF", "An existing template drift definition"); + + private static final ConfigurationDefinition NEW_PINNED_TEMPLATE_INSTANCE = new ConfigurationDefinition( + "NEW_PINNED_TEMPLATE_DRIFT_CONFIG_DEF", "A new pinned template drift definition"); + /** * Returns a configuration definition suitable for showing a new configuration form - that is, * a configuration that has not yet been created. @@ -124,6 +140,26 @@ public class DriftConfigurationDefinition implements Serializable { return INSTANCE_FOR_EXISTING_CONFIGS; } + public static ConfigurationDefinition getNewResourceInstanceByPinnedTemplate() { + return NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE; + } + + public static ConfigurationDefinition getExistingResourceInstanceByPinnedTemplate() { + return EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE; + } + + public static ConfigurationDefinition getNewTemplateInstance() { + return NEW_TEMPLATE_INSTANCE; + } + + public static ConfigurationDefinition getExistingTemplateInstance() { + return EXISTING_TEMPLATE_INSTANCE; + } + + public static ConfigurationDefinition getNewPinnedTemplateInstance() { + return NEW_PINNED_TEMPLATE_INSTANCE; + } + static { INSTANCE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); INSTANCE.put(createName(INSTANCE, false)); @@ -134,8 +170,8 @@ public class DriftConfigurationDefinition implements Serializable { INSTANCE.put(createBasedir(INSTANCE, false)); INSTANCE.put(createIncludes(INSTANCE, false)); INSTANCE.put(createExcludes(INSTANCE, false)); - INSTANCE.put(createPinned(INSTANCE)); - INSTANCE.put(createAttached(INSTANCE)); + INSTANCE.put(createPinned(INSTANCE, false)); + INSTANCE.put(createAttached(INSTANCE, false)); INSTANCE_FOR_EXISTING_CONFIGS.setConfigurationFormat(ConfigurationFormat.STRUCTURED); INSTANCE_FOR_EXISTING_CONFIGS.put(createName(INSTANCE_FOR_EXISTING_CONFIGS, true)); @@ -146,7 +182,69 @@ public class DriftConfigurationDefinition implements Serializable { INSTANCE_FOR_EXISTING_CONFIGS.put(createBasedir(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createIncludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createExcludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); - INSTANCE_FOR_EXISTING_CONFIGS.put(createPinned(INSTANCE_FOR_EXISTING_CONFIGS)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createExcludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createAttached(INSTANCE_FOR_EXISTING_CONFIGS, false)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createPinned(INSTANCE_FOR_EXISTING_CONFIGS, true)); + + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createName(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, false)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createDescription(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createInterval(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createEnabled(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createDriftHandlingMode(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createBasedir(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, true)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createIncludes(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, true)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createExcludes(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, true)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createPinned(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, true)); + NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createAttached(NEW_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, true)); + + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createName(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createDescription(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createInterval(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createEnabled(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createDriftHandlingMode(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createBasedir(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createIncludes(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createExcludes(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createPinned(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE.put(createAttached(EXISTING_RESOURCE_INSTANCE_BY_PINNED_TEMPLATE, + true)); + + NEW_TEMPLATE_INSTANCE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); + NEW_TEMPLATE_INSTANCE.put(createName(NEW_TEMPLATE_INSTANCE, false)); + NEW_TEMPLATE_INSTANCE.put(createDescription(NEW_TEMPLATE_INSTANCE)); + NEW_TEMPLATE_INSTANCE.put(createInterval(NEW_TEMPLATE_INSTANCE)); + NEW_TEMPLATE_INSTANCE.put(createEnabled(NEW_TEMPLATE_INSTANCE)); + NEW_TEMPLATE_INSTANCE.put(createDriftHandlingMode(NEW_TEMPLATE_INSTANCE)); + NEW_TEMPLATE_INSTANCE.put(createBasedir(NEW_TEMPLATE_INSTANCE, false)); + NEW_TEMPLATE_INSTANCE.put(createIncludes(NEW_TEMPLATE_INSTANCE, false)); + NEW_TEMPLATE_INSTANCE.put(createExcludes(NEW_TEMPLATE_INSTANCE, false)); + + EXISTING_TEMPLATE_INSTANCE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); + EXISTING_TEMPLATE_INSTANCE.put(createName(EXISTING_TEMPLATE_INSTANCE, true)); + EXISTING_TEMPLATE_INSTANCE.put(createDescription(EXISTING_TEMPLATE_INSTANCE)); + EXISTING_TEMPLATE_INSTANCE.put(createInterval(EXISTING_TEMPLATE_INSTANCE)); + EXISTING_TEMPLATE_INSTANCE.put(createEnabled(EXISTING_TEMPLATE_INSTANCE)); + EXISTING_TEMPLATE_INSTANCE.put(createDriftHandlingMode(EXISTING_TEMPLATE_INSTANCE)); + EXISTING_TEMPLATE_INSTANCE.put(createBasedir(EXISTING_TEMPLATE_INSTANCE, true)); + EXISTING_TEMPLATE_INSTANCE.put(createIncludes(EXISTING_TEMPLATE_INSTANCE, true)); + EXISTING_TEMPLATE_INSTANCE.put(createExcludes(EXISTING_TEMPLATE_INSTANCE, true)); + + NEW_PINNED_TEMPLATE_INSTANCE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); + NEW_PINNED_TEMPLATE_INSTANCE.put(createName(NEW_PINNED_TEMPLATE_INSTANCE, false)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createDescription(NEW_PINNED_TEMPLATE_INSTANCE)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createInterval(NEW_PINNED_TEMPLATE_INSTANCE)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createEnabled(NEW_PINNED_TEMPLATE_INSTANCE)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createDriftHandlingMode(NEW_PINNED_TEMPLATE_INSTANCE)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createBasedir(NEW_PINNED_TEMPLATE_INSTANCE, true)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createIncludes(NEW_PINNED_TEMPLATE_INSTANCE, true)); + NEW_PINNED_TEMPLATE_INSTANCE.put(createExcludes(NEW_PINNED_TEMPLATE_INSTANCE, true)); } private static PropertyDefinitionSimple createName(ConfigurationDefinition configDef, boolean readOnly) { @@ -203,7 +301,7 @@ public class DriftConfigurationDefinition implements Serializable { return pd; } - private static PropertyDefinitionSimple createAttached(ConfigurationDefinition configDef) { + private static PropertyDefinitionSimple createAttached(ConfigurationDefinition configDef, boolean readOnly) { String name = PROP_ATTACHED; String description = "A flag that indicates whether or not the definition is attached to the template from " + "which it is created. When a template is updated, the changes will be propagated to any attached " + @@ -216,6 +314,7 @@ public class DriftConfigurationDefinition implements Serializable { pd.setDisplayName("Attached to Template"); pd.setDefaultValue("true"); pd.setOrder(3); + pd.setReadOnly(readOnly); pd.setConfigurationDefinition(configDef); return pd; @@ -258,7 +357,7 @@ public class DriftConfigurationDefinition implements Serializable { return pd; } - private static PropertyDefinitionSimple createPinned(ConfigurationDefinition configDef) { + private static PropertyDefinitionSimple createPinned(ConfigurationDefinition configDef, boolean readOnly) { String name = PROP_PINNED; String description = "If set, pins the snapshot that the agent uses for comparing files during drift " + "detection. Normally, the agent compares those files being monitored for drift against the latest " @@ -271,6 +370,7 @@ public class DriftConfigurationDefinition implements Serializable { pd.setDisplayName("Pinned"); pd.setDefaultValue("false"); pd.setOrder(5); + pd.setReadOnly(readOnly); pd.setConfigurationDefinition(configDef); return pd; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java index 98450a6..802327a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java @@ -201,11 +201,16 @@ public class DriftDefinitionTemplate implements Serializable { } public Configuration createConfiguration() { - return configuration.deepCopyWithoutProxies(); + return createDefinition().getConfiguration(); } public DriftDefinition createDefinition() { - return new DriftDefinition(configuration.deepCopyWithoutProxies()); + DriftDefinition definition = new DriftDefinition(configuration.deepCopyWithoutProxies()); + definition.setAttached(true); + definition.setPinned(isPinned()); + definition.setTemplate(this); + + return definition; } public boolean isPinned() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java index 1808dfa..21c5d7b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java @@ -30,6 +30,7 @@ import com.smartgwt.client.widgets.toolbar.ToolStrip; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.drift.DriftConfigurationDefinition; import org.rhq.core.domain.drift.DriftDefinition; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -116,9 +117,14 @@ public class DriftDefinitionEditView extends LocatableVLayout implements Propert GWTServiceLookup.getDriftService().getDriftDefinition(driftDefId, new AsyncCallback<DriftDefinition>() { @Override public void onSuccess(final DriftDefinition result) { + ConfigurationDefinition configDef = null; + if (result.getTemplate() != null && result.getTemplate().isPinned()) { + configDef = DriftConfigurationDefinition.getExistingResourceInstanceByPinnedTemplate(); + } else { + configDef = DriftConfigurationDefinition.getInstanceForExistingConfiguration(); + } - editor = new ConfigurationEditor(extendLocatorId("Editor"), DriftConfigurationDefinition - .getInstanceForExistingConfiguration(), result.getConfiguration()); + editor = new ConfigurationEditor(extendLocatorId("Editor"), configDef, result.getConfiguration()); editor.setOverflow(Overflow.AUTO); editor.addPropertyValueChangeListener(DriftDefinitionEditView.this); editor.setReadOnly(!hasWriteAccess); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java index 5f60e8c..d7541c7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java @@ -121,7 +121,7 @@ public class DriftDefinitionTemplateEditView extends LocatableVLayout implements DriftDefinitionTemplate template = result.get(0); editor = new ConfigurationEditor(extendLocatorId("Editor"), DriftConfigurationDefinition - .getInstanceForExistingConfiguration(), template.getConfiguration()); + .getExistingTemplateInstance(), template.getConfiguration()); editor.setOverflow(Overflow.AUTO); editor.addPropertyValueChangeListener(DriftDefinitionTemplateEditView.this); editor.setReadOnly(!hasWriteAccess); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java index a0b15f5..9b0c9d9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java @@ -55,7 +55,7 @@ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep { // keep a reference to the startingConfig in case the user navs back and changes it startingConfig = wizard.getNewStartingConfiguration(); - ConfigurationDefinition def = DriftConfigurationDefinition.getInstance(); + ConfigurationDefinition def = getDriftConfigDef(); editor = new ConfigurationEditor(vLayout.extendLocatorId("Editor"), def, startingConfig); vLayout.addMember(editor); } @@ -63,6 +63,17 @@ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep { return vLayout; } + private ConfigurationDefinition getDriftConfigDef() { + if (wizard.getEntityContext().isSubsystemView()) { + return DriftConfigurationDefinition.getNewTemplateInstance(); + } + + if (wizard.getSelectedTemplate().isPinned()) { + return DriftConfigurationDefinition.getNewResourceInstanceByPinnedTemplate(); + } + return DriftConfigurationDefinition.getInstance(); + } + public boolean nextPage() { if (editor != null && editor.validate()) { wizard.setNewConfiguration(editor.getConfiguration()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java index 2917689..ccbe621 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java @@ -61,7 +61,7 @@ public class DriftPinTemplateWizardConfigStep extends AbstractWizardStep { vLayout.setOverflow(Overflow.AUTO); Configuration startingConfig = wizard.getSnapshotDriftDef().getConfiguration(); - ConfigurationDefinition def = DriftConfigurationDefinition.getInstance(); + ConfigurationDefinition def = DriftConfigurationDefinition.getNewPinnedTemplateInstance(); editor = new ConfigurationEditor(vLayout.extendLocatorId("Editor"), def, startingConfig); vLayout.addMember(editor); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index b7779a3..3b1626c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -43,11 +43,9 @@ import javax.jms.Session; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import difflib.DiffUtils; -import difflib.Patch; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.Hibernate; import org.jboss.remoting.CannotConnectException; @@ -65,8 +63,10 @@ import org.rhq.core.domain.drift.DriftChangeSet; import org.rhq.core.domain.drift.DriftChangeSetCategory; import org.rhq.core.domain.drift.DriftComposite; import org.rhq.core.domain.drift.DriftConfigurationDefinition; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.drift.DriftDefinition; import org.rhq.core.domain.drift.DriftDefinitionComparator; +import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode; import org.rhq.core.domain.drift.DriftDefinitionComposite; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.drift.DriftDetails; @@ -74,8 +74,6 @@ import org.rhq.core.domain.drift.DriftFile; import org.rhq.core.domain.drift.DriftSnapshot; import org.rhq.core.domain.drift.DriftSnapshotRequest; import org.rhq.core.domain.drift.FileDiffReport; -import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; -import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode; import org.rhq.core.domain.drift.dto.DriftChangeSetDTO; import org.rhq.core.domain.drift.dto.DriftDTO; import org.rhq.core.domain.drift.dto.DriftFileDTO; @@ -98,6 +96,9 @@ import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; +import difflib.DiffUtils; +import difflib.Patch; + /** * The SLSB supporting Drift management to clients. * @@ -502,7 +503,8 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { // force lazy loads result.getConfiguration().getProperties(); - result.getResource(); + Hibernate.initialize(result.getResource()); + Hibernate.initialize(result.getTemplate()); return result; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java index 58c5453..2c4bab4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java @@ -102,7 +102,6 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif @TransactionAttribute(NEVER) public void pinTemplate(Subject subject, int templateId, int driftDefId, int snapshotVersion) { templateMgr.createTemplateChangeSet(subject, templateId, driftDefId, snapshotVersion); - //pinDefinitions(subject, template); DriftDefinitionTemplateCriteria templateCriteria = new DriftDefinitionTemplateCriteria(); templateCriteria.addFilterId(templateId); @@ -127,8 +126,6 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif newDef.setPinned(true); driftMgr.updateDriftDefinition(subject, forResource(resourceId), newDef); -// templateMgr.pinDefinition(subject, def.getResource().getId(), templateId, -// new DriftDefinition(def.getConfiguration().deepCopyWithoutProxies())); } } } @@ -148,28 +145,6 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif template.setChangeSetId(newChangeSetId); } -// private void pinDefinitions(Subject subject, DriftDefinitionTemplate template) { -// // TODO filter out the detached definitions with a query to avoid loading all of them into memory -// for (DriftDefinition definition : template.getDriftDefinitions()) { -// if (definition.isAttached()) { -// DriftDefinition pinnedDef = new DriftDefinition(definition.getConfiguration().deepCopyWithoutProxies()); -// pinnedDef.setPinned(true); -// //pinnedDef.setTemplate(template); -// templateMgr.pinDefinition(subject, definition.getResource().getId(), template.getId(), pinnedDef); -// } -// } -// } -// -// @Override -// //@TransactionAttribute(NOT_SUPPORTED) -// public void pinDefinition(Subject subject, int resourceId, int templateId, DriftDefinition newDef) { -// driftMgr.deleteDriftDefinition(subject, forResource(resourceId), newDef.getName()); -// DriftDefinitionTemplate template = entityMgr.find(DriftDefinitionTemplate.class, templateId); -// newDef.setTemplate(template); -// newDef.setPinned(true); -// driftMgr.updateDriftDefinition(subject, forResource(resourceId), newDef); -// } - @RequiredPermission(Permission.MANAGE_SETTINGS) @Override public void deleteTemplate(Subject subject, int templateId) { commit c65be8b4ce2b6cfef01f4bb6389c25993f171bff Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Wed Oct 26 17:42:52 2011 -0400 [BZ 749277] fix bug where the ""Only 1 out of 2 available items are listed - please specify one or more filters to find the items for which you are looking." yellow warning message is always erroneously displayed for the user selector on the role edit view (https://bugzilla.redhat.com/show_bug.cgi?id=749277) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java index 99e0dbf..bf82a12 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java @@ -75,6 +75,17 @@ public class RoleSubjectSelector extends AbstractSelector<Subject, SubjectCriter } class RoleUsersDataSource extends UsersDataSource { +/* + @Override + protected SubjectCriteria getFetchCriteria(DSRequest request) { + SubjectCriteria criteria = super.getFetchCriteria(request); + // Filter out system users. + // TODO: Add a new custom filter to SubjectCriteria that returns only non-superusers (i.e. subjects with + // id > 2), then replace the hack below with this method. + return criteria; + } +*/ + @Override protected void sendSuccessResponseRecords(DSRequest request, DSResponse response, PageList<Record> records) { Record rhqAdminRecord = null; @@ -82,9 +93,11 @@ public class RoleSubjectSelector extends AbstractSelector<Subject, SubjectCriter Integer id = record.getAttributeAsInt(Field.ID); if (id.equals(ID_RHQADMIN)) { rhqAdminRecord = record; + break; } } if (rhqAdminRecord != null) { + records.setTotalSize(records.getTotalSize() - 1); records.remove(rhqAdminRecord); } super.sendSuccessResponseRecords(request, response, records); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 60cf787..9b9f4c4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -369,12 +369,14 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria } else { availableRecords.addAll(Arrays.asList(allRecords)); } - int totalAvailableRecords = response.getTotalRows() - assignedRecords.length; + int totalRecords = (response.getTotalRows() != null) ? response.getTotalRows() : allRecords.length; + int totalAvailableRecords = totalRecords - assignedRecords.length; if (availableRecords.size() < totalAvailableRecords) { // TODO: i18n Message message = new Message("Only " + availableRecords.size() + " out of " - + totalAvailableRecords - + " available items are listed - please specify one or more filters to find the items for which you are looking.", + + totalAvailableRecords + " available " + getItemTitle() + + " are listed - please specify one or more filters to find the " + getItemTitle() + + " for which you are looking.", Message.Severity.Warning); CoreGUI.getMessageCenter().notify(message); } commit 554a5ff5545b7cbaf5a08bfcbb23e18828524501 Author: Ian Springer <ian.springer(a)redhat.com&gt; Date: Wed Oct 26 16:28:54 2011 -0400 there is a bug in the RHQ criteria API, where when an unlimited PageControl is used in combination with one or more join fetches, the fetch results contain duplicates. to avoid this bug, when a DSRequest specifies endRow=null (i.e. no paging), still use a PageControl with pageSize=50, rather than an unlimited PageControl (which is what we used to commit 604b996 (10/21/11)) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index ad34c8b..c12c605 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -98,7 +98,7 @@ public abstract class RPCDataSource<T, C extends BaseCriteria> extends DataSourc setCacheAllData(false); setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM); - setDataPageSize(75); + setDataPageSize(50); } /** @@ -178,6 +178,9 @@ public abstract class RPCDataSource<T, C extends BaseCriteria> extends DataSourc * @param dataPageSize the data page size that should be used for fetch requests, or null if results should not be paged */ public void setDataPageSize(Integer dataPageSize) { + if (dataPageSize <= 0) { + throw new IllegalArgumentException("Page size must be greater than 0."); + } this.dataPageSize = dataPageSize; } @@ -214,9 +217,12 @@ public abstract class RPCDataSource<T, C extends BaseCriteria> extends DataSourc // Create PageControl and initialize paging. PageControl pageControl; if (request.getEndRow() == null) { - // null endRow means no paging - Log.debug("WARNING: " + getClass().getName() + " is not using paging for fetch request."); - pageControl = PageControl.getUnlimitedInstance(); + // A null endRow means no paging. However, there is a bug in the RHQ criteria API, where when an unlimited + // PageControl is used in combination with one or more join fetches, the results contain duplicates. + // So until that bug is fixed, always use paging. + //Log.debug("WARNING: " + getClass().getName() + " is not using paging for fetch request."); + //pageControl = PageControl.getUnlimitedInstance(); + pageControl = PageControl.getExplicitPageControl(0, getDataPageSize()); } else { int startRow = (request.getStartRow() != null) ? request.getStartRow() : 0; int endRow = request.getEndRow(); commit 1c4c9851749e195cd40712bc24c1d526ea3bb610 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Oct 26 14:34:05 2011 -0500 Add parsing for debug mode. diff --git a/release.sh b/release.sh index 3565cc1..27da8aa 100755 --- a/release.sh +++ b/release.sh @@ -86,7 +86,7 @@ parse_and_validate_options() DEBUG_MODE=false short_options="h" - long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug-maven" + long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::" PROGNAME=${0##*/} ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" ) commit 4e7de8c3ebc1bf78405a7cbbfaf00538b280d460 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Oct 26 14:30:41 2011 -0500 Add debug mode support for the release script. diff --git a/release.sh b/release.sh index 1219dfc..3565cc1 100755 --- a/release.sh +++ b/release.sh @@ -59,8 +59,8 @@ USAGE: release.sh OPTIONS --extra-profile=extra_profile [OPTIONAL] An extra maven profile to be used for all the maven commands. - --debug-maven [OPTIONAL] - Set maven in debug mode. + --debug=[true|false] [OPTIONAL] + Set maven in debug mode. Default is false; true if option specified without argument. EOF ) @@ -83,7 +83,7 @@ parse_and_validate_options() MODE="test" SCM_STRATEGY="tag" EXTRA_MAVEN_PROFILE= - DEBUG_MAVEN= + DEBUG_MODE=false short_options="h" long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug-maven" @@ -148,9 +148,26 @@ parse_and_validate_options() EXTRA_MAVEN_PROFILE="$1" shift ;; - --debug-maven) + --debug) shift - DEBUG_MAVEN="true" + case "$1" in + true) + DEBUG_MODE=true + shift + ;; + false) + DEBUG_MODE=false + shift + ;; + "") + DEBUG_MODE=true + shift + ;; + *) + DEBUG_MODE=false + shift + ;; + esac ;; --) shift @@ -237,7 +254,7 @@ set_local_and_environment_variables() MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav " fi - if [ -n "$DEBUG_MAVEN" ]; then + if [ -n "$DEBUG_MODE" ]; then echo "Maven debug enabled" MAVEN_ARGS="$MAVEN_ARGS --debug" fi @@ -495,6 +512,8 @@ checkout_build_branch_for_development() parse_and_validate_options $@ +set_script_debug_mode $DEBUG_MODE + validate_system_utilities set_local_and_environment_variables @@ -513,3 +532,4 @@ update_development_version print_release_information +unset_script_debug_mode $DEBUG_MODE commit 1d795e099afcccbee61a5c4847df74ccfeb1913f Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Oct 26 14:19:09 2011 -0500 Update script to avoid platforms compatibility issues. diff --git a/release.sh b/release.sh index e1492c8..1219dfc 100755 --- a/release.sh +++ b/release.sh @@ -162,17 +162,17 @@ parse_and_validate_options() esac done - if [ -z $RELEASE_VERSION ]; + if [ -z "$RELEASE_VERSION" ]; then usage "Release version not specified!" fi - if [ -z $DEVELOPMENT_VERSION ]; + if [ -z "$DEVELOPMENT_VERSION" ]; then usage "Development version not specified!" fi - if [ -z $RELEASE_BRANCH ]; + if [ -z "$RELEASE_BRANCH" ]; then usage "Release branch not specified!" fi @@ -512,3 +512,4 @@ checkout_build_branch_for_development update_development_version print_release_information + commit d93e1672d8fa611d1d2cbaf47b3d81b233d40c67 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Oct 26 14:16:45 2011 -0500 Add debug mode support to the bash library. diff --git a/rhq_bash.lib b/rhq_bash.lib index fcd90a0..8f9b3dd 100644 --- a/rhq_bash.lib +++ b/rhq_bash.lib @@ -210,3 +210,29 @@ print_centered() eval "printf '=%.0s' {1..${right_side}}" printf "\n" } + + +#======================================================================================== +# Description: Sets the script in debug mode; this will print all the commands before +# executing them. +#======================================================================================== +set_script_debug_mode() +{ + if [ -n "$1" ] && [ "$1" ]; + then + set -x + else + set +x + fi +} + + +#======================================================================================== +# Description: Resets the script in debug mode; this will stop printing all the commands +# before executing them. +#======================================================================================== +unset_script_debug_mode() +{ + set +x +} + commit 6297e70458e147d6474d7d49c3505d381cfcf5eb Author: John Sanda <jsanda(a)redhat.com&gt; Date: Tue Oct 25 17:35:49 2011 -0400 Handle detached definitions when deleting a template This commit adds code that deletes the actual template and it handles detached definitions by unsetting their template references. This means that definitions can re-attach to a template and that a definition can outlive the template from which it was created. These things only apply however to definitions created from unpinned templates. Definitions created from pinned templates are always necessarily attached. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java index 9ae958e..58c5453 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java @@ -106,6 +106,7 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif DriftDefinitionTemplateCriteria templateCriteria = new DriftDefinitionTemplateCriteria(); templateCriteria.addFilterId(templateId); + templateCriteria.fetchDriftDefinitions(true); PageList<DriftDefinitionTemplate> templates = templateMgr.findTemplatesByCriteria(subject, templateCriteria); DriftDefinitionTemplate template = templates.get(0); @@ -177,8 +178,11 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif if (defintion.isAttached()) { driftMgr.deleteDriftDefinition(subject, forResource(defintion.getResource().getId()), defintion.getName()); + } else { + defintion.setTemplate(null); } } + entityMgr.remove(template); } @RequiredPermission(Permission.MANAGE_SETTINGS) diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java index 3e8edd1..a39faa0 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java @@ -385,7 +385,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { assertDefinitionIsNotPinned(detachedDefs.get(1)); } - public void deleteUnpinnedTemplate() throws Exception { + public void deleteTemplate() throws Exception { // first create the template final DriftDefinition templateDef = new DriftDefinition(new Configuration()); templateDef.setName("test::pinTemplate"); @@ -454,10 +454,12 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { // verify that detached definitions along with their change sets have not been deleted assertNotNull("Change sets belonging to detached definitions should not be deleted", loadChangeSet(changeSet1.getId())); - assertNotNull("Detached definition " + toString(detachedDef1) + " should not be deleted", - loadDefinition(detachedDef1.getId())); - assertNotNull("Detached definition " + toString(detachedDef2) + " should not be deleted", - loadDefinition(detachedDef2.getId())); + assertDetachedDefinitionNotDeleted(detachedDef1.getId()); + assertDetachedDefinitionNotDeleted(detachedDef2.getId()); + + // verify that the template itself has been deleted + assertNull("The template " + toString(template) + " should have been deleted", + loadTemplate(template.getName(), false)); } private void assertDefinitionIsPinned(DriftDefinition definition) throws Exception { @@ -523,6 +525,13 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { assertEquals(msg, 0, comparator.compare(expected, actual)); } + private void assertDetachedDefinitionNotDeleted(int definitionId) { + DriftDefinition definition = loadDefinition(definitionId); + assertNotNull("Detached definition " + toString(definition) + " should not be deleted", definition); + assertNull("The detached definition's template reference should be set to null when the template is deleted", + definition.getTemplate()); + } + private DriftDefinition createDefinition(DriftDefinitionTemplate template, String defName, boolean isAttached) { DriftDefinition def = template.createDefinition(); def.setName(defName); @@ -533,14 +542,23 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { } private DriftDefinitionTemplate loadTemplate(String name) { + return loadTemplate(name, true); + } + + private DriftDefinitionTemplate loadTemplate(String name, boolean verifyResultsUnique) { DriftDefinitionTemplateCriteria criteria = new DriftDefinitionTemplateCriteria(); criteria.addFilterResourceTypeId(resourceType.getId()); criteria.addFilterName(name); criteria.fetchDriftDefinitions(true); PageList<DriftDefinitionTemplate> templates = templateMgr.findTemplatesByCriteria(getOverlord(), criteria); - assertEquals("Expected to find one template", 1, templates.size()); + if (verifyResultsUnique) { + assertEquals("Expected to find one template", 1, templates.size()); + } + if (templates.isEmpty()) { + return null; + } return templates.get(0); } @@ -548,6 +566,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); criteria.addFilterId(definitionId); criteria.fetchConfiguration(true); + criteria.fetchTemplate(true); PageList<DriftDefinition> definitions = driftMgr.findDriftDefinitionsByCriteria(getOverlord(), criteria); if (definitions.isEmpty()) { commit e3389c48c40bcfc6ea8795c4b01674a331a2ef27 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Tue Oct 25 17:26:49 2011 -0400 Drift, fix diffs involving new and removed files. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index 2d0a384..b7779a3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -673,10 +673,12 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { @Override public FileDiffReport generateUnifiedDiff(Subject subject, Drift<?, ?> drift1, Drift<?, ?> drift2) { - String content1 = getDriftFileBits(subject, drift1.getNewDriftFile().getHashId()); + DriftFile drift1File = drift1.getNewDriftFile(); + String content1 = (null == drift1File) ? "" : getDriftFileBits(subject, drift1File.getHashId()); List<String> content1List = asList(content1.split("\\n")); - String content2 = getDriftFileBits(subject, drift2.getNewDriftFile().getHashId()); + DriftFile drift2File = drift2.getNewDriftFile(); + String content2 = (null == drift2File) ? "" : getDriftFileBits(subject, drift2File.getHashId()); List<String> content2List = asList(content2.split("\\n")); Patch patch = DiffUtils.diff(content1List, content2List); commit 0cd7035a83d1da9ae95136d749773ff4ea84728f Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Tue Oct 25 17:05:50 2011 -0400 Drift Defs View, make sure ATTR_ENTITY is properly set for use by Detect Now button. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java index 8eaf519..69335e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java @@ -325,8 +325,8 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp DriftChangeSet<?> changeSet = from.getMostRecentChangeset(); ListGridRecord record = new ListGridRecord(); - // don't store this unless it's needed - // record.setAttribute(ATTR_ENTITY, from); + // We need this for Detect Now support + record.setAttribute(ATTR_ENTITY, from.getDriftDefinition()); record.setAttribute(ATTR_ID, def.getId()); record.setAttribute(ATTR_NAME, def.getName()); commit 8eb8bb612ad496a6b75be8e1a6b39d2cd9b2de33 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Tue Oct 25 17:05:04 2011 -0400 Fix snapshot directory view, removing bad assumption about what will be available from Drift.getChangeSet(). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java index b798d93..570f6f0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java @@ -103,7 +103,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { this.templateId = templateId; this.resourceId = resourceId; this.driftDefId = driftDefId; - this.version = version; + this.version = (null == version) ? 0 : version; this.hasWriteAccess = hasWriteAccess; setDataSource(getDataSource()); @@ -454,15 +454,8 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { record.setAttribute(DriftDataSource.ATTR_CTIME, new Date(from.getCtime())); - switch (from.getChangeSet().getCategory()) { - case COVERAGE: - record.setAttribute(DriftDataSource.ATTR_CATEGORY, ImageManager.getDriftCategoryIcon(null)); - break; - case DRIFT: - record.setAttribute(DriftDataSource.ATTR_CATEGORY, ImageManager.getDriftCategoryIcon(from - .getCategory())); - break; - } + record.setAttribute(DriftDataSource.ATTR_CATEGORY, ImageManager + .getDriftCategoryIcon((0 == version) ? null : from.getCategory())); record.setAttribute(DriftDataSource.ATTR_CHANGESET_VERSION, (null == from.getChangeSet()) ? "0" : from .getChangeSet().getVersion()); commit 35006e13a10796cb4ff1ebe13e82d66da66d0185 Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: Tue Oct 25 17:04:02 2011 -0400 Drift fix for accidentally reassigning a drift's changeset id in getSnapshot() logic. With this change we maintain the proper changeset for a drift record That means drift records for a template's pinned snapshot will always refer back to the template's change set. Which in turn means that the initial snapshot for a definition attached to a pinned template will have drift records that refer to the template's changset. Obvious, right :) Also, a little cleanup and use of proper generic decls. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java index 8de4821..dd3d676 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java @@ -87,25 +87,16 @@ public class DriftSnapshot implements Serializable { return directoryMap.values(); } - //public <D extends Drift<?, ?>> DriftSnapshot addChangeSet(DriftChangeSet<D> changeSet) { - // TODO: add to plugin facet a getInstance capability for DriftChangeSet so we can actually - // create a slim DriftChangeSet to set on the Drifts. Without this we'll get class cast - // exceptions. That's why we currently hijack the passed in DriftChangeSet. When we do that - // perhaps we can get a version that doesn't need to suppress unchecked warnings. /** - * MAJOR SIDE_EFFECT! This method will on exit will leave changeSet.getDrifts() null. - * - * @param changeSet + * @param changeSet The drifts must be set for the changeSet * @return */ - @SuppressWarnings("unchecked") - public DriftSnapshot addChangeSet(DriftChangeSet changeSet) { + public DriftSnapshot addChangeSet(DriftChangeSet<? extends Drift<?, ?>> changeSet) { String dirFilter = request.getDirectory(); - Set<Drift> drifts = changeSet.getDrifts(); - changeSet.setDrifts(null); + Set<? extends Drift<?, ?>> drifts = changeSet.getDrifts(); - for (Drift drift : drifts) { + for (Drift<?, ?> drift : drifts) { String path = drift.getPath(); if (request.isIncludeDriftDirectories()) { @@ -142,8 +133,6 @@ public class DriftSnapshot implements Serializable { if (drift.getCategory() == FILE_REMOVED) { driftMap.remove(path); } else { - // add drift instance to map, or replace with latest drift instance for the given path - drift.setChangeSet(changeSet); driftMap.put(drift.getPath(), drift); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index a037bee..2d0a384 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -43,6 +43,9 @@ import javax.jms.Session; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import difflib.DiffUtils; +import difflib.Patch; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,10 +65,8 @@ import org.rhq.core.domain.drift.DriftChangeSet; import org.rhq.core.domain.drift.DriftChangeSetCategory; import org.rhq.core.domain.drift.DriftComposite; import org.rhq.core.domain.drift.DriftConfigurationDefinition; -import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.drift.DriftDefinition; import org.rhq.core.domain.drift.DriftDefinitionComparator; -import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode; import org.rhq.core.domain.drift.DriftDefinitionComposite; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.drift.DriftDetails; @@ -73,6 +74,8 @@ import org.rhq.core.domain.drift.DriftFile; import org.rhq.core.domain.drift.DriftSnapshot; import org.rhq.core.domain.drift.DriftSnapshotRequest; import org.rhq.core.domain.drift.FileDiffReport; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; +import org.rhq.core.domain.drift.DriftDefinitionComparator.CompareMode; import org.rhq.core.domain.drift.dto.DriftChangeSetDTO; import org.rhq.core.domain.drift.dto.DriftDTO; import org.rhq.core.domain.drift.dto.DriftFileDTO; @@ -95,9 +98,6 @@ import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; -import difflib.DiffUtils; -import difflib.Patch; - /** * The SLSB supporting Drift management to clients. * @@ -283,7 +283,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { int startVersion = request.getStartVersion(); if (0 == startVersion) { - DriftChangeSet<?> initialChangeset = loadInitialChangeSet(subject, request); + DriftChangeSet<? extends Drift<?, ?>> initialChangeset = loadInitialChangeSet(subject, request); if (null == initialChangeset) { if (log.isDebugEnabled()) { log.debug("Cannot create snapshot, no initial changeset for: " + request); @@ -316,14 +316,14 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { criteria.addSortVersion(PageOrdering.ASC); PageList<? extends DriftChangeSet<?>> changeSets = findDriftChangeSetsByCriteria(subject, criteria); - for (DriftChangeSet<?> changeSet : changeSets) { + for (DriftChangeSet<? extends Drift<?, ?>> changeSet : changeSets) { result.addChangeSet(changeSet); } return result; } - private DriftChangeSet<?> loadInitialChangeSet(Subject subject, DriftSnapshotRequest request) { + private DriftChangeSet<? extends Drift<?, ?>> loadInitialChangeSet(Subject subject, DriftSnapshotRequest request) { DriftChangeSetCriteria criteria = new GenericDriftChangeSetCriteria(); criteria.addFilterCategory(COVERAGE); criteria.addFilterVersion("0"); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index 2542049..8c7b506 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -130,8 +130,8 @@ public class JPADriftServerBean implements JPADriftServerLocal { driftsDeleted = q.executeUpdate(); // delete the drift set -// JPADriftChangeSet changeSet = entityManager.createQuery( -// "select c from JPADriftChangeSet c where c.version = 0 and c.driftDefinition") + // JPADriftChangeSet changeSet = entityManager.createQuery( + // "select c from JPADriftChangeSet c where c.version = 0 and c.driftDefinition") // now purge all changesets q = entityManager.createNamedQuery(JPADriftChangeSet.QUERY_DELETE_BY_DRIFTDEF_RESOURCE); @@ -151,12 +151,18 @@ public class JPADriftServerBean implements JPADriftServerLocal { JPADriftChangeSetCriteria jpaCriteria = (criteria instanceof JPADriftChangeSetCriteria) ? (JPADriftChangeSetCriteria) criteria : new JPADriftChangeSetCriteria(criteria); + // If looking for the initial change set make sure version is to to 0 if (criteria.getFilterCategory() != null && criteria.getFilterCategory() == COVERAGE) { + + // If fetching Drifts then make sure we go through the DriftSet. Note that there is no guarantee + // that the fetched Drift will refer to the ChangeSets found, because it may refer to a pinned + // template's changeset and be shared amongst changesets. if (jpaCriteria.isFetchDrifts()) { jpaCriteria.fetchInitialDriftSet(true); jpaCriteria.fetchDrifts(false); } jpaCriteria.addFilterVersion("0"); + } else { jpaCriteria.fetchInitialDriftSet(false); } @@ -166,15 +172,6 @@ public class JPADriftServerBean implements JPADriftServerLocal { generator, entityManager); PageList<JPADriftChangeSet> result = queryRunner.execute(); - if (jpaCriteria.isFetchInitialDriftSet()) { - for (JPADriftChangeSet changeSet : result) { - // Need to wire up each drift with its parent change set. - for (JPADrift drift : changeSet.getInitialDriftSet().getDrifts()) { - drift.setChangeSet(changeSet); - } - } - } - return result; } @@ -234,8 +231,8 @@ public class JPADriftServerBean implements JPADriftServerLocal { JPADriftSet driftSet = new JPADriftSet(); for (Drift<?, ?> drift : changeSet.getDrifts()) { - JPADrift jpaDrift = new JPADrift(jpaChangeSet, drift.getPath(), drift.getCategory(), - toJPADriftFile(drift.getOldDriftFile()), toJPADriftFile(drift.getNewDriftFile())); + JPADrift jpaDrift = new JPADrift(jpaChangeSet, drift.getPath(), drift.getCategory(), toJPADriftFile(drift + .getOldDriftFile()), toJPADriftFile(drift.getNewDriftFile())); driftSet.addDrift(jpaDrift); } entityManager.persist(driftSet); commit ed03c55e1603ab7c54fc09111fc1d798d5963810 Author: Simeon Pinder <spinder(a)redhat.com&gt; Date: Tue Oct 25 16:33:31 2011 -0400 BZ 748966: moving LDAP test and utils into server/jar instead. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/LDAPStringUtil.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/LDAPStringUtil.java deleted file mode 100644 index 8e6b62a..0000000 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/LDAPStringUtil.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2011 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.core.domain.util; - -import java.io.UnsupportedEncodingException; - -/** - * A utility class containing static methods to perform common string - * manipulations or modifications for use with an LDAP implementation. - * - * @author loleary - * @since 4.0.1 - * - */ -public class LDAPStringUtil { - - /** - * <p>Encode a string so that it can be used in an LDAP search filter.</p> - * - * <p>The following table shows the characters that are encoded and their - * encoded version.</p> - * - * <table> - * <tr><th align="center">Character</th><th>Encoded As</th></tr> - * <tr><td align="center">*</td><td>\2a</td></tr> - * <tr><td align="center">(</td><td>\28</td></tr> - * <tr><td align="center">)</td><td>\29</td></tr> - * <tr><td align="center">\</td><td>\5c</td></tr> - * <tr><td align="center"><code>null</code></td><td>\00</td></tr> - * </table> - * - * <p>In addition to encoding the above characters, any non-ASCII character - * (any character with a hex value greater then <code>0x7f</code>) is also - * encoded and rewritten as a UTF-8 character or sequence of characters in - * hex notation.</p> - * - * @param filterString a string that is to be encoded - * @return the encoded version of <code>filterString</code> suitable for use - * in a LDAP search filter - * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> - */ - public static String encodeForFilter(final String filterString) { - if (filterString != null && filterString.length() > 0) { - StringBuilder encString = new StringBuilder(filterString.length()); - for (int i = 0; i < filterString.length(); i++) { - char ch = filterString.charAt(i); - switch (ch) { - case '*': // encode a wildcard * character - encString.append("\\2a"); - break; - case '(': // encode a open parenthesis ( character - encString.append("\\28"); - break; - case ')': // encode a close parenthesis ) character - encString.append("\\29"); - break; - case '\\': // encode a backslash \ character - encString.append("\\5c"); - break; - case '\u0000': // encode a null character - encString.append("\\00"); - break; - default: - if (ch <= 0x7f) { // an ASCII character - encString.append(ch); - } else if (ch >= 0x80) { // encode to UTF-8 - try { - byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); - for (byte b : utf8bytes) { - encString.append(String.format("\\%02x", b)); - } - } catch (UnsupportedEncodingException e) { - // ignore - } - } - } - } - return encString.toString(); - } - return filterString; - } - -} diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/LDAPStringUtilTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/LDAPStringUtilTest.java deleted file mode 100644 index d3fbc69..0000000 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/LDAPStringUtilTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2011 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.core.domain.util; - -import static org.testng.Assert.assertEquals; - -import org.testng.annotations.Test; - -/** - * Test various methods of the {@link LDAPStringUtil} class. - * - * @author loleary - * @since 4.0.1 - * - */ -public class LDAPStringUtilTest { - - /** - * Test method for {@link org.rhq.core.domain.util.LDAPStringUtil#encodeForFilter(java.lang.String)}. - */ - @Test - public void testEncodeForFilter() { - assertEquals(LDAPStringUtil.encodeForFilter("\\, (, ), and *"), "\\5c, \\28, \\29, and \\2a", - "Failed to encode \"\\, (, ), and *\""); - assertEquals(LDAPStringUtil.encodeForFilter("A " + '\0' + " empty value"), "A \\00 empty value", - "Failed to encode \"A <null> empty value\""); - assertEquals(LDAPStringUtil.encodeForFilter("A " + '\u00E9' + " value"), "A \\c3\\a9 value", - "Failed to encode \"A <letter e with acute> value\""); - } - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java new file mode 100644 index 0000000..71fb0b6 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java @@ -0,0 +1,100 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 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.server.resource.group; + +import java.io.UnsupportedEncodingException; + +/** + * A utility class containing static methods to perform common string + * manipulations or modifications for use with an LDAP implementation. + * + * @author loleary + * @since 4.0.1 + * + */ +public class LDAPStringUtil { + + /** + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 19ea74b..396b2c8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -51,7 +51,6 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.authz.Role; import org.rhq.core.domain.common.composite.SystemSetting; import org.rhq.core.domain.resource.group.LdapGroup; -import org.rhq.core.domain.util.LDAPStringUtil; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.server.PersistenceUtility; diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java new file mode 100644 index 0000000..a6e50cb --- /dev/null +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java @@ -0,0 +1,50 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 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.server.resource.group.test; + +import static org.testng.Assert.assertEquals; + +import org.testng.annotations.Test; + +import org.rhq.enterprise.server.resource.group.LDAPStringUtil; + +/** + * Test various methods of the {@link LDAPStringUtil} class. + * + * @author loleary + * @since 4.0.1 + * + */ +public class LDAPStringUtilTest { + + /** + * Test method for {@link org.rhq.core.domain.util.LDAPStringUtil#encodeForFilter(java.lang.String)}. + */ + @Test + public void testEncodeForFilter() { + assertEquals(LDAPStringUtil.encodeForFilter("\\, (, ), and *"), "\\5c, \\28, \\29, and \\2a", + "Failed to encode \"\\, (, ), and *\""); + assertEquals(LDAPStringUtil.encodeForFilter("A " + '\0' + " empty value"), "A \\00 empty value", + "Failed to encode \"A <null> empty value\""); + assertEquals(LDAPStringUtil.encodeForFilter("A " + '\u00E9' + " value"), "A \\c3\\a9 value", + "Failed to encode \"A <letter e with acute> value\""); + } + +} diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java index 9031913..0df53e8 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java @@ -44,7 +44,7 @@ import javax.naming.ldap.ExtendedRequest; import javax.naming.ldap.ExtendedResponse; import javax.naming.ldap.LdapContext; -import org.rhq.core.domain.util.LDAPStringUtil; +import org.rhq.enterprise.server.resource.group.LDAPStringUtil; /** * A fake implementation of {@link LdapContext} which can be used for LDAP