September 2013 - rhq-commits - Fedora Mailing-Lists

[rhq] Branch 'refs/tags/RHQ_4_7_0_JONCI' - 69 commits - etc/rhq-ircBot etc/scripts maven.dependency.tree modules/common modules/core modules/enterprise modules/helpers modules/plugins

by rhqci

etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java | 28 etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks |binary etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/logger.sh | 8 etc/scripts/rhq-api-check | 4 etc/scripts/rhq-probe | 4 etc/scripts/rhq-trigger | 36 maven.dependency.tree | 8846 ---------- modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 11 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java | 16 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties | 6 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 217 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerError.java | 33 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerException.java | 2 modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 224 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java | 26 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java | 3 modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/MCCHelper.java | 25 modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java | 62 modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 6 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 31 modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 4 modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java | 30 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 10 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java | 20 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 20 modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 13 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java | 4 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 46 modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java | 22 modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 | 2 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 36 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 92 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 70 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupEditView.java | 54 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/RefreshIntervalMenu.java | 175 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 52 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 49 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 357 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 137 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 55 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 116 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 97 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 71 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 12 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 47 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 36 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 38 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 36 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 27 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 36 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 20 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 32 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css | 405 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 405 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4 modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css | 252 modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 252 modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js | 1400 + modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js | 6 modules/enterprise/gui/coregui/src/main/webapp/js/moment.js | 1400 - modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js | 6 modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js | 183 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 183 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/UploadRichFacesRenderer.java | 34 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java | 6 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml | 8 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jboss-web.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml | 122 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/summary-navigation.xml | 4 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml | 6 modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp | 30 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 4 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 16 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventInventoryJSON.jsp | 4 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 8 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 50 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 174 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/advisoryInfo-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-add-map-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-edit-map-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-add-map-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createRepo-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/packageVersion-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml | 14 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml | 5 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml | 44 modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-plain-layout.xhtml | 42 modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/popup.xhtml | 32 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml | 5 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml | 5 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml | 16 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/test/menu/main-layout.xhtml | 42 modules/enterprise/server/appserver/pom.xml | 2 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat | 159 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh | 241 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server-console.bat | 2 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat | 218 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.security-policy | 10 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh | 622 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat | 202 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh | 243 modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat | 238 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat | 160 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh | 242 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat | 5 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat | 219 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy | 10 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh | 623 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.bat | 203 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.sh | 244 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage.bat | 239 modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 4 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 88 modules/enterprise/server/ear/pom.xml | 2 modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 3 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java | 45 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 64 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 110 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java | 11 modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 176 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 161 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java | 4 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 8 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 12 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Remove.java | 19 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 23 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 27 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java | 9 modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 18 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 122 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 43 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/AvailabilityResult.java | 94 modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java | 141 modules/plugins/cassandra/pom.xml | 48 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 20 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 16 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java | 206 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java | 29 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 58 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java | 14 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java | 137 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java | 22 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java | 22 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java | 5 modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 4 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 29 212 files changed, 7960 insertions(+), 14762 deletions(-) New commits: commit cdd8be9e0d4ab83cc9c39ce32ea06c503a2825c7 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Wed Sep 25 07:37:59 2013 -0400 tag RHQ_4_7_0_JONCI diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 9783c17..4aae357 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index df3c6b7..434edad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index e27e9ae..86baa5a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index ad356e9..5195e6e 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 1ee2365..dc9fcac 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 86298a7..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 4b78cec..8640d5b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index 7a5bf61..b817c60 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 44e3f9e..1b8bc61 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 0c341cd..fac3833 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 1a4e928..c62a28f 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 18d2ef8..800f5d1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a97a3f1..d3baf3b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index a22d463..93f3805 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index cf49eb0..ef791fb 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index bff6e36..866f669 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 8a4966b..d31a6ad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index fefcf36..f4b2afa 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 832fdd3..33e48b1 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index f6638aa..66df7dd 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index fd8e278..bbe0954 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 474988c..b560968 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index cdb3121..a06011c 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b3bcfd0..ff8a21b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index ce66cca..83c9dac 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ab06e9e..b59e15e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e25a193..710a585 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d076cd9..86a3e7e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fdf355f..adf5bd4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 8cb5215..2ed4c26 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 57987fd..e03ac78 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index a619439..97ed3ab 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 143ce73..b2c1184 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 72e7d1b..0820f4b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 24a00ee..ecdde93 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index dcbfd30..9765a55 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 4935618a..2d97b0b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index fcd9b26..c832b41 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 20854c9..c0554c6 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 8cd2d97..4d3b17e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 0a1e19b..f3e07b4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e3de1bc..1ea7d61 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 908c109..d418db5 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 578f0ed..57c01e8 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 cf9088d..b418671 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 4e7d74c..53a1556 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index b946b2b..0ab8d0e 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 b6a7a04..22ee22b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 1eac425..300e679 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d8527f8..427c5fb 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 ed18648..49e0186 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 982d3d3..a087cb1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d445ed7..bbd87da 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 575a004..4b4ba59 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index f469ca5..aac6e73 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 50ab4c3..4c47992 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 7ef3212..1e36d6c 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 83d7b23..61830f3 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 91a653b..12215be 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 58a16f2..1af4fa8 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6a4b21c..f35a0a4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 04dc335..c9c0a03 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index f9f2e6a..7af6f9d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 3f7c17a..4d8a07d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 44d1b10..abc220d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 dc9d767..20c07de 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e81935a..471003a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 a1a6f8b..2457b0d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 d32dddd..d620c92 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 eb14068..7e3cbe7 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 3e00528..54dcd5b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 39b5ca5..317e61b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 12758b4..36e246a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 6aab82f..5551c92 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 56ad7b6..6f7ac53 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 1ef821f..8edfd9b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 21145a5..32acda7 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 82c6669..02fd80d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 7259db3..8689924 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e497a9c..5833fee 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index c7caff8..7211f4c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 93fe1f4..13b66fe 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 7d1797b..c86f705 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 117271d..6b28aa9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 2449ed8..32d9a39 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 fd56fff..a6cdea1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 1e9b481..bca927d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 9c2ccf4..bb51ace 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 0c9d27c..713b1b4 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 7d57760..0d39f8e 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 03c2ce5..fc766fe 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 6350464..edf7c87 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 768ec0a..e63e38e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index dd97e8f..a7ed4cc 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 26c709d..545b5db 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 36e76d8..718c14c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 d5bd8e7..fa787c5 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9630bc8..84ef130 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index c31b804..0567602 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 63f1e62..df8b7ef 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 77ed069..ca3d81f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0a616d3..0b0c363 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 4510e72..5e1f84c 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 8038922..777f236 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index da1ad51..ac50627 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 556c1e4..7c5748d 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 523406f..a7b8e47 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 167ab67..7c2d095 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a89a568..0c23814 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f96b173..71c5eca 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 679f9b3..56452fb 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index e16b1fd..6d5887e 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index bc7bca1..ddc9e9e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0edf971..5f332a0 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9446a83..2f42e79 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 92dace7..dd1d4a3 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index ebdb5c0..d252d6c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a3f17f4..a10b0f8 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 44ac23f..0d0eefa 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index a9e7295..e0e3cdc 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 092ac13..b31fd66 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 6853c1a..aaa9aa2 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index b32ee81..a35e582 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 dc08424..725187f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 f4a7a88..00d0bda 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 993a215..1c8fe0f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 44e9ce9..513f5b4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index a8e46d8..69b26bf 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 18e79f9..6e2414b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index c3c0db9..ac3304d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 206f2d7..bab062b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index c1a9f61..21102b3 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9678528..c45ff85 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 06b5a80..a7df5f9 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index cd0c446..6f8216c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 2160f12..6ac7fb2 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 1b10af4..766df02 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 4e18f5f..930f335 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 51af020..ba2069c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index feb87c4..bf6fe94 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index bb904517..0cc62a9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 414a2c4..4989446 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index f373663..a579f86 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 942836c..834091d 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 9269350..b3fce75 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c018eed..1f52ac4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index b2c4587..539f1b9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 404f7d6..ee7b2fd 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index fb12b85..834b985 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9f53f6f..b9f2b39 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 764fe67..beb0dd1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f043ba1..f9bd9b1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 67c4519..45d589a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 01d0d24..f46c475 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 7fbac03..678e67f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 41280b9..70e298a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3d4ed73..3407cad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index c305a40..b3d1503 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>pom</packaging> <name>RHQ</name> commit 6cf86130802caa5430cf0153c772f6b2a0fc76e4 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 24 15:10:40 2013 -0400 fix an issue causing a server itest failure. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 671853f..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> </table> commit 04ea628989b39bac142f65833bf2c0f9d0cb8e90 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Sep 24 12:02:13 2013 -0400 Modifying LdapManagerBeanTest to use original settings since the right fix affects other tests as well. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java index 7452247..6c0fd5e 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java @@ -29,7 +29,6 @@ import org.testng.annotations.Test; import org.rhq.core.domain.common.SystemConfiguration; import org.rhq.core.domain.common.composite.SystemSetting; -import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.resource.group.LdapGroupManagerBean; import org.rhq.enterprise.server.resource.group.LdapGroupManagerLocal; @@ -440,10 +439,9 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test { * Helper methods ---------------*/ private void setSystemConfigProperty(final String name, final String value) throws Exception { - SystemSettings sysConfig = systemManager.getSystemSettings(LookupUtil.getSubjectManager().getOverlord()); - SystemSetting retrievedKey = SystemSetting.valueOf(name); - sysConfig.put(retrievedKey, value); - systemManager.setSystemSettings(LookupUtil.getSubjectManager().getOverlord(), sysConfig); + Properties sysConfig = systemManager.getSystemConfiguration(LookupUtil.getSubjectManager().getOverlord()); + sysConfig.setProperty(name, value); + systemManager.setSystemConfiguration(LookupUtil.getSubjectManager().getOverlord(), sysConfig, true); } private void setLdapGroupFilter(String filter) throws Exception { commit 814f047d6aa81cd0242aba65427d532376af1d0e Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Sep 23 14:40:21 2013 -0400 Setting pom versions for RHQ_4_9_0_JON320ER2. diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 1a8284f..9783c17 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index e7923a3..df3c6b7 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 720bfc8..e27e9ae 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index c02b137..ad356e9 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 512c30c..1ee2365 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 7cdd274..86298a7 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index bb6f37e..4b78cec 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index 4a350fa..7a5bf61 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index efca5b9..44e3f9e 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 46d2035..0c341cd 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index a5d8cba..1a4e928 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index e6474b1..18d2ef8 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index bc27f0a..a97a3f1 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index e625006..a22d463 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index c09393a..cf49eb0 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 617b3f9..bff6e36 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 6f5e532..8a4966b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index ffb3f31..fefcf36 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index c094eb6..832fdd3 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 2f35c76..f6638aa 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index 0d6f795..fd8e278 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 7d0b522..474988c 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 95c0b9f..cdb3121 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index e8f0283..b3bcfd0 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 5c8da9b..ce66cca 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index b791f76..ab06e9e 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 912e115..e25a193 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 1732edf..d076cd9 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 4d17615..fdf355f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index fcf7cb6..8cb5215 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index f2e6732..57987fd 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 6c89eae..a619439 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index ad3872c..143ce73 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0f64c06..72e7d1b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 355a1d4..24a00ee 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d68e830..dcbfd30 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index ae264f9..4935618a 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index d0fef55..fcd9b26 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index e2c2d85..20854c9 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 2884b6c..8cd2d97 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 f0f91bf..0a1e19b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 a1583ca..e3de1bc 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index dfea554..908c109 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 648d913..578f0ed 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 7ed5063..cf9088d 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index eb0f5cb..4e7d74c 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 76f6289..b946b2b 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 a707865..b6a7a04 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0105ca8..1eac425 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 7515110..d8527f8 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 fb84763..ed18648 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 43c3715..982d3d3 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d1e38e3..d445ed7 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 6d83c83..575a004 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index e717bfb..f469ca5 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 1bcfe6e..50ab4c3 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 74c89c6..7ef3212 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 421ae6c..83d7b23 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 7f583c5..91a653b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index a2a88c4..58a16f2 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index a2e91a3..6a4b21c 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index b91bad6..04dc335 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 7812f45..f9f2e6a 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index c1559a7..3f7c17a 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 d980eb1..44d1b10 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 8a3e836..dc9d767 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 2ce635e..e81935a 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 2a99065..a1a6f8b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 fa9b113..d32dddd 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 5eba78d..eb14068 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 f651099..3e00528 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 0ddb077..39b5ca5 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 d6bee28..12758b4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 00137eb..6aab82f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 080f1f2..56ad7b6 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 756065c..1ef821f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 fec823d..21145a5 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 0e57cbd..82c6669 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 0f01ac9..7259db3 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 d0dd9be..e497a9c 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 2de9e86..c7caff8 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 a3b6153..93fe1f4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index be5b3a9..7d1797b 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 5e250e5..117271d 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 a9c2542..2449ed8 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 c8ee9f0..fd56fff 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index c820eb4..1e9b481 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 94cd5ae..9c2ccf4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 9f53404..0c9d27c 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 16eacd7..7d57760 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 131c470..03c2ce5 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 2a75c27..6350464 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index cb8b21b..768ec0a 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 6b06712..dd97e8f 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 3281f90..26c709d 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 26ca127..36e76d8 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 4642ba1..d5bd8e7 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index ac587f1..9630bc8 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 08f3004..c31b804 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 4725468..63f1e62 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index de0ce85..77ed069 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 3f5d3a9..0a616d3 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index f0cfdaa..4510e72 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index d1c1be1..8038922 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index eb9e366..da1ad51 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 7075ec3..556c1e4 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index fe89a45..523406f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 02f76b1..167ab67 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index c416175..a89a568 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index da5429b..f96b173 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 38cf3fb..679f9b3 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index d96fa92..e16b1fd 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 2749a8e..bc7bca1 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index c34d1c2..0edf971 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 7ede2af..9446a83 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 1df9119..92dace7 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 37cf180..ebdb5c0 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index f74ea37..a3f17f4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 2436798..44ac23f 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 164aaf0..a9e7295 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index fc03161..092ac13 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2695daf..6853c1a 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 22d2789..b32ee81 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 637cfec..dc08424 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 8b5ff0d..f4a7a88 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 817563e..993a215 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 6bf163d..44e9ce9 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 861d169..a8e46d8 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 4ffb32f..18e79f9 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 7ca1b7a..c3c0db9 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 9a03e04..206f2d7 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 48a788f..c1a9f61 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 1d1edde..9678528 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 39497f0..06b5a80 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 904bec7..cd0c446 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 05c4c3d..2160f12 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index c07beea..1b10af4 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 628c46e..4e18f5f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index aa91586..51af020 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index c5bf422..feb87c4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 5a41c81..bb904517 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 5ec0606..414a2c4 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 1613f24..f373663 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index bf3eabd..942836c 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index e4d7ce0..9269350 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 758fb3b..c018eed 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index f02b873..b2c4587 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 6910176..404f7d6 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index edbd8fe..fb12b85 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 1f86b9a..9f53f6f 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 090632d..764fe67 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 2942971..f043ba1 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index de0ec13..67c4519 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</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 37a8d5b..01d0d24 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index cffe023..7fbac03 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 580d59c..41280b9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 70207d9..3d4ed73 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.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 3b03fe9..c305a40 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.10.0-SNAPSHOT</version> + <version>4.9.0.JON320ER2</version> <packaging>pom</packaging> <name>RHQ</name> commit 7ef8bc9dd55759093a6a33a2d44de2036da57617 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Sep 23 14:34:02 2013 -0400 Reset installer test to version in master. diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 48b0670..dff74bf 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -281,74 +281,6 @@ public class StorageInstallerTest { } @Test - public void performDefaultInstall() throws Exception { - CommandLineParser parser = new PosixParser(); - CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {}); - - int status = installer.run(cmdLine); - - String address = InetAddress.getLocalHost().getHostAddress(); - - assertEquals(status, 0, "Expected to get back a status code of 0 for a successful default install"); - assertNodeIsRunning(); - assertRhqServerPropsUpdated(address); - - File binDir = new File(storageDir, "bin"); - assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); - - File confDir = new File(storageDir, "conf"); - assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); - - File libDir = new File(storageDir, "lib"); - assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); - - File baseDataDir = new File(basedir, "rhq-data"); - - File commitLogDir = new File(baseDataDir, "commit_log"); - assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); - - File dataDir = new File(baseDataDir, "data"); - assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); - - File savedCachesDir = new File(baseDataDir, "saved_caches"); - assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); - - File log4jFile = new File(confDir, "log4j-server.properties"); - assertTrue(log4jFile.exists(), log4jFile + " does not exist"); - - File logsDir = new File(serverDir, "logs"); - File logFile = new File(logsDir, "rhq-storage.log"); - - Properties log4jProps = new Properties(); - log4jProps.load(new FileInputStream(log4jFile)); - assertEquals(log4jProps.getProperty("log4j.appender.R.File"), logFile.getAbsolutePath(), - "The log file is wrong"); - - File yamlFile = new File(confDir, "cassandra.yaml"); - ConfigEditor yamlEditor = new ConfigEditor(yamlFile); - yamlEditor.load(); - - assertEquals(yamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", - "Failed to set the internode_authenticator property in " + yamlFile); - assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", - "The authenticator property is wrong"); - assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); - assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); - assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); - assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); - - File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); - Properties properties = new Properties(); - properties.load(new FileInputStream(cassandraJvmPropsFile)); - - assertEquals(properties.getProperty("jmx_port"), "7299", "The jmx_port property is wrong"); - assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); - assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); - assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); - assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); - } - - @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); commit 4ff4b61f8c50a1f850245abd43bed487ef96e89c Merge: 3c5d524 9f4e250 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Sep 23 13:49:22 2013 -0400 Merge branch 'master' into nightly/rhq.jon Conflicts: modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java commit 3c5d52457ab5124a2057a5f153a9bf243f16d337 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Sep 23 13:45:45 2013 -0400 Temporarily move the versions for merge conflicts resolution. diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 3674957..1a8284f 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index b1ff4ce..e7923a3 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.9.0.JON320ER1</version> + <version>4.10.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 372791d..720bfc8 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index 22cb6f5..c02b137 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index d0adb3c..512c30c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index a75a419..7cdd274 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index c21882b..bb6f37e 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index a918ffb..4a350fa 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index b591f20..efca5b9 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index eec9ee0..46d2035 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 03c94fe..a5d8cba 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 7c1b099..e6474b1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index f0105e5..bc27f0a 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.9.0.JON320ER1</version> + <version>4.10.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 a117365..e625006 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index faed67e..c09393a 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 64a5c15..617b3f9 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 53774d6..6f5e532 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index 7156b1e..ffb3f31 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 5aae91b..c094eb6 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index c0860b6..2f35c76 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index 331c618..0d6f795 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index d2511a2..7d0b522 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9b5e022..95c0b9f 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 cfeeda3..e8f0283 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 39a8663..086f15e 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index bdabb87..b791f76 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index a08a329..912e115 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.9.0.JON320ER1</version> + <version>4.10.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 b8b46fd..1732edf 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.9.0.JON320ER1</version> + <version>4.10.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 485f25b..4d17615 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 936a047..fcf7cb6 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index f6bd3af..f2e6732 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 6ac8db4..6c89eae 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 3cfe4bf..ad3872c 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0393928..0f64c06 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index b16f720..355a1d4 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 23ec3fa..d68e830 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index f1e1a55..ae264f9 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 8440872..d0fef55 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0ec39ab..e2c2d85 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index bebac2a..2884b6c 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 6eed60c..f0f91bf 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.9.0.JON320ER1</version> + <version>4.10.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 a336945..a1583ca 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.9.0.JON320ER1</version> + <version>4.10.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 598e198..dfea554 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index a96ec07..648d913 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.9.0.JON320ER1</version> + <version>4.10.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 d03b6b5..7ed5063 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 1e1915a..eb0f5cb 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 72fb62a..76f6289 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 01460f3..a707865 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 3a71c75..0105ca8 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.9.0.JON320ER1</version> + <version>4.10.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 f39d539..7515110 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.9.0.JON320ER1</version> + <version>4.10.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 7b169f3..fb84763 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.9.0.JON320ER1</version> + <version>4.10.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 885d57c..43c3715 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index df1c225..d1e38e3 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index c971675..6d83c83 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index 5a45579..e717bfb 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index ee00c82..1bcfe6e 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index ab22fab..74c89c6 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index c6a7448..4063181 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 07b9d6a..7f583c5 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 552bde1..a2a88c4 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 6581d50..68d4ffe 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 8601cd3..b91bad6 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index c08d66b..7812f45 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 b4d132c..c1559a7 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 39f192d..d980eb1 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 38c1ab7..8a3e836 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 491c189..2ce635e 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 1a88824..2a99065 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 8d1cc99..fa9b113 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 260e853..5eba78d 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 845b4dc..f651099 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 b8bc01f..0ddb077 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 ee75f25..d6bee28 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 92702de..00137eb 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 8d200ae..080f1f2 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 54966a7..756065c 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.9.0.JON320ER1</version> + <version>4.10.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 ba80047..fec823d 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 ff6c92f..0e57cbd 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.9.0.JON320ER1</version> + <version>4.10.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 af4a49b..0f01ac9 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.9.0.JON320ER1</version> + <version>4.10.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 21cc3b2..d0dd9be 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 0af7f7d..2de9e86 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.9.0.JON320ER1</version> + <version>4.10.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 44c9bd8..a3b6153 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 242fc9f..be5b3a9 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 1778ba7..5e250e5 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.9.0.JON320ER1</version> + <version>4.10.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 eb2adcd..a9c2542 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.9.0.JON320ER1</version> + <version>4.10.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 9da4863..c8ee9f0 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 705d6a2..c820eb4 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.9.0.JON320ER1</version> + <version>4.10.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 efebd31..94cd5ae 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 0586656..9f53404 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 507c690..16eacd7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index d199b9d..131c470 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 fbb58cd..2a75c27 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index dd14588..cb8b21b 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 8637533..6b06712 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index bb70aa9..3281f90 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 70a74c4..26ca127 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 9880d0f..4642ba1 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 7f2ec30..ac587f1 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index ae3660f..08f3004 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a1983d1..4725468 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 405b7f5..de0ce85 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index d55ca09..3f5d3a9 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 54e477c..f0cfdaa 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index e74add2..d1c1be1 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 17f5019..eb9e366 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index a07c8b5..7075ec3 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index a82c476..fe89a45 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.9.0.JON320ER1</version> + <version>4.10.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 3c700ba..02f76b1 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 6cf68e0..c416175 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 26a9f7a..da5429b 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 0e0e0a0..38cf3fb 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 35cd506..d96fa92 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index cf8b26a..2749a8e 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 1bfdc1e..c34d1c2 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9ce68bc..7ede2af 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.9.0.JON320ER1</version> + <version>4.10.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 252ed1d..1df9119 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 890da11..37cf180 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 8314f9d..f74ea37 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index f92d27a..2436798 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index bfaf55c..164aaf0 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 8381c22..fc03161 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 b29f670..2695daf 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 88e6bd8..22d2789 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.9.0.JON320ER1</version> + <version>4.10.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 6c0dcad..637cfec 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.9.0.JON320ER1</version> + <version>4.10.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 c8a724b..8b5ff0d 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.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 3dc5621..817563e 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.9.0.JON320ER1</version> + <version>4.10.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 7e1a23c..6bf163d 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.9.0.JON320ER1</version> + <version>4.10.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 21e3dbe..861d169 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index f79c768..4ffb32f 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 237afa2..7ca1b7a 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.9.0.JON320ER1</version> + <version>4.10.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 0af9315..9a03e04 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 647727c..48a788f 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 8f3fd25..1d1edde 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 45cec0d..39497f0 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index a7dc367..904bec7 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.9.0.JON320ER1</version> + <version>4.10.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 664785d..05c4c3d 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 8003a82..c07beea 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 5d22e10..628c46e 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index c10d157..aa91586 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 8fdcb18..c5bf422 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 19c9151..5a41c81 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.9.0.JON320ER1</version> + <version>4.10.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 ea3a238..5ec0606 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.9.0.JON320ER1</version> + <version>4.10.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 c9859d5..1613f24 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 832ccce..bf3eabd 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 6d1e513..e4d7ce0 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index db2b7e7..758fb3b 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index dec591c..f02b873 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 6c2fe96..6910176 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index c9825a5..edbd8fe 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index af559e9..1f86b9a 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 5cd3f6b..090632d 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index e0baad6..2942971 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 51a9800..de0ec13 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.9.0.JON320ER1</version> + <version>4.10.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 d0019fb..37a8d5b 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 733c751..cffe023 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index bb020e6..580d59c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 54ec33f..70207d9 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.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 351d973..3b03fe9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER1</version> + <version>4.10.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 9f4e250fa89ea2755556d4858b0f142da9268a16 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Sep 23 16:51:58 2013 +0200 BZ 1010319 - Check if this is really a propertyMap or a Config and display accordingly. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java index 9715ab6..361f986 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java @@ -173,7 +173,15 @@ public class ConfigurationComparisonView extends VLayout { TreeNode mapNode = new TreeNode(defMap.getDisplayName()); ArrayList<PropertyMap> properties = new ArrayList<PropertyMap>(); for (AbstractPropertyMap map : maps) { - properties.add((PropertyMap) map); + if (map instanceof PropertyMap) { + properties.add((PropertyMap) map); + } else { + // map is a Configuration + String name = definition.getName(); + PropertyMap innerMap = map.getMap(name); + properties.add(innerMap); + // TODO recursively add the map's items + } } buildNode(mapNode, defMap.getOrderedPropertyDefinitions(), properties); if (!mapNode.getAttributeAsBoolean(ATTRIB_ALL_SAME)) { commit 1ba590c19821808a42c6b59e4cdea319686b7b96 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Sep 21 10:54:18 2013 -0400 [BZ 996710] Only log warnings when C* writes to stderr The installer now only logs a warning when C* writes to stderr. If there is in fact in error, it will be caught during the post-install verification. Some additional checks have been added to the install execution path. The cql, gossip, and jmx ports are checked for conflicts. The installation will fail if there is a conflict for any of those ports. Tests have been added as well. diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 38b0089..99f4894 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -30,7 +30,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.io.IOException; +import java.net.BindException; import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -94,6 +97,12 @@ public class StorageInstaller { public static final int STATUS_IO_ERROR = 7; + public static final int STATUS_JMX_PORT_CONFLICT = 8; + + public static final int STATUS_CQL_PORT_CONFLICT = 9; + + public static final int STATUS_GOSSIP_PORT_CONFLICT = 10; + private final String STORAGE_BASEDIR = "rhq-storage"; private final Log log = LogFactory.getLog(StorageInstaller.class); @@ -151,11 +160,6 @@ public class StorageInstaller { + " from other nodes. Defaults to " + defaultStoragePort); storagePortOption.setArgName("PORT"); - Option sslStoragePortOption = new Option(null, "ssl-storage-port", true, "The port on which to listen for " - + "encrypted requests from other nodes. Only used when encryption is enabled. Defaults to " - + sslStoragePort); - sslStoragePortOption.setArgName("PORT"); - Option startOption = new Option(null, "start", true, "Start the storage node after installing it on disk. " + "Defaults to true."); startOption.setArgName("true|false"); @@ -200,8 +204,8 @@ public class StorageInstaller { options = new Options().addOption(new Option("h", "help", false, "Show this message.")).addOption(hostname) .addOption(seeds).addOption(jmxPortOption).addOption(startOption).addOption(checkStatus) .addOption(commitLogOption).addOption(dataDirOption).addOption(savedCachesDirOption) - .addOption(nativeTransportPortOption).addOption(storagePortOption).addOption(sslStoragePortOption) - .addOption(basedirOption).addOption(heapSizeOption).addOption(heapNewSizeOption).addOption(stackSizeOption) + .addOption(nativeTransportPortOption).addOption(storagePortOption).addOption(basedirOption) + .addOption(heapSizeOption).addOption(heapNewSizeOption).addOption(stackSizeOption) .addOption(upgradeOption).addOption(verifyDataDirsEmptyOption); } @@ -218,10 +222,15 @@ public class StorageInstaller { } else { installerInfo = install(cmdLine); } + } catch (StorageInstallerError e) { + log.error("An unexpected error occurred", e); + log.error("The storage installer will exit due to previous errors"); + return e.getErrorCode(); } catch (StorageInstallerException e) { - log.error("The storage installer will exit due to previous errors", e); + log.warn(e.getMessage()); + log.warn("The storage installer will exit due to previous errors"); return e.getErrorCode(); - } + } PropertiesFileUpdate serverPropertiesUpdater = getServerProperties(); log.info("Updating rhq-server.properties..."); @@ -244,58 +253,44 @@ public class StorageInstaller { binDir = new File(installerInfo.basedir, "bin"); } String startupErrors = startNode(binDir); - if (startupErrors == null) { - boolean checkStatus = Boolean.parseBoolean(cmdLine.getOptionValue("check-status", "true")); - if (checkStatus || isWindows()) { // no reliable pid file on windows - if (verifyNodeIsUp(installerInfo.hostname, installerInfo.jmxPort, 5, 3000)) { - log.info("RHQ Storage Node is up and running and ready to service client requests"); - log.info("Installation of the storage node has completed successfully."); - return STATUS_NO_ERRORS; - } else { - log.error("Could not verify that the node is up and running."); - log.error("Check the log file at " + installerInfo.logFile + " for errors."); - log.error("The storage installer will now exit"); - return STATUS_FAILED_TO_VERIFY_NODE_UP; - } + if (startupErrors != null) { + log.warn("The storage node reported the following errors while trying to start:\n\n" + + startupErrors + "\n"); + if (startupErrors.contains("Port already in use: " + installerInfo.jmxPort)) { + log.warn("There is a conflict with the JMX port that prevented the storage node JVM " + + "from starting."); + File confDir = new File(storageBasedir, "conf"); + File confFile = new File(confDir, "cassandra-jvm.properties"); + log.info("Change the jmx_port property in " + confFile + " to have the storage node listen " + + "on a different port for JMX connections."); + + return STATUS_JMX_PORT_CONFLICT; + } + log.warn("Please review your configuration for possible sources of errors such as port " + + "conflicts or invalid arguments/options passed to the java executable."); + } + boolean checkStatus = Boolean.parseBoolean(cmdLine.getOptionValue("check-status", "true")); + if (checkStatus || isWindows()) { // no reliable pid file on windows + if (verifyNodeIsUp(installerInfo.hostname, installerInfo.jmxPort, 5, 3000)) { + log.info("RHQ Storage Node is up and running and ready to service client requests"); + log.info("Installation of the storage node has completed successfully."); + return STATUS_NO_ERRORS; } else { - if (isRunning()) { - log.info("Installation of the storage node is complete. The node should be up and " - + "running"); - return STATUS_NO_ERRORS; - } else { - log.warn("Installation of the storage node is complete, but the node does not appear to " - + "be running. No start up errors were reported. Check the log file at " + - installerInfo.logFile + " for any other possible errors."); - return STATUS_STORAGE_NOT_RUNNING; - } + log.warn("Could not verify that the node is up and running."); + log.warn("Check the log file at " + installerInfo.logFile + " for errors."); + log.warn("The storage installer will now exit"); + return STATUS_FAILED_TO_VERIFY_NODE_UP; } } else { - // There are platforms where snappy can not be found (OS/X or IBM JRE) - // We get a message back from the cassandra node, which is in reality just a - // warning. So we can swallow it. - boolean foundLinkError = false; - boolean harmless = true; - if (startupErrors.contains("UnsatisfiedLinkError: no snappyjava")) { - log.info("Could not find snappyjava in library path. Will not compress system tables."); - log.info("Installation of the storage node is complete"); - foundLinkError = true; - } - if (!foundLinkError) { - log.error("The storage node reported the following errors while trying to start:\n\n" - + startupErrors + "\n\n"); - harmless = false; - } - if (startupErrors.contains("java.net.BindException: Address already in use")) { - log.error("This error may indicate a conflict for the JMX port."); - } - if (!harmless) { - log.error("Please review your configuration for possible sources of errors such as port " - + "conflicts or invalid arguments/options passed to the java executable."); - log.error("The storage installer will now exit."); - return STATUS_STORAGE_NOT_RUNNING; - } - else { + if (isRunning()) { + log.info("Installation of the storage node is complete. The node should be up and " + + "running"); return STATUS_NO_ERRORS; + } else { + log.warn("Installation of the storage node is complete, but the node does not appear to " + + "be running. No start up errors were reported. Check the log file at " + + installerInfo.logFile + " for any other possible errors."); + return STATUS_STORAGE_NOT_RUNNING; } } } else { @@ -364,8 +359,22 @@ public class StorageInstaller { } installerInfo.jmxPort = getPort(cmdLine, "jmx-port", defaultJmxPort); + if (isPortBound(installerInfo.hostname, installerInfo.jmxPort, "jmx-port")) { + throw new StorageInstallerException("The jmx-port (" + installerInfo.jmxPort + ") is already in use. " + + "Installation cannot proceed.", STATUS_JMX_PORT_CONFLICT); + } + installerInfo.cqlPort = getPort(cmdLine, "client-port", defaultNativeTransportPort); + if (isPortBound(installerInfo.hostname, installerInfo.cqlPort, "client-port")) { + throw new StorageInstallerException("The client-port (" + installerInfo.cqlPort + ") is already in use. " + + "Installation cannot proceed.", STATUS_CQL_PORT_CONFLICT); + } + installerInfo.gossipPort = getPort(cmdLine, "storage-port", defaultStoragePort); + if (isPortBound(installerInfo.hostname, installerInfo.gossipPort, "storage-port")) { + throw new StorageInstallerException("The storage-port (" + installerInfo.gossipPort + ") is already in use. " + + "Installation cannot proceed.", STATUS_GOSSIP_PORT_CONFLICT); + } deploymentOptions.setCommitLogDir(commitlogDir); // TODO add support for specifying multiple dirs @@ -570,6 +579,30 @@ public class StorageInstaller { } } + private boolean isPortBound(String address, int port, String portName) { + ServerSocket serverSocket = null; + try { + serverSocket = new ServerSocket(); + serverSocket.bind(new InetSocketAddress(address, port)); + return false; + } catch (BindException e) { + return true; + } catch (IOException e) { + // We only log a warning here and let the installation proceed in case the + // exception is something that can be ignored. + log.warn("An unexpected error occurred while checking the " + portName + " port", e); + return false; + } finally { + if (serverSocket != null) { + try { + serverSocket.close(); + } catch (IOException e) { + log.error("An error occurred trying to close the connection to the " + portName, e); + } + } + } + } + private File findParentDir(File path) { File dir = path; while (!dir.exists()) { @@ -665,7 +698,7 @@ public class StorageInstaller { String result = ""; try { - executor.execute(cmdLine); + exec(executor, cmdLine); result = buffer.toString(); } finally { @@ -680,6 +713,11 @@ public class StorageInstaller { return result; } + // This is just a test hook + protected void exec(Executor executor, org.apache.commons.exec.CommandLine cmdLine) throws IOException { + executor.execute(cmdLine); + } + private boolean isWindows() { String operatingSystem = System.getProperty("os.name").toLowerCase(Locale.US); return operatingSystem.contains("windows"); diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerError.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerError.java new file mode 100644 index 0000000..6660d37 --- /dev/null +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerError.java @@ -0,0 +1,33 @@ +package org.rhq.storage.installer; + +/** + * Thrown to indicate an unexpected, internal error occurred during storage node installation. + * + * @author John Sanda + */ +public class StorageInstallerError extends StorageInstallerException { + + public StorageInstallerError() { + super(); + } + + public StorageInstallerError(String message) { + super(message); + } + + public StorageInstallerError(String message, int errorCode) { + super(message, errorCode); + } + + public StorageInstallerError(String message, Throwable cause) { + super(message, cause); + } + + public StorageInstallerError(String message, Throwable cause, int errorCode) { + super(message, cause, errorCode); + } + + public StorageInstallerError(Throwable cause) { + super(cause); + } +} diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerException.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerException.java index d022743..696da5c 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerException.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstallerException.java @@ -26,6 +26,8 @@ package org.rhq.storage.installer; /** + * Thrown to indicate that installation has failed. + * * @author John Sanda */ public class StorageInstallerException extends Exception { diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 22cc4c4..dff74bf 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -12,11 +12,16 @@ import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; import java.util.Properties; +import com.google.common.collect.ImmutableMap; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.PosixParser; +import org.apache.commons.exec.Executor; import org.apache.commons.io.FileUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -45,6 +50,7 @@ public class StorageInstallerTest { @BeforeMethod public void initDirs(Method test) throws Exception { + System.out.println("BEGIN " + test); digestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); File dir = new File(getClass().getResource(".").toURI()); @@ -65,11 +71,13 @@ public class StorageInstallerTest { installer = new StorageInstaller(); } - @AfterMethod + @AfterMethod(alwaysRun = true) public void shutdownStorageNode() throws Exception { + System.out.println("END"); if (FileUtils.getFile(storageDir, "bin", "cassandra.pid").exists()) { CassandraClusterManager ccm = new CassandraClusterManager(); ccm.killNode(storageDir); + Thread.sleep(1000); } } @@ -212,6 +220,67 @@ public class StorageInstallerTest { } @Test + public void performValidInstallWithOutputToStderr() throws Exception { + installer = new StorageInstaller() { + @Override + protected void exec(Executor executor, org.apache.commons.exec.CommandLine cmdLine) throws IOException { + executor.execute(cmdLine, ImmutableMap.of("JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF8")); + } + }; + + System.setProperty("-Dfile.encoding", "UTF8"); + + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {}); + + int status = installer.run(cmdLine); + + assertEquals(status, 0, "A zero status code should be returned even when the storage node writes to stderr."); + } + + @Test + public void installWithJMXPortConflict() throws Exception { + ServerSocket serverSocket = null; + try { + String address = InetAddress.getLocalHost().getHostAddress(); + serverSocket = new ServerSocket(); + serverSocket.bind(new InetSocketAddress(address, 7799)); + + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {"--jmx-port", "7799"}); + + int status = installer.run(cmdLine); + + assertEquals(status, StorageInstaller.STATUS_JMX_PORT_CONFLICT, "The status code is wrong"); + } finally { + if (serverSocket != null) { + serverSocket.close(); + } + } + } + + @Test + public void installWithCQLPortConflict() throws Exception { + ServerSocket serverSocket = null; + try { + String address = InetAddress.getLocalHost().getHostAddress(); + serverSocket = new ServerSocket(); + serverSocket.bind(new InetSocketAddress(address, 9342)); + + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {"--client-port", "9342"}); + + int status = installer.run(cmdLine); + + assertEquals(status, StorageInstaller.STATUS_CQL_PORT_CONFLICT, "The status code is wrong"); + } finally { + if (serverSocket != null) { + serverSocket.close(); + } + } + } + + @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); @@ -370,12 +439,4 @@ public class StorageInstallerTest { assertEquals(properties.getProperty("rhq.storage.cql-port"), "9142"); } - private String sha256(File file) { - try { - return digestGenerator.calcDigestString(file); - } catch (IOException e) { - throw new RuntimeException("Failed to calculate SHA-256 hash for " + file.getPath(), e); - } - } - } commit 97b9534b4af482b8e70c477f7cc16c83610a9fa1 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Sep 20 17:36:04 2013 -0400 Updating SystemSettings usage for unit test so it's Storage settings aware. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java index 6c0fd5e..7452247 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java @@ -29,6 +29,7 @@ import org.testng.annotations.Test; import org.rhq.core.domain.common.SystemConfiguration; import org.rhq.core.domain.common.composite.SystemSetting; +import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.resource.group.LdapGroupManagerBean; import org.rhq.enterprise.server.resource.group.LdapGroupManagerLocal; @@ -439,9 +440,10 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test { * Helper methods ---------------*/ private void setSystemConfigProperty(final String name, final String value) throws Exception { - Properties sysConfig = systemManager.getSystemConfiguration(LookupUtil.getSubjectManager().getOverlord()); - sysConfig.setProperty(name, value); - systemManager.setSystemConfiguration(LookupUtil.getSubjectManager().getOverlord(), sysConfig, true); + SystemSettings sysConfig = systemManager.getSystemSettings(LookupUtil.getSubjectManager().getOverlord()); + SystemSetting retrievedKey = SystemSetting.valueOf(name); + sysConfig.put(retrievedKey, value); + systemManager.setSystemSettings(LookupUtil.getSubjectManager().getOverlord(), sysConfig); } private void setLdapGroupFilter(String filter) throws Exception { commit e7f55176b240d8955619f72de50d2e9683bfbc05 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 20 14:48:07 2013 -0400 Always try and stop or remove the server with rhqctl, regardless of whether it appears to be installed. If install borks it may leave behind an installed service or a running but broken server. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Remove.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Remove.java index 121b3b9..791f873 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Remove.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Remove.java @@ -76,9 +76,12 @@ public class Remove extends ControlCommand { if (isAgentInstalled()) { removeAgentService(); } - if (isServerInstalled()) { - removeServerService(); - } + + // the server service may be installed even if the full server install fails. The files to execute + // the remove are there after the initial unzip, so just go ahead and try to remove the service. This + // may help clean up a failed install. + removeServerService(); + if (isStorageInstalled()) { removeStorageService(); } @@ -92,12 +95,10 @@ public class Remove extends ControlCommand { } } if (commandLine.hasOption(SERVER_OPTION)) { - if (isServerInstalled()) { - removeServerService(); - } else { - log.warn("It appears that the server is not installed. The --" + SERVER_OPTION - + " option will be ignored."); - } + // the server service may be installed even if the full server install fails. The files to execute + // the remove are there after the initial unzip, so just go ahead and try to remove the service. This + // may help clean up a failed install. + removeServerService(); } if (commandLine.hasOption(STORAGE_OPTION)) { if (isStorageInstalled()) { diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java index 908aa8e..cfbb1ff 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java @@ -70,9 +70,12 @@ public class Stop extends AbstractInstall { if (isAgentInstalled()) { stopAgent(); } - if (isServerInstalled()) { - stopRHQServer(); - } + + // the server service may be installed even if the full server install fails. The files to execute + // the remove are there after the initial unzip, so just go ahead and try to stop the service. This + // may help clean up a failed install. + stopRHQServer(); + if (isStorageInstalled()) { stopStorage(); } @@ -85,14 +88,14 @@ public class Stop extends AbstractInstall { + " option will be ignored."); } } + if (commandLine.hasOption(SERVER_OPTION)) { - if (isServerInstalled()) { - stopRHQServer(); - } else { - log.warn("It appears that the server is not installed. The --" + SERVER_OPTION - + " option will be ignored."); - } + // the server service may be installed even if the full server install fails. The files to execute + // the remove are there after the initial unzip, so just go ahead and try to stop the service. This + // may help clean up a failed install. + stopRHQServer(); } + if (commandLine.hasOption(STORAGE_OPTION)) { if (isStorageInstalled()) { stopStorage(); @@ -126,7 +129,7 @@ public class Stop extends AbstractInstall { log.debug("Failed to stop storage service", e); } } else { - if(isStorageRunning()) { + if (isStorageRunning()) { String pid = getStoragePid(); System.out.println("Stopping RHQ storage node..."); commit 58dc86e94f9a96112e306b3becf2290cc38a7dc1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 20 14:46:44 2013 -0400 Fix rhq windows issue with new "internal" bin dir. diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index a2c04be..38b0089 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -239,7 +239,7 @@ public class StorageInstaller { if (isWindows()) { File basedir = new File(System.getProperty("rhq.server.basedir")); basedir = (null == basedir) ? installerInfo.basedir.getParentFile() : basedir; - binDir = new File(basedir, "bin"); + binDir = new File(basedir, "bin/internal"); } else { binDir = new File(installerInfo.basedir, "bin"); } diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf index a294bd1..23e05fc 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf @@ -87,7 +87,7 @@ wrapper.java.additional.17="-Dlogging.configuration=file:%RHQ_SERVER_HOME%/jboss wrapper.java.additional.18=-Dsun.lang.ClassLoader.allowArraySyntax=true wrapper.java.additional.19=-Djava.security.manager # the double equals for the policy file specification IS INTENTIONAL -wrapper.java.additional.20="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/rhq-server.security-policy" +wrapper.java.additional.20="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/internal/rhq-server.security-policy" wrapper.java.additional.21="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on" wrapper.java.additional.22="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html" @@ -191,7 +191,7 @@ wrapper.daemonize=TRUE # Wrapper Shutdown Monitoring Properties #***************************************************************************** # File to be monitored - when anchor file is deleted, the instance will shutdown -#wrapper.anchorfile=%RHQ_SERVER_HOME%\bin\anchor +#wrapper.anchorfile=%RHQ_SERVER_HOME%\bin\internal\anchor #wrapper.anchor.poll_interval=5 # auto-restart on weird exit status - if exiting normally, just shutdown commit 863048e054750d0b35f69cdc83594928e5c2603e Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Sep 20 17:31:21 2013 +0200 [BZ 1000065] - During install / server start show a sign of life - making changes to portal war web app in order to make it work with different application context ("/portal"). diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/UploadRichFacesRenderer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/UploadRichFacesRenderer.java new file mode 100644 index 0000000..19ec779 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/UploadRichFacesRenderer.java @@ -0,0 +1,34 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.common.upload; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.context.AjaxContext; +import org.richfaces.renderkit.html.FileUploadRenderer; + +public class UploadRichFacesRenderer extends FileUploadRenderer { + + @Override + public String getActionUrl(FacesContext context){ + AjaxContext ajaxContext = org.ajax4jsf.context.AjaxContext.getCurrentInstance(context); + String ajaxActionUrl = ajaxContext.getAjaxActionURL(context); + return "/portal" + ajaxActionUrl; + } +} diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml index c137f08..3f0afb7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml @@ -20,6 +20,14 @@ <el-resolver>org.rhq.enterprise.gui.common.paging.PageControlELResolver</el-resolver> </application> + <render-kit> + <renderer> + <component-family>org.richfaces.component.FileUpload</component-family> + <renderer-type>org.richfaces.renderkit.html.FileUploadRenderer</renderer-type> + <renderer-class>org.rhq.enterprise.gui.common.upload.UploadRichFacesRenderer</renderer-class> + </renderer> + </render-kit> + <lifecycle> <phase-listener>org.rhq.enterprise.gui.common.framework.FacesMessagePropogationPhaseListener</phase-listener> <phase-listener>org.rhq.enterprise.gui.common.framework.PhaseTracker</phase-listener> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml index 14db2d7..5c72e1f 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml @@ -9,21 +9,21 @@ <navigation-case> <from-outcome>sort</from-outcome> - <to-view-id>/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{ResourceReposUIBean.deleteSelectedResourceRepos}</from-action> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{AvailableResourceReposUIBean.subscribeSelectedResourceRepos}</from-action> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/subscription-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> </navigation-rule> @@ -33,7 +33,7 @@ <navigation-case> <from-outcome>sort</from-outcome> - <to-view-id>/rhq/resource/content/view-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/view-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -41,7 +41,7 @@ <navigation-case> <from-action>#{ListPackagesUIBean.deleteSelectedInstalledPackages}</from-action> <from-outcome>successOrFailure</from-outcome> - <to-view-id>/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> --> @@ -49,7 +49,7 @@ <navigation-case> <from-action>#{DeletePackagesUIBean.beginDeleteWorkflow}</from-action> <from-outcome>beginDeleteWorkflow</from-outcome> - <to-view-id>/rhq/resource/content/confirm-delete-plain.xhtml</to-view-id> + <to-view-id>/portal/portal/rhq/resource/content/confirm-delete-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -59,14 +59,14 @@ <navigation-case> <from-outcome>uploadNew</from-outcome> - <to-view-id>/rhq/resource/content/create-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/create-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{CreateNewPackageUIBean.deployExisting}</from-action> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -77,14 +77,14 @@ <navigation-case> <from-outcome>uploadNew</from-outcome> - <to-view-id>/rhq/resource/content/create-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/create-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{CreateNewPackageUIBean.deployExisting}</from-action> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -96,13 +96,13 @@ <navigation-case> <from-outcome>showContentServiceRequestDetails</from-outcome> - <to-view-id>/rhq/resource/content/history-request-plain.xhtml?id=#{param.id}&selectedRequestId=#{param.selectedRequestId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-request-plain.xhtml?id=#{param.id}&selectedRequestId=#{param.selectedRequestId}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>showHistoryItem</from-outcome> - <to-view-id>/rhq/resource/content/audit-trail-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/audit-trail-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}</to-view-id> <redirect/> </navigation-case> @@ -113,13 +113,13 @@ <navigation-case> <from-outcome>showHistoryItem</from-outcome> - <to-view-id>/rhq/resource/content/history-request-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-request-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>returnToAllRequests</from-outcome> - <to-view-id>/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -130,13 +130,13 @@ <navigation-case> <from-outcome>returnToRequest</from-outcome> - <to-view-id>/rhq/resource/content/history-request-plain.xhtml?id=#{param.id}&selectedRequestId=#{param.selectedRequestId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-request-plain.xhtml?id=#{param.id}&selectedRequestId=#{param.selectedRequestId}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>stepDetails</from-outcome> - <to-view-id>/rhq/resource/content/history-request-step-details-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}&stepId=#{param.stepId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-request-step-details-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}&stepId=#{param.stepId}</to-view-id> <redirect/> </navigation-case> @@ -147,7 +147,7 @@ <navigation-case> <from-outcome>returnToHistory</from-outcome> - <to-view-id>/rhq/resource/content/history-request-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-request-item-plain.xhtml?id=#{param.id}&selectedHistoryId=#{param.selectedHistoryId}&selectedRequestId=#{param.selectedRequestId}</to-view-id> <redirect/> </navigation-case> @@ -159,12 +159,12 @@ <navigation-case> <from-action>#{CreateNewPackageUIBean.createPackage}</from-action> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/resource/content/confirm-create-plain.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -175,13 +175,13 @@ <navigation-case> <from-outcome>successOrFailure</from-outcome> - <to-view-id>/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -192,13 +192,13 @@ <navigation-case> <from-outcome>successOrFailure</from-outcome> - <to-view-id>/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/history-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/content/deploy-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -211,49 +211,49 @@ <navigation-case>  <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/listRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>createNewRepo</from-outcome> - <to-view-id>/rhq/content/createRepo-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/createRepo-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>importRepos</from-outcome> - <to-view-id>/rhq/content/importRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/importRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/listRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/rhq/content/importRepos-plain.xhtml</from-view-id> + <from-view-id>rhq/content/importRepos-plain.xhtml</from-view-id> <navigation-case>  <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/listRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>failed</from-outcome> - <to-view-id>/rhq/content/importRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/importRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/importRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/importRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> </navigation-rule> @@ -264,32 +264,32 @@ <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/repo-plain.xhtml?mode=view&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repo-plain.xhtml?mode=view&id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>edit</from-outcome> - <to-view-id>/rhq/content/repo-plain.xhtml?mode=edit&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repo-plain.xhtml?mode=edit&id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>associateWithContentProviders</from-outcome> - <to-view-id>/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>subscribeResources</from-outcome> - <to-view-id>/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/repo-plain.xhtml?mode=view&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repo-plain.xhtml?mode=view&id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -302,20 +302,20 @@ <navigation-case>  <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/listContentProviders-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listContentProviders-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>createNewContentSource</from-outcome> - <to-view-id>/rhq/content/createContentProvider-plain.xhtml?mode=new</to-view-id> + <to-view-id>/portal/rhq/content/createContentProvider-plain.xhtml?mode=new</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/listContentProviders-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listContentProviders-plain.xhtml</to-view-id> <redirect/> </navigation-case> @@ -327,36 +327,36 @@ <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/contentProvider-plain.xhtml?mode=view&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml?mode=view&id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>edit</from-outcome> - <to-view-id>/rhq/content/contentProvider-plain.xhtml?mode=edit&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml?mode=edit&id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/contentProvider-plain.xhtml?mode=view&id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml?mode=view&id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{ConfigHelperUIBean.accessMap}</from-action> - <to-view-id>/rhq/content/contentProvider-view-map-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-view-map-plain.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{ConfigHelperUIBean.accessMap}</from-action> - <to-view-id>/rhq/content/contentProvider-edit-map-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-edit-map-plain.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{ConfigHelperUIBean.addNewMap}</from-action> - <to-view-id>/rhq/content/contentProvider-add-map-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-add-map-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -367,23 +367,23 @@ <navigation-case> <from-action>#{ConfigHelperUIBean.accessMap}</from-action> - <to-view-id>/rhq/content/createContentProvider-edit-map-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/createContentProvider-edit-map-plain.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{ConfigHelperUIBean.addNewMap}</from-action> - <to-view-id>/rhq/content/createContentProvider-add-map-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/createContentProvider-add-map-plain.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>save</from-outcome> - <to-view-id>/rhq/content/listContentProviders-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listContentProviders-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/rhq/content/listContentProviders-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listContentProviders-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -391,7 +391,7 @@ <from-view-id>/rhq/content/createContentProvider-edit-map-plain.xhtml</from-view-id> <navigation-case> - <to-view-id>/rhq/content/createContentProvider-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/createContentProvider-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -399,7 +399,7 @@ <from-view-id>/rhq/content/createContentProvider-add-map-plain.xhtml</from-view-id> <navigation-case> - <to-view-id>/rhq/content/createContentProvider-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/createContentProvider-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -407,7 +407,7 @@ <from-view-id>/rhq/content/contentProvider-view-map-plain.xhtml</from-view-id> <navigation-case> - <to-view-id>/rhq/content/contentProvider-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -415,7 +415,7 @@ <from-view-id>/rhq/content/contentProvider-edit-map-plain.xhtml</from-view-id> <navigation-case> - <to-view-id>/rhq/content/contentProvider-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -423,7 +423,7 @@ <from-view-id>/rhq/content/contentProvider-add-map-plain.xhtml</from-view-id> <navigation-case> - <to-view-id>/rhq/content/contentProvider-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/contentProvider-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -433,13 +433,13 @@ <navigation-case> <from-outcome>save</from-outcome> - <to-view-id>/rhq/content/listRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listRepos-plain.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/rhq/content/listRepos-plain.xhtml</to-view-id> + <to-view-id>/portal/rhq/content/listRepos-plain.xhtml</to-view-id> </navigation-case> </navigation-rule> @@ -450,14 +450,14 @@ <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoAssociations-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> @@ -469,20 +469,20 @@ <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>search</from-outcome> - <to-view-id>/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/content/repoSubscriptions-plain.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/summary-navigation.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/summary-navigation.xml index 7588e93..fb79af3 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/summary-navigation.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/summary-navigation.xml @@ -10,10 +10,10 @@ <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/rhq/resource/summary/timeline.xhtml?id=#{param.id}</to-view-id> + <to-view-id>/portal/rhq/resource/summary/timeline.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> </navigation-rule> -</faces-config> \ No newline at end of file +</faces-config> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml index 1c75b2e..ad12ceb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml @@ -156,7 +156,7 @@ height="25" width="104" classtype="org.rhq.enterprise.gui.legacy.util.Tab"/> <item value="Timeline" - link="/rhq/resource/monitor/timeline.xhtml" mode="timeline" + link="/portal/rhq/resource/monitor/timeline.xhtml" mode="timeline" height="25" width="104" classtype="org.rhq.enterprise.gui.legacy.util.Tab"/> <item value="Configure" @@ -438,8 +438,8 @@  <definition name=".resource.common.monitor.visibility.timeline" - path="/resource/common/monitor/visibility/Timeline.jsp" - controllerUrl="/resource/common/monitor/visibility/Timeline.do"/> + path="/portal/resource/common/monitor/visibility/Timeline.jsp" + controllerUrl="/portal/resource/common/monitor/visibility/Timeline.do"/> <definition name=".resource.common.events.Events" controllerUrl="/resource/common/events/EventsFormPrepare.do" diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp index c76bd25..29c5b1b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/portal/MainLayout.jsp @@ -12,23 +12,23 @@ <meta http-equiv="Max-Age" content="0"> <meta http-equiv="Cache-Control" content="no-cache"> - <link rel="stylesheet" type="text/css" media="screen" href="/css/win.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/layout.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/layout.css"/> - <script type="text/javascript" src="/js/functions.js"></script> - <script type="text/javascript" src="/js/prototype.js"></script> - <script type="text/javascript" src="/js/window.js"></script> - <script type="text/javascript" src="/js/effects.js"></script> -  - <script type="text/javascript" src="/js/rhq.js"></script> + <script type="text/javascript" src="/portal/js/functions.js"></script> + <script type="text/javascript" src="/portal/js/prototype.js"></script> + <script type="text/javascript" src="/portal/js/window.js"></script> + <script type="text/javascript" src="/portal/js/effects.js"></script> +  + <script type="text/javascript" src="/portal/js/rhq.js"></script> - <link href="/css/theme/default.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/debug.css" rel="stylesheet" type="text/css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/menu.css"/> + <link href="/portal/css/theme/default.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/debug.css" rel="stylesheet" type="text/css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/menu.css"/> - <link rel="icon" type="image/png" href="/images/favicon.png"/> - <link rel="apple-touch-icon" href="/images/favicon.png"/> + <link rel="icon" type="image/png" href="/portal/images/favicon.png"/> + <link rel="apple-touch-icon" href="/portal/images/favicon.png"/> <tiles:insert attribute="head"/> <title> @@ -42,7 +42,7 @@ </fmt:message> </title> - <script type="text/javascript" src="/js/ajax.js"></script> + <script type="text/javascript" src="/portal/js/ajax.js"></script>  - <script type="text/javascript" src="/js/formValues.js"></script> - <script type="text/javascript" src="/js/rhq.js"></script> - <script type="text/javascript" src="/js/popup.js"></script> - <link href="/css/theme/default.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/debug.css" rel="stylesheet" type="text/css"/> - - <link rel="icon" type="image/png" href="/images/favicon.png"/> - <link rel="apple-touch-icon" href="/images/favicon.png"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/form-style.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/menu.css"/> + + <script type="text/javascript" src="/portal/js/functions.js"></script> + <script type="text/javascript" src="/portal/js/prototype.js"></script> + <script type="text/javascript" src="/portal/js/window.js"></script> + <script type="text/javascript" src="/portal/js/effects.js"></script> +  + <script type="text/javascript" src="/portal/js/formValues.js"></script> + <script type="text/javascript" src="/portal/js/rhq.js"></script> + <script type="text/javascript" src="/portal/js/popup.js"></script> + <link href="/portal/css/theme/default.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/debug.css" rel="stylesheet" type="text/css"/> + + <link rel="icon" type="image/png" href="/portal/images/favicon.png"/> + <link rel="apple-touch-icon" href="/portal/images/favicon.png"/>  <style type="text/css"> @@ -198,11 +198,11 @@ - <link rel="stylesheet" type="text/css" media="screen" href="/css/tabular.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/layout.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/tabular.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/layout.css"/> <script type="text/javascript"> - var imagePath = "/images/"; + var imagePath = "/portal/images/"; </script> </head> @@ -252,7 +252,7 @@ Firefox and other Gecko-based browsers to render the page in "Almost Standards"  <c:if test="${empty param.nomenu and empty disableMenu}"> - <ui:include src="/rhq/common/menu/menu.xhtml"/> + <ui:include src="/portal/rhq/common/menu/menu.xhtml"/> </c:if>  diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-plain-layout.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-plain-layout.xhtml index ffb0bda..a8f9796 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-plain-layout.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-plain-layout.xhtml @@ -21,24 +21,24 @@ <meta http-equiv="Cache-Control" content="no-cache"/> <ui:insert name="metaHeaders"></ui:insert> - <link rel="stylesheet" type="text/css" media="screen" href="/css/win.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/form-style.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/menu.css"/> - - <script type="text/javascript" src="/js/functions.js"></script> - <script type="text/javascript" src="/js/prototype.js"></script> - <script type="text/javascript" src="/js/window.js"></script> - <script type="text/javascript" src="/js/effects.js"></script> -  - <script type="text/javascript" src="/js/formValues.js"></script> - <script type="text/javascript" src="/js/rhq.js"></script> - <script type="text/javascript" src="/js/popup.js"></script> - <link href="/css/theme/default.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/debug.css" rel="stylesheet" type="text/css"/> - - <link rel="icon" type="image/png" href="/images/favicon.png"/> - <link rel="apple-touch-icon" href="/images/favicon.png"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/form-style.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/menu.css"/> + + <script type="text/javascript" src="/portal/js/functions.js"></script> + <script type="text/javascript" src="/portal/js/prototype.js"></script> + <script type="text/javascript" src="/portal/js/window.js"></script> + <script type="text/javascript" src="/portal/js/effects.js"></script> +  + <script type="text/javascript" src="/portal/js/formValues.js"></script> + <script type="text/javascript" src="/portal/js/rhq.js"></script> + <script type="text/javascript" src="/portal/js/popup.js"></script> + <link href="/portal/css/theme/default.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/debug.css" rel="stylesheet" type="text/css"/> + + <link rel="icon" type="image/png" href="/portal/images/favicon.png"/> + <link rel="apple-touch-icon" href="/portal/images/favicon.png"/>  <style type="text/css"> @@ -202,11 +202,11 @@ - <link rel="stylesheet" type="text/css" media="screen" href="/css/tabular.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/layout.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/tabular.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/layout.css"/> <script type="text/javascript"> - var imagePath = "/images/"; + var imagePath = "/portal/images/"; </script> </head> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/popup.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/popup.xhtml index fc20516..283cb76 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/popup.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/popup.xhtml @@ -20,32 +20,32 @@ <meta http-equiv="Cache-Control" content="no-cache"/> <ui:insert name="metaHeaders"></ui:insert> - <link rel="stylesheet" type="text/css" media="screen" href="/css/win.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/form-style.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/menu.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/form-style.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/menu.css"/> - <script type="text/javascript" src="/js/functions.js"></script> - <script type="text/javascript" src="/js/prototype.js"></script> - <script type="text/javascript" src="/js/window.js"></script> - <script type="text/javascript" src="/js/effects.js"></script> -  - <script type="text/javascript" src="/js/rhq.js"></script> - <script type="text/javascript" src="/js/popup.js"></script> + <script type="text/javascript" src="/portal/js/functions.js"></script> + <script type="text/javascript" src="/portal/js/prototype.js"></script> + <script type="text/javascript" src="/portal/js/window.js"></script> + <script type="text/javascript" src="/portal/js/effects.js"></script> +  + <script type="text/javascript" src="/portal/js/rhq.js"></script> + <script type="text/javascript" src="/portal/js/popup.js"></script> - <link href="/css/theme/default.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/debug.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/default.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/debug.css" rel="stylesheet" type="text/css"/>  <style type="text/css"> .BlockTitle { padding-top: 3px; padding-bottom:3px; } </style> - <link rel="stylesheet" type="text/css" media="screen" href="/css/tabular.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/layout.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/tabular.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/layout.css"/> <script type="text/javascript"> - var imagePath = "/images/"; + var imagePath = "/portal/images/"; </script> </head> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml index 13055f5..9e3fc28 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml @@ -13,7 +13,8 @@ function prepareFormForUpload() { var form = document.getElementById('editResourceConfigurationForm'); form.encoding = 'multipart/form-data'; - + form.setAttribute('action', 'upload-modal.xhtml'); + return true; } </script> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml index bc8b50a..92badca 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml @@ -68,6 +68,9 @@ </rich:panel> </h:form> +<script> +document.getElementById('contentRequestsForm').setAttribute('action', 'audit-trail-item-plain.xhtml'); +</script> </ui:define> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml index 90a4323..87af65a 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml @@ -18,7 +18,7 @@ <ui:param name="selectedTabName" value="Content.New"/> <ui:define name="content"> - <h:form> + <h:form id="confirmCreateForm"> <input type="hidden" name="id" value="${param.id}"/> @@ -175,6 +175,11 @@ </h:form> +<script> +document.getElementById('confirmCreateForm').setAttribute('action', 'confirm-create-plain.xhtml'); +</script> + + </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml index 7f410a1..ea8791b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml @@ -18,7 +18,7 @@ <ui:param name="selectedTabName" value="Content.Deployed"/> <ui:define name="content"> - <h:form> + <h:form id="confirmDeleteForm"> <input type="hidden" name="id" value="${param.id}"/> <rich:panel> @@ -63,6 +63,9 @@ </rich:panel> </h:form> +<script> +document.getElementById('confirmDeleteForm').setAttribute('action', 'confirm-delete-plain.xhtml'); +</script> </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml index 0b6c45b..466827a 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml @@ -19,7 +19,7 @@ <input type="button" class="buttonmed" value="UPLOAD FILE..." - onclick="javascript:open('/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> + onclick="javascript:open('/portal/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> <rich:spacer width="5" /> <h:outputText rendered="#{UploadNewPackageUIBean.fileUploaded}" value="File Uploaded: #{UploadNewPackageUIBean.fileItem.fileName}"/> @@ -140,6 +140,10 @@ </h:panelGrid> </h:form> +<script> +document.getElementById('uploadForm').setAttribute('action', 'create-plain.xhtml'); +</script> + </ui:define> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml index f6af050..be4db0a 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml @@ -28,7 +28,7 @@ <input type="button" class="buttonmed" value="UPLOAD FILE..." - onclick="javascript:open('/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> + onclick="javascript:open('/portal/rhq/resource/content/file-upload.xhtml', 'uploadwin', 'titlebar=0,toolbar=0,location=0,menubar=0,directories=0,resizable=0,height=160,width=450')"/> <rich:spacer width="5" /> <h:outputText rendered="#{UploadNewPackageUIBean.fileUploaded}" value="File Uploaded: #{UploadNewPackageUIBean.fileItem.fileName}"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml index 28cc396..b35e78d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml @@ -137,5 +137,10 @@ </rich:panel> </h:form> + +<script> +document.getElementById('currentPackageVersionsForm').setAttribute('action', 'deploy-plain.xhtml'); +</script> + </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml index a237c26..ce89fb5 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml @@ -15,7 +15,7 @@ <head> - <link rel="stylesheet" href="/css/win.css" type="text/css"/> + <link rel="stylesheet" href="/portal/css/win.css" type="text/css"/> </head> <body> @@ -353,6 +353,10 @@ </rich:panel> </h:form> +<script> +document.getElementById('contentaRequestsForm').setAttribute('action', 'history-plain.xhtml'); +</script> + </body> </html> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml index de42127..9649654 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml @@ -123,6 +123,9 @@ </p> </h:form> +<script> +document.getElementById('contentRequestsForm').setAttribute('action', 'history-request-item-plain.xhtml'); +</script> </ui:define> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml index a897944..1e75915 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml @@ -182,6 +182,9 @@ </p> </h:form> +<script> +document.getElementById('contentRequestsForm').setAttribute('action', 'history-request-plain.xhtml'); +</script> </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml index c7631e2..4b0c922 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml @@ -49,7 +49,9 @@ </rich:panel> </h:form> - +<script> +document.getElementById('contentRequestsForm').setAttribute('action', 'history-request-step-details-plain.xhtml'); +</script> </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request.xhtml index 584d481..45eb95b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request.xhtml @@ -182,6 +182,10 @@ </p> </h:form> +<script> +document.getElementById('contentRequestsForm').setAttribute('action', 'history-request.xhtml'); +</script> + </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml index 61d62b0..ede7478 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml @@ -141,7 +141,7 @@  - <h:outputLink value="/rhq/resource/content/view-plain.xhtml?id=#{param.id}"> + <h:outputLink value="/portal/rhq/resource/content/view-plain.xhtml?id=#{param.id}"> <h:outputText value="Return to Packages"/> </h:outputLink> </ui:define> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml index c575b47..7409954 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml @@ -51,7 +51,7 @@ </onc:sortableColumnHeader> </f:facet> - <h:outputLink value="/rhq/content/repo-plain.xhtml"> + <h:outputLink value="/portal/rhq/content/repo-plain.xhtml"> <f:param name="mode" value="view"/> <f:param name="id" value="#{item.repo.id}"/> <h:outputText value="#{item.repo.name}" /> @@ -164,7 +164,7 @@ </onc:sortableColumnHeader> </f:facet> - <h:outputLink value="/rhq/content/repo-plain.xhtml"> + <h:outputLink value="/portal/rhq/content/repo-plain.xhtml"> <f:param name="mode" value="view"/> <f:param name="id" value="#{item.repo.id}"/> <h:outputText value="#{item.repo.name}" /> @@ -239,7 +239,7 @@ disabling it for now until we decide if this is needed. --></ui:remove>  - <script type="text/javascript" src="/js/rhq.js"></script> - <script type="text/javascript" src="/js/popup.js"></script> - - <link href="/css/theme/default.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> - <link href="/css/theme/debug.css" rel="stylesheet" type="text/css"/> - <link href="/test/menu/menu.css" rel="stylesheet" type="text/css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/leftMenu.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/form-style.css"/> + + <script type="text/javascript" src="/portal/js/functions.js"></script> + <script type="text/javascript" src="/portal/js/prototype.js"></script> + <script type="text/javascript" src="/portal/js/window.js"></script> + <script type="text/javascript" src="/portal/js/effects.js"></script> +  + <script type="text/javascript" src="/portal/js/rhq.js"></script> + <script type="text/javascript" src="/portal/js/popup.js"></script> + + <link href="/portal/css/theme/default.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/alphacube.css" rel="stylesheet" type="text/css"/> + <link href="/portal/css/theme/debug.css" rel="stylesheet" type="text/css"/> + <link href="/portal/test/menu/menu.css" rel="stylesheet" type="text/css"/>  @@ -43,11 +43,11 @@ .BlockTitle { padding-top: 3px; padding-bottom:3px; } </style> - <link rel="stylesheet" type="text/css" media="screen" href="/css/tabular.css"/> - <link rel="stylesheet" type="text/css" media="screen" href="/css/layout.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/tabular.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/portal/css/layout.css"/> <script type="text/javascript"> - var imagePath = "/images/"; + var imagePath = "/portal/images/"; </script> </head> @@ -70,7 +70,7 @@ <tr valign="bottom"> <td align="left"> <a href="#" onclick="openAbout(aboutWindowTitle)"> - <img src="/images/logo_header.gif" title="${msg['product.fullName']}"/> + <img src="/portal/images/logo_header.gif" title="${msg['product.fullName']}"/> </a> </td> <td align="right"> @@ -79,7 +79,7 @@ <area href="http://www.jboss.org/" alt="JBoss Homepage" title="JBoss" shape="rect" coords="100,0,200,42" /> </map> <div> - <img src="/images/redhat-jboss-logo.gif" usemap="#redhat-jboss-logo-map" /> + <img src="/portal/images/redhat-jboss-logo.gif" usemap="#redhat-jboss-logo-map" /> </div> </td> </tr> commit d8ec664b255c59f38459ede0c8d99f721799da4c Author: Jirka Kremser <jkremser(a)redhat.com> Date: Thu Sep 19 12:57:43 2013 +0200 [BZ 1000065] - During install / server start show a sign of life - Using the welcome root page for indicating the server startup. This required the portal war webapp to move from "/" context to "/portal" context. diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/MCCHelper.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/MCCHelper.java index b344963..e5fbb27 100644 --- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/MCCHelper.java +++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/MCCHelper.java @@ -28,19 +28,23 @@ import org.jboss.as.controller.client.ModelControllerClient; */ public class MCCHelper { + private static final String RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY = "jboss.management.native.port"; + private static final int RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY_DEFAULT_VALUE = 6999; + public static ModelControllerClient getModelControllerClient() { - return getModelControllerClient("localhost",6999); + return getModelControllerClient("localhost", getPort()); } - public static ModelControllerClient getModelControllerClient(String host,int port) { + public static ModelControllerClient getModelControllerClient(String host, int port) { ModelControllerClient client; try { if (host==null || host.isEmpty()) host = "localhost"; - if (port <= 0) - port = 6999; // Default for RHQ TODO obtain from rhq-server.properties, jboss.management.native.port=6999 ? + if (port <= 0 || port > (1 << 16) - 1) { + port = RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY_DEFAULT_VALUE; + } client = ModelControllerClient.Factory.create(host, port); } catch (Exception e) { throw new RuntimeException("Cannot obtain client connection to the app server", e); @@ -48,4 +52,17 @@ public class MCCHelper { return client; } + private static int getPort() { + // The property may return "" so also use "" as the default to ensure we set it to something useful + String result = System.getProperty(RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY, ""); + + if (!"".equals(result)) { + try { + return Integer.parseInt(result); + } catch (NumberFormatException nfe) { + return RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY_DEFAULT_VALUE; + } + } else return RHQ_JBOSS_MANAGEMENT_PORT_PROPERTY_DEFAULT_VALUE; + } + } 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 db5da39..00af75e 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 @@ -41,7 +41,7 @@ public class LinkManager { if (GWT) { return "#Resource/" + resourceId; } else { - return "/rhq/resource/summary/overview.xhtml?id=" + resourceId; + return "/portal/rhq/resource/summary/overview.xhtml?id=" + resourceId; } } @@ -49,7 +49,7 @@ public class LinkManager { if (GWT) { return "#Resource/" + resourceId + "/" + tabName + ((null == subTabName) ? "" : ("/" + subTabName)); } else { - return "/rhq/resource/summary/overview.xhtml?id=" + resourceId; + return "/portal/rhq/resource/summary/overview.xhtml?id=" + resourceId; } } @@ -57,7 +57,7 @@ public class LinkManager { if (GWT) { return "#ResourceGroup/" + groupId; } else { - return "/rhq/group/inventory/view.xhtml?groupId=" + groupId; + return "/portal/rhq/group/inventory/view.xhtml?groupId=" + groupId; } } @@ -70,7 +70,7 @@ public class LinkManager { return "#Resource/AutoGroup/" + autoGroupId + "/" + tabName + ((null == subTabName) ? "" : ("/" + subTabName)); } else { - return "/rhq/group/inventory/view.xhtml?groupId=" + autoGroupId; + return "/portal/rhq/group/inventory/view.xhtml?groupId=" + autoGroupId; } } @@ -83,7 +83,7 @@ public class LinkManager { return "#ResourceGroup/AutoCluster/" + autoClusterGroupId + "/" + tabName + ((null == subTabName) ? "" : ("/" + subTabName)); } else { - return "/rhq/group/inventory/view.xhtml?groupId=" + autoClusterGroupId; + return "/portal/rhq/group/inventory/view.xhtml?groupId=" + autoClusterGroupId; } } @@ -96,7 +96,7 @@ public class LinkManager { return "#ResourceGroup/" + resourceGroupId + "/" + tabName + ((null == subTabName) ? "" : ("/" + subTabName)); } else { - return "/rhq/group/inventory/view.xhtml?groupId=" + resourceGroupId; + return "/portal/rhq/group/inventory/view.xhtml?groupId=" + resourceGroupId; } } @@ -199,7 +199,7 @@ public class LinkManager { if (GWT) { return "#Inventory/Groups/DynagroupDefinitions/" + groupDefinitionId; } else { - return "/rhq/definition/group/view.xhtml?groupDefinitionId=" + groupDefinitionId; + return "/portal/rhq/definition/group/view.xhtml?groupDefinitionId=" + groupDefinitionId; } } @@ -207,7 +207,7 @@ public class LinkManager { if (GWT) { return "#" + UsersView.VIEW_PATH + "/" + subjectId; } else { - return "/admin/user/UserAdmin.do?mode=view&u=" + subjectId; + return "/portal/admin/user/UserAdmin.do?mode=view&u=" + subjectId; } } @@ -215,16 +215,16 @@ public class LinkManager { if (GWT) { return "#" + RolesView.VIEW_PATH + "/" + roleId; } else { - return "/admin/role/RoleAdmin.do?mode=view&r=" + roleId; + return "/portal/admin/role/RoleAdmin.do?mode=view&r=" + roleId; } } public static String getSubsystemConfigurationLink() { - return "/rhq/subsystem/configurationUpdate.xhtml"; + return "/portal/rhq/subsystem/configurationUpdate.xhtml"; } public static String getSubsystemSuspectMetricsLink() { - return "/rhq/subsystem/oobHistory.xhtml"; + return "/portal/rhq/subsystem/oobHistory.xhtml"; } public static String getSubsystemResourceOperationHistoryLink(int resourceId, int opHistoryId) { @@ -232,7 +232,7 @@ public class LinkManager { if (GWT) { link = "#Resource/" + resourceId + "/Operations/History/" + opHistoryId; } else { - link = "/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id=" + resourceId + "&opId=" + link = "/portal/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id=" + resourceId + "&opId=" + opHistoryId; } return link; @@ -243,7 +243,7 @@ public class LinkManager { if (GWT) { link = "#Resource/" + resourceId + "/Operations/Schedules/" + opScheduleId; } else { - link = "/rhq/resource/operation/resourceOperationScheduleDetails-plain.xhtml?id=" + resourceId + "&opId=" + link = "/portal/rhq/resource/operation/resourceOperationScheduleDetails-plain.xhtml?id=" + resourceId + "&opId=" + opScheduleId; } @@ -271,7 +271,7 @@ public class LinkManager { if (GWT) { link = "#Resource/" + resourceId + "/Alerts/Definitions/" + alertDefinitionId; } else { - link = "/rhq/subsystem/alertDefinitions.xhtml"; + link = "/portal/rhq/subsystem/alertDefinitions.xhtml"; } return link; @@ -285,7 +285,7 @@ public class LinkManager { if (GWT) { return "#Inventory/Resources/AutodiscoveryQueue"; } else { - return "/rhq/discovery/queue.xhtml"; + return "/portal/rhq/discovery/queue.xhtml"; } } @@ -293,7 +293,7 @@ public class LinkManager { if (GWT) { return "#Dashboards"; } else { - return "/Dashboard.do"; + return "/portal/Dashboard.do"; } } @@ -301,7 +301,7 @@ public class LinkManager { if (GWT) { return "#Dashboards/" + dashboardId; } else { - return "/Dashboard.do"; + return "/portal/Dashboard.do"; } } @@ -309,7 +309,7 @@ public class LinkManager { if (GWT) { return "#Inventory"; } else { - return "/rhq/inventory/browseResources.xhtml?subtab=all"; + return "/portal/rhq/inventory/browseResources.xhtml?subtab=all"; } } @@ -317,7 +317,7 @@ public class LinkManager { if (GWT) { return "#Inventory/Platforms"; } else { - return "/rhq/inventory/browseResources.xhtml?subtab=platform"; + return "/portal/rhq/inventory/browseResources.xhtml?subtab=platform"; } } @@ -325,7 +325,7 @@ public class LinkManager { if (GWT) { return "#Inventory/Servers"; } else { - return "/rhq/inventory/browseResources.xhtml?subtab=server"; + return "/portal/rhq/inventory/browseResources.xhtml?subtab=server"; } } @@ -333,16 +333,16 @@ public class LinkManager { if (GWT) { return "#Inventory/Services"; } else { - return "/rhq/inventory/browseResources.xhtml?subtab=service"; + return "/portal/rhq/inventory/browseResources.xhtml?subtab=service"; } } public static String getSavedSearchLink(int searchId) { - return "/rhq/inventory/browseResources.xhtml?subtab=all&searchId=" + searchId; + return "/portal/rhq/inventory/browseResources.xhtml?subtab=all&searchId=" + searchId; } public static String getHubAllGroupsLink() { - return "/rhq/inventory/browseGroups.xhtml?subtab=all"; + return "/portal/rhq/inventory/browseGroups.xhtml?subtab=all"; } public static String getHubCompatibleGroupsLink() { @@ -357,23 +357,23 @@ public class LinkManager { if (GWT) { return "#Inventory/Groups/DynagroupDefinitions"; } else { - return "/rhq/definition/group/list.xhtml"; + return "/portal/rhq/definition/group/list.xhtml"; } } public static String getHubNewGroupLink() { - return "/resource/group/Inventory.do?mode=new"; + return "/portal/resource/group/Inventory.do?mode=new"; } public static String getHubNewGroupDefLink() { - return "/rhq/definition/group/new.xhtml"; + return "/portal/rhq/definition/group/new.xhtml"; } public static String getAdminUsersLink() { if (GWT) { return "#Administration/Security/Users"; } else { - return "/admin/user/UserAdmin.do?mode=list"; + return "/portal/admin/user/UserAdmin.do?mode=list"; } } @@ -381,7 +381,7 @@ public class LinkManager { if (GWT) { return "#Administration/Security/Roles"; } else { - return "/admin/role/RoleAdmin.do?mode=list"; + return "/portal/admin/role/RoleAdmin.do?mode=list"; } } @@ -389,7 +389,7 @@ public class LinkManager { if (GWT) { return "#Administration/Configuration/SystemSettings"; } else { - return "/admin/config/Config.do?mode=edit"; + return "/portal/admin/config/Config.do?mode=edit"; } } @@ -397,7 +397,7 @@ public class LinkManager { if (GWT) { return "#Administration/Configuration/Plugins"; } else { - return "/rhq/admin/plugin/plugin-list.xhtml"; + return "/portal/rhq/admin/plugin/plugin-list.xhtml"; } } @@ -405,7 +405,7 @@ public class LinkManager { if (GWT) { return "#Administration/Configuration/" + viewName; } else { - return "/admin/config/EditDefaults.do?mode=monitor&viewMode=all"; + return "/portal/admin/config/EditDefaults.do?mode=monitor&viewMode=all"; } } @@ -413,27 +413,27 @@ public class LinkManager { if (GWT) { return "#Administration/Configuration/" + viewName + "/" + typeId; } else { - return "/admin/config/EditDefaults.do?mode=monitor&viewMode=all"; + return "/portal/admin/config/EditDefaults.do?mode=monitor&viewMode=all"; } } public static String getAdminAlertNotifTemplatesLink() { - return "/rhq/admin/alert/template/notification/list.xhtml"; + return "/portal/rhq/admin/alert/template/notification/list.xhtml"; } public static String getAdminContentProvidersLink() { - return "/rhq/content/listContentProviders.xhtml"; + return "/portal/rhq/content/listContentProviders.xhtml"; } public static String getAdminContentReposLink() { - return "/rhq/content/listRepos.xhtml"; + return "/portal/rhq/content/listRepos.xhtml"; } public static String getHAServersLink() { if (GWT) { return "#Administration/Cluster/Servers"; } else { - return "/rhq/ha/listServers.xhtml"; + return "/portal/rhq/ha/listServers.xhtml"; } } @@ -441,7 +441,7 @@ public class LinkManager { if (GWT) { return "#Administration/Cluster/Agents"; } else { - return "/rhq/ha/listAgents.xhtml"; + return "/portal/rhq/ha/listAgents.xhtml"; } } @@ -449,7 +449,7 @@ public class LinkManager { if (GWT) { return "#Administration/Cluster/Affinity Groups"; } else { - return "/rhq/ha/listAffinityGroups.xhtml"; + return "/portal/rhq/ha/listAffinityGroups.xhtml"; } } @@ -457,7 +457,7 @@ public class LinkManager { if (GWT) { return "#Administration/Cluster/Partition Events"; } else { - return "/rhq/ha/listPartitionEvents.xhtml"; + return "/portal/rhq/ha/listPartitionEvents.xhtml"; } } @@ -465,7 +465,7 @@ public class LinkManager { if (GWT) { return "#Administration/Reports/Inventory Summary"; } else { - return "/rhq/admin/report/resourceInstallReport.xhtml"; + return "/portal/rhq/admin/report/resourceInstallReport.xhtml"; } } @@ -473,28 +473,28 @@ public class LinkManager { if (GWT) { return "#Administration/Configuration/Downloads"; } else { - return "/rhq/admin/downloads.xhtml"; + return "/portal/rhq/admin/downloads.xhtml"; } } public static String getDebugSqlLink() { - return "/admin/test/sql.jsp"; + return "/portal/admin/test/sql.jsp"; } public static String getDebugHibernateLink() { - return "/admin/test/hibernate.jsp"; + return "/portal/admin/test/hibernate.jsp"; } public static String getDebugBrowserLink() { - return "/admin/test/browser.jsp"; + return "/portal/admin/test/browser.jsp"; } public static String getUserPrefsLink(int subjectId) { - return "/admin/user/UserAdmin.do?mode=edit&u=" + subjectId; + return "/portal/admin/user/UserAdmin.do?mode=edit&u=" + subjectId; } public static String getUserPasswordLink(int subjectId) { - return "/admin/user/UserAdmin.do?mode=editPass&u=" + subjectId; + return "/portal/admin/user/UserAdmin.do?mode=editPass&u=" + subjectId; } public static String getTagLink(String tag) { 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 0a80e6a..4ad3bee 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 @@ -528,7 +528,7 @@ public class LoginView extends Canvas { loginButton.setDisabled(true); try { - RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.POST, "/j_security_check.do"); + RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.POST, "/portal/j_security_check.do"); requestBuilder.setHeader("Content-Type", "application/x-www-form-urlencoded"); // URL-encode the username and password in case they contain URL special characters ('?', '&', '%', '+', // etc.), which would corrupt the request if not encoded. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java index e1d29ee..df9931d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java @@ -653,7 +653,7 @@ public class UserSessionManager { } private static RequestBuilder createSessionAccessRequestBuilder() { - final RequestBuilder b = new RequestBuilder(RequestBuilder.POST, "/sessionAccess"); + final RequestBuilder b = new RequestBuilder(RequestBuilder.POST, "/portal/sessionAccess"); b.setHeader("Accept", "text/plain"); return b; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java index 9a7e75f..6162b98 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java @@ -244,13 +244,13 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView { private NavigationSection buildContentSection() { NavigationItem contentSourcesItem = new NavigationItem(PAGE_CONTENT_SOURCES_VIEW_ID, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/rhq/content/listContentProviders-plain.xhtml"); + return new FullHTMLPane("/portal/rhq/content/listContentProviders-plain.xhtml"); } }, getGlobalPermissions().contains(Permission.MANAGE_REPOSITORIES)); NavigationItem reposItem = new NavigationItem(PAGE_REPOS_VIEW_ID, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/rhq/content/listRepos-plain.xhtml"); + return new FullHTMLPane("/portal/rhq/content/listRepos-plain.xhtml"); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java index f13afcf..0f2a087 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java @@ -228,7 +228,7 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet StaticTextItem iconItem = AbstractActivityView.newTextItemIcon( "subsystems/content/Package_16.png", null); String title = history.getPackageVersion().getFileName() + ":"; - //String destination = "/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId + //String destination = "/portal/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId // + "&selectedHistoryId=" + history.getId(); //spinder 4/27/11: disabling links as they point into portal.war content pages // LinkItem link = AbstractActivityView.newLinkItem(title, destination); @@ -241,7 +241,7 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet } // //insert see more link // DynamicForm row = new DynamicForm(); - // String destination = "/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId; + // String destination = "/portal/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId; // addSeeMoreLink(row, destination, column); } else { DynamicForm row = AbstractActivityView.createEmptyDisplayRow(MSG.view_portlet_results_empty()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java index b619e83..15ac318 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java @@ -118,7 +118,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet { StaticTextItem iconItem = AbstractActivityView.newTextItemIcon( "subsystems/content/Package_16.png", null); String title = history.getPackageVersion().getFileName() + ":"; - String destination = "/rhq/resource/content/audit-trail-item.xhtml?id=" + resourceId + String destination = "/portal/rhq/resource/content/audit-trail-item.xhtml?id=" + resourceId + "&selectedHistoryId=" + history.getId(); //spinder 4/27/11: disabling links as they point into portal.war content pages // LinkItem link = AbstractActivityView.newLinkItem(title, destination); @@ -131,7 +131,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet { } // //insert see more link // DynamicForm row = new DynamicForm(); - // String destination = "/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId; + // String destination = "/portal/rhq/resource/content/audit-trail-item.xhtml?id=" + groupId; // addSeeMoreLink(row, destination, column); } else { DynamicForm row = AbstractActivityView.createEmptyDisplayRow(MSG.view_portlet_results_empty()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java index 119b0ef..f53bdb9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java @@ -352,7 +352,7 @@ public class ResourceGroupContextMenu extends Menu { grpGraphElements += "," + group.getResourceType().getId(); } //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + String baseUrl = "/portal/resource/common/monitor/visibility/IndicatorCharts.do"; //No need to rebuild the autogroup url as everything handled as a compatible group now // if (isAutoGroup) { // //Ex. ?parent=10001&ctype=1013&view=Default diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java index 8ca1ac5..1447d8f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -226,7 +226,7 @@ public class DashboardLinkUtility { private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + String baseUrl = "/portal/resource/common/monitor/visibility/IndicatorCharts.do"; baseUrl += "?id=" + id; baseUrl += "&view=" + selectedView; baseUrl += "&action=addChart&metric=" + resourceGraphElements; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 328d471..8d7da04 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -557,28 +557,28 @@ public class ResourceDetailView extends updateSubTab(this.contentTab, this.contentDeployed, true, true, new ViewFactory() { @Override public Canvas createView() { - return new FullHTMLPane("/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()); + return new FullHTMLPane("/portal/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()); } }); updateSubTab(this.contentTab, this.contentNew, true, true, new ViewFactory() { @Override public Canvas createView() { - return new FullHTMLPane("/rhq/resource/content/deploy-plain.xhtml?id=" + resource.getId()); + return new FullHTMLPane("/portal/rhq/resource/content/deploy-plain.xhtml?id=" + resource.getId()); } }); updateSubTab(this.contentTab, this.contentSubscrip, true, true, new ViewFactory() { @Override public Canvas createView() { - return new FullHTMLPane("/rhq/resource/content/subscription-plain.xhtml?id=" + resource.getId()); + return new FullHTMLPane("/portal/rhq/resource/content/subscription-plain.xhtml?id=" + resource.getId()); } }); updateSubTab(this.contentTab, this.contentHistory, true, true, new ViewFactory() { @Override public Canvas createView() { - return new FullHTMLPane("/rhq/resource/content/history-plain.xhtml?id=" + resource.getId()); + return new FullHTMLPane("/portal/rhq/resource/content/history-plain.xhtml?id=" + resource.getId()); } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java index e39d7c3..908fa0a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java @@ -44,7 +44,7 @@ public class TimelineView extends EnhancedVLayout { @Override protected void onDraw() { //TODO: replace with GWT version - final FullHTMLPane timelinePane = new FullHTMLPane("/resource/common/monitor/events/EventsView.jsp?id=" + final FullHTMLPane timelinePane = new FullHTMLPane("/portal/resource/common/monitor/events/EventsView.jsp?id=" + resourceComposite.getResource().getId()); // we create a simple subclass because we need to know when a new range has been set in order to refresh the timeline diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java index 8093241..0374e7a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java @@ -186,37 +186,37 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { NavigationItem sqlItem = new NavigationItem(PAGE_SQL, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/sql.jsp"); + return new FullHTMLPane("/portal/admin/test/sql.jsp"); } }); NavigationItem hibernateItem = new NavigationItem(PAGE_HIBERNATE, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/hibernate.jsp"); + return new FullHTMLPane("/portal/admin/test/hibernate.jsp"); } }); NavigationItem entityBrowserItem = new NavigationItem(PAGE_ENTITY_BROWSER, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/browser.jsp"); + return new FullHTMLPane("/portal/admin/test/browser.jsp"); } }); NavigationItem adminControlItem = new NavigationItem(PAGE_ADMIN_CONTROL, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/control.jsp"); + return new FullHTMLPane("/portal/admin/test/control.jsp"); } }); NavigationItem emailItem = new NavigationItem(PAGE_EMAIL, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/email.jsp"); + return new FullHTMLPane("/portal/admin/test/email.jsp"); } }); NavigationItem agentItem = new NavigationItem(PAGE_AGENT, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane("/admin/test/agent.jsp"); + return new FullHTMLPane("/portal/admin/test/agent.jsp"); } }); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java index f7cca42..7c5c3d4 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java @@ -142,4 +142,22 @@ public class SessionAccessServlet extends HttpServlet { } } + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/plain"); + response.addHeader("Pragma", "no-cache"); + response.addHeader("Cache-Control", "no-cache"); + response.addHeader("Cache-Control", "no-store"); + response.addHeader("Cache-Control", "must-revalidate"); + // some date in the past + response.addHeader("Expires", "Mon, 8 Aug 2006 10:00:00 GMT"); + boolean serverInitialized; + try { + serverInitialized = LookupUtil.getStartupLocal().isInitialized(); + } catch (Throwable t) { + serverInitialized = false; // this probably means we are still starting up and app server hasn't made EJBs available yet + } + PrintWriter out = response.getWriter(); + out.println(serverInitialized); + } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java index f6b6f28..8e1e532 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java @@ -86,7 +86,7 @@ public class FaceletRedirectionViewHandler extends FaceletViewHandler { protected void handleRenderException(FacesContext context, Exception ex) throws IOException, ELException, FacesException { try { - if (context.getViewRoot().getViewId().equals("/rhq/common/error.xhtml")) { + if (context.getViewRoot().getViewId().equals("/portal/rhq/common/error.xhtml")) { /* * This is to protect from infinite redirects if the error page itself * has an error; in this case, revert to the default error handling, @@ -103,7 +103,7 @@ public class FaceletRedirectionViewHandler extends FaceletViewHandler { Map<String, Object> sessionMap = externalContext.getSessionMap(); sessionMap.put("GLOBAL_RENDER_ERROR", ex); - FacesContextUtility.getResponse().sendRedirect("/rhq/common/error.xhtml"); + FacesContextUtility.getResponse().sendRedirect("/portal/rhq/common/error.xhtml"); } catch (IOException ioe) { log.fatal("Could not process redirect to handle application error", ioe); } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java index 06ba36f..4176d74 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java @@ -207,12 +207,12 @@ public class CreateContentSourceUIBean extends PagedDataTableUIBean { String link = null;//perspectiveManager.getPageLink(subject, "createContentProvider", typeName, null); if (null == link) { - //link = "/rhq/content/createContentProvider-plain.xhtml?mode=new&typeName=" + typeName; - link = "/rhq/content/createContentProvider-plain.xhtml"; + //link = "/portal/rhq/content/createContentProvider-plain.xhtml?mode=new&typeName=" + typeName; + link = "/portal/rhq/content/createContentProvider-plain.xhtml"; } else { //link += "&mode=new&typeName=" + typeName; } return link; } -} \ No newline at end of file +} diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jboss-web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jboss-web.xml index 21ad035..ff5f945 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jboss-web.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jboss-web.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> <jboss-web> - <context-root>/</context-root> + <context-root>portal</context-root> </jboss-web> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 8fdcc80..f3fb2d1 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -351,6 +351,8 @@ <echo>Delete domain files - we only start in standalone mode</echo> <delete dir="${jboss.home}/domain" /> + <antcall target="prepare-welcome-content" /> +   + <replaceregexp file="${jboss.home}/welcome-content/index.html" flags="gis" match='<body>' replace=' + <body>
 + <script type="text/JavaScript">
 + 
 + </script>'/> + +  + <replaceregexp file="${jboss.home}/welcome-content/index.html" flags="gis" match='<div class="section">(.*?)</div>' replace=' + <div class="section">
 + <h1>EAP 6 Notification</h1>
 + <h3>Your RHQ Server is being started, please wait.</h3>
 + <p class="WarnBlock" id="progress">Starting..</p>
 + <sub>You will be automatically redirected once the RHQ server is up and running. If this takes more than 10 minutes, please check the server log for possible issues.</sub>
 + </div>'/> + </target> + <target name="package-connectors"> <echo>Packaging the response-time (RT) servlet filter connectors ...</echo> <delete file="${rhq.ear.dir}/rhq-downloads/connectors/connector-rtfilter.zip" /> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 68d4ffe..a2e91a3 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -260,7 +260,7 @@ <groupId>${project.groupId}</groupId> <artifactId>rhq-portal</artifactId> <bundleFileName>rhq-portal.war</bundleFileName> - <contextRoot>/</contextRoot> + <contextRoot>/portal</contextRoot> </webModule>  diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 4b42c53..59c9360 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -1127,8 +1127,8 @@ public class InstallerServiceImpl implements InstallerService { // setup the email service ServerInstallUtil.setupMailService(mcc, serverProperties); - // we don't want to the JBossAS welcome screen; turn it off - new WebJBossASClient(mcc).setEnableWelcomeRoot(false); + // we use the welcome root webapp for indicating the state of installation + // new WebJBossASClient(mcc).setEnableWelcomeRoot(false); // we don't want users to access the admin console new CoreJBossASClient(mcc).setEnableAdminConsole(false); commit 8d6fc4eae84ba71cf825d8f98aa1406884aa945d Author: Jirka Kremser <jkremser(a)redhat.com> Date: Thu Sep 19 00:57:23 2013 +0200 irc bot: adding newly issued bugzilla ca certificate, this one will expire on 12/12/15 diff --git a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks index 431de7c..94185a4 100644 Binary files a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks and b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks differ commit 65e57d049de7a8440e4262470aaf88f492cbb3ff Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Sep 18 14:22:26 2013 +0200 irc bot: simple logger using grep|sed|awk combo. diff --git a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/logger.sh b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/logger.sh new file mode 100644 index 0000000..d7b0e62 --- /dev/null +++ b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/logger.sh @@ -0,0 +1,8 @@ +#!/bin/sh +_LOG_FILE=/var/www/html/rhqLog + +# initial copy +echo "<html><h1>#jboss-on</h1><table>"`cat $1 | grep "PRIVMSG #jboss-on" | grep -v "SAFELIST" | grep -v "TARGMAX" | grep -v ">>>PRIVMSG" | awk '{$2=substr($2, 5, index($2, "!") - 5); $3=""; $4=""; print strftime("%b %d %H:%M:%S %Y", substr($1, 0, 10))$0;}' | awk '{$1="<nobr>"$1; $3=$3"</nobr>"; $4=""; $5="</td><td><span style=\"color:red;\">"$5"</span></td><td>"; $6=substr($6, 2); print "<tr><td>"$0"</td></tr>"}' | sed 's/$https\?:\/\/[^ <]*$/<a href="\1">\1<\/a>/'` > $_LOG_FILE + +# listen and add new changes +tail -f $1 | grep --line-buffered "PRIVMSG #jboss-on" | grep --line-buffered -v "SAFELIST" | grep --line-buffered -v "TARGMAX" | grep --line-buffered -v ">>>PRIVMSG" | awk '{$2=substr($2, 5, index($2, "!") - 5); $3=""; $4=""; print strftime("%b %d %H:%M:%S %Y", substr($1, 0, 10))$0;system("")}' | awk '{$1="<nobr>"$1; $3=$3"</nobr>"; $4=""; $5="</td><td><span style=\"color:red;\">"$5"</span></td><td>"; $6=substr($6, 2); print "<tr><td>"$0"</td></tr>";system("")}' | sed 's/$https\?:\/\/[^ <]*$/<a href="\1">\1<\/a>/' >> $_LOG_FILE commit 24017351b98f14b3e300f26b81113763e5887eff Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Sep 11 19:09:45 2013 +0200 rhq irc bot now uses caching for \!support and \!pto commands. diff --git a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java index cc10d2d..3e3e6f9 100644 --- a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java +++ b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java @@ -98,6 +98,8 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { private BugzillaConnector bzConnector = new BugzillaConnector(); private final Map<Integer, Long> bugLogTimestamps = new HashMap<Integer, Long>(); private final Map<String, String> names = new HashMap<String, String>(); + private final Map<String, String> ptoCache = new HashMap<String, String>(); + private final Map<String, String> supportCache = new HashMap<String, String>(); private final Pattern commandPattern; public RhqIrcBotListener(String server, String channel) { @@ -305,6 +307,10 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { } String month = monthFormat.format(new Date()); String dayInMonth = dayInMonthFormat.format(new Date()); + String cachedValue = ptoCache.get(month + "#" + dayInMonth); + if (cachedValue != null) { + return cachedValue; + } int dayInMonthInt = Integer.parseInt(dayInMonth); try { boolean monthFound = false; @@ -317,12 +323,16 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { if (cellText.startsWith(month.toLowerCase())) { monthFound = true; if (cellText.substring(cellText.length() - 1, cellText.length()).equals(dayInMonth)) { - return doNotNotify(cell.firstElementSibling().text() + " is on support this week"); + String value = doNotNotify(cell.firstElementSibling().text() + " is on support this week"); + ptoCache.put(month + "#" + dayInMonth, value); + return value; } continue; } if (monthFound && cellText.equals(dayInMonth)) { - return doNotNotify(cell.firstElementSibling().text() + " is on support this week"); + String value = doNotNotify(cell.firstElementSibling().text() + " is on support this week"); + ptoCache.put(month + "#" + dayInMonth, value); + return value; } else if (monthFound) { if (cell.equals(cell.firstElementSibling()) || cell.equals(cell.lastElementSibling())) { continue; //the first row with name or the last row with a comment @@ -331,7 +341,9 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { try { day = Integer.parseInt(cellText); if (day > dayInMonthInt) { - return doNotNotify(cell.parent().previousElementSibling().child(0).text() + " is on support this week"); + String value = doNotNotify(cell.parent().previousElementSibling().child(0).text() + " is on support this week"); + ptoCache.put(month + "#" + dayInMonth, value); + return value; } } catch (NumberFormatException nfe) { break; // next month @@ -347,6 +359,12 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { } private String whoIsOnPto(String link) { + String month = monthFormat.format(new Date()); + String dayInMonth = dayInMonthFormat.format(new Date()); + String cachedValue = supportCache.get(month + "#" + dayInMonth); + if (cachedValue != null) { + return cachedValue; + } try { String onPto = ""; Document doc = Jsoup.connect(link).ignoreContentType(true).get(); @@ -355,7 +373,9 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { onPto += doNotNotify(title.text()) + ", "; } if (!onPto.isEmpty()) { - return doNotNotify(onPto.substring(0, onPto.length() - 2)); + String value = doNotNotify(onPto.substring(0, onPto.length() - 2)); + supportCache.put(month + "#" + dayInMonth, value); + return value; } } catch (IOException e) { e.printStackTrace(); commit a9b580eecbbbd58fc46dac0c177fdf15a28808c5 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Sep 20 13:58:08 2013 +0200 Bug 991202 - Excessive warnings of invalid metric calls Added another JBASXXXXX pattern to the list of unknown resource response patterns Made ASConnection log infos and warnings only in verbose mode diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java index 1524816..5ae86d1 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java @@ -317,19 +317,15 @@ public class ASConnection { .toString(httpResponseEntity); if (statusLine.getStatusCode() >= 400) { if (verbose) { - LOG.debug(operation + " failed with " + statusAsString(statusLine) + " - response body was [" - + responseBody + "]."); - } - - if (responseBody.contains("JBAS014807") || responseBody.contains("JBAS010850") - || responseBody.contains("JBAS014792") || responseBody.contains("JBAS014793")) { - // management resource not found or not readable or no known child-type - if (LOG.isDebugEnabled()) { - LOG.debug("Requested management resource not found: " + operation.getAddress().getPath()); + if (responseBody.contains("JBAS014807") || responseBody.contains("JBAS010850") + || responseBody.contains("JBAS014792") || responseBody.contains("JBAS014793") + || responseBody.contains("JBAS014739")) { + // management resource not found or not readable or no known child-type + LOG.info("Requested management resource not found: " + operation.getAddress().getPath()); + } else { + LOG.warn(operation + " failed with " + statusAsString(statusLine) + " - response body was [" + + responseBody + "]."); } - } else { - LOG.warn("Received " + statusAsString(statusLine) + " response to " + operation - + " - response body was [" + responseBody + "]."); } } commit 2a4106f79a170418ea4a98cf820d615fd9056fe6 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Sep 20 11:45:12 2013 +0200 Followup to 68bca80 : mask all entries that have "passw" in the key. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java index 0bd1103..328647e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java @@ -77,7 +77,9 @@ public class SystemInfoManagerBean implements SystemInfoManagerLocal{ for (Map.Entry<String,String> detail : settingsMap.entrySet()) { String key = detail.getKey(); if (key.equals(SystemSetting.LDAP_BIND_PW.getInternalName()) - || key.equals(SystemSetting.HELP_PASSWORD.getInternalName())) { + || key.toLowerCase().contains("passw") + || key.equals(SystemSetting.HELP_PASSWORD.getInternalName()) + || key.equals(SystemSetting.STORAGE_PASSWORD.getInternalName())) { if (detail.getValue()==null) result.put(key,"- null -"); else commit 60f05188843411e70ad40ee46841da4d200ae7a8 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Sep 19 21:59:50 2013 -0400 handle changes in lifecycle notifications that were introduced in upgrade to C* 1.2.9 Part of storage node (un)deployment relied on event notifications from the driver that let the server know when a node has been added to or removed from the cluster. Those notifcations come in the middle of the work flow and trigger the next step in the repsective workflows. I learned that after upgrading to C* 1.2.9, there were changes as to when the IEndpointLifecycleSubscriber listeners get called. We are getting host added event notifications before the node finishes bootstrapping. We do not want to start the next phase of the deployment workflow unless and until the node has successfully bootstrapped. This commit removes the usage of the event notifications for determining when to start the next phase of the (un)deployment. After some code review of what C* does during bootstrap and decommission, the prepareForBootstrap and decommission operations in the storage plugin now include checks to make sure the respective operations are successful. This change ensures we do not move on to the next phase of the storage node (un)deployment workflow prematurely. It also has the added benefit of simplifying StorageNodeOperationsHandlerBean in multiple ways. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java index bd2efbe..bcb03d8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java @@ -7,7 +7,6 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.server.metrics.StorageStateListener; /** @@ -26,11 +25,7 @@ public class StorageClusterMonitor implements StorageStateListener { @Override public void onStorageNodeUp(InetAddress address) { log.info("Storage node at " + address.getHostAddress() + " is up"); - isClusterAvailable = true; - - StorageNodeOperationsHandlerLocal storageOperationsHandler = LookupUtil.getStorageNodeOperationsHandler(); - storageOperationsHandler.performAddNodeMaintenanceIfNecessary(address); } @Override @@ -41,8 +36,6 @@ public class StorageClusterMonitor implements StorageStateListener { @Override public void onStorageNodeRemoved(InetAddress address) { log.info("Storage node at " + address.getHostAddress() + " has been removed from the cluster"); - StorageNodeOperationsHandlerLocal storageNodeOperationsHandler = LookupUtil.getStorageNodeOperationsHandler(); - storageNodeOperationsHandler.performRemoveNodeMaintenanceIfNecessary(address); } @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index 66ee2fc..4d79ea5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -206,30 +206,6 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } } - @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) - public void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) { - try { - StorageNode storageNode = storageNodeManager.findStorageNodeByAddress(storageNodeAddress); - - if (storageNode.getOperationMode() == StorageNode.OperationMode.BOOTSTRAP) { - // TODO need to add support for HA deployments - // If multiple RHQ servers are running, they will all receive the event - // notification that the node is up and will all wind up calling this method. - // We can probably handle this with optimistic locking, adding a version field - // to the StorageNode class. Then only one writer would succeed in updating - // the operation mode. - storageNode = storageNodeOperationsHandler.setMode(storageNode, - StorageNode.OperationMode.ADD_MAINTENANCE); - storageNodeOperationsHandler.performAddMaintenance(subjectManager.getOverlord(), storageNode); - } - } catch (Exception e) { - String msg = "Aborting storage node deployment due to unexpected error while performing add node " + - "maintenance."; - log.error(msg, e); - storageNodeOperationsHandler.logError(StorageNode.OperationMode.ADD_MAINTENANCE, msg, e); - } - } - @Override @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) public void performAddNodeMaintenance(Subject subject, StorageNode storageNode) { @@ -274,33 +250,6 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa @Override @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) - public void performRemoveNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) { - try { - StorageNode storageNode = storageNodeManager.findStorageNodeByAddress(storageNodeAddress); - - if (storageNode.getOperationMode() == StorageNode.OperationMode.DECOMMISSION) { - // TODO need to add support for HA deployments - // If multiple RHQ servers are running, they will all receive the event - // notification that the node is up and will all wind up calling this method. - // We can probably handle this with optimistic locking, adding a version field - // to the StorageNode class. Then only one writer would succeed in updating - // the operation mode. - storageNode = storageNodeOperationsHandler.setMode(storageNode, - StorageNode.OperationMode.REMOVE_MAINTENANCE); - storageNodeOperationsHandler.performRemoveMaintenance(subjectManager.getOverlord(), storageNode); - } else { - log.info("Remove node maintenance has already been run for " + storageNode); - } - } catch (Exception e) { - String msg = "Aborting undeployment due to unexpected error while performing remove node maintenance for " + - storageNodeAddress.getHostAddress(); - log.error(msg, e); - storageNodeOperationsHandler.logError(StorageNode.OperationMode.REMOVE_MAINTENANCE, msg, e); - } - } - - @Override - @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) public void performRemoveNodeMaintenance(Subject subject, StorageNode storageNode) { try { storageNodeOperationsHandler.performRemoveMaintenance(subject, storageNode); @@ -489,48 +438,24 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public void handlePrepareForBootstrap(ResourceOperationHistory resourceOperationHistory) { - StorageNode newStorageNode = findStorageNode(resourceOperationHistory.getResource()); - switch (resourceOperationHistory.getStatus()) { + public void handlePrepareForBootstrap(ResourceOperationHistory operationHistory) { + StorageNode newStorageNode = findStorageNode(operationHistory.getResource()); + switch (operationHistory.getStatus()) { case INPROGRESS: // nothing to do here return; case CANCELED: - // TODO Verify whether or not the node has been bootstrapped - // If the operation is canceled the plugin will get an InterruptedException. - // The actual bootstrapping may very well complete so we need to add in some - // checks to find out if the node is up and part of the cluster. - deploymentOperationCanceled(newStorageNode, resourceOperationHistory); + deploymentOperationCanceled(newStorageNode, operationHistory); return; case FAILURE: - deploymentOperationFailed(newStorageNode, resourceOperationHistory); + deploymentOperationFailed(newStorageNode, operationHistory); return; default: // SUCCESS - try { - log.info("The prepare for bootstrap operation completed successfully for " + newStorageNode); - // 30 seconds is more than a sufficient amount of time to wait for the - // event notification from storage session especially considering that - // nodes gossip every second. - Thread.sleep(1000 * 30); - entityManager.refresh(newStorageNode); - if (newStorageNode.getOperationMode() == StorageNode.OperationMode.BOOTSTRAP) { - InetAddress address = InetAddress.getByName(newStorageNode.getAddress()); - if (isPartOfCluster(address)) { - log.warn("We have missed the event notification about " + newStorageNode + " joining the " + - "cluster. The next phase of deployment will be started."); - storageNodeOperationsHandler.performAddNodeMaintenanceIfNecessary(address); - } else { - newStorageNode.setErrorMessage("The prepare for bootstrap operation completed " + - "successfully but it appears that " + newStorageNode + " is not yet part of the " + - "ring."); - } - } - } catch (InterruptedException e) { - throw new RuntimeException("Interrupted while waiting to verify that " + newStorageNode + - " has joined the cluster", e); - } catch (UnknownHostException e) { - throw new RuntimeException("Failed to parse address for " + newStorageNode, e); - } + log.info("The prepare for bootstrap operation completed successfully for " + newStorageNode); + newStorageNode = storageNodeOperationsHandler.setMode(newStorageNode, + StorageNode.OperationMode.ADD_MAINTENANCE); + Subject subject = getSubject(operationHistory); + performAddMaintenance(subject, newStorageNode); } } @@ -689,32 +614,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa break; default: // SUCCESS log.info("Successfully decommissioned " + storageNode); - try { - // 30 seconds is more than a sufficient amount of time to wait for the - // event notification from storage session especially considering that - // nodes gossip every second. - Thread.sleep(1000 * 30); - entityManager.refresh(storageNode); - if (storageNode.getOperationMode() == StorageNode.OperationMode.DECOMMISSION) { - InetAddress address = InetAddress.getByName(storageNode.getAddress()); - if (isPartOfCluster(address)) { - storageNode.setErrorMessage("The decommission operation completed successfully but it " + - "appears that " + storageNode + " is still part of ring."); - } else { - log.warn("We have missed the event notification about " + storageNode + " leaving the " + - "cluster. The next phase of undeployment will be started."); - storageNodeOperationsHandler.performRemoveNodeMaintenanceIfNecessary(address); - } - } - } catch (EntityNotFoundException e) { - // We can hit this if the storage node entity has already been deleted - // from the database. It can be ignored. - } catch (InterruptedException e) { - throw new RuntimeException("Interrupted while waiting to verify that " + storageNode + - " has been decommissioned and removed from the cluster", e); - } catch (UnknownHostException e) { - throw new RuntimeException("Failed to parse address for " + storageNode, e); - } + storageNode = storageNodeOperationsHandler.setMode(storageNode, + StorageNode.OperationMode.REMOVE_MAINTENANCE); + Subject subject = getSubject(operationHistory); + performRemoveMaintenance(subject, storageNode); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java index b968709..e515934 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java @@ -1,6 +1,5 @@ package org.rhq.enterprise.server.storage; -import java.net.InetAddress; import java.util.List; import javax.ejb.Asynchronous; @@ -38,8 +37,6 @@ public interface StorageNodeOperationsHandlerLocal { void bootstrapStorageNode(Subject subject, StorageNode storageNode); - void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress); - void performAddNodeMaintenance(Subject subject, StorageNode storageNode); void performAddMaintenance(Subject subject, StorageNode storageNode); @@ -50,8 +47,6 @@ public interface StorageNodeOperationsHandlerLocal { void decommissionStorageNode(Subject subject, StorageNode storageNode); - void performRemoveNodeMaintenanceIfNecessary(InetAddress storageNodeAddress); - void performRemoveNodeMaintenance(Subject subject, StorageNode storageNode); void performRemoveMaintenance(Subject subject, StorageNode storageNode); diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java index 5c07fde..c3b64fa 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java @@ -13,11 +13,16 @@ import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * @author John Sanda */ public class StorageSession implements Host.StateListener { + private final Log log = LogFactory.getLog(StorageSession.class); + private Session wrappedSession; private List<StorageStateListener> listeners = new ArrayList<StorageStateListener>(); @@ -77,6 +82,7 @@ public class StorageSession implements Host.StateListener { @Override public void onAdd(Host host) { + log.info(host + " added"); for (StorageStateListener listener : listeners) { listener.onStorageNodeUp(host.getAddress()); } @@ -84,6 +90,7 @@ public class StorageSession implements Host.StateListener { @Override public void onUp(Host host) { + log.info(host + " is up"); for (StorageStateListener listener : listeners) { listener.onStorageNodeUp(host.getAddress()); } @@ -91,6 +98,7 @@ public class StorageSession implements Host.StateListener { @Override public void onDown(Host host) { + log.info(host + " is down"); for (StorageStateListener listener : listeners) { listener.onStorageNodeDown(host.getAddress()); } @@ -98,6 +106,7 @@ public class StorageSession implements Host.StateListener { @Override public void onRemove(Host host) { + log.info(host + " has been removed"); for (StorageStateListener listener : listeners) { listener.onStorageNodeRemoved(host.getAddress()); } diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index e9f68b6..357f0b7 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -278,11 +278,19 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper EmsAttribute operationModeAttr = storageService.getAttribute("OperationMode"); String operationMode = (String) operationModeAttr.refresh(); if (operationMode.equals("DECOMMISSIONED")) { - log.info("The storage node at " + getResourceContext().getResourceKey() + " is already decommissioned."); + log.info("The storage node " + getHost() + " is already decommissioned."); } else { Class<?>[] emptyParams = new Class<?>[0]; EmsOperation operation = storageService.getOperation("decommission", emptyParams); operation.invoke((Object[]) emptyParams); + + operationMode = (String) operationModeAttr.refresh(); + if (!operationMode.equals("DECOMMISSIONED")) { + result.setErrorMessage("Failed to decommission storage node " + getHost() + ". The " + + "StorageService is reporting " + operationMode + " for its operation mode but it should be " + + "reporting DECOMMISSIONED. The StorageService operation mode is not to be confused with the " + + "Storage Node operation mode."); + } } } catch (EmsInvocationException e) { result.setErrorMessage("Decommission operation failed: " + ThrowableUtil.getAllMessages(e)); @@ -435,6 +443,17 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper "agent logs for more details"); } } + + EmsConnection emsConnection = getEmsConnection(); + EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); + EmsAttribute attribute = storageService.getAttribute("OperationMode"); + String operationMode = (String) attribute.refresh(); + + if (!operationMode.equals("NORMAL")) { + result.setErrorMessage("Bootstrapping " + getHost() + " failed. The StorageService is reporting " + + operationMode + " for its operation mode but it should be reporting NORMAL. The StorageService " + + "operation mode is not to be confused with the Storage Node operation mode."); + } return result; } catch (InternodeAuthConfUpdateException e) { File authFile = getInternodeAuthConfFile(); @@ -471,6 +490,14 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } } + String getOperationMode() { + EmsConnection emsConnection = getEmsConnection(); + EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); + EmsAttribute attribute = storageService.getAttribute("OperationMode"); + + return (String) attribute.refresh(); + } + private OperationResult nodeAdded(Configuration params) { return performTopologyChangeMaintenance(params); } commit d7b95c57a3dca634a417dde8cd005f524d83c9d3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 19 17:26:31 2013 -0400 Bug 1007530 - Installer prints hundreds of database errors when performing install leading user to believe install is unstable/failed An attempt at a sort of hack-fix. I don't think there is a clean way to do this, really. diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java index b426361..c3bd236 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -37,9 +38,10 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; + import mazz.i18n.Logger; import mazz.i18n.Msg; -import org.rhq.core.db.ExtendedSQLException; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -47,11 +49,13 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; + import org.rhq.core.db.DatabaseType; import org.rhq.core.db.DatabaseTypeFactory; import org.rhq.core.db.DbUtil; import org.rhq.core.db.DbUtilsI18NFactory; import org.rhq.core.db.DbUtilsI18NResourceKeys; +import org.rhq.core.db.ExtendedSQLException; import org.rhq.core.db.TypeMap; /** @@ -113,14 +117,14 @@ public class DBSetup { m_connection = connection; m_databaseType = DatabaseTypeFactory.getDatabaseType(connection); m_consoleMode = false; - + // MySQL complains if autocomit is true and you try to commit. // DDL operations are not transactional anyhow. m_connection.setAutoCommit(false); - + m_doDisconnect = false; } - + /** * A console application that can be used to run the DBSetup from a command line. The arguments are as follows: * @@ -419,8 +423,8 @@ public class DBSetup { // Make sure we have a DBSetup XML file. if (node_root.getNodeName().equalsIgnoreCase(DBSETUP_ROOT_ELEMENT_NAME) == false) { if (source instanceof String) { - throw new IOException(LOG.getMsgString(DbUtilsI18NResourceKeys.DBSETUP_SOURCE_NOT_VALID, source - .toString())); + throw new IOException(LOG.getMsgString(DbUtilsI18NResourceKeys.DBSETUP_SOURCE_NOT_VALID, + source.toString())); } throw new IOException(LOG.getMsgString(DbUtilsI18NResourceKeys.DBSETUP_SOURCE_NOT_VALID, "<stream>")); @@ -443,8 +447,8 @@ public class DBSetup { if (fileInclude.isAbsolute() == false) { if (!(source instanceof String)) { - throw new IOException(LOG - .getMsgString(DbUtilsI18NResourceKeys.DBSETUP_PATHS_NOT_RELATIVE_TO_STREAM)); + throw new IOException( + LOG.getMsgString(DbUtilsI18NResourceKeys.DBSETUP_PATHS_NOT_RELATIVE_TO_STREAM)); } fileInclude = new File(source_file.getParentFile(), nodeMap.getNodeValue()); @@ -553,8 +557,8 @@ public class DBSetup { index.getTable().getName()); created_indexes++; } catch (SQLException e) { - handleFatalSQLException(e, DbUtilsI18NResourceKeys.DBSETUP_CREATED_INDEX_ERROR, index - .getName(), index.getTable().getName()); + handleFatalSQLException(e, DbUtilsI18NResourceKeys.DBSETUP_CREATED_INDEX_ERROR, + index.getName(), index.getTable().getName()); } } } @@ -692,8 +696,8 @@ public class DBSetup { } catch (SQLException e) { failed_tables_count++; failed_tables.add(table); // add it to the list so we try to clear it again in our second pass - log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_CLEARED_TABLE_ERROR_FIRST_PASS, table - .getName(), DbUtil.getSQLExceptionString(e)); + log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_CLEARED_TABLE_ERROR_FIRST_PASS, + table.getName(), DbUtil.getSQLExceptionString(e)); } } @@ -715,8 +719,8 @@ public class DBSetup { log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_CLEARED_TABLE, table.getName()); } catch (SQLException e) { // crap - there is still a problem causing us to be unable to clear the data - log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_CLEARED_TABLE_ERROR_SECOND_PASS, table - .getName(), DbUtil.getSQLExceptionString(e)); + log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_CLEARED_TABLE_ERROR_SECOND_PASS, + table.getName(), DbUtil.getSQLExceptionString(e)); } } } @@ -770,8 +774,7 @@ public class DBSetup { log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_DROPPED_VIEW, view.getName()); } catch (SQLException e) { failed_views++; - log(LogPriority.ERROR, DbUtilsI18NResourceKeys.DBSETUP_DROPPED_VIEW_ERROR, view.getName(), DbUtil - .getSQLExceptionString(e)); + logDropFailureIfNecessary(DbUtilsI18NResourceKeys.DBSETUP_DROPPED_VIEW_ERROR, view.getName(), e); } } @@ -789,8 +792,7 @@ public class DBSetup { log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_DROPPED_TABLE, table.getName()); } catch (SQLException e) { failed_tables++; - log(LogPriority.ERROR, DbUtilsI18NResourceKeys.DBSETUP_DROPPED_TABLE_ERROR, table.getName(), DbUtil - .getSQLExceptionString(e)); + logDropFailureIfNecessary(DbUtilsI18NResourceKeys.DBSETUP_DROPPED_TABLE_ERROR, table.getName(), e); } } @@ -811,6 +813,16 @@ public class DBSetup { return ret_ok; } + // skip logging an error if the drop failure is due to the object not existing + private void logDropFailureIfNecessary(String I18NKey, String objectName, SQLException e) { + String sqlExceptionString = DbUtil.getSQLExceptionString(e); + if (null != sqlExceptionString && sqlExceptionString.toLowerCase().contains("does not exist")) { + return; + } + + log(LogPriority.ERROR, I18NKey, objectName, sqlExceptionString); + } + /** * Exports an existing schema to a DBSetup XML file. * @@ -858,8 +870,8 @@ public class DBSetup { while (iterCols.hasNext() == true) { Column col = (Column) iterCols.next(); - log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_EXPORT_FOUND_COLUMN, table.getName(), col - .getName()); + log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_EXPORT_FOUND_COLUMN, table.getName(), + col.getName()); Element elemChild = doc.createElement("column"); elemChild.setAttribute("name", col.getName()); @@ -969,8 +981,8 @@ public class DBSetup { * @see ErrorHandler#warning(SAXParseException) */ public void warning(SAXParseException e) throws SAXException { - log(LogPriority.WARN, e, DbUtilsI18NResourceKeys.DBSETUP_SAX_WARNING, e.getLineNumber(), e - .getColumnNumber(), e.getMessage()); + log(LogPriority.WARN, e, DbUtilsI18NResourceKeys.DBSETUP_SAX_WARNING, e.getLineNumber(), + e.getColumnNumber(), e.getMessage()); } } @@ -1039,7 +1051,7 @@ public class DBSetup { } long duration = System.currentTimeMillis() - start; -// log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_DURATION, duration); + // log(LogPriority.DEBUG, DbUtilsI18NResourceKeys.DBSETUP_DURATION, duration); // Reset the commit option this.getConnection().setAutoCommit(committing); @@ -1087,7 +1099,7 @@ public class DBSetup { if (m_connection != null) { return m_connection; } - + m_connection = DbUtil.getConnection(m_jdbcUrl, m_username, m_password); try { @@ -1119,7 +1131,7 @@ public class DBSetup { if (!m_doDisconnect) { return; } - + try { m_connection.close(); } catch (Exception e) { commit 3ef678248e1205dd7f64a6088756ebce0f91eca6 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Sep 19 17:07:00 2013 -0400 BZ 1006347 move the "real" start scripts into bin/internal. The scripts in bin/ are obsoleted versions that spit out errors and exit codes so people know not to use them. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 4063181..421ae6c 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -288,7 +288,7 @@  <chmod perm="ug+x" verbose="true"> - <fileset dir="${deployment.dir}/bin" includes="*.sh,rhqctl" /> + <fileset dir="${deployment.dir}/bin" includes="**/*.sh,rhqctl" /> <fileset dir="${deployment.dir}/jbossas/bin" includes="*.sh" /> </chmod> </target> diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat new file mode 100644 index 0000000..6f19e3c --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat @@ -0,0 +1,159 @@ +@echo off + +rem =========================================================================== +rem RHQ Server Windows Install Script +rem +rem This file is used to complete the installation of the RHQ Server on a +rem Windows platform. +rem +rem This script is customizable by setting the following environment variables: +rem +rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +rem messages. +rem If not set or set to "false", debug is turned off. +rem +rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +rem not set, the Server's embedded JRE will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, +rem RHQ_SERVER_JAVA_HOME is ignored. +rem If this is not set, then +rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe +rem is used. If this and +rem RHQ_SERVER_JAVA_HOME are not set, the +rem Server's embedded JRE will be used. +rem +rem RHQ_SERVER_INSTALLER_JAVA_OPTS - Java VM command line options to be +rem passed into the Java VM. If this is not defined +rem this script will pass in a default set of options. +rem If you only want to add options to the defaults, +rem then you will want to use +rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS instead. +rem +rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command +rem line options to be passed into the VM. +rem This is added to +rem RHQ_SERVER_INSTALLER_JAVA_OPTS; it +rem is mainly used to augment the +rem default set of options. This can be +rem left unset if it is not needed. +rem +rem If the embedded JRE is to be used but is not available, the fallback +rem JRE to be used will be determined by the JAVA_HOME environment variable. +rem =========================================================================== + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_SERVER_DEBUG%" == "false" ( + set RHQ_SERVER_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\..\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available. +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre +) + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +if not exist "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" ( + echo ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ instance + echo Missing %RHQ_SERVER_HOME%\jboss-modules.jar + exit /B 1 +) + +rem ---------------------------------------------------------------------- +rem Determine the logs directory +rem ---------------------------------------------------------------------- + +set _LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs + +rem ---------------------------------------------------------------------- +rem Prepare the VM command line options to be passed in +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_INSTALLER_JAVA_OPTS set RHQ_SERVER_INSTALLER_JAVA_OPTS=-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true + +rem Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS. +if defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=DEBUG +if not defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=INFO +set RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=%RHQ_SERVER_HOME%\bin\rhq-server.properties -Drhq.server.installer.logdir=%RHQ_SERVER_HOME%\logs -Drhq.server.installer.loglevel=%_RHQ_LOGLEVEL% + +rem Sample JPDA settings for remote socket debugging +rem set RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_JAVA_OPTS: %RHQ_SERVER_INSTALLER_JAVA_OPTS% +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS: %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% + +rem ---------------------------------------------------------------------- +rem We need to add our own modules to the core set of JBossAS modules. +rem ---------------------------------------------------------------------- +set _RHQ_MODULES_PATH=%RHQ_SERVER_HOME%\modules +set _INTERNAL_MODULES_PATH=%RHQ_SERVER_HOME%\jbossas\modules +set _JBOSS_MODULEPATH=%_RHQ_MODULES_PATH%;%_INTERNAL_MODULES_PATH% +if defined RHQ_SERVER_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH% + +rem start the AS instance with our main installer module +"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" %RHQ_SERVER_INSTALLER_JAVA_OPTS% %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" -mp "%_JBOSS_MODULEPATH%" org.rhq.rhq-installer-util %* + +goto :done + +rem ---------------------------------------------------------------------- +rem CALL subroutine that prepares to use the embedded JRE +rem ---------------------------------------------------------------------- + +:prepare_embedded_jre +set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre +if defined RHQ_SERVER_DEBUG echo Using the embedded JRE +if not exist "%RHQ_SERVER_JAVA_HOME%" ( + if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh new file mode 100755 index 0000000..3aa29df --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh @@ -0,0 +1,241 @@ +#!/bin/sh + +# ============================================================================= +# RHQ Server UNIX Install Script +# +# This file is used to complete the installation of the RHQ Server on a +# UNIX platform. +# +# This script is customizable by setting the following environment variables: +# +# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +# messages. If this is not defined or set to "false" +# debug messages are not emitted. +# +# RHQ_SERVER_HOME - Defines where the server's home install directory is. +# If not defined, it will be assumed to be the parent +# directory of the directory where this script lives. +# +# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will +# host RHQ. If this is set, it overrides any +# JBOSS_HOME that might be set. If this not +# set, JBOSS_HOME is used as a fallback. If +# neither is set, it is assumed the AS bundled +# under RHQ_SERVER_HOME/jbossas is to be used. +# +# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +# use. This will be ignored if +# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +# not set, the Server's embedded JRE will be used. +# +# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +# executable to use. If this is set, +# RHQ_SERVER_JAVA_HOME is ignored. +# If this is not set, then +# $RHQ_SERVER_JAVA_HOME/bin/java +# is used. If this and +# RHQ_SERVER_JAVA_HOME are not set, the +# Server's embedded JRE will be used. +# +# RHQ_SERVER_INSTALLER_JAVA_OPTS - Java VM command line options to be +# passed into the Java VM. If this is not defined +# this script will pass in a default set of options. +# If you only want to add options to the defaults, +# then you will want to use +# RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS instead. +# +# RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command +# line options to be passed into the VM. +# This is added to +# RHQ_SERVER_INSTALLER_JAVA_OPTS; it +# is mainly used to augment the +# default set of options. This can be +# left unset if it is not needed. +# +# If the embedded JRE is to be used but is not available, the fallback +# JRE to be used will be determined by the JAVA_HOME environment variable. +# ============================================================================= + +debug_msg () +{ + # if debug variable is set, it is assumed to be on, unless its value is false + if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + echo $1 + fi +} + +# ---------------------------------------------------------------------- +# Determine what specific platform we are running on. +# Set some platform-specific variables. +# ---------------------------------------------------------------------- + +case "`uname`" in + CYGWIN*) _CYGWIN=true + ;; + Linux*) _LINUX=true + ;; + Darwin*) _DARWIN=true + ;; + SunOS*) _SOLARIS=true + ;; + AIX*) _AIX=true + ;; +esac + +# only certain platforms support the -e argument for readlink +if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then + _READLINK_ARG="-e" +fi + +# ---------------------------------------------------------------------- +# Determine the RHQ Server installation directory. +# If RHQ_SERVER_HOME is not defined, we will assume we are running +# directly from the server installation's bin/internal directory. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_HOME" ]; then + _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` + RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/../.. +else + if [ ! -d "$RHQ_SERVER_HOME" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" + echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_HOME" +RHQ_SERVER_HOME=`pwd` + +debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + +# ---------------------------------------------------------------------- +# Determine what JBossAS instance to use. +# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will +# assume we are to run the embedded AS instance from the RHQ +# installation directory - RHQ_SERVER_HOME/jbossas +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then + if [ -z "$JBOSS_HOME" ]; then + RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" + else + if [ ! -d "$JBOSS_HOME" ]; then + echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" + echo "JBOSS_HOME: $JBOSS_HOME" + exit 1 + fi + RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" + fi +else + if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" + echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_JBOSS_HOME" +RHQ_SERVER_JBOSS_HOME=`pwd` + +debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + +if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance" + echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" + exit 1 +fi + +# we want the rest of this script to be able to assume cwd is the RHQ install dir +cd "$RHQ_SERVER_HOME" + +# ---------------------------------------------------------------------- +# if we are on a Mac and JAVA_HOME is not set, then set it to /usr +# as this is the default location. +# ---------------------------------------------------------------------- + +if [ -z "$JAVA_HOME" ]; then + if [ -n "$_DARWIN" ]; then + debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" + JAVA_HOME=/usr + fi +fi + +# ---------------------------------------------------------------------- +# Create the logs directory +# ---------------------------------------------------------------------- + +_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" +if [ -n "$_CYGWIN" ]; then + _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` +fi +if [ ! -d "${_LOG_DIR_PATH}" ]; then + mkdir "${_LOG_DIR_PATH}" +fi + +# ---------------------------------------------------------------------- +# Find the Java executable and verify we have a VM available +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then + RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" + if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then + debug_msg "Using the embedded JRE" + else + debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" + RHQ_SERVER_JAVA_HOME="$JAVA_HOME" + fi + fi + debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" + RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" +fi +debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" + +if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + echo "There is no JVM available." + echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." + exit 1 +fi + +# ---------------------------------------------------------------------- +# Prepare the VM command line options to be passed in +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_INSTALLER_JAVA_OPTS" ]; then + RHQ_SERVER_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true" +fi + +# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS. +if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + _RHQ_LOGLEVEL="DEBUG" +else + _RHQ_LOGLEVEL="INFO" +fi + +RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.server.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.server.installer.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}" + +# Sample JPDA settings for remote socket debugging +#RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" + +debug_msg "RHQ_SERVER_INSTALLER_JAVA_OPTS: $RHQ_SERVER_INSTALLER_JAVA_OPTS" +debug_msg "RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS" + +# ---------------------------------------------------------------------- +# We need to add our own modules to the core set of JBossAS modules. +# ---------------------------------------------------------------------- +_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" +_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" +if [ -n "$_CYGWIN" ]; then + _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` + _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` +fi +_JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" +debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH" + +# start the AS instance with our main installer module +"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_SERVER_INSTALLER_JAVA_OPTS} ${RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-installer-util "$@" + +_EXIT_STATUS=$? +exit $_EXIT_STATUS diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server-console.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server-console.bat new file mode 100644 index 0000000..7f56679 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server-console.bat @@ -0,0 +1,2 @@ +cd %~dp0 +rhq-server.bat console diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat new file mode 100644 index 0000000..aa7de4b --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat @@ -0,0 +1,218 @@ +@echo off + +rem =========================================================================== +rem RHQ Server Windows Startup Script +rem +rem This file is used to install, start, stop and remove the RHQ Server Windows +rem Service for the Windows platform. It can also be used to start the +rem RHQ Server in a console window. The RHQ Server is actually wrapped +rem by the Java Service Wrapper (JSW) and it is the JSW that is the actual +rem executable that is registered as the Windows Service. +rem +rem This script is customizable by setting the following environment variables: +rem +rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +rem messages. +rem If not set or set to "false", debug is turned off. +rem +rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +rem not set, JAVA_HOME will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, +rem RHQ_SERVER_JAVA_HOME is ignored. +rem If this is not set, then +rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe +rem is used. +rem +rem RHQ_SERVER_INSTANCE_NAME - The name of the Windows Service; it must +rem conform to the Windows Service naming +rem conventions. By default, this is the +rem name "rhqserver-%COMPUTERNAME%" +rem +rem RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The full path to the location where +rem the wrapper log file will go. +rem +rem RHQ_SERVER_RUN_AS - if defined, then when the Windows Service is +rem installed, the value is the domain\username of the +rem user that the Windows Service will run as. It is +rem important to also set RHQ_SERVER_PASSWORD for the +rem current user account. +rem +rem RHQ_SERVER_RUN_AS_ME - if defined, then when the Windows Service is +rem installed, the domain\username of the user that the Windows +rem Service will run as will be the current user (.\%USERNAME%). +rem This takes precedence over RHQ_SERVER_RUN_AS. It is +rem important to also set RHQ_SERVER_PASSWORD for the +rem current user account. +rem +rem Note that you cannot define custom Java VM parameters or command line +rem arguments to pass to the RHQ Server standalone.sh. If you wish to pass in +rem specific arguments, modify the rhq-server-wrapper.conf file. +rem +rem This script does not use the built-in JBossAS run.bat. +rem =========================================================================== + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_SERVER_DEBUG%" == "false" ( + set RHQ_SERVER_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\..\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME ( + if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% + ) +) +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe +) + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +rem ---------------------------------------------------------------------- +rem Define the name used for the name of the Windows Service. +rem If this is not defined, the name of the computer is used. +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_INSTANCE_NAME ( + set RHQ_SERVER_INSTANCE_NAME=rhqserver-%COMPUTERNAME% +) +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTANCE_NAME: %RHQ_SERVER_INSTANCE_NAME% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper directory. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\..\wrapper +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_DIR_PATH: %RHQ_SERVER_WRAPPER_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem The Windows OS platform name is also the wrapper subdirectory name. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_OS_PLATFORM=windows-x86_32 +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_OS_PLATFORM: %RHQ_SERVER_OS_PLATFORM% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper executable that this script will run. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_EXE_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\%RHQ_SERVER_OS_PLATFORM%\wrapper.exe +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_EXE_FILE_PATH: %RHQ_SERVER_WRAPPER_EXE_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Determine the Server wrapper configuration file. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_CONF_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\rhq-server-wrapper.conf +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_CONF_FILE_PATH: %RHQ_SERVER_WRAPPER_CONF_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Create and configure the wrapper log directory. +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_WRAPPER_LOG_DIR_PATH ( + set RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs +) +if not exist "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" ( + mkdir "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" +) + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_LOG_DIR_PATH: %RHQ_SERVER_WRAPPER_LOG_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem Determine what to do and do it. +rem ---------------------------------------------------------------------- + +rem Determine if there should be debug VM options passed into it. +rem For some reason, this can't go inside another if statement. +if defined RHQ_SERVER_DEBUG set _DEBUG_OPTS=wrapper.debug=true + +rem Determine what user the Windows Service will run as. +if defined RHQ_SERVER_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_SERVER_RUN_AS%" +if defined RHQ_SERVER_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%" +rem This service is typically installed by rhqctl, so assume we don't want to prompt +if not defined RHQ_SERVER_PASSWORD_PROMPT set RHQ_SERVER_PASSWORD_PROMPT=false + +if /i "%1"=="console" ( + rem START SERVER + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="install" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="start" ( + rem START SERVER + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="stop" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="remove" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="status" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console } +goto :done + + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.security-policy b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.security-policy new file mode 100644 index 0000000..8860b47 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.security-policy @@ -0,0 +1,10 @@ +// We need the SecurityManager installed to enable sandboxing of CLI scripts +// but we don't define any other security measures on the RHQ server itself. +// +// Granting all permissions allows us to run the RHQ server as if no security +// manager was in place (which is assumed by default by JBoss AS) but be able +// to use it when we need it for our own purposes. + +grant { + permission java.security.AllPermission; +}; diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh new file mode 100755 index 0000000..2b37aac --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh @@ -0,0 +1,622 @@ +#!/bin/sh + +# chkconfig: 2345 92 26 +# description: Starts and stops the RHQ Server +# +# processname: java + +# ============================================================================= +# RHQ Server UNIX Startup Script +# +# This file is used to execute the RHQ Server on a UNIX platform as part of +# the platform's bootup sequence or as a foreground console process. +# Run this script without any command line options for the syntax help. +# +# This script is customizable by setting the following environment variables: +# +# Note that if this script is to be used as an init.d script, you must set +# RHQ_SERVER_HOME so this script knows where to find the Server installation. +# +# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +# messages. If this is not defined or set to "false" +# debug messages are not emitted. +# +# RHQ_SERVER_HOME - Defines where the server's home install directory is. +# If not defined, it will be assumed to be the parent +# directory of the directory where this script lives. +# +# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will +# host RHQ. If this is set, it overrides any +# JBOSS_HOME that might be set. If this not +# set, JBOSS_HOME is used as a fallback. If +# neither is set, it is assumed the AS bundled +# under RHQ_SERVER_HOME/jbossas is to be used. +# +# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +# use. This will be ignored if +# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +# not set, JAVA_HOME will be used. +# +# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +# executable to use. If this is set, +# RHQ_SERVER_JAVA_HOME is ignored. +# If this is not set, then +# $RHQ_SERVER_JAVA_HOME/bin/java +# is used. +# +# RHQ_SERVER_JAVA_OPTS - Java VM command line options to be +# passed into the Server's VM. If this is not defined +# this script will pass in a default set of options. +# If this is set, it completely overrides the +# Server's defaults. If you only want to add options +# to the Server's defaults, then you will want to +# use RHQ_SERVER_ADDITIONAL_JAVA_OPTS instead. +# +# RHQ_SERVER_ADDITIONAL_JAVA_OPTS - additional Java VM command line options +# to be passed into the Server's VM. This +# is added to RHQ_SERVER_JAVA_OPTS; it +# is mainly used to augment the Server's +# default set of options. This can be +# left unset if it is not needed. +# +# RHQ_SERVER_CMDLINE_OPTS - If this is defined, these are the command line +# arguments that will be passed to the RHQ Server +# JBossAS standalone.sh. If you only want to add +# options to the Server's defaults, then you will +# want to use RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS +# instead. +# +# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS - additional command line arguments to +# be passed to the RHQ Server JBossAS +# standalone.sh. This is added to +# RHQ_SERVER_CMDLINE_OPTS; it is mainly +# used to augment the Server's default +# set of options. This can be left unset +# if it is not needed. +# +# RHQ_SERVER_PIDFILE_DIR - a full path to a writable directory where this +# script can write its pidfile to. +# If not defined, this defaults to the Server's +# bin directory. +# +# RHQ_SERVER_STOP_DELAY - the number of minutes to wait for the server to go +# down after sending the TERM signal. Defaults to +# 5 minutes. +# +# RHQ_SERVER_KILL_AFTER_STOP_DELAY - If this is defined, the server will be +# killed if it is still running after the +# RHQ_SERVER_STOP_DELAY. If this is not +# defined or set to "false" the script +# will exit with error code 127. +# +# +# +# If the embedded JRE is to be used but is not available, the fallback +# JRE to be used will be determined by the JAVA_HOME environment variable. +# +# This script calls standalone.sh when starting the underlying JBossAS server. +# ============================================================================= + +# ---------------------------------------------------------------------- +# Environment variables that can customize the launch of the RHQ Server. +# ---------------------------------------------------------------------- + +# RHQ_SERVER_HOME=/path/to/server/home +# RHQ_SERVER_DEBUG=true +# JAVA_HOME=/path/to/java/installation +# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable +# RHQ_SERVER_JAVA_OPTS=VM options +# RHQ_SERVER_ADDITIONAL_JAVA_OPTS=additional VM options +# RHQ_SERVER_CMDLINE_OPTS=standalone.sh options +# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS=additional standalone.sh options +# RHQ_SERVER_STOP_DELAY=5 +# RHQ_SERVER_KILL_AFTER_STOP_DELAY=false + +# ---------------------------------------------------------------------- +# Environment variables to set in order to enable remote debugging. +# ---------------------------------------------------------------------- + +#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n" + +# Enable JProfiler +#JPROFILER_HOME="/opt/jprofiler6" +#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="$RHQ_SERVER_ADDITIONAL_JAVA_OPTS -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:$JPROFILER_HOME/bin/agent.jar" +#export PATH="$PATH:$JPROFILER_HOME/bin" +#export LD_LIBRARY_PATH="$JPROFILER_HOME/bin/linux-x64" + +# ---------------------------------------------------------------------- +# Dumps a message iff debug mode is enabled +# ---------------------------------------------------------------------- + +debug_msg () +{ + # if debug variable is set, it is assumed to be on, unless its value is false + if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + echo $1 + fi +} + +# ---------------------------------------------------------------------- +# Sets _SERVER_STATUS, _SERVER_RUNNING and _SERVER_PID based on the +# status of the RHQ Server VM start script (standalone.sh). +# Also sets _JVM_STATUS, _JVM_RUNNING and _JVM_PID based on the +# status of the JBossAS Java Virtual Machine. +# ---------------------------------------------------------------------- + +check_status () +{ + if [ -f "$_SERVER_PIDFILE" ]; then + _SERVER_PID=`cat "$_SERVER_PIDFILE"` + if [ -n "$_SERVER_PID" ] && kill -0 $_SERVER_PID 2>/dev/null ; then + _SERVER_STATUS=`printf "%-30s (pid %-7s) IS %s" "RHQ Server" $_SERVER_PID $1` + _SERVER_RUNNING=1 + else + _SERVER_STATUS=`printf "%-30s (pid %-7s) IS NOT running" "RHQ Server" $_SERVER_PID` + _SERVER_RUNNING=0 + fi + else + _SERVER_STATUS=`printf "%-30s (no pid file) IS NOT running" "RHQ Server"` + _SERVER_RUNNING=0 + fi + + if [ -f "$_JVM_PIDFILE" ]; then + _JVM_PID=`cat "$_JVM_PIDFILE"` + if [ -n "$_JVM_PID" ] && kill -0 $_JVM_PID 2>/dev/null ; then + _JVM_STATUS=`printf "%-30s (pid %-7s) IS %s" "JBossAS Java VM child process" $_SERVER_PID $1` + _JVM_RUNNING=1 + else + _JVM_STATUS=`printf "%-30s (pid %-7s) IS NOT running" "JBossAS Java VM child process" $_SERVER_PID` + _JVM_RUNNING=0 + fi + else + _JVM_STATUS=`printf "%-30s (no pid file) IS NOT running" "JBossAS Java VM child process"` + _JVM_RUNNING=0 + fi +} + +# ---------------------------------------------------------------------- +# Ensures that the PID files no longer exist +# ---------------------------------------------------------------------- + +remove_pid_files () +{ + if [ -f "$_SERVER_PIDFILE" ]; then + rm -f "$_SERVER_PIDFILE" + fi + if [ -f "$_JVM_PIDFILE" ]; then + rm -f "$_JVM_PIDFILE" + fi +} + +# ---------------------------------------------------------------------- +# Unset any lingering JBossAS environment variables that were set in +# the user's environment. This might happen if the user has an external +# JBossAS installed and configured but doesn't want RHQ to use it. +# ---------------------------------------------------------------------- +unset_jboss_as_env () +{ + unset JBOSS_HOME + unset RUN_CONF + unset JAVAC_JAR + unset JBOSS_CLASSPATH + unset JBOSS_BASE_DIR + unset JBOSS_LOG_DIR + unset JBOSS_CONFIG_DIR +} + +# ---------------------------------------------------------------------- +# Kill RHQ Server +# ---------------------------------------------------------------------- + +kill_rhq_server () +{ + echo "Trying to kill the RHQ Server..." + + echo "RHQ Server parent process (pid=${_SERVER_PID}) is being killed..." + while [ "$_SERVER_RUNNING" = "1" ]; do + kill -9 $_SERVER_PID + sleep 2 + check_status "killing..." + done + + echo "Java Virtual Machine child process (pid=${_JVM_PID}) is being killed..." + while [ "$_JVM_RUNNING" = "1" ]; do + kill -9 $_JVM_PID + sleep 2 + check_status "killing..." + done + + remove_pid_files + echo "RHQ Server has been killed." +} + +# ---------------------------------------------------------------------- +# Determine what specific platform we are running on. +# Set some platform-specific variables. +# ---------------------------------------------------------------------- + +case "`uname`" in + CYGWIN*) _CYGWIN=true + ;; + Linux*) _LINUX=true + ;; + Darwin*) _DARWIN=true + ;; + SunOS*) _SOLARIS=true + ;; + AIX*) _AIX=true + ;; +esac + +# only certain platforms support the -e argument for readlink +if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then + _READLINK_ARG="-e" +fi + +# ---------------------------------------------------------------------- +# Determine the RHQ Server installation directory. +# If RHQ_SERVER_HOME is not defined, we will assume we are running +# directly from the server installation's bin/internal directory. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_HOME" ]; then + _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` + RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/../.. +else + if [ ! -d "$RHQ_SERVER_HOME" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" + echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_HOME" +RHQ_SERVER_HOME=`pwd` + +debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + +# ---------------------------------------------------------------------- +# Determine what JBossAS instance to use. +# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will +# assume we are to run the embedded AS instance from the RHQ +# installation directory - RHQ_SERVER_HOME/jbossas +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then + if [ -z "$JBOSS_HOME" ]; then + RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" + # Unset any lingering JBossAS environment variables that we don't want. + # These could be in the user's environment for an external AS install. + unset_jboss_as_env + else + if [ ! -d "$JBOSS_HOME" ]; then + echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" + echo "JBOSS_HOME: $JBOSS_HOME" + exit 1 + fi + RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" + fi +else + if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" + echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + exit 1 + fi + unset_jboss_as_env +fi + +cd "$RHQ_SERVER_JBOSS_HOME" +RHQ_SERVER_JBOSS_HOME=`pwd` + +debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + + +if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid RHQ Server" + echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" + exit 1 +fi + +# ---------------------------------------------------------------------- +# if we are on a Mac and JAVA_HOME is not set, then set it to /usr +# as this is the default location. +# ---------------------------------------------------------------------- +if [ -z "$JAVA_HOME" ]; then + if [ -n "$_DARWIN" ]; then + debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" + JAVA_HOME=/usr + fi +fi + +# ---------------------------------------------------------------------- +# create the logs directory +# ---------------------------------------------------------------------- + +_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" +if [ -n "$_CYGWIN" ]; then + _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` +fi +if [ ! -d "${_LOG_DIR_PATH}" ]; then + mkdir "${_LOG_DIR_PATH}" +fi + +# ---------------------------------------------------------------------- +# Find the Java executable and verify we have a VM available +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then + debug_msg "No JRE found - will try to use JAVA_HOME: $JAVA_HOME" + RHQ_SERVER_JAVA_HOME="$JAVA_HOME" + fi + debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" + RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" +fi +debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" + +if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + echo "There is no JVM available." + echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." + exit 1 +fi + +# standalone.sh will use JAVA as the full java command +JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH" +export JAVA + +# ---------------------------------------------------------------------- +# Prepare the VM command line options to be passed in +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then + RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" +fi + +if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + _JBOSS_DEBUG_LOGGING="-Djboss.boot.server.log.level=DEBUG -Djboss.boot.server.log.console.level=DEBUG" +else + _JBOSS_DEBUG_LOGGING= +fi + +# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_JAVA_OPTS. +# Note that the double equals for the policy file specification IS INTENTIONAL +_HTTP_COMPRESSION="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on -Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html" +RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS} -Drhq.server.home=${RHQ_SERVER_HOME} -Djboss.server.log.dir=${_LOG_DIR_PATH} -Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.server.default.config=standalone-full.xml -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager -Djava.security.policy==${RHQ_SERVER_HOME}/bin/internal/rhq-server.security-policy ${_HTTP_COMPRESSION} ${_JBOSS_DEBUG_LOGGING}" + +debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS" +debug_msg "RHQ_SERVER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" + +# standalone.sh wants the options to be in the JAVA_OPTS variable +JAVA_OPTS="$RHQ_SERVER_JAVA_OPTS $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" +export JAVA_OPTS + +# ---------------------------------------------------------------------- +# Prepare the command line arguments passed to the RHQ Server JBossAS +# standalone.sh script +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then + _PROPS_FILE_PATH="${RHQ_SERVER_HOME}/bin/rhq-server.properties" + + # convert paths if we are on Windows + if [ -n "$_CYGWIN" ]; then + _PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"` + fi + + RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}" +fi + +debug_msg "RHQ_SERVER_CMDLINE_OPTS: $RHQ_SERVER_CMDLINE_OPTS" +debug_msg "RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS: $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" + +# JBoss may parse its command line args such that later options of a +# certain type may override earlier options of that same type, so make sure the +# additional opts are added after the base opts, since we want the additional +# opts to take precedence +_CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" + +# ---------------------------------------------------------------------- +# We need to add our own modules to the core set of JBossAS modules. +# JBOSS_MODULEPATH tells standalone.sh what to use. +# ---------------------------------------------------------------------- +_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" +_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" +if [ -n "$_CYGWIN" ]; then + _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` + _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` +fi +JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" +export JBOSS_MODULEPATH +debug_msg "JBOSS_MODULEPATH: $JBOSS_MODULEPATH" + +# ---------------------------------------------------------------------- +# Now find the JBossAS standalone.sh script +# ---------------------------------------------------------------------- + +_JBOSS_RUN_SCRIPT="${RHQ_SERVER_JBOSS_HOME}/bin/standalone.sh" + +if [ ! -f "$_JBOSS_RUN_SCRIPT" ]; then + echo "ERROR! Cannot find the JBossAS run script" + echo "Not found: $_JBOSS_RUN_SCRIPT" + exit 1 +fi +debug_msg "_JBOSS_RUN_SCRIPT: $_JBOSS_RUN_SCRIPT" + +# ---------------------------------------------------------------------- +# Define where we want to write the pidfiles - let user override the dir +# Note that we actually have two pidfiles - one is for the script +# that starts the JBossAS Java virtual machine and the second is the +# actual server's Java virtual machine process itself. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_PIDFILE_DIR" ]; then + RHQ_SERVER_PIDFILE_DIR="${RHQ_SERVER_HOME}/bin/internal" +fi +mkdir -p "$RHQ_SERVER_PIDFILE_DIR" + +_SERVER_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-server.pid" +_JVM_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-jvm.pid" + +# ---------------------------------------------------------------------- +# Execute the command that the user wants us to do +# ---------------------------------------------------------------------- + +check_status "running" + +case "$1" in +'console') + if [ "$_SERVER_RUNNING" = "1" ]; then + echo "$_SERVER_STATUS" + exit 0 + fi + + echo "Starting RHQ Server in console..." + + # we are running in foreground, make both pids show the same process + echo "$$" > "$_SERVER_PIDFILE" + echo "$$" > "$_JVM_PIDFILE" + + # START SERVER + # first, make sure its working directory is the JBossAS bin directory + cd "${RHQ_SERVER_JBOSS_HOME}/bin" + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS + + _JBOSS_STATUS=$? + + remove_pid_files + + exit $_JBOSS_STATUS + ;; + +'start') + if [ "$_SERVER_RUNNING" = "1" ]; then + echo "$_SERVER_STATUS" + exit 0 + fi + + echo "Trying to start the RHQ Server..." + + LAUNCH_JBOSS_IN_BACKGROUND=true + JBOSS_PIDFILE="$_JVM_PIDFILE" + export LAUNCH_JBOSS_IN_BACKGROUND + export JBOSS_PIDFILE + + # START SERVER + # first, make sure its working directory is the JBossAS bin directory + cd "${RHQ_SERVER_JBOSS_HOME}/bin" + if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS & + else + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS > /dev/null 2>&1 & + fi + + echo "$!" > "$_SERVER_PIDFILE" + + sleep 5 + check_status "starting" + echo "$_SERVER_STATUS" + + if [ "$_SERVER_RUNNING" = "1" ]; then + exit 0 + else + echo "Failed to start - make sure the RHQ Server is fully configured properly" + exit 1 + fi + ;; + +'stop') + if [ "$_SERVER_RUNNING" = "0" ]; then + echo "$_SERVER_STATUS" + remove_pid_files + exit 0 + fi + + echo "Trying to stop the RHQ Server..." + + echo "RHQ Server (pid=${_SERVER_PID}) is stopping..." + + kill -TERM $_SERVER_PID + + if [ -z "$RHQ_SERVER_STOP_DELAY" ]; then + # RHQ_SERVER_STOP_DELAY is not set + RHQ_SERVER_STOP_DELAY=5 + fi + case $RHQ_SERVER_STOP_DELAY in + ''|*[!0-9]*) + echo "RHQ_SERVER_STOP_DELAY is not a number (value=${RHQ_SERVER_STOP_DELAY})" + echo "Applying default value (5 minutes)" + RHQ_SERVER_STOP_DELAY=5 + ;; + *) ;; + esac + if [ $RHQ_SERVER_STOP_DELAY -le 0 ]; then + echo "RHQ_SERVER_STOP_DELAY is less than or equal to zero (value=${RHQ_SERVER_STOP_DELAY})" + echo "Applying default value (5 minutes)" + RHQ_SERVER_STOP_DELAY=5 + fi + waited_seconds=0 + max_wait_seconds=$(expr $RHQ_SERVER_STOP_DELAY \* 60) + while [ "$_SERVER_RUNNING" -eq "1" ] && [ $waited_seconds -lt $max_wait_seconds ]; do + sleep 2s + waited_seconds=$(expr $waited_seconds + 2) + check_status "stopping..." + done + + if [ "$_SERVER_RUNNING" = "0" ]; then + remove_pid_files + echo "RHQ Server has stopped." + exit 0 + fi + + debug_msg "RHQ Server did not stop within $RHQ_SERVER_STOP_DELAY minutes." + echo "Timed out waiting for RHQ Server to stop." + kill -QUIT $_SERVER_PID # Generate thread dump for later investigation + + if [ -n "$RHQ_SERVER_KILL_AFTER_STOP_DELAY" ] && [ "$RHQ_SERVER_KILL_AFTER_STOP_DELAY" != "false" ]; then + kill_rhq_server + exit 0 + else + echo "Failed to stop RHQ Server" + exit 127 + fi + ;; + +'kill') + if [ "$_SERVER_RUNNING" = "0" ]; then + echo "$_SERVER_STATUS" + fi + if [ "$_JVM_RUNNING" = "0" ]; then + echo "$_JVM_STATUS" + remove_pid_files + exit 0 + fi + + kill_rhq_server + exit 0 + ;; + +'clean') + if [ "$_SERVER_RUNNING" = "1" ]; then + echo "$_SERVER_STATUS" + echo "Please shutdown the server before cleaning." + exit 0 + fi + + echo "Cleaning data, tmp and log directories..." + rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/data" + rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/tmp" + rm -rf "${RHQ_SERVER_HOME}/logs" + ;; + +'status') + echo "$_SERVER_STATUS" + echo "$_JVM_STATUS" + exit 0 + ;; + +*) + echo "Usage: $0 { start | stop | kill | status | console | clean }" + exit 1 + ;; +esac diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat new file mode 100644 index 0000000..6c6534a --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat @@ -0,0 +1,202 @@ +@echo off + +rem ============================================================================= +rem RHQ Storage Installer Script +rem +rem This file is used to complete the installation of the RHQ storage Server on a +rem Windows platform. +rem +rem This script is customizable by setting the following environment variables: +rem +rem RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug +rem messages. If this is not defined or set to "false" +rem debug messages are not emitted. +rem +rem RHQ_SERVER_HOME - Defines where the server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will +rem host RHQ. If this is set, it overrides any +rem JBOSS_HOME that might be set. If this not +rem set, JBOSS_HOME is used as a fallback. If +rem neither is set, it is assumed the AS bundled +rem under RHQ_SERVER_HOME\jbossas is to be used. +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +rem not set, JAVA_HOME will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, +rem RHQ_SERVER_JAVA_HOME is ignored. +rem If this is not set, then +rem $RHQ_SERVER_JAVA_HOME\bin\java +rem is used. +rem +rem RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be +rem passed into the Java VM. If this is not defined +rem this script will pass in a default set of options. +rem If you only want to add options to the defaults, +rem then you will want to use +rem RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead. +rem +rem RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command +rem line options to be passed into the VM. +rem This is added to RHQ_STORAGE_JAVA_OPTS; it +rem is mainly used to augment the +rem default set of options. This can be +rem left unset if it is not needed. +rem +rem ============================================================================= + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_STORAGE_DEBUG%" == "false" ( + set RHQ_STORAGE_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\..\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Determine what JBossAS instance to use. +rem If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will +rem assume we are to run the embedded AS instance from the RHQ +rem installation directory - RHQ_SERVER_HOME\jbossas +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JBOSS_HOME ( + if not defined JBOSS_HOME ( + set RHQ_SERVER_JBOSS_HOME=%RHQ_SERVER_HOME%\jbossas + ) else ( + if not exist "%JBOSS_HOME%" ( + echo ERROR! JBOSS_HOME is not pointing to a valid AS directory + echo JBOSS_HOME: "%JBOSS_HOME%" + exit /B 1 + ) + set RHQ_SERVER_JBOSS_HOME=%JBOSS_HOME% + ) +) else ( + cd %RHQ_SERVER_JBOSS_HOME% || ( + echo ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory + echo RHQ_SERVER_JBOSS_HOME: "%RHQ_SERVER_JBOSS_HOME%" + exit /B 1 + ) +) + +cd %RHQ_SERVER_JBOSS_HOME% +set RHQ_SERVER_JBOSS_HOME=%CD% + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JBOSS_HOME: %RHQ_SERVER_JBOSS_HOME% + + +if not exist "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" ( + echo ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance + echo Missing "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" + exit /B 1 +) + +rem we want the rest of this script to be able to assume cwd is the RHQ install dir +cd "%RHQ_SERVER_HOME%" + + +rem ---------------------------------------------------------------------- +rem Create the logs directory +rem ---------------------------------------------------------------------- + +set _LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs +if not exist "%_LOG_DIR_PATH%" ( + mkdir "%_LOG_DIR_PATH%" +) + + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME ( + if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% + ) +) +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe +) + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + + +rem ---------------------------------------------------------------------- +rem Prepare the VM command line options to be passed in +rem ---------------------------------------------------------------------- + +if not defined RHQ_STORAGE_INSTALLER_JAVA_OPTS ( + set RHQ_STORAGE_INSTALLER_JAVA_OPTS=-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true +) + +rem Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS. +if defined RHQ_STORAGE_DEBUG ( + set _RHQ_LOGLEVEL=DEBUG +) else ( + set _RHQ_LOGLEVEL=INFO +) + + +rem debugging the logging level now for development/testing +set RHQ_STORAGE_INSTALLER_JAVA_OPTS=%RHQ_STORAGE_INSTALLER_JAVA_OPTS% -Djava.awt.headless=true -Drhq.server.properties-file=%RHQ_SERVER_HOME%\bin\rhq-server.properties -Drhq.storage.installer.logdir=%RHQ_SERVER_HOME%\logs -Drhq.storage.installer.loglevel=%_RHQ_LOGLEVEL% -Drhq.server.basedir=%RHQ_SERVER_HOME% + +rem Sample JPDA settings for remote socket debugging +rem set RHQ_STORAGE_INSTALLER_JAVA_OPTS=%RHQ_STORAGE_INSTALLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y + +if defined RHQ_STORAGE_DEBUG echo "RHQ_STORAGE_INSTALLER_JAVA_OPTS: %RHQ_STORAGE_INSTALLER_JAVA_OPTS%" +if defined RHQ_STORAGE_DEBUG echo "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: %RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS%" + + +rem ---------------------------------------------------------------------- +rem We need to add our own modules to the core set of JBossAS modules. +rem ---------------------------------------------------------------------- +set _RHQ_MODULES_PATH=%RHQ_SERVER_HOME%\modules +set _INTERNAL_MODULES_PATH=%RHQ_SERVER_JBOSS_HOME%\modules +set _JBOSS_MODULEPATH=%_RHQ_MODULES_PATH%;%_INTERNAL_MODULES_PATH% + +if defined RHQ_STORAGE_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH% + + +echo "Starting RHQ Storage Installer ..." + +rem start the AS instance with our main installer module + +"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" %RHQ_STORAGE_INSTALLER_JAVA_OPTS% %RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" -mp "%_JBOSS_MODULEPATH%" org.rhq.rhq-cassandra-installer %* +if not errorlevel 1 goto done +exit /B %ERRORLEVEL% + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh new file mode 100755 index 0000000..8bbc9bb --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh @@ -0,0 +1,243 @@ +#!/bin/sh + +# ============================================================================= +# RHQ Storage Installer Script +# +# This file is used to complete the installation of the RHQ storage Server on a +# UNIX platform. +# +# This script is customizable by setting the following environment variables: +# +# RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug +# messages. If this is not defined or set to "false" +# debug messages are not emitted. +# +# RHQ_SERVER_HOME - Defines where the server's home install directory is. +# If not defined, it will be assumed to be the parent +# directory of the directory where this script lives. +# +# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will +# host RHQ. If this is set, it overrides any +# JBOSS_HOME that might be set. If this not +# set, JBOSS_HOME is used as a fallback. If +# neither is set, it is assumed the AS bundled +# under RHQ_SERVER_HOME/jbossas is to be used. +# +# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +# use. This will be ignored if +# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +# not set, the Server's embedded JRE will be used. +# +# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +# executable to use. If this is set, +# RHQ_SERVER_JAVA_HOME is ignored. +# If this is not set, then +# $RHQ_SERVER_JAVA_HOME/bin/java +# is used. If this and +# RHQ_SERVER_JAVA_HOME are not set, the +# Server's embedded JRE will be used. +# +# RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be +# passed into the Java VM. If this is not defined +# this script will pass in a default set of options. +# If you only want to add options to the defaults, +# then you will want to use +# RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead. +# +# RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command +# line options to be passed into the VM. +# This is added to RHQ_STORAGE_JAVA_OPTS; it +# is mainly used to augment the +# default set of options. This can be +# left unset if it is not needed. +# +# If the embedded JRE is to be used but is not available, the fallback +# JRE to be used will be determined by the JAVA_HOME environment variable. +# ============================================================================= + +debug_msg () +{ + # if debug variable is set, it is assumed to be on, unless its value is false + if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then + echo $1 + fi +} + +# ---------------------------------------------------------------------- +# Determine what specific platform we are running on. +# Set some platform-specific variables. +# ---------------------------------------------------------------------- + +case "`uname`" in + CYGWIN*) _CYGWIN=true + ;; + Linux*) _LINUX=true + ;; + Darwin*) _DARWIN=true + ;; + SunOS*) _SOLARIS=true + ;; + AIX*) _AIX=true + ;; +esac + +# only certain platforms support the -e argument for readlink +if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then + _READLINK_ARG="-e" +fi + +# ---------------------------------------------------------------------- +# Determine the RHQ Server installation directory. +# If RHQ_SERVER_HOME is not defined, we will assume we are running +# directly from the server installation's bin directory. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_HOME" ]; then + _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` + RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/../.. +else + if [ ! -d "$RHQ_SERVER_HOME" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" + echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_HOME" +RHQ_SERVER_HOME=`pwd` + +debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + +# ---------------------------------------------------------------------- +# Determine what JBossAS instance to use. +# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will +# assume we are to run the embedded AS instance from the RHQ +# installation directory - RHQ_SERVER_HOME/jbossas +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then + if [ -z "$JBOSS_HOME" ]; then + RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" + else + if [ ! -d "$JBOSS_HOME" ]; then + echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" + echo "JBOSS_HOME: $JBOSS_HOME" + exit 1 + fi + RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" + fi +else + if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" + echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_JBOSS_HOME" +RHQ_SERVER_JBOSS_HOME=`pwd` + +debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" + +if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then + echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance" + echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" + exit 1 +fi + +# we want the rest of this script to be able to assume cwd is the RHQ install dir +cd "$RHQ_SERVER_HOME" + +# ---------------------------------------------------------------------- +# if we are on a Mac and JAVA_HOME is not set, then set it to /usr +# as this is the default location. +# ---------------------------------------------------------------------- + +if [ -z "$JAVA_HOME" ]; then + if [ -n "$_DARWIN" ]; then + debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" + JAVA_HOME=/usr + fi +fi + +# ---------------------------------------------------------------------- +# Create the logs directory +# ---------------------------------------------------------------------- + +_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" +if [ -n "$_CYGWIN" ]; then + _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` +fi +if [ ! -d "${_LOG_DIR_PATH}" ]; then + mkdir "${_LOG_DIR_PATH}" +fi + +# ---------------------------------------------------------------------- +# Find the Java executable and verify we have a VM available +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then + RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" + if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then + debug_msg "Using the embedded JRE" + else + debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" + RHQ_SERVER_JAVA_HOME="$JAVA_HOME" + fi + fi + debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" + RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" +fi +debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" + +if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + echo "There is no JVM available." + echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." + exit 1 +fi + +# ---------------------------------------------------------------------- +# Prepare the VM command line options to be passed in +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_STORAGE_INSTALLER_JAVA_OPTS" ]; then + RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true" +fi + +# Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS. +if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then + _RHQ_LOGLEVEL="DEBUG" +else + _RHQ_LOGLEVEL="INFO" +fi + +# debugging the logging level now for development/testing +RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.storage.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.storage.installer.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}" + +# Sample JPDA settings for remote socket debugging +#RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" + +debug_msg "RHQ_STORAGE_INSTALLER_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_JAVA_OPTS" +debug_msg "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS" + +# ---------------------------------------------------------------------- +# We need to add our own modules to the core set of JBossAS modules. +# ---------------------------------------------------------------------- +_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" +_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" +if [ -n "$_CYGWIN" ]; then + _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` + _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` +fi +_JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" +debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH" + +echo "Starting RHQ Storage Installer ..." + +# start the AS instance with our main installer module +"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_STORAGE_INSTALLER_JAVA_OPTS} ${RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-cassandra-installer "$@" + +_EXIT_STATUS=$? +exit $_EXIT_STATUS diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat new file mode 100644 index 0000000..70cca6c --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat @@ -0,0 +1,238 @@ +@echo off + +rem =========================================================================== +rem RHQ Storage Node (Cassandra) Windows Startup Script +rem +rem This file is used to install, start, stop and remove the RHQ Storage Node +rem (cassandra) Windows Service for the Windows platform. The RHQ Storage node +rem is actually wrapped by the Java Service Wrapper (JSW) and it is the JSW that +rem is the actual executable that is registered as the Windows Service. +rem +rem This script is customizable by setting the following environment variables: +rem + +rem RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug +rem messages. If unset or "false", debug is turned off. +rem +rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem RHQ_STORAGE_HOME - Defines where the Storage Node's home install directory +rem is. If not defined, it will be assumed to be +rem %RHQ_SERVER_HOME%\rhq-storage. +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. If this and +rem RHQ_SERVER_JAVA_EXE_FILE_PATH are not set, JAVA_HOME +rem will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, RHQ_SERVER_JAVA_HOME +rem is ignored. If this is not set, then +rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe is used. +rem +rem RHQ_STORAGE_INSTANCE_NAME - The name of the Windows Service; it must +rem conform to the Windows Service naming conventions. By +rem default, this is the name "rhqstorage-%COMPUTERNAME%" +rem +rem RHQ_STORAGE_WRAPPER_LOG_DIR_PATH - The full path to the location where +rem the wrapper log file will go. +rem +rem RHQ_STORAGE_RUN_AS - if defined, then when the Windows Service is +rem installed, the value is the domain\username of the +rem user that the Windows Service will run as. It is +rem important to also set RHQ_STORAGE_PASSWORD for the +rem current user account. +rem +rem RHQ_STORAGE_RUN_AS_ME - if defined, then when the Windows Service is +rem installed, the domain\username of the user that the Windows +rem Service will run as will be the current user (.\%USERNAME%). +rem This takes precedence over RHQ_STORAGE_RUN_AS. It is +rem important to also set RHQ_STORAGE_PASSWORD for the +rem current user account. +rem +rem Note that you cannot define custom Java VM parameters or command line +rem arguments to pass to Cassandra. If you wish to pass in specific arguments, +rem modify the rhq-storage-wrapper.conf file. +rem +rem This script does not use the built-in cassandra.bat. +rem =========================================================================== + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_STORAGE_DEBUG%" == "false" ( + set RHQ_STORAGE_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\..\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_STORAGE_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_STORAGE_HOME ( + set RHQ_STORAGE_HOME=%RHQ_SERVER_HOME%\rhq-storage +) +set RHQ_STORAGE_BIN_DIR_PATH=%RHQ_STORAGE_HOME%\bin + +if not exist %RHQ_STORAGE_BIN_DIR_PATH% ( + echo Cannot find the RHQ_STORAGE bin directory: %RHQ_STORAGE_BIN_DIR_PATH% + exit /B 1 +) + +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_HOME: %RHQ_STORAGE_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available + +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME ( + if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% + ) +) +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe +) + +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + + +rem ---------------------------------------------------------------------- +rem Define the name used for the name of the Windows Service. +rem If this is not defined, the name of the computer is used. +rem ---------------------------------------------------------------------- + +if not defined RHQ_STORAGE_INSTANCE_NAME ( + set RHQ_STORAGE_INSTANCE_NAME=rhqstorage-%COMPUTERNAME% +) +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_INSTANCE_NAME: %RHQ_STORAGE_INSTANCE_NAME% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper directory. +rem ---------------------------------------------------------------------- + +set RHQ_STORAGE_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\..\wrapper +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_DIR_PATH: %RHQ_STORAGE_WRAPPER_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem The Windows OS platform name is also the wrapper subdirectory name. +rem ---------------------------------------------------------------------- + +set RHQ_STORAGE_OS_PLATFORM=windows-x86_32 +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_OS_PLATFORM: %RHQ_STORAGE_OS_PLATFORM% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper executable that this script will run. +rem ---------------------------------------------------------------------- + +set RHQ_STORAGE_WRAPPER_EXE_FILE_PATH=%RHQ_STORAGE_WRAPPER_DIR_PATH%\%RHQ_STORAGE_OS_PLATFORM%\wrapper.exe +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_EXE_FILE_PATH: %RHQ_STORAGE_WRAPPER_EXE_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Determine the Storage wrapper configuration file. +rem ---------------------------------------------------------------------- + +set RHQ_STORAGE_WRAPPER_CONF_FILE_PATH=%RHQ_STORAGE_WRAPPER_DIR_PATH%\rhq-storage-wrapper.conf +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_CONF_FILE_PATH: %RHQ_STORAGE_WRAPPER_CONF_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Create and configure the wrapper log directory. +rem ---------------------------------------------------------------------- + +if not defined RHQ_STORAGE_WRAPPER_LOG_DIR_PATH ( + set RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs +) +if not exist "%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" ( + mkdir "%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" +) + +if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_LOG_DIR_PATH: %RHQ_STORAGE_WRAPPER_LOG_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem Determine what to do and do it. +rem ---------------------------------------------------------------------- + +rem Determine if there should be debug VM options passed into it. +rem For some reason, this can't go inside another if statement. +if defined RHQ_STORAGE_DEBUG set _DEBUG_OPTS=wrapper.debug=true + +rem Determine what user the Windows Service will run as. +if defined RHQ_STORAGE_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_STORAGE_RUN_AS%" +if defined RHQ_STORAGE_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%" +rem This service is typically installed by rhqctl, so assume we don't want to prompt +if not defined RHQ_STORAGE_PASSWORD_PROMPT set RHQ_STORAGE_PASSWORD_PROMPT=false + +if /i "%1"=="console" ( + rem START STORAGE NODE + start "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_STORAGE_HOME=%RHQ_STORAGE_HOME%" "set.RHQ_STORAGE_INSTANCE_NAME=%RHQ_STORAGE_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_STORAGE_OS_PLATFORM=%RHQ_STORAGE_OS_PLATFORM%" "set.RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="install" ( + "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_STORAGE_HOME=%RHQ_STORAGE_HOME%" "set.RHQ_STORAGE_INSTANCE_NAME=%RHQ_STORAGE_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_STORAGE_OS_PLATFORM=%RHQ_STORAGE_OS_PLATFORM%" "set.RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="start" ( + rem START STORAGE NODE + "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="stop" ( + "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="remove" ( + "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="status" ( + "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" + goto done +) + +echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console } +goto :done + + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat index 7f43cf9..8ccc2d3 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat @@ -1,159 +1,3 @@ @echo off - -rem =========================================================================== -rem RHQ Server Windows Install Script -rem -rem This file is used to complete the installation of the RHQ Server on a -rem Windows platform. -rem -rem This script is customizable by setting the following environment variables: -rem -rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug -rem messages. -rem If not set or set to "false", debug is turned off. -rem -rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. -rem If not defined, it will be assumed to be the parent -rem directory of the directory where this script lives. -rem -rem -rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will -rem use. This will be ignored if -rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -rem not set, the Server's embedded JRE will be used. -rem -rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -rem executable to use. If this is set, -rem RHQ_SERVER_JAVA_HOME is ignored. -rem If this is not set, then -rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe -rem is used. If this and -rem RHQ_SERVER_JAVA_HOME are not set, the -rem Server's embedded JRE will be used. -rem -rem RHQ_SERVER_INSTALLER_JAVA_OPTS - Java VM command line options to be -rem passed into the Java VM. If this is not defined -rem this script will pass in a default set of options. -rem If you only want to add options to the defaults, -rem then you will want to use -rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS instead. -rem -rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command -rem line options to be passed into the VM. -rem This is added to -rem RHQ_SERVER_INSTALLER_JAVA_OPTS; it -rem is mainly used to augment the -rem default set of options. This can be -rem left unset if it is not needed. -rem -rem If the embedded JRE is to be used but is not available, the fallback -rem JRE to be used will be determined by the JAVA_HOME environment variable. -rem =========================================================================== - -setlocal - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_SERVER_DEBUG%" == "false" ( - set RHQ_SERVER_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Server home. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_BIN_DIR_PATH=%~dp0 - -if not defined RHQ_SERVER_HOME ( - cd "%RHQ_SERVER_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_SERVER_HOME%" || ( - echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% - exit /B 1 - ) -) - -set RHQ_SERVER_HOME=%CD% - -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available. -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre -) - -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe - -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - -if not exist "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" ( - echo ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ instance - echo Missing %RHQ_SERVER_HOME%\jboss-modules.jar - exit /B 1 -) - -rem ---------------------------------------------------------------------- -rem Determine the logs directory -rem ---------------------------------------------------------------------- - -set _LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs - -rem ---------------------------------------------------------------------- -rem Prepare the VM command line options to be passed in -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_INSTALLER_JAVA_OPTS set RHQ_SERVER_INSTALLER_JAVA_OPTS=-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true - -rem Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS. -if defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=DEBUG -if not defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=INFO -set RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=%RHQ_SERVER_HOME%\bin\rhq-server.properties -Drhq.server.installer.logdir=%RHQ_SERVER_HOME%\logs -Drhq.server.installer.loglevel=%_RHQ_LOGLEVEL% - -rem Sample JPDA settings for remote socket debugging -rem set RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y - -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_JAVA_OPTS: %RHQ_SERVER_INSTALLER_JAVA_OPTS% -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS: %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% - -rem ---------------------------------------------------------------------- -rem We need to add our own modules to the core set of JBossAS modules. -rem ---------------------------------------------------------------------- -set _RHQ_MODULES_PATH=%RHQ_SERVER_HOME%\modules -set _INTERNAL_MODULES_PATH=%RHQ_SERVER_HOME%\jbossas\modules -set _JBOSS_MODULEPATH=%_RHQ_MODULES_PATH%;%_INTERNAL_MODULES_PATH% -if defined RHQ_SERVER_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH% - -rem start the AS instance with our main installer module -"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" %RHQ_SERVER_INSTALLER_JAVA_OPTS% %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" -mp "%_JBOSS_MODULEPATH%" org.rhq.rhq-installer-util %* - -goto :done - -rem ---------------------------------------------------------------------- -rem CALL subroutine that prepares to use the embedded JRE -rem ---------------------------------------------------------------------- - -:prepare_embedded_jre -set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre -if defined RHQ_SERVER_DEBUG echo Using the embedded JRE -if not exist "%RHQ_SERVER_JAVA_HOME%" ( - if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% -) -goto :eof - -rem ---------------------------------------------------------------------- -rem CALL subroutine that exits this script normally -rem ---------------------------------------------------------------------- - -:done -endlocal +echo This script is obsolete and no longer used. Use rhqctl instead. +exit /B 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh index fb73810..548e1b6 100755 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh @@ -1,241 +1,3 @@ #!/bin/sh - -# ============================================================================= -# RHQ Server UNIX Install Script -# -# This file is used to complete the installation of the RHQ Server on a -# UNIX platform. -# -# This script is customizable by setting the following environment variables: -# -# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug -# messages. If this is not defined or set to "false" -# debug messages are not emitted. -# -# RHQ_SERVER_HOME - Defines where the server's home install directory is. -# If not defined, it will be assumed to be the parent -# directory of the directory where this script lives. -# -# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will -# host RHQ. If this is set, it overrides any -# JBOSS_HOME that might be set. If this not -# set, JBOSS_HOME is used as a fallback. If -# neither is set, it is assumed the AS bundled -# under RHQ_SERVER_HOME/jbossas is to be used. -# -# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will -# use. This will be ignored if -# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -# not set, the Server's embedded JRE will be used. -# -# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -# executable to use. If this is set, -# RHQ_SERVER_JAVA_HOME is ignored. -# If this is not set, then -# $RHQ_SERVER_JAVA_HOME/bin/java -# is used. If this and -# RHQ_SERVER_JAVA_HOME are not set, the -# Server's embedded JRE will be used. -# -# RHQ_SERVER_INSTALLER_JAVA_OPTS - Java VM command line options to be -# passed into the Java VM. If this is not defined -# this script will pass in a default set of options. -# If you only want to add options to the defaults, -# then you will want to use -# RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS instead. -# -# RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command -# line options to be passed into the VM. -# This is added to -# RHQ_SERVER_INSTALLER_JAVA_OPTS; it -# is mainly used to augment the -# default set of options. This can be -# left unset if it is not needed. -# -# If the embedded JRE is to be used but is not available, the fallback -# JRE to be used will be determined by the JAVA_HOME environment variable. -# ============================================================================= - -debug_msg () -{ - # if debug variable is set, it is assumed to be on, unless its value is false - if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then - echo $1 - fi -} - -# ---------------------------------------------------------------------- -# Determine what specific platform we are running on. -# Set some platform-specific variables. -# ---------------------------------------------------------------------- - -case "`uname`" in - CYGWIN*) _CYGWIN=true - ;; - Linux*) _LINUX=true - ;; - Darwin*) _DARWIN=true - ;; - SunOS*) _SOLARIS=true - ;; - AIX*) _AIX=true - ;; -esac - -# only certain platforms support the -e argument for readlink -if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then - _READLINK_ARG="-e" -fi - -# ---------------------------------------------------------------------- -# Determine the RHQ Server installation directory. -# If RHQ_SERVER_HOME is not defined, we will assume we are running -# directly from the server installation's bin directory. -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_HOME" ]; then - _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` - RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/.. -else - if [ ! -d "$RHQ_SERVER_HOME" ]; then - echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" - echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - exit 1 - fi -fi - -cd "$RHQ_SERVER_HOME" -RHQ_SERVER_HOME=`pwd` - -debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - -# ---------------------------------------------------------------------- -# Determine what JBossAS instance to use. -# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will -# assume we are to run the embedded AS instance from the RHQ -# installation directory - RHQ_SERVER_HOME/jbossas -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then - if [ -z "$JBOSS_HOME" ]; then - RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" - else - if [ ! -d "$JBOSS_HOME" ]; then - echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" - echo "JBOSS_HOME: $JBOSS_HOME" - exit 1 - fi - RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" - fi -else - if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" - echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - exit 1 - fi -fi - -cd "$RHQ_SERVER_JBOSS_HOME" -RHQ_SERVER_JBOSS_HOME=`pwd` - -debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - -if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance" - echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" - exit 1 -fi - -# we want the rest of this script to be able to assume cwd is the RHQ install dir -cd "$RHQ_SERVER_HOME" - -# ---------------------------------------------------------------------- -# if we are on a Mac and JAVA_HOME is not set, then set it to /usr -# as this is the default location. -# ---------------------------------------------------------------------- - -if [ -z "$JAVA_HOME" ]; then - if [ -n "$_DARWIN" ]; then - debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" - JAVA_HOME=/usr - fi -fi - -# ---------------------------------------------------------------------- -# Create the logs directory -# ---------------------------------------------------------------------- - -_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" -if [ -n "$_CYGWIN" ]; then - _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` -fi -if [ ! -d "${_LOG_DIR_PATH}" ]; then - mkdir "${_LOG_DIR_PATH}" -fi - -# ---------------------------------------------------------------------- -# Find the Java executable and verify we have a VM available -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then - RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" - if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then - debug_msg "Using the embedded JRE" - else - debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" - RHQ_SERVER_JAVA_HOME="$JAVA_HOME" - fi - fi - debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" - RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" -fi -debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" - -if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - echo "There is no JVM available." - echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." - exit 1 -fi - -# ---------------------------------------------------------------------- -# Prepare the VM command line options to be passed in -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_INSTALLER_JAVA_OPTS" ]; then - RHQ_SERVER_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true" -fi - -# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS. -if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then - _RHQ_LOGLEVEL="DEBUG" -else - _RHQ_LOGLEVEL="INFO" -fi - -RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Di18nlog.logger-type=commons -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.server.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.server.installer.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}" - -# Sample JPDA settings for remote socket debugging -#RHQ_SERVER_INSTALLER_JAVA_OPTS="${RHQ_SERVER_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" - -debug_msg "RHQ_SERVER_INSTALLER_JAVA_OPTS: $RHQ_SERVER_INSTALLER_JAVA_OPTS" -debug_msg "RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS" - -# ---------------------------------------------------------------------- -# We need to add our own modules to the core set of JBossAS modules. -# ---------------------------------------------------------------------- -_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" -_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" -if [ -n "$_CYGWIN" ]; then - _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` - _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` -fi -_JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" -debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH" - -# start the AS instance with our main installer module -"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_SERVER_INSTALLER_JAVA_OPTS} ${RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-installer-util "$@" - -_EXIT_STATUS=$? -exit $_EXIT_STATUS +echo "This script is obsolete and no longer used. Use rhqctl instead." +exit 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat index 7f56679..8ccc2d3 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat @@ -1,2 +1,3 @@ -cd %~dp0 -rhq-server.bat console +@echo off +echo This script is obsolete and no longer used. Use rhqctl instead. +exit /B 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat index cfdc8ea..8ccc2d3 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat @@ -1,218 +1,3 @@ @echo off - -rem =========================================================================== -rem RHQ Server Windows Startup Script -rem -rem This file is used to install, start, stop and remove the RHQ Server Windows -rem Service for the Windows platform. It can also be used to start the -rem RHQ Server in a console window. The RHQ Server is actually wrapped -rem by the Java Service Wrapper (JSW) and it is the JSW that is the actual -rem executable that is registered as the Windows Service. -rem -rem This script is customizable by setting the following environment variables: -rem -rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug -rem messages. -rem If not set or set to "false", debug is turned off. -rem -rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. -rem If not defined, it will be assumed to be the parent -rem directory of the directory where this script lives. -rem -rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will -rem use. This will be ignored if -rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -rem not set, JAVA_HOME will be used. -rem -rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -rem executable to use. If this is set, -rem RHQ_SERVER_JAVA_HOME is ignored. -rem If this is not set, then -rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe -rem is used. -rem -rem RHQ_SERVER_INSTANCE_NAME - The name of the Windows Service; it must -rem conform to the Windows Service naming -rem conventions. By default, this is the -rem name "rhqserver-%COMPUTERNAME%" -rem -rem RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The full path to the location where -rem the wrapper log file will go. -rem -rem RHQ_SERVER_RUN_AS - if defined, then when the Windows Service is -rem installed, the value is the domain\username of the -rem user that the Windows Service will run as. It is -rem important to also set RHQ_SERVER_PASSWORD for the -rem current user account. -rem -rem RHQ_SERVER_RUN_AS_ME - if defined, then when the Windows Service is -rem installed, the domain\username of the user that the Windows -rem Service will run as will be the current user (.\%USERNAME%). -rem This takes precedence over RHQ_SERVER_RUN_AS. It is -rem important to also set RHQ_SERVER_PASSWORD for the -rem current user account. -rem -rem Note that you cannot define custom Java VM parameters or command line -rem arguments to pass to the RHQ Server standalone.sh. If you wish to pass in -rem specific arguments, modify the rhq-server-wrapper.conf file. -rem -rem This script does not use the built-in JBossAS run.bat. -rem =========================================================================== - -setlocal - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_SERVER_DEBUG%" == "false" ( - set RHQ_SERVER_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Server home. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_BIN_DIR_PATH=%~dp0 - -if not defined RHQ_SERVER_HOME ( - cd "%RHQ_SERVER_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_SERVER_HOME%" || ( - echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% - exit /B 1 - ) -) - -set RHQ_SERVER_HOME=%CD% - -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - if not defined RHQ_SERVER_JAVA_HOME ( - if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% - ) -) -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe -) - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - -rem ---------------------------------------------------------------------- -rem Define the name used for the name of the Windows Service. -rem If this is not defined, the name of the computer is used. -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_INSTANCE_NAME ( - set RHQ_SERVER_INSTANCE_NAME=rhqserver-%COMPUTERNAME% -) -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTANCE_NAME: %RHQ_SERVER_INSTANCE_NAME% - -rem ---------------------------------------------------------------------- -rem Determine the wrapper directory. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\wrapper -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_DIR_PATH: %RHQ_SERVER_WRAPPER_DIR_PATH% - -rem ---------------------------------------------------------------------- -rem The Windows OS platform name is also the wrapper subdirectory name. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_OS_PLATFORM=windows-x86_32 -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_OS_PLATFORM: %RHQ_SERVER_OS_PLATFORM% - -rem ---------------------------------------------------------------------- -rem Determine the wrapper executable that this script will run. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_WRAPPER_EXE_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\%RHQ_SERVER_OS_PLATFORM%\wrapper.exe -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_EXE_FILE_PATH: %RHQ_SERVER_WRAPPER_EXE_FILE_PATH% - -rem ---------------------------------------------------------------------- -rem Determine the Server wrapper configuration file. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_WRAPPER_CONF_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\rhq-server-wrapper.conf -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_CONF_FILE_PATH: %RHQ_SERVER_WRAPPER_CONF_FILE_PATH% - -rem ---------------------------------------------------------------------- -rem Create and configure the wrapper log directory. -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_WRAPPER_LOG_DIR_PATH ( - set RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs -) -if not exist "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" ( - mkdir "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" -) - -if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_LOG_DIR_PATH: %RHQ_SERVER_WRAPPER_LOG_DIR_PATH% - -rem ---------------------------------------------------------------------- -rem Determine what to do and do it. -rem ---------------------------------------------------------------------- - -rem Determine if there should be debug VM options passed into it. -rem For some reason, this can't go inside another if statement. -if defined RHQ_SERVER_DEBUG set _DEBUG_OPTS=wrapper.debug=true - -rem Determine what user the Windows Service will run as. -if defined RHQ_SERVER_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_SERVER_RUN_AS%" -if defined RHQ_SERVER_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%" -rem This service is typically installed by rhqctl, so assume we don't want to prompt -if not defined RHQ_SERVER_PASSWORD_PROMPT set RHQ_SERVER_PASSWORD_PROMPT=false - -if /i "%1"=="console" ( - rem START SERVER - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% - goto done -) - -if /i "%1"=="install" ( - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% - goto done -) - -if /i "%1"=="start" ( - rem START SERVER - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="stop" ( - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="remove" ( - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="status" ( - "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" - goto done -) - -echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console } -goto :done - - -rem ---------------------------------------------------------------------- -rem CALL subroutine that exits this script normally -rem ---------------------------------------------------------------------- - -:done -endlocal +echo This script is obsolete and no longer used. Use rhqctl instead. +exit /B 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy deleted file mode 100644 index 8860b47..0000000 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy +++ /dev/null @@ -1,10 +0,0 @@ -// We need the SecurityManager installed to enable sandboxing of CLI scripts -// but we don't define any other security measures on the RHQ server itself. -// -// Granting all permissions allows us to run the RHQ server as if no security -// manager was in place (which is assumed by default by JBoss AS) but be able -// to use it when we need it for our own purposes. - -grant { - permission java.security.AllPermission; -}; diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh index 385997f..548e1b6 100755 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh @@ -1,622 +1,3 @@ #!/bin/sh - -# chkconfig: 2345 92 26 -# description: Starts and stops the RHQ Server -# -# processname: java - -# ============================================================================= -# RHQ Server UNIX Startup Script -# -# This file is used to execute the RHQ Server on a UNIX platform as part of -# the platform's bootup sequence or as a foreground console process. -# Run this script without any command line options for the syntax help. -# -# This script is customizable by setting the following environment variables: -# -# Note that if this script is to be used as an init.d script, you must set -# RHQ_SERVER_HOME so this script knows where to find the Server installation. -# -# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug -# messages. If this is not defined or set to "false" -# debug messages are not emitted. -# -# RHQ_SERVER_HOME - Defines where the server's home install directory is. -# If not defined, it will be assumed to be the parent -# directory of the directory where this script lives. -# -# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will -# host RHQ. If this is set, it overrides any -# JBOSS_HOME that might be set. If this not -# set, JBOSS_HOME is used as a fallback. If -# neither is set, it is assumed the AS bundled -# under RHQ_SERVER_HOME/jbossas is to be used. -# -# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will -# use. This will be ignored if -# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -# not set, JAVA_HOME will be used. -# -# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -# executable to use. If this is set, -# RHQ_SERVER_JAVA_HOME is ignored. -# If this is not set, then -# $RHQ_SERVER_JAVA_HOME/bin/java -# is used. -# -# RHQ_SERVER_JAVA_OPTS - Java VM command line options to be -# passed into the Server's VM. If this is not defined -# this script will pass in a default set of options. -# If this is set, it completely overrides the -# Server's defaults. If you only want to add options -# to the Server's defaults, then you will want to -# use RHQ_SERVER_ADDITIONAL_JAVA_OPTS instead. -# -# RHQ_SERVER_ADDITIONAL_JAVA_OPTS - additional Java VM command line options -# to be passed into the Server's VM. This -# is added to RHQ_SERVER_JAVA_OPTS; it -# is mainly used to augment the Server's -# default set of options. This can be -# left unset if it is not needed. -# -# RHQ_SERVER_CMDLINE_OPTS - If this is defined, these are the command line -# arguments that will be passed to the RHQ Server -# JBossAS standalone.sh. If you only want to add -# options to the Server's defaults, then you will -# want to use RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS -# instead. -# -# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS - additional command line arguments to -# be passed to the RHQ Server JBossAS -# standalone.sh. This is added to -# RHQ_SERVER_CMDLINE_OPTS; it is mainly -# used to augment the Server's default -# set of options. This can be left unset -# if it is not needed. -# -# RHQ_SERVER_PIDFILE_DIR - a full path to a writable directory where this -# script can write its pidfile to. -# If not defined, this defaults to the Server's -# bin directory. -# -# RHQ_SERVER_STOP_DELAY - the number of minutes to wait for the server to go -# down after sending the TERM signal. Defaults to -# 5 minutes. -# -# RHQ_SERVER_KILL_AFTER_STOP_DELAY - If this is defined, the server will be -# killed if it is still running after the -# RHQ_SERVER_STOP_DELAY. If this is not -# defined or set to "false" the script -# will exit with error code 127. -# -# -# -# If the embedded JRE is to be used but is not available, the fallback -# JRE to be used will be determined by the JAVA_HOME environment variable. -# -# This script calls standalone.sh when starting the underlying JBossAS server. -# ============================================================================= - -# ---------------------------------------------------------------------- -# Environment variables that can customize the launch of the RHQ Server. -# ---------------------------------------------------------------------- - -# RHQ_SERVER_HOME=/path/to/server/home -# RHQ_SERVER_DEBUG=true -# JAVA_HOME=/path/to/java/installation -# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable -# RHQ_SERVER_JAVA_OPTS=VM options -# RHQ_SERVER_ADDITIONAL_JAVA_OPTS=additional VM options -# RHQ_SERVER_CMDLINE_OPTS=standalone.sh options -# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS=additional standalone.sh options -# RHQ_SERVER_STOP_DELAY=5 -# RHQ_SERVER_KILL_AFTER_STOP_DELAY=false - -# ---------------------------------------------------------------------- -# Environment variables to set in order to enable remote debugging. -# ---------------------------------------------------------------------- - -#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n" - -# Enable JProfiler -#JPROFILER_HOME="/opt/jprofiler6" -#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="$RHQ_SERVER_ADDITIONAL_JAVA_OPTS -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:$JPROFILER_HOME/bin/agent.jar" -#export PATH="$PATH:$JPROFILER_HOME/bin" -#export LD_LIBRARY_PATH="$JPROFILER_HOME/bin/linux-x64" - -# ---------------------------------------------------------------------- -# Dumps a message iff debug mode is enabled -# ---------------------------------------------------------------------- - -debug_msg () -{ - # if debug variable is set, it is assumed to be on, unless its value is false - if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then - echo $1 - fi -} - -# ---------------------------------------------------------------------- -# Sets _SERVER_STATUS, _SERVER_RUNNING and _SERVER_PID based on the -# status of the RHQ Server VM start script (standalone.sh). -# Also sets _JVM_STATUS, _JVM_RUNNING and _JVM_PID based on the -# status of the JBossAS Java Virtual Machine. -# ---------------------------------------------------------------------- - -check_status () -{ - if [ -f "$_SERVER_PIDFILE" ]; then - _SERVER_PID=`cat "$_SERVER_PIDFILE"` - if [ -n "$_SERVER_PID" ] && kill -0 $_SERVER_PID 2>/dev/null ; then - _SERVER_STATUS=`printf "%-30s (pid %-7s) IS %s" "RHQ Server" $_SERVER_PID $1` - _SERVER_RUNNING=1 - else - _SERVER_STATUS=`printf "%-30s (pid %-7s) IS NOT running" "RHQ Server" $_SERVER_PID` - _SERVER_RUNNING=0 - fi - else - _SERVER_STATUS=`printf "%-30s (no pid file) IS NOT running" "RHQ Server"` - _SERVER_RUNNING=0 - fi - - if [ -f "$_JVM_PIDFILE" ]; then - _JVM_PID=`cat "$_JVM_PIDFILE"` - if [ -n "$_JVM_PID" ] && kill -0 $_JVM_PID 2>/dev/null ; then - _JVM_STATUS=`printf "%-30s (pid %-7s) IS %s" "JBossAS Java VM child process" $_SERVER_PID $1` - _JVM_RUNNING=1 - else - _JVM_STATUS=`printf "%-30s (pid %-7s) IS NOT running" "JBossAS Java VM child process" $_SERVER_PID` - _JVM_RUNNING=0 - fi - else - _JVM_STATUS=`printf "%-30s (no pid file) IS NOT running" "JBossAS Java VM child process"` - _JVM_RUNNING=0 - fi -} - -# ---------------------------------------------------------------------- -# Ensures that the PID files no longer exist -# ---------------------------------------------------------------------- - -remove_pid_files () -{ - if [ -f "$_SERVER_PIDFILE" ]; then - rm -f "$_SERVER_PIDFILE" - fi - if [ -f "$_JVM_PIDFILE" ]; then - rm -f "$_JVM_PIDFILE" - fi -} - -# ---------------------------------------------------------------------- -# Unset any lingering JBossAS environment variables that were set in -# the user's environment. This might happen if the user has an external -# JBossAS installed and configured but doesn't want RHQ to use it. -# ---------------------------------------------------------------------- -unset_jboss_as_env () -{ - unset JBOSS_HOME - unset RUN_CONF - unset JAVAC_JAR - unset JBOSS_CLASSPATH - unset JBOSS_BASE_DIR - unset JBOSS_LOG_DIR - unset JBOSS_CONFIG_DIR -} - -# ---------------------------------------------------------------------- -# Kill RHQ Server -# ---------------------------------------------------------------------- - -kill_rhq_server () -{ - echo "Trying to kill the RHQ Server..." - - echo "RHQ Server parent process (pid=${_SERVER_PID}) is being killed..." - while [ "$_SERVER_RUNNING" = "1" ]; do - kill -9 $_SERVER_PID - sleep 2 - check_status "killing..." - done - - echo "Java Virtual Machine child process (pid=${_JVM_PID}) is being killed..." - while [ "$_JVM_RUNNING" = "1" ]; do - kill -9 $_JVM_PID - sleep 2 - check_status "killing..." - done - - remove_pid_files - echo "RHQ Server has been killed." -} - -# ---------------------------------------------------------------------- -# Determine what specific platform we are running on. -# Set some platform-specific variables. -# ---------------------------------------------------------------------- - -case "`uname`" in - CYGWIN*) _CYGWIN=true - ;; - Linux*) _LINUX=true - ;; - Darwin*) _DARWIN=true - ;; - SunOS*) _SOLARIS=true - ;; - AIX*) _AIX=true - ;; -esac - -# only certain platforms support the -e argument for readlink -if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then - _READLINK_ARG="-e" -fi - -# ---------------------------------------------------------------------- -# Determine the RHQ Server installation directory. -# If RHQ_SERVER_HOME is not defined, we will assume we are running -# directly from the server installation's bin directory. -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_HOME" ]; then - _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` - RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/.. -else - if [ ! -d "$RHQ_SERVER_HOME" ]; then - echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" - echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - exit 1 - fi -fi - -cd "$RHQ_SERVER_HOME" -RHQ_SERVER_HOME=`pwd` - -debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - -# ---------------------------------------------------------------------- -# Determine what JBossAS instance to use. -# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will -# assume we are to run the embedded AS instance from the RHQ -# installation directory - RHQ_SERVER_HOME/jbossas -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then - if [ -z "$JBOSS_HOME" ]; then - RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" - # Unset any lingering JBossAS environment variables that we don't want. - # These could be in the user's environment for an external AS install. - unset_jboss_as_env - else - if [ ! -d "$JBOSS_HOME" ]; then - echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" - echo "JBOSS_HOME: $JBOSS_HOME" - exit 1 - fi - RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" - fi -else - if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" - echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - exit 1 - fi - unset_jboss_as_env -fi - -cd "$RHQ_SERVER_JBOSS_HOME" -RHQ_SERVER_JBOSS_HOME=`pwd` - -debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - - -if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid RHQ Server" - echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" - exit 1 -fi - -# ---------------------------------------------------------------------- -# if we are on a Mac and JAVA_HOME is not set, then set it to /usr -# as this is the default location. -# ---------------------------------------------------------------------- -if [ -z "$JAVA_HOME" ]; then - if [ -n "$_DARWIN" ]; then - debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" - JAVA_HOME=/usr - fi -fi - -# ---------------------------------------------------------------------- -# create the logs directory -# ---------------------------------------------------------------------- - -_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" -if [ -n "$_CYGWIN" ]; then - _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` -fi -if [ ! -d "${_LOG_DIR_PATH}" ]; then - mkdir "${_LOG_DIR_PATH}" -fi - -# ---------------------------------------------------------------------- -# Find the Java executable and verify we have a VM available -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then - debug_msg "No JRE found - will try to use JAVA_HOME: $JAVA_HOME" - RHQ_SERVER_JAVA_HOME="$JAVA_HOME" - fi - debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" - RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" -fi -debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" - -if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - echo "There is no JVM available." - echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." - exit 1 -fi - -# standalone.sh will use JAVA as the full java command -JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH" -export JAVA - -# ---------------------------------------------------------------------- -# Prepare the VM command line options to be passed in -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then - RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" -fi - -if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then - _JBOSS_DEBUG_LOGGING="-Djboss.boot.server.log.level=DEBUG -Djboss.boot.server.log.console.level=DEBUG" -else - _JBOSS_DEBUG_LOGGING= -fi - -# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_JAVA_OPTS. -# Note that the double equals for the policy file specification IS INTENTIONAL -_HTTP_COMPRESSION="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on -Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html" -RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS} -Drhq.server.home=${RHQ_SERVER_HOME} -Djboss.server.log.dir=${_LOG_DIR_PATH} -Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.server.default.config=standalone-full.xml -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager -Djava.security.policy==${RHQ_SERVER_HOME}/bin/rhq-server.security-policy ${_HTTP_COMPRESSION} ${_JBOSS_DEBUG_LOGGING}" - -debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS" -debug_msg "RHQ_SERVER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" - -# standalone.sh wants the options to be in the JAVA_OPTS variable -JAVA_OPTS="$RHQ_SERVER_JAVA_OPTS $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" -export JAVA_OPTS - -# ---------------------------------------------------------------------- -# Prepare the command line arguments passed to the RHQ Server JBossAS -# standalone.sh script -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then - _PROPS_FILE_PATH="${RHQ_SERVER_HOME}/bin/rhq-server.properties" - - # convert paths if we are on Windows - if [ -n "$_CYGWIN" ]; then - _PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"` - fi - - RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}" -fi - -debug_msg "RHQ_SERVER_CMDLINE_OPTS: $RHQ_SERVER_CMDLINE_OPTS" -debug_msg "RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS: $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" - -# JBoss may parse its command line args such that later options of a -# certain type may override earlier options of that same type, so make sure the -# additional opts are added after the base opts, since we want the additional -# opts to take precedence -_CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" - -# ---------------------------------------------------------------------- -# We need to add our own modules to the core set of JBossAS modules. -# JBOSS_MODULEPATH tells standalone.sh what to use. -# ---------------------------------------------------------------------- -_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" -_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" -if [ -n "$_CYGWIN" ]; then - _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` - _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` -fi -JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" -export JBOSS_MODULEPATH -debug_msg "JBOSS_MODULEPATH: $JBOSS_MODULEPATH" - -# ---------------------------------------------------------------------- -# Now find the JBossAS standalone.sh script -# ---------------------------------------------------------------------- - -_JBOSS_RUN_SCRIPT="${RHQ_SERVER_JBOSS_HOME}/bin/standalone.sh" - -if [ ! -f "$_JBOSS_RUN_SCRIPT" ]; then - echo "ERROR! Cannot find the JBossAS run script" - echo "Not found: $_JBOSS_RUN_SCRIPT" - exit 1 -fi -debug_msg "_JBOSS_RUN_SCRIPT: $_JBOSS_RUN_SCRIPT" - -# ---------------------------------------------------------------------- -# Define where we want to write the pidfiles - let user override the dir -# Note that we actually have two pidfiles - one is for the script -# that starts the JBossAS Java virtual machine and the second is the -# actual server's Java virtual machine process itself. -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_PIDFILE_DIR" ]; then - RHQ_SERVER_PIDFILE_DIR="${RHQ_SERVER_HOME}/bin" -fi -mkdir -p "$RHQ_SERVER_PIDFILE_DIR" - -_SERVER_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-server.pid" -_JVM_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-jvm.pid" - -# ---------------------------------------------------------------------- -# Execute the command that the user wants us to do -# ---------------------------------------------------------------------- - -check_status "running" - -case "$1" in -'console') - if [ "$_SERVER_RUNNING" = "1" ]; then - echo "$_SERVER_STATUS" - exit 0 - fi - - echo "Starting RHQ Server in console..." - - # we are running in foreground, make both pids show the same process - echo "$$" > "$_SERVER_PIDFILE" - echo "$$" > "$_JVM_PIDFILE" - - # START SERVER - # first, make sure its working directory is the JBossAS bin directory - cd "${RHQ_SERVER_JBOSS_HOME}/bin" - "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS - - _JBOSS_STATUS=$? - - remove_pid_files - - exit $_JBOSS_STATUS - ;; - -'start') - if [ "$_SERVER_RUNNING" = "1" ]; then - echo "$_SERVER_STATUS" - exit 0 - fi - - echo "Trying to start the RHQ Server..." - - LAUNCH_JBOSS_IN_BACKGROUND=true - JBOSS_PIDFILE="$_JVM_PIDFILE" - export LAUNCH_JBOSS_IN_BACKGROUND - export JBOSS_PIDFILE - - # START SERVER - # first, make sure its working directory is the JBossAS bin directory - cd "${RHQ_SERVER_JBOSS_HOME}/bin" - if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then - "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS & - else - "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS > /dev/null 2>&1 & - fi - - echo "$!" > "$_SERVER_PIDFILE" - - sleep 5 - check_status "starting" - echo "$_SERVER_STATUS" - - if [ "$_SERVER_RUNNING" = "1" ]; then - exit 0 - else - echo "Failed to start - make sure the RHQ Server is fully configured properly" - exit 1 - fi - ;; - -'stop') - if [ "$_SERVER_RUNNING" = "0" ]; then - echo "$_SERVER_STATUS" - remove_pid_files - exit 0 - fi - - echo "Trying to stop the RHQ Server..." - - echo "RHQ Server (pid=${_SERVER_PID}) is stopping..." - - kill -TERM $_SERVER_PID - - if [ -z "$RHQ_SERVER_STOP_DELAY" ]; then - # RHQ_SERVER_STOP_DELAY is not set - RHQ_SERVER_STOP_DELAY=5 - fi - case $RHQ_SERVER_STOP_DELAY in - ''|*[!0-9]*) - echo "RHQ_SERVER_STOP_DELAY is not a number (value=${RHQ_SERVER_STOP_DELAY})" - echo "Applying default value (5 minutes)" - RHQ_SERVER_STOP_DELAY=5 - ;; - *) ;; - esac - if [ $RHQ_SERVER_STOP_DELAY -le 0 ]; then - echo "RHQ_SERVER_STOP_DELAY is less than or equal to zero (value=${RHQ_SERVER_STOP_DELAY})" - echo "Applying default value (5 minutes)" - RHQ_SERVER_STOP_DELAY=5 - fi - waited_seconds=0 - max_wait_seconds=$(expr $RHQ_SERVER_STOP_DELAY \* 60) - while [ "$_SERVER_RUNNING" -eq "1" ] && [ $waited_seconds -lt $max_wait_seconds ]; do - sleep 2s - waited_seconds=$(expr $waited_seconds + 2) - check_status "stopping..." - done - - if [ "$_SERVER_RUNNING" = "0" ]; then - remove_pid_files - echo "RHQ Server has stopped." - exit 0 - fi - - debug_msg "RHQ Server did not stop within $RHQ_SERVER_STOP_DELAY minutes." - echo "Timed out waiting for RHQ Server to stop." - kill -QUIT $_SERVER_PID # Generate thread dump for later investigation - - if [ -n "$RHQ_SERVER_KILL_AFTER_STOP_DELAY" ] && [ "$RHQ_SERVER_KILL_AFTER_STOP_DELAY" != "false" ]; then - kill_rhq_server - exit 0 - else - echo "Failed to stop RHQ Server" - exit 127 - fi - ;; - -'kill') - if [ "$_SERVER_RUNNING" = "0" ]; then - echo "$_SERVER_STATUS" - fi - if [ "$_JVM_RUNNING" = "0" ]; then - echo "$_JVM_STATUS" - remove_pid_files - exit 0 - fi - - kill_rhq_server - exit 0 - ;; - -'clean') - if [ "$_SERVER_RUNNING" = "1" ]; then - echo "$_SERVER_STATUS" - echo "Please shutdown the server before cleaning." - exit 0 - fi - - echo "Cleaning data, tmp and log directories..." - rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/data" - rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/tmp" - rm -rf "${RHQ_SERVER_HOME}/logs" - ;; - -'status') - echo "$_SERVER_STATUS" - echo "$_JVM_STATUS" - exit 0 - ;; - -*) - echo "Usage: $0 { start | stop | kill | status | console | clean }" - exit 1 - ;; -esac +echo "This script is obsolete and no longer used. Use rhqctl instead." +exit 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.bat index 43ccd3b..8ccc2d3 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.bat +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.bat @@ -1,202 +1,3 @@ @echo off - -rem ============================================================================= -rem RHQ Storage Installer Script -rem -rem This file is used to complete the installation of the RHQ storage Server on a -rem Windows platform. -rem -rem This script is customizable by setting the following environment variables: -rem -rem RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug -rem messages. If this is not defined or set to "false" -rem debug messages are not emitted. -rem -rem RHQ_SERVER_HOME - Defines where the server's home install directory is. -rem If not defined, it will be assumed to be the parent -rem directory of the directory where this script lives. -rem -rem RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will -rem host RHQ. If this is set, it overrides any -rem JBOSS_HOME that might be set. If this not -rem set, JBOSS_HOME is used as a fallback. If -rem neither is set, it is assumed the AS bundled -rem under RHQ_SERVER_HOME\jbossas is to be used. -rem -rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will -rem use. This will be ignored if -rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -rem not set, JAVA_HOME will be used. -rem -rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -rem executable to use. If this is set, -rem RHQ_SERVER_JAVA_HOME is ignored. -rem If this is not set, then -rem $RHQ_SERVER_JAVA_HOME\bin\java -rem is used. -rem -rem RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be -rem passed into the Java VM. If this is not defined -rem this script will pass in a default set of options. -rem If you only want to add options to the defaults, -rem then you will want to use -rem RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead. -rem -rem RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command -rem line options to be passed into the VM. -rem This is added to RHQ_STORAGE_JAVA_OPTS; it -rem is mainly used to augment the -rem default set of options. This can be -rem left unset if it is not needed. -rem -rem ============================================================================= - -setlocal - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_STORAGE_DEBUG%" == "false" ( - set RHQ_STORAGE_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Server home. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_BIN_DIR_PATH=%~dp0 - -if not defined RHQ_SERVER_HOME ( - cd "%RHQ_SERVER_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_SERVER_HOME%" || ( - echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% - exit /B 1 - ) -) - -set RHQ_SERVER_HOME=%CD% - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% - -rem ---------------------------------------------------------------------- -rem Determine what JBossAS instance to use. -rem If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will -rem assume we are to run the embedded AS instance from the RHQ -rem installation directory - RHQ_SERVER_HOME\jbossas -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_JBOSS_HOME ( - if not defined JBOSS_HOME ( - set RHQ_SERVER_JBOSS_HOME=%RHQ_SERVER_HOME%\jbossas - ) else ( - if not exist "%JBOSS_HOME%" ( - echo ERROR! JBOSS_HOME is not pointing to a valid AS directory - echo JBOSS_HOME: "%JBOSS_HOME%" - exit /B 1 - ) - set RHQ_SERVER_JBOSS_HOME=%JBOSS_HOME% - ) -) else ( - cd %RHQ_SERVER_JBOSS_HOME% || ( - echo ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory - echo RHQ_SERVER_JBOSS_HOME: "%RHQ_SERVER_JBOSS_HOME%" - exit /B 1 - ) -) - -cd %RHQ_SERVER_JBOSS_HOME% -set RHQ_SERVER_JBOSS_HOME=%CD% - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JBOSS_HOME: %RHQ_SERVER_JBOSS_HOME% - - -if not exist "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" ( - echo ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance - echo Missing "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" - exit /B 1 -) - -rem we want the rest of this script to be able to assume cwd is the RHQ install dir -cd "%RHQ_SERVER_HOME%" - - -rem ---------------------------------------------------------------------- -rem Create the logs directory -rem ---------------------------------------------------------------------- - -set _LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs -if not exist "%_LOG_DIR_PATH%" ( - mkdir "%_LOG_DIR_PATH%" -) - - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - if not defined RHQ_SERVER_JAVA_HOME ( - if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% - ) -) -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe -) - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - - -rem ---------------------------------------------------------------------- -rem Prepare the VM command line options to be passed in -rem ---------------------------------------------------------------------- - -if not defined RHQ_STORAGE_INSTALLER_JAVA_OPTS ( - set RHQ_STORAGE_INSTALLER_JAVA_OPTS=-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -) - -rem Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS. -if defined RHQ_STORAGE_DEBUG ( - set _RHQ_LOGLEVEL=DEBUG -) else ( - set _RHQ_LOGLEVEL=INFO -) - - -rem debugging the logging level now for development/testing -set RHQ_STORAGE_INSTALLER_JAVA_OPTS=%RHQ_STORAGE_INSTALLER_JAVA_OPTS% -Djava.awt.headless=true -Drhq.server.properties-file=%RHQ_SERVER_HOME%\bin\rhq-server.properties -Drhq.storage.installer.logdir=%RHQ_SERVER_HOME%\logs -Drhq.storage.installer.loglevel=%_RHQ_LOGLEVEL% -Drhq.server.basedir=%RHQ_SERVER_HOME% - -rem Sample JPDA settings for remote socket debugging -rem set RHQ_STORAGE_INSTALLER_JAVA_OPTS=%RHQ_STORAGE_INSTALLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y - -if defined RHQ_STORAGE_DEBUG echo "RHQ_STORAGE_INSTALLER_JAVA_OPTS: %RHQ_STORAGE_INSTALLER_JAVA_OPTS%" -if defined RHQ_STORAGE_DEBUG echo "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: %RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS%" - - -rem ---------------------------------------------------------------------- -rem We need to add our own modules to the core set of JBossAS modules. -rem ---------------------------------------------------------------------- -set _RHQ_MODULES_PATH=%RHQ_SERVER_HOME%\modules -set _INTERNAL_MODULES_PATH=%RHQ_SERVER_JBOSS_HOME%\modules -set _JBOSS_MODULEPATH=%_RHQ_MODULES_PATH%;%_INTERNAL_MODULES_PATH% - -if defined RHQ_STORAGE_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH% - - -echo "Starting RHQ Storage Installer ..." - -rem start the AS instance with our main installer module - -"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" %RHQ_STORAGE_INSTALLER_JAVA_OPTS% %RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar "%RHQ_SERVER_JBOSS_HOME%\jboss-modules.jar" -mp "%_JBOSS_MODULEPATH%" org.rhq.rhq-cassandra-installer %* -if not errorlevel 1 goto done -exit /B %ERRORLEVEL% - -:done -endlocal +echo This script is obsolete and no longer used. Use rhqctl instead. +exit /B 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.sh index d7ddbdf..548e1b6 100755 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.sh +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage-installer.sh @@ -1,243 +1,3 @@ #!/bin/sh - -# ============================================================================= -# RHQ Storage Installer Script -# -# This file is used to complete the installation of the RHQ storage Server on a -# UNIX platform. -# -# This script is customizable by setting the following environment variables: -# -# RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug -# messages. If this is not defined or set to "false" -# debug messages are not emitted. -# -# RHQ_SERVER_HOME - Defines where the server's home install directory is. -# If not defined, it will be assumed to be the parent -# directory of the directory where this script lives. -# -# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will -# host RHQ. If this is set, it overrides any -# JBOSS_HOME that might be set. If this not -# set, JBOSS_HOME is used as a fallback. If -# neither is set, it is assumed the AS bundled -# under RHQ_SERVER_HOME/jbossas is to be used. -# -# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will -# use. This will be ignored if -# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. -# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are -# not set, the Server's embedded JRE will be used. -# -# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -# executable to use. If this is set, -# RHQ_SERVER_JAVA_HOME is ignored. -# If this is not set, then -# $RHQ_SERVER_JAVA_HOME/bin/java -# is used. If this and -# RHQ_SERVER_JAVA_HOME are not set, the -# Server's embedded JRE will be used. -# -# RHQ_STORAGE_INSTALLER_JAVA_OPTS - Java VM command line options to be -# passed into the Java VM. If this is not defined -# this script will pass in a default set of options. -# If you only want to add options to the defaults, -# then you will want to use -# RHQ_STORAGE_ADDITIONAL_JAVA_OPTS instead. -# -# RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command -# line options to be passed into the VM. -# This is added to RHQ_STORAGE_JAVA_OPTS; it -# is mainly used to augment the -# default set of options. This can be -# left unset if it is not needed. -# -# If the embedded JRE is to be used but is not available, the fallback -# JRE to be used will be determined by the JAVA_HOME environment variable. -# ============================================================================= - -debug_msg () -{ - # if debug variable is set, it is assumed to be on, unless its value is false - if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then - echo $1 - fi -} - -# ---------------------------------------------------------------------- -# Determine what specific platform we are running on. -# Set some platform-specific variables. -# ---------------------------------------------------------------------- - -case "`uname`" in - CYGWIN*) _CYGWIN=true - ;; - Linux*) _LINUX=true - ;; - Darwin*) _DARWIN=true - ;; - SunOS*) _SOLARIS=true - ;; - AIX*) _AIX=true - ;; -esac - -# only certain platforms support the -e argument for readlink -if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then - _READLINK_ARG="-e" -fi - -# ---------------------------------------------------------------------- -# Determine the RHQ Server installation directory. -# If RHQ_SERVER_HOME is not defined, we will assume we are running -# directly from the server installation's bin directory. -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_HOME" ]; then - _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` - RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/.. -else - if [ ! -d "$RHQ_SERVER_HOME" ]; then - echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" - echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - exit 1 - fi -fi - -cd "$RHQ_SERVER_HOME" -RHQ_SERVER_HOME=`pwd` - -debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" - -# ---------------------------------------------------------------------- -# Determine what JBossAS instance to use. -# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will -# assume we are to run the embedded AS instance from the RHQ -# installation directory - RHQ_SERVER_HOME/jbossas -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then - if [ -z "$JBOSS_HOME" ]; then - RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas" - else - if [ ! -d "$JBOSS_HOME" ]; then - echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory" - echo "JBOSS_HOME: $JBOSS_HOME" - exit 1 - fi - RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}" - fi -else - if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory" - echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - exit 1 - fi -fi - -cd "$RHQ_SERVER_JBOSS_HOME" -RHQ_SERVER_JBOSS_HOME=`pwd` - -debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME" - -if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then - echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS instance" - echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" - exit 1 -fi - -# we want the rest of this script to be able to assume cwd is the RHQ install dir -cd "$RHQ_SERVER_HOME" - -# ---------------------------------------------------------------------- -# if we are on a Mac and JAVA_HOME is not set, then set it to /usr -# as this is the default location. -# ---------------------------------------------------------------------- - -if [ -z "$JAVA_HOME" ]; then - if [ -n "$_DARWIN" ]; then - debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" - JAVA_HOME=/usr - fi -fi - -# ---------------------------------------------------------------------- -# Create the logs directory -# ---------------------------------------------------------------------- - -_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" -if [ -n "$_CYGWIN" ]; then - _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` -fi -if [ ! -d "${_LOG_DIR_PATH}" ]; then - mkdir "${_LOG_DIR_PATH}" -fi - -# ---------------------------------------------------------------------- -# Find the Java executable and verify we have a VM available -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then - RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" - if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then - debug_msg "Using the embedded JRE" - else - debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" - RHQ_SERVER_JAVA_HOME="$JAVA_HOME" - fi - fi - debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" - RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" -fi -debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" - -if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then - echo "There is no JVM available." - echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." - exit 1 -fi - -# ---------------------------------------------------------------------- -# Prepare the VM command line options to be passed in -# ---------------------------------------------------------------------- - -if [ -z "$RHQ_STORAGE_INSTALLER_JAVA_OPTS" ]; then - RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true" -fi - -# Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS. -if [ -n "$RHQ_STORAGE_DEBUG" ] && [ "$RHQ_STORAGE_DEBUG" != "false" ]; then - _RHQ_LOGLEVEL="DEBUG" -else - _RHQ_LOGLEVEL="INFO" -fi - -# debugging the logging level now for development/testing -RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Djava.awt.headless=true -Drhq.server.properties-file=${RHQ_SERVER_HOME}/bin/rhq-server.properties -Drhq.storage.installer.logdir=${RHQ_SERVER_HOME}/logs -Drhq.storage.installer.loglevel=${_RHQ_LOGLEVEL} -Drhq.server.basedir=${RHQ_SERVER_HOME}" - -# Sample JPDA settings for remote socket debugging -#RHQ_STORAGE_INSTALLER_JAVA_OPTS="${RHQ_STORAGE_INSTALLER_JAVA_OPTS} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" - -debug_msg "RHQ_STORAGE_INSTALLER_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_JAVA_OPTS" -debug_msg "RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS: $RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS" - -# ---------------------------------------------------------------------- -# We need to add our own modules to the core set of JBossAS modules. -# ---------------------------------------------------------------------- -_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules" -_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules" -if [ -n "$_CYGWIN" ]; then - _RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"` - _INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"` -fi -_JBOSS_MODULEPATH="${_RHQ_MODULES_PATH}:${_INTERNAL_MODULES_PATH}" -debug_msg "_JBOSS_MODULEPATH: $_JBOSS_MODULEPATH" - -echo "Starting RHQ Storage Installer ..." - -# start the AS instance with our main installer module -"$RHQ_SERVER_JAVA_EXE_FILE_PATH" ${RHQ_STORAGE_INSTALLER_JAVA_OPTS} ${RHQ_STORAGE_INSTALLER_ADDITIONAL_JAVA_OPTS} -jar "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" -mp "$_JBOSS_MODULEPATH" org.rhq.rhq-cassandra-installer "$@" - -_EXIT_STATUS=$? -exit $_EXIT_STATUS +echo "This script is obsolete and no longer used. Use rhqctl instead." +exit 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage.bat index 3201ae5..8ccc2d3 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage.bat +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-storage.bat @@ -1,238 +1,3 @@ @echo off - -rem =========================================================================== -rem RHQ Storage Node (Cassandra) Windows Startup Script -rem -rem This file is used to install, start, stop and remove the RHQ Storage Node -rem (cassandra) Windows Service for the Windows platform. The RHQ Storage node -rem is actually wrapped by the Java Service Wrapper (JSW) and it is the JSW that -rem is the actual executable that is registered as the Windows Service. -rem -rem This script is customizable by setting the following environment variables: -rem - -rem RHQ_STORAGE_DEBUG - If this is defined, the script will emit debug -rem messages. If unset or "false", debug is turned off. -rem -rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. -rem If not defined, it will be assumed to be the parent -rem directory of the directory where this script lives. -rem -rem RHQ_STORAGE_HOME - Defines where the Storage Node's home install directory -rem is. If not defined, it will be assumed to be -rem %RHQ_SERVER_HOME%\rhq-storage. -rem -rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will -rem use. This will be ignored if -rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. If this and -rem RHQ_SERVER_JAVA_EXE_FILE_PATH are not set, JAVA_HOME -rem will be used. -rem -rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java -rem executable to use. If this is set, RHQ_SERVER_JAVA_HOME -rem is ignored. If this is not set, then -rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe is used. -rem -rem RHQ_STORAGE_INSTANCE_NAME - The name of the Windows Service; it must -rem conform to the Windows Service naming conventions. By -rem default, this is the name "rhqstorage-%COMPUTERNAME%" -rem -rem RHQ_STORAGE_WRAPPER_LOG_DIR_PATH - The full path to the location where -rem the wrapper log file will go. -rem -rem RHQ_STORAGE_RUN_AS - if defined, then when the Windows Service is -rem installed, the value is the domain\username of the -rem user that the Windows Service will run as. It is -rem important to also set RHQ_STORAGE_PASSWORD for the -rem current user account. -rem -rem RHQ_STORAGE_RUN_AS_ME - if defined, then when the Windows Service is -rem installed, the domain\username of the user that the Windows -rem Service will run as will be the current user (.\%USERNAME%). -rem This takes precedence over RHQ_STORAGE_RUN_AS. It is -rem important to also set RHQ_STORAGE_PASSWORD for the -rem current user account. -rem -rem Note that you cannot define custom Java VM parameters or command line -rem arguments to pass to Cassandra. If you wish to pass in specific arguments, -rem modify the rhq-storage-wrapper.conf file. -rem -rem This script does not use the built-in cassandra.bat. -rem =========================================================================== - -setlocal - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_STORAGE_DEBUG%" == "false" ( - set RHQ_STORAGE_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Server home. -rem ---------------------------------------------------------------------- - -set RHQ_SERVER_BIN_DIR_PATH=%~dp0 - -if not defined RHQ_SERVER_HOME ( - cd "%RHQ_SERVER_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_SERVER_HOME%" || ( - echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% - exit /B 1 - ) -) - -set RHQ_SERVER_HOME=%CD% - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Server home. -rem ---------------------------------------------------------------------- - -set RHQ_STORAGE_BIN_DIR_PATH=%~dp0 - -if not defined RHQ_STORAGE_HOME ( - set RHQ_STORAGE_HOME=%RHQ_SERVER_HOME%\rhq-storage -) -set RHQ_STORAGE_BIN_DIR_PATH=%RHQ_STORAGE_HOME%\bin - -if not exist %RHQ_STORAGE_BIN_DIR_PATH% ( - echo Cannot find the RHQ_STORAGE bin directory: %RHQ_STORAGE_BIN_DIR_PATH% - exit /B 1 -) - -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_HOME: %RHQ_STORAGE_HOME% - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available - -rem ---------------------------------------------------------------------- - -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - if not defined RHQ_SERVER_JAVA_HOME ( - if defined RHQ_STORAGE_DEBUG echo No JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% - ) -) -if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( - set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe -) - -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% -if defined RHQ_STORAGE_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - - -rem ---------------------------------------------------------------------- -rem Define the name used for the name of the Windows Service. -rem If this is not defined, the name of the computer is used. -rem ---------------------------------------------------------------------- - -if not defined RHQ_STORAGE_INSTANCE_NAME ( - set RHQ_STORAGE_INSTANCE_NAME=rhqstorage-%COMPUTERNAME% -) -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_INSTANCE_NAME: %RHQ_STORAGE_INSTANCE_NAME% - -rem ---------------------------------------------------------------------- -rem Determine the wrapper directory. -rem ---------------------------------------------------------------------- - -set RHQ_STORAGE_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\wrapper -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_DIR_PATH: %RHQ_STORAGE_WRAPPER_DIR_PATH% - -rem ---------------------------------------------------------------------- -rem The Windows OS platform name is also the wrapper subdirectory name. -rem ---------------------------------------------------------------------- - -set RHQ_STORAGE_OS_PLATFORM=windows-x86_32 -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_OS_PLATFORM: %RHQ_STORAGE_OS_PLATFORM% - -rem ---------------------------------------------------------------------- -rem Determine the wrapper executable that this script will run. -rem ---------------------------------------------------------------------- - -set RHQ_STORAGE_WRAPPER_EXE_FILE_PATH=%RHQ_STORAGE_WRAPPER_DIR_PATH%\%RHQ_STORAGE_OS_PLATFORM%\wrapper.exe -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_EXE_FILE_PATH: %RHQ_STORAGE_WRAPPER_EXE_FILE_PATH% - -rem ---------------------------------------------------------------------- -rem Determine the Storage wrapper configuration file. -rem ---------------------------------------------------------------------- - -set RHQ_STORAGE_WRAPPER_CONF_FILE_PATH=%RHQ_STORAGE_WRAPPER_DIR_PATH%\rhq-storage-wrapper.conf -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_CONF_FILE_PATH: %RHQ_STORAGE_WRAPPER_CONF_FILE_PATH% - -rem ---------------------------------------------------------------------- -rem Create and configure the wrapper log directory. -rem ---------------------------------------------------------------------- - -if not defined RHQ_STORAGE_WRAPPER_LOG_DIR_PATH ( - set RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs -) -if not exist "%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" ( - mkdir "%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" -) - -if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_LOG_DIR_PATH: %RHQ_STORAGE_WRAPPER_LOG_DIR_PATH% - -rem ---------------------------------------------------------------------- -rem Determine what to do and do it. -rem ---------------------------------------------------------------------- - -rem Determine if there should be debug VM options passed into it. -rem For some reason, this can't go inside another if statement. -if defined RHQ_STORAGE_DEBUG set _DEBUG_OPTS=wrapper.debug=true - -rem Determine what user the Windows Service will run as. -if defined RHQ_STORAGE_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_STORAGE_RUN_AS%" -if defined RHQ_STORAGE_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%" -rem This service is typically installed by rhqctl, so assume we don't want to prompt -if not defined RHQ_STORAGE_PASSWORD_PROMPT set RHQ_STORAGE_PASSWORD_PROMPT=false - -if /i "%1"=="console" ( - rem START STORAGE NODE - start "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_STORAGE_HOME=%RHQ_STORAGE_HOME%" "set.RHQ_STORAGE_INSTANCE_NAME=%RHQ_STORAGE_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_STORAGE_OS_PLATFORM=%RHQ_STORAGE_OS_PLATFORM%" "set.RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% - goto done -) - -if /i "%1"=="install" ( - "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_STORAGE_HOME=%RHQ_STORAGE_HOME%" "set.RHQ_STORAGE_INSTANCE_NAME=%RHQ_STORAGE_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_STORAGE_OS_PLATFORM=%RHQ_STORAGE_OS_PLATFORM%" "set.RHQ_STORAGE_WRAPPER_LOG_DIR_PATH=%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% - goto done -) - -if /i "%1"=="start" ( - rem START STORAGE NODE - "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="stop" ( - "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="remove" ( - "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" - goto done -) - -if /i "%1"=="status" ( - "%RHQ_STORAGE_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_STORAGE_WRAPPER_CONF_FILE_PATH%" - goto done -) - -echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console } -goto :done - - -rem ---------------------------------------------------------------------- -rem CALL subroutine that exits this script normally -rem ---------------------------------------------------------------------- - -:done -endlocal +echo This script is obsolete and no longer used. Use rhqctl instead. +exit /B 1 diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl old mode 100644 new mode 100755 diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 6c2f6f9..8fdcc80 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -826,6 +826,7 @@ rhq.server.agent-update.nonstrict-version-check=true <target name="fix-perms"> <echo>Make sure shell scripts are readable and executable.</echo> <chmod dir="${project.build.outputDirectory}/bin" includes="*.sh,rhqctl" perm="ug+x" verbose="true" /> + <chmod dir="${project.build.outputDirectory}/bin/internal" includes="*.sh" perm="ug+x" verbose="true" /> <chmod dir="${jboss.home}/bin" includes="*.sh" perm="ug+x" verbose="true" /> </target> diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java index 5528619..b3e09a2 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java @@ -70,13 +70,13 @@ public abstract class ControlCommand { protected final Log log = LogFactory.getLog(getClass().getName()); private File basedir; - private File binDir; + private File binDir; // where the internal startup scripts are private PropertiesConfiguration rhqctlConfig; public ControlCommand() { basedir = new File(System.getProperty("rhq.server.basedir")); - binDir = new File(basedir, "bin"); + binDir = new File(basedir, "bin/internal"); File rhqctlPropertiesFile = getRhqCtlProperties(); try { @@ -249,7 +249,7 @@ public abstract class ControlCommand { if (isWindows()) { result = new org.apache.commons.exec.CommandLine("cmd.exe"); result.addArgument("/C"); - result.addArgument(scriptName + ".bat"); + result.addArgument(scriptName.replace('/', '\\') + ".bat"); } else { result = new org.apache.commons.exec.CommandLine("./" + (addShExt ? scriptName + ".sh" : scriptName)); @@ -264,7 +264,7 @@ public abstract class ControlCommand { protected String getScript(String scriptName) { if (isWindows()) { - return scriptName + ".bat"; + return scriptName.replace('/', '\\') + ".bat"; } return "./" + scriptName + ".sh"; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 5579af8..301c24f 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -340,7 +340,7 @@ public abstract class AbstractInstall extends ControlCommand { protected void stopServer(File serverBasedir) throws Exception { - File serverBinDir = new File(serverBasedir, "bin"); + File serverBinDir = new File(serverBasedir, "bin/internal"); if (!serverBinDir.exists()) { throw new IllegalArgumentException("No Server found for base directory [" + serverBasedir.getPath() + "]"); } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 3363291..f31636d 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -227,7 +227,7 @@ public class Upgrade extends AbstractInstall { } Executor executor = new DefaultExecutor(); - executor.setWorkingDirectory(getBinDir()); + executor.setWorkingDirectory(new File(getBaseDir(), "bin")); // data migrator script is not in bin/internal executor.setStreamHandler(new PumpStreamHandler()); int exitValue = executor.execute(commandLine); @@ -251,7 +251,8 @@ public class Upgrade extends AbstractInstall { // to not get a port conflict waitForProcessToStop(getStoragePid()); - org.apache.commons.exec.CommandLine commandLine = getCommandLine("rhq-storage-installer", "--upgrade", + org.apache.commons.exec.CommandLine commandLine = getCommandLine("rhq-storage-installer", + "--upgrade", getFromServerDir(rhqctlCommandLine).getAbsolutePath()); Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(getBinDir()); @@ -481,7 +482,7 @@ public class Upgrade extends AbstractInstall { copyReferredFile(commandLine, oldServerProps, "rhq.server.client.security.truststore.file"); // now merge the old settings in with the default properties from the new server install - String newServerPropsFilePath = new File(getBinDir(), "rhq-server.properties").getAbsolutePath(); + String newServerPropsFilePath = new File(getBaseDir(), "bin/rhq-server.properties").getAbsolutePath(); PropertiesFileUpdate newServerPropsFile = new PropertiesFileUpdate(newServerPropsFilePath); newServerPropsFile.update(oldServerProps); @@ -567,7 +568,14 @@ public class Upgrade extends AbstractInstall { throw new FileNotFoundException("Missing agent to upgrade: " + oldAgentDir.getAbsolutePath()); } } else { - oldAgentDir = getAgentBasedir(); + oldAgentDir = null; + File fromServerDir = getFromServerDir(rhqctlCommandLine); + if (fromServerDir != null && fromServerDir.isDirectory()) { + File fromServerDirParent = fromServerDir.getParentFile(); + if (fromServerDirParent != null && fromServerDirParent.isDirectory()) { + oldAgentDir = new File(fromServerDirParent, "rhq-agent"); + } + } if (!oldAgentDir.isDirectory()) { log.info("No agent found in the old server location... skipping agent upgrade"); return; @@ -691,6 +699,10 @@ public class Upgrade extends AbstractInstall { return new File(getFromServerDir(commandLine), "bin/rhqctl").exists(); } + protected boolean isRhq410OrLater(CommandLine commandLine) { + return new File(getFromServerDir(commandLine), "bin/internal").isDirectory(); + } + private void printDataMigrationNotice() { log.info("\n================\n" + "If this was an upgrade from older systems that did not have storage nodes,\n " commit 68bca808787fa95c8cca0c100ae6b113a07315b1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 19 16:35:07 2013 -0400 forgot to register the new storage system config props, adding... diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java index 70ad0e8..ef9360c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java @@ -113,11 +113,13 @@ public enum SystemSetting { /** * The STORAGE settings are all read-only and deal with shared, cluster-wide settings * among storage nodes. They are read-only because they should only be updated through - * the storage subsystem. + * the storage subsystem. The username and password should not be updated at all. */ STORAGE_CQL_PORT("STORAGE_CQL_PORT", PropertySimpleType.INTEGER, true, true), STORAGE_GOSSIP_PORT("STORAGE_GOSSIP_PORT", PropertySimpleType.INTEGER, true, true), STORAGE_AUTOMATIC_DEPLOYMENT("STORAGE_AUTOMATIC_DEPLOYMENT", PropertySimpleType.BOOLEAN, true, true), + STORAGE_USERNAME("STORAGE_USERNAME", PropertySimpleType.STRING, true, true), + STORAGE_PASSWORD("STORAGE_PASSWORD", PropertySimpleType.STRING, true, true), //these seem to be unused yet still present in the database... @Deprecated commit 553db312306ca9f49d27b5c9041d4a52d3bc59a2 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 19 11:53:14 2013 -0400 Bug 1006419 - Improve handling of obfuscated passwords for installation Use generated username/password for storage nodes. This removes the need for the user to generate a password and manually paste it into rhq-server.properties prior to an install. It also generates a username so that the username will not conflict with any rhq username, in anticipation of a chained authentication mechanism that can use rhq auth as a secondary login mechanism. This will be useful for support, for example, since the generated username/password will be internally used only. The generated username and encoded version of the password are now also stored as system config values in the database. This allows the installer to use the previously generated values for additional HA nodes. The username/password logic used in install is: IF set, use the values in the db system config ELSE IF pre-set, use the values in rhq-server.properties (primarily for dev builds) ELSE generate username/password and set in rhq-server.properties store values in db system config also: - removed username/password defaults from cassandra.properties (which should likely go away, or minimally not be used in rhq-container.build.xml. - added the new system config props to dbsetup and dbupgrade (2.141) - limit generated usernames to alpha chars to avoid invalid c* identifiers - remove logging of plain text storage password when creating superuser - remove use of plain text storage password in temporary task file when creating superuser (now decodes just prior to cql statement execution) - added ServerInstallUtil.fetchStorageClusterSettings() to fetch current storage settings in the db and updated persistStorageClusterSettingsIfNecessary() to include the new props. - added storage property constants to ServerProperties and started using the constants in place of string literals in various places. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties index f9bdc30..e44b3ac 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties @@ -7,10 +7,10 @@ rhq.cassandra.basedir=${rhq.rootDir} # The username with which to authenticate requests to Cassandra. -rhq.storage.username=rhqadmin +# rhq.storage.username= # The password with which to authenticate requests to Cassandra. -rhq.storage.password=1eeb2f255e832171df8592078de921bc +# rhq.storage.password= # Defines the number of tokens randomly assigned to a node on the ring. The more tokens, # relative to other nodes, the larger the proportion of data that this node will store. You diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java index fb9f127..778b8d5 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java @@ -40,6 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.cassandra.util.ClusterBuilder; +import org.rhq.core.util.obfuscation.PicketBoxObfuscator; /** * @author Stefan Negrea @@ -53,12 +54,7 @@ abstract class AbstractManager { private final Log log = LogFactory.getLog(AbstractManager.class); enum Query { - USER_EXISTS, - SCHEMA_EXISTS, - VERSION_COLUMNFAMILY_EXISTS, - VERSION, - REPLICATION_FACTOR, - INSERT_SCHEMA_VERSION; + USER_EXISTS, SCHEMA_EXISTS, VERSION_COLUMNFAMILY_EXISTS, VERSION, REPLICATION_FACTOR, INSERT_SCHEMA_VERSION; @Override public String toString() { @@ -295,7 +291,6 @@ abstract class AbstractManager { return execute(queryString); } - /** * Execute all the queries in an update file as returned by @link {@link UpdateFile#getOrderedSteps()}. * @@ -334,7 +329,13 @@ abstract class AbstractManager { log.info("Applying update file: " + updateFile); for (String step : updateFile.getOrderedSteps(properties)) { - log.info("Statement: \n" + step); + if (step.toUpperCase().contains("CREATE USER")) { + // the task file must not contain plain text passwords, so assume it needs to be decoded + step = replaceEncodedPassword(step); + log.debug("Statement: \n" + step); + } else { + log.info("Statement: \n" + step); + } results.add(execute(step)); } log.info("Applied update file: " + updateFile); @@ -342,6 +343,15 @@ abstract class AbstractManager { return results; } + private String replaceEncodedPassword(String step) { + int firstQuoteIndex = step.indexOf("'"); + int lastQuoteIndex = step.lastIndexOf("'"); + String encodedPassword = step.substring(++firstQuoteIndex, lastQuoteIndex); + String decodedPassword = PicketBoxObfuscator.decode(encodedPassword); + String decodedStep = step.replace(encodedPassword, decodedPassword); + return decodedStep; + } + /** * Execute a CQL query. * diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java index 9184af3..e71d12f 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import org.rhq.cassandra.schema.exception.InstalledSchemaTooAdvancedException; import org.rhq.cassandra.schema.exception.InstalledSchemaTooOldException; import org.rhq.cassandra.schema.exception.SchemaNotInstalledException; -import org.rhq.core.util.obfuscation.PicketBoxObfuscator; /** * @author Stefan Negrea @@ -107,7 +106,7 @@ class VersionManager extends AbstractManager { properties.put("replication_factor", calculateNewReplicationFactor() + ""); properties.put("cassandra_user_password", UUID.randomUUID() + ""); properties.put("rhq_admin_username", getUsername()); - properties.put("rhq_admin_password", PicketBoxObfuscator.decode(getPassword())); + properties.put("rhq_admin_password", getPassword()); /** * NOTE: Before applying any schema, we need to create the rhqadmin user. If we have more diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 086f15e..5c8da9b 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -17,7 +17,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.140</db.schema.version> + <db.schema.version>2.141</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index c6da7d2..671853f 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -143,11 +143,15 @@ PROPERTY_VALUE="true" DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="TRUE"/> -  +  <data ID="61" PROPERTY_KEY="STORAGE_CQL_PORT" FREAD_ONLY="TRUE"/> <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" FREAD_ONLY="TRUE"/> + + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" FREAD_ONLY="TRUE"/> + </table> </dbsetup> 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 e98c95e..94688f6 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2036,6 +2036,8 @@ </schema-directSQL> </schemaSpec> + + <schemaSpec version="2.133">  <schema-createSequence name="RHQ_STORAGE_NODE_ID_SEQ" initial="10001" /> @@ -2073,6 +2075,8 @@ </schema-directSQL> </schemaSpec> + + <schemaSpec version="2.134">  <schema-javaTask className="StorageNodeAddressUpgradeTask" /> @@ -2252,6 +2256,33 @@ </statement> </schema-directSQL> </schemaSpec> + + + + <schemaSpec version="2.141"> + <schema-directSQL> + <statement targetDBVendor="postgresql" desc="Adding storage username"> + INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only) + VALUES (63, 'STORAGE_USERNAME', null, null, true) + </statement> + <statement targetDBVendor="oracle" desc="Adding storage username"> + INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only) + VALUES (63, 'STORAGE_USERNAME', null, null, 1) + </statement> + </schema-directSQL> + + <schema-directSQL> + <statement targetDBVendor="postgresql" desc="Adding storage password"> + INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only) + VALUES (64, 'STORAGE_PASSWORD', null, null, true) + </statement> + <statement targetDBVendor="oracle" desc="Adding default storage password"> + INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only) + VALUES (64, 'STORAGE_PASSWORD', null, null, 1) + </statement> + </schema-directSQL> + </schemaSpec> + </dbupgrade> </target> </project> diff --git a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java index 4743548..2198f9e 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java @@ -119,9 +119,18 @@ public final class Obfuscator { return new String(decode); } - // adapted from http://stackoverflow.com/questions/2863852/how-to-generate-a-random-strin... + /** + * Adapted from http://stackoverflow.com/questions/2863852/how-to-generate-a-random-strin.... + * <p/> + * The default set of validCharacters: 1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ + * + * @param random + * @param validCharacters + * @param length + * @return + */ public static String generateString(Random random, String validCharacters, int length) { - validCharacters = (null == validCharacters || validCharacters.isEmpty()) ? "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#$" + validCharacters = (null == validCharacters || validCharacters.isEmpty()) ? "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" : validCharacters; length = (length < 1) ? 10 : length; diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index c76ba7b..6c2f6f9 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -21,9 +21,12 @@ <property name="default.rhq.server.drift.binary.content" value="false"/> + <property name="default.rhq.storage.username" value=""/> + <property name="default.rhq.storage.password" value=""/> + <property name="default.jboss.bind.address" value=""/> - <target name="set-predeploy-prop"> + <target name="set-predeploy-prop"> <condition property="predeploy" value="true"> <or> <equals arg1="${dev.profile.active}" arg2="true" /> @@ -46,6 +49,9 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> +  + <property name="rhq.storage.username" value="rhqadmin"/> + <property name="rhq.storage.password" value="1eeb2f255e832171df8592078de921bc"/>  <property name="jboss.bind.address" value="0.0.0.0"/> </target> @@ -64,6 +70,9 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> +  + <property name="rhq.storage.username" value="${default.rhq.storage.username}"/> + <property name="rhq.storage.password" value="${default.rhq.storage.password}"/>  <property name="jboss.bind.address" value="${default.jboss.bind.address}"/> </target> @@ -419,10 +428,10 @@ <target name="prepare-bin-dir"> <echo>*** Preparing bin dir ***</echo> - <loadproperties> - <zipentry zipfile="${settings.localRepository}/org/rhq/rhq-cassandra-ccm-core/${project.version}/rhq-cassandra-ccm-core-${project.version}.jar" + <loadproperties> + <zipentry zipfile="${settings.localRepository}/org/rhq/rhq-cassandra-ccm-core/${project.version}/rhq-cassandra-ccm-core-${project.version}.jar" name="cassandra.properties"/> - </loadproperties> + </loadproperties> <echo>Connection URL is ${rhq.server.database.connection-url}</echo> diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java index 7d3d4e0..04f5cff 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java @@ -228,7 +228,7 @@ public class Installer { } case 'e': { - // prompt for the password. we don't use a command line option because then the plain test password + // prompt for the password. we don't use a command line option because then the plain text password // could get captured in command history. Console console = System.console(); if (null != console) { @@ -262,13 +262,12 @@ public class Installer { } } - // if a password was asked to be obfuscated, that's all we do on the execution + // if a password was asked to be encoded, that's all we do on the execution if (passwordToEncode != null) { - String obfuscatedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(String + String encodedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(String .valueOf(passwordToEncode)); - LOG.info("*** Encoded password properties for rhq-server.properties:"); - LOG.info("*** rhq.server.database.password=" + obfuscatedPassword); - LOG.info("*** rhq.storage.password=" + obfuscatedPassword); + LOG.info("*** Encoded password for rhq-server.properties:"); + LOG.info("*** rhq.server.database.password=" + encodedPassword); return new WhatToDo[] { WhatToDo.DO_NOTHING }; } diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 906e4ea..4b42c53 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -265,7 +265,8 @@ public class InstallerServiceImpl implements InstallerService { // create an rhqadmin management user so when discovered, the AS7 plugin can immediately // connect to the RHQ Server. The password is generated as we try to make the RHQ server manageable by // the plugin without the user having to get involved. - String managementPassword = Obfuscator.generateString(new Random(), null, 8); + Random random = new Random(); + String managementPassword = Obfuscator.generateString(random, null, 8); ServerInstallUtil.createDefaultManagementUser(managementPassword, serverDetails, appServerConfigDir); // Doing this prior to prepareDatabase sets the property before they are validated and saved. @@ -275,6 +276,21 @@ public class InstallerServiceImpl implements InstallerService { String encodedManagementPassword = Obfuscator.encode(managementPassword); serverProperties.put(ServerProperties.PROP_MGMT_USER_PASSWORD, encodedManagementPassword); + // Similarly generate a storage username and password, and encode the password. If already set, don't + // override. This allows for canned values in a dev env, or user override in a prod env. + String storageUsername = serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME); + String storagePassword = serverProperties.get(ServerProperties.PROP_STORAGE_PASSWORD); + if (ServerInstallUtil.isEmpty(storageUsername)) { + // note, limit to alpha usernames to ensure we don't violate cassandra identifier rules + storageUsername = Obfuscator.generateString(random, "abcdefghijklmnopqrstuvwxyz", 8); + serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsername); + } + if (ServerInstallUtil.isEmpty(storagePassword)) { + storagePassword = Obfuscator.generateString(random, null, 8); + String encodedStoragePassword = PicketBoxObfuscator.encode(storagePassword); + serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, encodedStoragePassword); + } + prepareDatabase(serverProperties, serverDetails, existingSchemaOption); // perform stuff that has to get done via the JBossAS management client @@ -490,6 +506,19 @@ public class InstallerServiceImpl implements InstallerService { throw new Exception("Could not complete the database schema installation", e); } + // if the storage cluster credentials are already set (typically an HA install), override + // what's currently in the server properties file, and then continue with storage schema setup + Map<String, String> storageProperties = ServerInstallUtil.fetchStorageClusterSettings(serverProperties, + clearTextDbPassword); + String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME); + String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD); + if (null != storageUsernameSetting) { + serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting); + } + if (null != storagePasswordSetting) { + serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting); + } + SchemaManager storageNodeSchemaManager = null; try { storageNodeSchemaManager = createStorageNodeSchemaManager(serverProperties); @@ -1174,8 +1203,8 @@ public class InstallerServiceImpl implements InstallerService { } private List<StorageNode> parseNodeInformation(HashMap<String, String> serverProps) { - String[] nodes = serverProps.get("rhq.storage.nodes").split(","); - String cqlPort = serverProps.get("rhq.storage.cql-port"); + String[] nodes = serverProps.get(ServerProperties.PROP_STORAGE_NODES).split(","); + String cqlPort = serverProps.get(ServerProperties.PROP_STORAGE_CQL_PORT); List<StorageNode> parsedNodes = new ArrayList<StorageNode>(); for (String node : nodes) { @@ -1189,8 +1218,8 @@ public class InstallerServiceImpl implements InstallerService { } private SchemaManager createStorageNodeSchemaManager(HashMap<String, String> serverProps) { - String username = serverProps.get("rhq.storage.username"); - String password = serverProps.get("rhq.storage.password"); + String username = serverProps.get(ServerProperties.PROP_STORAGE_USERNAME); + String password = serverProps.get(ServerProperties.PROP_STORAGE_PASSWORD); List<StorageNode> storageNodes = this.parseNodeInformation(serverProps); String[] nodes = new String[storageNodes.size()]; diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java index 8b9ce6f..c01ef5c 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java @@ -977,6 +977,64 @@ public class ServerInstallUtil { } } + public static Map<String, String> fetchStorageClusterSettings(HashMap<String, String> serverProperties, + String password) throws Exception { + + Map<String, String> result = new HashMap<String, String>(4); + DatabaseType db = null; + Connection connection = null; + PreparedStatement statement = null; + + try { + String dbUrl = serverProperties.get(ServerProperties.PROP_DATABASE_CONNECTION_URL); + String userName = serverProperties.get(ServerProperties.PROP_DATABASE_USERNAME); + connection = getDatabaseConnection(dbUrl, userName, password); + db = DatabaseTypeFactory.getDatabaseType(connection); + + if (!(db instanceof PostgresqlDatabaseType || db instanceof OracleDatabaseType)) { + throw new IllegalArgumentException("Unknown database type, can't continue: " + db); + } + + connection = getDatabaseConnection(dbUrl, userName, password); + connection.setAutoCommit(false); + + statement = connection.prepareStatement("" // + + "SELECT property_key, property_value FROM rhq_system_config " // + + " WHERE property_key LIKE 'STORAGE%' " // + + " AND NOT property_value IS NULL "); + ResultSet rs = statement.executeQuery(); + + while (rs.next()) { + String key = rs.getString(1); + String value = rs.getString(2); + + if (key.equals("STORAGE_USERNAME")) { + result.put(ServerProperties.PROP_STORAGE_USERNAME, value); + } else if (key.equals("STORAGE_PASSWORD")) { + result.put(ServerProperties.PROP_STORAGE_PASSWORD, value); + } else if (key.equals("STORAGE_GOSSIP_PORT")) { + result.put(ServerProperties.PROP_STORAGE_GOSSIP_PORT, value); + } else if (key.equals("STORAGE_CQL_PORT")) { + result.put(ServerProperties.PROP_STORAGE_CQL_PORT, value); + } + } + + connection.commit(); + + } catch (SQLException e) { + LOG.error("Failed to fetch storage cluster settings. Transaction will be rolled back.", e); + connection.rollback(); + throw e; + } finally { + if (db != null) { + db.closeStatement(statement); + db.closeConnection(connection); + } + } + + return result; + } + public static void persistStorageClusterSettingsIfNecessary(HashMap<String, String> serverProperties, String password) throws Exception { DatabaseType db = null; @@ -1000,13 +1058,23 @@ public class ServerInstallUtil { + "SET property_value = ?, default_property_value = ? " + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL"); - updateClusterSetting.setString(1, serverProperties.get("rhq.storage.cql-port")); - updateClusterSetting.setString(2, serverProperties.get("rhq.storage.cql-port")); + updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME)); + updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME)); + updateClusterSetting.setString(3, "STORAGE_USERNAME"); + updateClusterSetting.executeUpdate(); + + updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_PASSWORD)); + updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_PASSWORD)); + updateClusterSetting.setString(3, "STORAGE_PASSWORD"); + updateClusterSetting.executeUpdate(); + + updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_CQL_PORT)); + updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_CQL_PORT)); updateClusterSetting.setString(3, "STORAGE_CQL_PORT"); updateClusterSetting.executeUpdate(); - updateClusterSetting.setString(1, serverProperties.get("rhq.storage.gossip-port")); - updateClusterSetting.setString(2, serverProperties.get("rhq.storage.gossip-port")); + updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_GOSSIP_PORT)); + updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_GOSSIP_PORT)); updateClusterSetting.setString(3, "STORAGE_GOSSIP_PORT"); updateClusterSetting.executeUpdate(); diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java index 6177830..6ac264d 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java @@ -118,6 +118,12 @@ public class ServerProperties { public static final String PROP_MGMT_USER_PASSWORD = "rhq.server.management.password"; + public static final String PROP_STORAGE_USERNAME = "rhq.storage.username"; + public static final String PROP_STORAGE_PASSWORD = "rhq.storage.password"; + public static final String PROP_STORAGE_NODES = "rhq.storage.nodes"; + public static final String PROP_STORAGE_CQL_PORT = "rhq.storage.cql-port"; + public static final String PROP_STORAGE_GOSSIP_PORT = "rhq.storage.gossip-port"; + // this list contains all the properties that are to have boolean values (true | false) public static final Set<String> BOOLEAN_PROPERTIES; static { @@ -147,6 +153,8 @@ public class ServerProperties { INTEGER_PROPERTIES.add(PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ); INTEGER_PROPERTIES.add(PROP_CONCURRENCY_LIMIT_WEBCONNS); INTEGER_PROPERTIES.add(PROP_AGENT_MULTICAST_DETECTOR_PORT); + INTEGER_PROPERTIES.add(PROP_STORAGE_CQL_PORT); + INTEGER_PROPERTIES.add(PROP_STORAGE_GOSSIP_PORT); } // this list contains all the properties that are to have non-empty string values commit 6ddd1d6dc0c21e20c69a4d516a0d85c030b73abb Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Sep 19 17:33:10 2013 +0200 Added new scripts to trigger RHQ On Demand jobs diff --git a/etc/scripts/rhq-api-check b/etc/scripts/rhq-api-check new file mode 100755 index 0000000..0005ad6 --- /dev/null +++ b/etc/scripts/rhq-api-check @@ -0,0 +1,4 @@ +#!/bin/bash + +rhq-trigger "rhq-api-check" "$@" + diff --git a/etc/scripts/rhq-probe b/etc/scripts/rhq-probe new file mode 100755 index 0000000..284fa44 --- /dev/null +++ b/etc/scripts/rhq-probe @@ -0,0 +1,4 @@ +#!/bin/bash + +rhq-trigger "rhq-probe" "$@" + diff --git a/etc/scripts/rhq-trigger b/etc/scripts/rhq-trigger new file mode 100755 index 0000000..d362b86 --- /dev/null +++ b/etc/scripts/rhq-trigger @@ -0,0 +1,36 @@ +#!/bin/bash + +JOB=$1 +if [ $# -eq 2 ]; then + BRANCH=$2 +else + BRANCH=`git rev-parse --abbrev-ref HEAD` + status=$? + if [ $status -ne 0 ]; then + echo "Not in a Git repository. You must provide a branch name" + exit 1 + fi +fi + +echo "Will trigger job '$JOB' for branch '$BRANCH'" + +URL="https://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/RHQ/view/RHQ%20On%2..." + +case "`uname`" in + CYGWIN*) + cygstart $URL + ;; + + Darwin*) + open $URL + ;; + + Linux) + xdg-open $URL > /dev/null 2>&1 + ;; + + *) + start '"browse"' "$URL" + ;; +esac + commit e3aa1e003b6d61bb42c4e6d48222c3d5d11ab5b6 Merge: a87c72d 3843704 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Sep 19 09:56:47 2013 -0400 Merge branch 'bug/1009666' commit a87c72d760acdf9f77849d2a094f3a81e9bbb257 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Sep 18 22:19:43 2013 -0400 fix storage installer upgrade bugs (only impact upgrading from RHQ 4.9) diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 30db17c..a2c04be 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -468,6 +468,15 @@ public class StorageInstaller { installerInfo.basedir = storageBasedir; installerInfo.logFile = new File(logDir, "rhq-storage.log"); + boolean isRHQ48Install; + if (cassandraEnvFile.exists()) { + isRHQ48Install = true; + installerInfo.jmxPort = parseJmxPortFromCassandrEnv(cassandraEnvFile); + } else { + isRHQ48Install = false; + installerInfo.jmxPort = parseJmxPort(new File(oldConfDir, "cassandra-jvm.properties")); + } + deploymentOptions.setBasedir(storageBasedir.getAbsolutePath()); deploymentOptions.setLogFileName(installerInfo.logFile.getPath()); deploymentOptions.setLoggingLevel("INFO"); @@ -484,9 +493,7 @@ public class StorageInstaller { deployer.applyConfigChanges(); deployer.updateFilePerms(); - if (cassandraEnvFile.exists()) { - // Then this is an RHQ 4.8 install - installerInfo.jmxPort = parseJmxPortFromCassandrEnv(cassandraEnvFile); + if (isRHQ48Install) { Properties jvmProps = new Properties(); jvmProps.load(new FileInputStream(cassandraJvmPropsFile)); PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate( @@ -494,8 +501,6 @@ public class StorageInstaller { jvmProps.setProperty("jmx_port", Integer.toString(installerInfo.jmxPort)); propertiesUpdater.update(jvmProps); - } else { - installerInfo.jmxPort = parseJmxPort(cassandraJvmPropsFile); } ConfigEditor oldYamlEditor = new ConfigEditor(oldYamlFile); diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 6b5d9d7..22cc4c4 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -141,6 +141,76 @@ public class StorageInstallerTest { assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); } + @Test(dependsOnMethods = "performDefaultInstall") + public void upgradeFromDefaultInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + File defaultInstallDir = new File(basedir.getParentFile(), "performDefaultInstall"); + File upgradeFromServerDir = new File(defaultInstallDir, "rhq-server"); + String[] args = {"--upgrade", upgradeFromServerDir.getAbsolutePath()}; + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + + int status = installer.run(cmdLine); + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful default upgrade"); + + String address = InetAddress.getLocalHost().getHostAddress(); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(address); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File baseDataDir = new File(defaultInstallDir, "rhq-data"); + + File commitLogDir = new File(baseDataDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(baseDataDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(baseDataDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + + File log4jFile = new File(confDir, "log4j-server.properties"); + assertTrue(log4jFile.exists(), log4jFile + " does not exist"); + + File logsDir = new File(serverDir, "logs"); + File logFile = new File(logsDir, "rhq-storage.log"); + + Properties log4jProps = new Properties(); + log4jProps.load(new FileInputStream(log4jFile)); + assertEquals(log4jProps.getProperty("log4j.appender.R.File"), logFile.getAbsolutePath(), + "The log file is wrong"); + + File yamlFile = new File(confDir, "cassandra.yaml"); + ConfigEditor yamlEditor = new ConfigEditor(yamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", + "Failed to set the internode_authenticator property in " + yamlFile); + assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", + "The authenticator property is wrong"); + assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + assertEquals(properties.getProperty("jmx_port"), "7299", "The jmx_port property is wrong"); + assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); + assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); + assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); + } + @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); commit 3843704e61a48c6162dca42861fb0c44a70b3f47 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Sep 18 20:37:47 2013 -0400 [BZ 1009666] Store plugin container init listeners in a list The PC initialization listeners were introduced to work around a deadlock issue with registering event pollers. The listeners are stored in a map in which entries are keyed off of the class name. The only class that adds listeners is EventContextImpl. This results in only every having one event poller registered after PC initialization regardless of the number of event pollers. Storing the listeners in a list resolves the issue. diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java index 4f6a9a1..d88ce53 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java @@ -24,10 +24,10 @@ package org.rhq.core.pc; import java.beans.Introspector; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashSet; -import java.util.Map; +import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; @@ -146,8 +146,8 @@ public class PluginContainer { // this is to prevent race conditions on startup between components from all the different managers private ReadWriteLock rwLock = new ReentrantReadWriteLock(); - private Map<String, InitializationListener> initListeners = new HashMap<String, InitializationListener>(); - private Map<String, ShutdownListener> shutdownListeners = new HashMap<String, ShutdownListener>(); + private List<InitializationListener> initListeners = new ArrayList<InitializationListener>(); + private List<ShutdownListener> shutdownListeners = new ArrayList<ShutdownListener>(); private Object initListenersLock = new Object(); private Object shutdownListenersLock = new Object(); private boolean shuttingDown; @@ -344,7 +344,7 @@ public class PluginContainer { synchronized (initListenersLock) { if (started) { - for (InitializationListener listener : initListeners.values()) { + for (InitializationListener listener : initListeners) { listener.initialized(); } } @@ -454,7 +454,7 @@ public class PluginContainer { synchronized (shutdownListenersLock) { if (!started) { - for (ShutdownListener listener : shutdownListeners.values()) { + for (ShutdownListener listener : shutdownListeners) { listener.shutdown(); } } @@ -741,13 +741,12 @@ public class PluginContainer { * Add the callback listener to notify when the plugin container is initialized. If this method is invoked and * the PC is already initialized, then <code>listener</code> will be invoked immediately. * - * @param name associated with the listener * @param listener The callback object to notify. If a listener with the supplied name is registered, it * will be replaced with the newly supplied listner. */ - public void addInitializationListener(String name, InitializationListener listener) { + public void addInitializationListener(InitializationListener listener) { synchronized (initListenersLock) { - initListeners.put(name, listener); + initListeners.add(listener); if (started) { listener.initialized(); @@ -760,13 +759,12 @@ public class PluginContainer { * {@link #addInitializationListener(String, InitializationListener)} the <code>listener</code> will * not be invoked immediately if the PC is already shutdown. It will only be invoked on future shutdowns. * - * @param name associated with the listener * @param listener The callback object to notify. If a listener with the supplied name is registered, it * will be replaced with the newly supplied listener. */ public void addShutdownListener(String name, ShutdownListener listener) { synchronized (shutdownListenersLock) { - shutdownListeners.put(name, listener); + shutdownListeners.add(listener); } } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java index fd360cf..52f270b 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java @@ -124,13 +124,12 @@ public class EventContextImpl implements EventContext { final int adjustedPollingInterval = Math.max(EventContext.MINIMUM_POLLING_INTERVAL, pollingInterval); // Registering the event poller has to be done in a callback listener to avoid a potential deadlock. // See https://bugzilla.redhat.com/show_bug.cgi?id=677349 for a detailed explaination. - PluginContainer.getInstance().addInitializationListener(this.getClass().getName(), - new PluginContainer.InitializationListener() { - @Override - public void initialized() { - getEventManager().registerEventPoller(poller, adjustedPollingInterval, resource, sourceLocation); - } - }); + PluginContainer.getInstance().addInitializationListener(new PluginContainer.InitializationListener() { + @Override + public void initialized() { + getEventManager().registerEventPoller(poller, adjustedPollingInterval, resource, sourceLocation); + } + }); } private void unregisterEventPollerInternal(String eventType, String sourceLocation) { commit 13344592ed5c88b300903390481fbacd531f6461 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Sep 18 14:57:57 2013 -0700 [BZ 1000175] - Cleanup from auto-refresh refactoring. Adjust initial date range back to proper value instead of last stored value. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 891fb9d..5a81ab3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -172,7 +172,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { } } - Log.debug("DateTimeSelection: " + dateTimeSelection + " = " + dateTimeOffset); return new Date(endDate.getTime() - dateTimeOffset); } @@ -236,7 +235,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { @Override public void onClick(ClickEvent clickEvent) { IButton button = (IButton) clickEvent.getSource(); - Log.debug("Button pressed for: " + button.getTitle()); } }; @@ -298,7 +296,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { saveButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent clickEvent) { - Log.debug("Saving Custom Date Range Window."); Date startTimeDate = (Date) startTimeItem.getValue(); Date endTimeDate = (Date) endTimeItem.getValue(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index b51592d..8870e58 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -73,6 +73,8 @@ public class MetricsResourceView extends AbstractD3GraphListView implements public void onInit() { super.onInit(); + updateTimeRangeToNow(); + final ResourceMetricAvailabilityView availabilityDetails = new ResourceMetricAvailabilityView(resource); availabilityDetails.hide(); commit 3507a4d2686f9fa04783a88417344510a1974200 Author: mtho11 <mikecthompson(a)gmail.com> Date: Wed Sep 18 12:50:24 2013 -0700 [BZ 1000175] After refactoring auto refresh out with previous fix now fixing proper refresh of expanded charts. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index d89ba19..451659b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -90,18 +90,21 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements if (isVisible() && !isRefreshing()) { isRefreshing = true; try { - Date now = new Date(); - AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs - .getMetricRangePreferences(); - long timeRange = metricRangePreferences.end - metricRangePreferences.begin; - Date newStartDate = new Date(now.getTime() - timeRange); - buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now); - buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(), now.getTime()); - + updateTimeRangeToNow(); refreshData(); } finally { isRefreshing = false; } } } + + protected void updateTimeRangeToNow() { + Date now = new Date(); + AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs + .getMetricRangePreferences(); + long timeRange = metricRangePreferences.end - metricRangePreferences.begin; + Date newStartDate = new Date(now.getTime() - timeRange); + buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now); + buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(), now.getTime()); + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 7e20007..b51592d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -121,6 +121,7 @@ public class MetricsResourceView extends AbstractD3GraphListView implements public void refreshData() { Log.debug("MetricResourceView.refreshData() for: " + resource.getName() + " id: " + resource.getId()); addAvailabilityGraph(); + metricsTableView.refresh(); } private void addAvailabilityGraph() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 436bdd9..f726e7e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -142,7 +142,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re * Redraw Graphs in this context means to refresh the table and redraw open graphs. */ public void refreshData() { - Log.debug("MetricsView.redrawGraphs."); + Log.debug("MetricsView.refreshData()"); new Timer() { @Override commit 647e7a088dfbf25edc51b5dc552ab42e2b258669 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Sep 18 14:49:05 2013 -0500 Move test dependencies that do not get build when test compilation is skipped to a special profile. (cherry picked from commit 464a64330230fc32803efdb452d14745c4cc9460) diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index b391ff5..d96fa92 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -43,20 +43,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-test-api</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-test-util</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -169,6 +155,40 @@ </build> <profiles> + + <profile> +  + <id>test.dependencies</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>!true</value> + </property> + </activation> + + <dependencies> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-test-api</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-test-util</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>dev</id> commit 464a64330230fc32803efdb452d14745c4cc9460 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Sep 18 14:43:21 2013 -0500 Move test dependencies that do not get build when test compilation is skipped to a special profile. diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index fd411a3..35cd506 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -43,20 +43,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-test-api</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-test-util</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -169,6 +155,40 @@ </build> <profiles> + + <profile> +  + <id>test.dependencies</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>!true</value> + </property> + </activation> + + <dependencies> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-test-api</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-test-util</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>dev</id> commit 7776a638d127c33781d37c63864a649ec50f730e Author: John Sanda <jsanda(a)redhat.com> Date: Wed Sep 18 15:29:04 2013 -0400 [BZ 1009640] close jdbc connections after executing native sql query diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java index 1dec51b..3504cdc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.server.measurement; +import java.sql.Connection; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -46,6 +47,7 @@ import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.NumericType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.util.collection.ArrayUtils; +import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; @@ -233,8 +235,10 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage @SuppressWarnings("unchecked") @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public List<Integer> getSchedulesWithoutBaselines() { + Connection connection = null; try { - DatabaseType databaseType = DatabaseTypeFactory.getDatabaseType(rhqDs.getConnection()); + connection = rhqDs.getConnection(); + DatabaseType databaseType = DatabaseTypeFactory.getDatabaseType(connection); final String sql = "SELECT s.id FROM rhq_measurement_sched s INNER JOIN rhq_measurement_def d ON s.definition = d.id " + "LEFT JOIN rhq_measurement_bline b ON s.id = b.schedule_id WHERE s.enabled = " + @@ -249,6 +253,8 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage } catch (Exception e) { throw new RuntimeException("An unexpected error occurred while trying to retrieve schedules without baselines", e); + } finally { + JDBCUtil.safeClose(connection); } } commit f9ea3f9ea47de8862f98d2bb097aaca1f51e78ff Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 18 13:38:10 2013 -0400 Fix incomplete merge. diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index a39feb0..6b5d9d7 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -283,6 +283,10 @@ public class StorageInstallerTest { } private void assertRhqServerPropsUpdated() { + assertRhqServerPropsUpdated("127.0.0.1"); + } + + private void assertRhqServerPropsUpdated(String address) { File serverPropsFile = new File(serverDir, "rhq-server.properties"); Properties properties = new Properties(); @@ -292,7 +296,7 @@ public class StorageInstallerTest { fail("Failed to verify that " + serverPropsFile + " was updated", e); } - assertEquals(properties.getProperty("rhq.storage.nodes"), "127.0.0.1"); + assertEquals(properties.getProperty("rhq.storage.nodes"), address); assertEquals(properties.getProperty("rhq.storage.cql-port"), "9142"); } commit 0558fe8fbaae9b83f5fe20029c01b52d38d3ee22 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 18 11:54:34 2013 -0400 Tagging RHQ_4_9_0_JON320ER1 diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 4aae357..3674957 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 434edad..b1ff4ce 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 86baa5a..372791d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index 5195e6e..22cb6f5 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index dc9fcac..d0adb3c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index b84d36c..a75a419 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 8640d5b..c21882b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index b817c60..a918ffb 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 1b8bc61..b591f20 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index fac3833..eec9ee0 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index c62a28f..03c94fe 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 800f5d1..7c1b099 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index d3baf3b..f0105e5 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 93f3805..a117365 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index ef791fb..faed67e 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 866f669..64a5c15 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d31a6ad..53774d6 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index f4b2afa..7156b1e 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 33e48b1..5aae91b 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 66df7dd..c0860b6 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index bbe0954..331c618 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index b560968..d2511a2 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index a06011c..9b5e022 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index ff8a21b..cfeeda3 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index f6dc761..39a8663 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index b59e15e..bdabb87 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 710a585..a08a329 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 86a3e7e..b8b46fd 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index adf5bd4..485f25b 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 2ed4c26..936a047 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index e03ac78..f6bd3af 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 97ed3ab..6ac8db4 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index b2c1184..3cfe4bf 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0820f4b..0393928 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index ecdde93..b16f720 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9765a55..23ec3fa 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2d97b0b..f1e1a55 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index c832b41..8440872 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c0554c6..0ec39ab 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 4d3b17e..bebac2a 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 f3e07b4..6eed60c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 1ea7d61..a336945 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index d418db5..598e198 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 57c01e8..a96ec07 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 b418671..d03b6b5 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 53a1556..1e1915a 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 0ab8d0e..72fb62a 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 22ee22b..01460f3 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 300e679..3a71c75 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 427c5fb..f39d539 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 49e0186..7b169f3 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 a087cb1..885d57c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index bbd87da..df1c225 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 4b4ba59..c971675 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index aac6e73..5a45579 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 4c47992..ee00c82 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 1e36d6c..ab22fab 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index e0c37f9..c6a7448 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 12215be..07b9d6a 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 1af4fa8..552bde1 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 0ee039c..6581d50 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index c9c0a03..8601cd3 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 7af6f9d..c08d66b 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4d8a07d..b4d132c 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 abc220d..39f192d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 20c07de..38c1ab7 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 471003a..491c189 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 2457b0d..1a88824 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 d620c92..8d1cc99 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 7e3cbe7..260e853 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 54dcd5b..845b4dc 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 317e61b..b8bc01f 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 36e246a..ee75f25 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 5551c92..92702de 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 6f7ac53..8d200ae 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8edfd9b..54966a7 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 32acda7..ba80047 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 02fd80d..ff6c92f 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 8689924..af4a49b 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 5833fee..21cc3b2 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7211f4c..0af7f7d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 13b66fe..44c9bd8 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index c86f705..242fc9f 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 6b28aa9..1778ba7 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 32d9a39..eb2adcd 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 a6cdea1..9da4863 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index bca927d..705d6a2 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 bb51ace..efebd31 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 713b1b4..0586656 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 0d39f8e..507c690 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index fc766fe..d199b9d 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 edf7c87..fbb58cd 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index e63e38e..dd14588 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index a7ed4cc..8637533 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 545b5db..bb70aa9 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 718c14c..70a74c4 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</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 fa787c5..9880d0f 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 84ef130..7f2ec30 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 0567602..ae3660f 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index df8b7ef..a1983d1 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index ca3d81f..405b7f5 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0b0c363..d55ca09 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 5e1f84c..54e477c 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 777f236..e74add2 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index ac50627..17f5019 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 7c5748d..a07c8b5 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index a7b8e47..a82c476 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 7c2d095..3c700ba 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0c23814..6cf68e0 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 71c5eca..26a9f7a 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 56452fb..0e0e0a0 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index e8ccb55..fd411a3 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index ddc9e9e..cf8b26a 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 5f332a0..1bfdc1e 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 2f42e79..9ce68bc 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index dd1d4a3..252ed1d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d252d6c..890da11 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a10b0f8..8314f9d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 0d0eefa..f92d27a 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index e0e3cdc..bfaf55c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b31fd66..8381c22 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index aaa9aa2..b29f670 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index a35e582..88e6bd8 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 725187f..6c0dcad 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 00d0bda..c8a724b 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 1c8fe0f..3dc5621 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 513f5b4..7e1a23c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 69b26bf..21e3dbe 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6e2414b..f79c768 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index ac3304d..237afa2 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index bab062b..0af9315 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 21102b3..647727c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index c45ff85..8f3fd25 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index a7df5f9..45cec0d 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 6f8216c..a7dc367 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6ac7fb2..664785d 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 766df02..8003a82 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 930f335..5d22e10 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index ba2069c..c10d157 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index bf6fe94..8fdcb18 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 0cc62a9..19c9151 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 4989446..ea3a238 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index a579f86..c9859d5 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 834091d..832ccce 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index b3fce75..6d1e513 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 1f52ac4..db2b7e7 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 539f1b9..dec591c 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index ee7b2fd..6c2fe96 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index 834b985..c9825a5 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index b9f2b39..af559e9 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index beb0dd1..5cd3f6b 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f9bd9b1..e0baad6 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 45d589a..51a9800 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.7.0.JON</version> + <version>4.9.0.JON320ER1</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 f46c475..d0019fb 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 678e67f..733c751 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 70e298a..bb020e6 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3407cad..54ec33f 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.7.0.JON</version> + <version>4.9.0.JON320ER1</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index b3d1503..351d973 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER1</version> <packaging>pom</packaging> <name>RHQ</name> commit fc543e0ba84f7b65cde863c227dae721131fc3a5 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 18 09:20:17 2013 -0400 [BZ 1008090] Set default thread stack size to 256k across the board Conflicts: modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java index 4c79543..7a3f207 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java @@ -35,21 +35,11 @@ public class DeploymentOptionsFactory { /** * @return A new {@link DeploymentOptions}. This method checks the platform arch * (32 bit vs 64 bit) and the JRE being used to determine if any particular defaults - * need to be set. For example, on 32 bit arches running on OpenJDK 6, Cassandra - * cannot use its default thread stack stack of 180k. It causes the JVM to segfault on - * start up. When this runtime environment is detected, the factory will set the - * appropriate system property so that a default thread stack of 240k is used. That - * can be overridden by calling {@link DeploymentOptions#setStackSize(String)}. + * need to be set. */ public DeploymentOptions newDeploymentOptions() { - String arch = System.getProperty("os.arch"); - String javaVMName = System.getProperty("java.vm.name"); - String javaVersion = System.getProperty("java.version"); - - if ((arch.equals("i386") || arch.equals("amd64") || arch.equals("i686")) && javaVMName.startsWith("OpenJDK")) { - System.setProperty("rhq.cassandra.stack.size", "240k"); - } - + // Make sure we have a high enough stack size. See https://bugzilla.redhat.com/show_bug.cgi?id=1008090 + System.setProperty("rhq.cassandra.stack.size", "256k"); return new DeploymentOptions(); } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties index ebadc27..f9bdc30 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties @@ -85,7 +85,7 @@ rhq.cassandra.max.heap.size=\${MAX_HEAP_SIZE} rhq.cassandra.heap.new.size=\${HEAP_NEWSIZE} # The JVM stack size for Cassandra. This value is passed directly to the -Xss option. -rhq.cassandra.stack.size=180k +rhq.cassandra.stack.size=256k # The log4j logging level to use. rhq.cassandra.logging.level=DEBUG diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index 2951eaa..5dacf36 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -15,7 +15,7 @@ heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" heap_dump_dir= -thread_stack_size=-Xss180k +thread_stack_size=-Xss256k # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 28992cb..a39feb0 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -11,6 +11,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; +import java.net.InetAddress; import java.util.Properties; import org.apache.commons.cli.CommandLine; @@ -73,6 +74,74 @@ public class StorageInstallerTest { } @Test + public void performDefaultInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {}); + + int status = installer.run(cmdLine); + + String address = InetAddress.getLocalHost().getHostAddress(); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful default install"); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(address); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File baseDataDir = new File(basedir, "rhq-data"); + + File commitLogDir = new File(baseDataDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(baseDataDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(baseDataDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + + File log4jFile = new File(confDir, "log4j-server.properties"); + assertTrue(log4jFile.exists(), log4jFile + " does not exist"); + + File logsDir = new File(serverDir, "logs"); + File logFile = new File(logsDir, "rhq-storage.log"); + + Properties log4jProps = new Properties(); + log4jProps.load(new FileInputStream(log4jFile)); + assertEquals(log4jProps.getProperty("log4j.appender.R.File"), logFile.getAbsolutePath(), + "The log file is wrong"); + + File yamlFile = new File(confDir, "cassandra.yaml"); + ConfigEditor yamlEditor = new ConfigEditor(yamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", + "Failed to set the internode_authenticator property in " + yamlFile); + assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", + "The authenticator property is wrong"); + assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + assertEquals(properties.getProperty("jmx_port"), "7299", "The jmx_port property is wrong"); + assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); + assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); + assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); + } + + @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); commit 728e7969ba2afcec80d3e0196528d8bcaf3a24e7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Sep 18 12:53:50 2013 +0200 [BZ 1009042] - make sure rss4j can access Xerces classes in the server. diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml index 80a648f..a6f5d90 100644 --- a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -50,6 +50,9 @@ <module name="org.codehaus.jackson.jackson-core-asl" export="true"/> <module name="org.codehaus.jackson.jackson-jaxrs" export="true"/> <module name="org.codehaus.jackson.jackson-mapper-asl" export="true"/> + +  + <module name="org.apache.xerces" export="true"/> </dependencies> </sub-deployment> commit 7fa1c742509e1aa365abd62f272a17e9edef7cbf Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Sep 12 13:06:14 2013 +0200 [BZ 998645] - Collect method invocation stats on AS7 EJBs. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java new file mode 100644 index 0000000..c1fdf42 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java @@ -0,0 +1,206 @@ +/* + * RHQ Management Platform + * Copyright (C) 2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.measurement.calltime.CallTimeData; +import org.rhq.core.domain.measurement.calltime.CallTimeDataValue; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; +import org.rhq.modules.plugins.jbossas7.json.Result; + +/** + * A specialization of the AS component for EJB3 runtime beans. This kind of beans can collect method invocation + * statistics which is what this class handles. + * + * @author Lukas Krejci + * @since 4.9 + */ +public class Ejb3BeanRuntimeComponent extends BaseComponent<ResourceComponent<?>> { + + private static final String METHODS_ATTRIBUTE = "methods"; + private static final int CALLTIME_METRIC_NAME_PREFIX_LENGTH = "__calltime:".length(); + + private static class StatsRecord implements Serializable { + private static final long serialVersionUID = 1L; + + long invocations; + long total; + } + + private static class Stats implements Serializable { + private static final long serialVersionUID = 1L; + + long collectionTime; + Map<String, StatsRecord> data; + + static Stats fromMap(Map<String, Map<String, Number>> map, String collectedMetric, long collectionTime) { + Stats ret = new Stats(); + ret.collectionTime = collectionTime; + ret.data = new HashMap<String, StatsRecord>(map.size()); + + for(Map.Entry<String, Map<String, Number>> entry : map.entrySet()) { + StatsRecord rec = new StatsRecord(); + String methodName = entry.getKey(); + + rec.invocations = entry.getValue().get("invocations").longValue(); + rec.total = entry.getValue().get(collectedMetric).longValue(); + + ret.data.put(methodName, rec); + } + + return ret; + } + } + + @Override + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + //we'll handling the rest of the metrics using the super method, but we may leave out some of the requests + //if we handle them here. Right now, just use the obtained set. We only create a copy of the (unmodifiable) set + //of requests if necessary. + Set<MeasurementScheduleRequest> metricsToPassDown = metrics; + + for(MeasurementScheduleRequest request : metrics) { + if (request.getDataType() == DataType.CALLTIME) { + //make a copy to pass down to super class if necessary + if (metricsToPassDown == metrics) { + metricsToPassDown = new HashSet<MeasurementScheduleRequest>(metrics); + } + + metricsToPassDown.remove(request); + + //handle this ourselves + //the name of the metric is actually the name of the stat collected for each method. we then provide + //the calltime data for each method. + + Result result = getASConnection().execute(new ReadAttribute(address, METHODS_ATTRIBUTE)); + Object value = result.getResult(); + if (value instanceof Map) { + String requestedMetric = request.getName().substring(CALLTIME_METRIC_NAME_PREFIX_LENGTH); + + @SuppressWarnings("unchecked") + Map<String, Map<String, Number>> allMethodStats = (Map<String, Map<String, Number>>) value; + + Stats lastCollection = getLastCallTimeCollection(requestedMetric, allMethodStats); + Stats thisCollection = Stats.fromMap(allMethodStats, requestedMetric, System.currentTimeMillis()); + + CallTimeData callTime = new CallTimeData(request); + + fillCallTimeData(callTime, requestedMetric, thisCollection, lastCollection); + + saveCallTimeCollection(requestedMetric, thisCollection); + + report.addData(callTime); + } else { + log.error("Unexpected type of results when querying method stats"); + } + } + } + + super.getValues(report, metricsToPassDown); + } + + private Stats getLastCallTimeCollection(String requestName, Map<String, Map<String, Number>> fallbackValues) throws IOException { + File dataFile = new File(context.getResourceDataDirectory(), requestName); + if (!dataFile.exists()) { + return Stats.fromMap(fallbackValues, requestName, System.currentTimeMillis()); + } else { + ObjectInputStream in = null; + try { + in = new ObjectInputStream(new FileInputStream(dataFile)); + + return (Stats) in.readObject(); + } catch (IOException e) { + throw new IOException("Couldn't read the stored calltime data from file " + dataFile + ".", e); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Couldn't find plugin API classes. This is serious!", e); + } finally { + StreamUtil.safeClose(in); + } + } + } + + private void saveCallTimeCollection(String requestName, Stats stats) throws IOException { + File dataFile = new File(context.getResourceDataDirectory(), requestName); + + ObjectOutputStream out = null; + try { + out = new ObjectOutputStream(new FileOutputStream(dataFile)); + out.writeObject(stats); + } catch (IOException e) { + throw new IOException("Couldn't write the last collected calltime data to file " + dataFile + ".", e); + } finally { + StreamUtil.safeClose(out); + } + } + + /** + * Given the current and previous stats collected from the AS, this fills in the provided calltime data record with + * the differential values from the last time to this time. + * + * @param callTimeData the calltime record to fill in + * @param requestName the name of the metric being collected + * @param stats the current stats collected from the AS + * @param previousStats the previously collected stats + */ + private void fillCallTimeData(CallTimeData callTimeData, String requestName, Stats stats, Stats previousStats) { + Date startDate = new Date(previousStats.collectionTime); + Date endDate = new Date(stats.collectionTime); + + for(Map.Entry<String, StatsRecord> entry : stats.data.entrySet()) { + String methodName = entry.getKey(); + StatsRecord thisStatsRecord = entry.getValue(); + + StatsRecord previousStatsRecord = previousStats.data.get(methodName); + + long invocations = thisStatsRecord.invocations - previousStatsRecord.invocations; + if (invocations == 0) { + continue; + } + + long total = thisStatsRecord.total - previousStatsRecord.total; + + //AS doesn't really give us this info... + double min = (double) total / invocations; + double max = (double) total / invocations; + + callTimeData.addAggregatedCallData(methodName, startDate, endDate, min, max, total, + invocations); + } + + } +} diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 3960407..af8474b 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -903,6 +903,22 @@ </resource-configuration> '> + <!ENTITY ejb3BeanStats ' + <metric property="peak-concurrent-invocations" category="performance" dataType="measurement" displayType="summary" + measurementType="dynamic" description="Peak concurrent invocations." + displayName="Peak concurrent invocations"/> + <metric property="invocations" category="performance" dataType="measurement" displayType="summary" + measurementType="trendsup" description="Number of invocations processed." displayName="Invocations"/> + <metric property="wait-time" category="performance" dataType="measurement" displayType="summary" + measurementType="dynamic" description="Time spent waiting to obtain an instance." displayName="Wait Time" + units="milliseconds"/> + <metric property="execution-time" category="performance" dataType="measurement" displayType="summary" + measurementType="trendsup" description="Time spent within a bean method" displayName="Execution Time" + units="milliseconds"/> + <metric property="__calltime:execution-time" category="performance" dataType="calltime" displayType="summary" + description="The execution times of individual methods on a bean" displayName="Method Execution Time" + units="milliseconds" destinationType="Method Name"/> +'> ]> <plugin name="&pluginName;" displayName="JBoss Application Server 7.x" @@ -972,7 +988,6 @@ </results> </operation> - <metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000" displayType="summary" measurementType="trendsup" description="Number of requests sent to the controller" displayName="Number of management requests"/> @@ -2969,6 +2984,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="true" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="true" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool (Managed Server)" @@ -5803,6 +5819,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="false" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool (Profile)" @@ -9798,7 +9815,7 @@ </plugin-configuration> <service name="Message Driven Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Bean component included in the deployment."> @@ -9811,6 +9828,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9843,7 +9861,7 @@ </service> <service name="Singleton Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Singleton bean component included in the deployment."> @@ -9851,6 +9869,8 @@ <c:simple-property name="path" default="singleton-bean" readOnly="true"/> </plugin-configuration> + &ejb3BeanStats; + <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> <c:list-property name="declared-roles" description="The roles declared (via @DeclareRoles) on this EJB component."> @@ -9882,7 +9902,7 @@ </service> <service name="Stateless Session Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Stateless session bean component included in the deployment."> @@ -9895,6 +9915,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9927,7 +9948,7 @@ </service> <service name="Entity Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Entity bean component included in the deployment."> @@ -9940,6 +9961,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9952,7 +9974,7 @@ </service> <service name="Stateful Session Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Stateful session bean component included in the deployment."> @@ -9960,6 +9982,8 @@ <c:simple-property name="path" default="stateful-session-bean" readOnly="true"/> </plugin-configuration> + &ejb3BeanStats; + <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> <c:list-property name="declared-roles" description="The roles declared (via @DeclareRoles) on this EJB component."> @@ -11005,6 +11029,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="false" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool" commit 1e23623a8ce39893ce04f0ce507e9137f211e65a Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Sep 17 16:02:45 2013 -0700 [BZ 1009089] - Metrics list from previous resource cached when navigating Monitor Sub Tabs. Move the stateful momento containing open chart rows out to the ResourceDetailView instead of at the MetricsTableView which can then be created and destroyed like the other stateless views and state momento passed into the View to restore previous (opened rows) state. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 11c7328..328d471 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -89,106 +89,13 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar, D3GraphListView> { private static final String BASE_VIEW_PATH = "Resource"; - - public static class Tab { - public static class Summary { - public static final String NAME = "Summary"; - - public static class SubTab { - public static final String ACTIVITY = "Activity"; - public static final String TIMELINE = "Timeline"; - } - } - - public static class Inventory { - public static final String NAME = "Inventory"; - - public static class SubTab { - public static final String CHILDREN = "Children"; - public static final String CHILD_HISTORY = "ChildHistory"; - public static final String CONNECTION_SETTINGS = "ConnectionSettings"; - public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigurationHistoryListView.VIEW_ID.getName(); - public static final String GROUPS = "Groups"; - public static final String AGENT = "Agent"; - } - } - - public static class Alerts { - public static final String NAME = "Alerts"; - - public static class SubTab { - public static final String HISTORY = "History"; - public static final String DEFINITIONS = "Definitions"; - } - } - - public static class Monitoring { - public static final String NAME = "Monitoring"; - - public static class SubTab { - public static final String METRICS = "Metrics"; - public static final String TRAITS = "Traits"; - public static final String SCHEDULES = "Schedules"; - public static final String CALL_TIME = "CallTime"; - } - } - - public static class Events { - public static final String NAME = "Events"; - - public static class SubTab { - public static final String HISTORY = "History"; - } - } - - public static class Operations { - public static final String NAME = "Operations"; - - public static class SubTab { - public static final String SCHEDULES = "Schedules"; - public static final String HISTORY = "History"; - } - } - - public static class Configuration { - public static final String NAME = "Configuration"; - - public static class SubTab { - public static final String CURRENT = "Current"; - public static final String HISTORY = "History"; - } - } - - public static class Drift { - public static final String NAME = "Drift"; - - public static class SubTab { - public static final String DEFINITIONS = "Definitions"; - } - } - - public static class Content { - public static final String NAME = "Content"; - - public static class SubTab { - public static final String DEPLOYED = "Deployed"; - public static final String NEW = "New"; - public static final String SUBSCRIPTIONS = "Subscriptions"; - public static final String HISTORY = "History"; - } - } - } - private Integer resourceId; private Integer lastSelectedResourceId = 0; - private ResourceComposite resourceComposite; - private MetricsResourceView metricsResourceView; - - //private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>(); - + private Set<Integer> metricsExpandedRowsMomento; private TwoLevelTab summaryTab; + private TwoLevelTab monitoringTab; private TwoLevelTab inventoryTab; private TwoLevelTab operationsTab; @@ -275,100 +182,96 @@ public class ResourceDetailView extends private static TwoLevelTab[] createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>(); - TwoLevelTab summaryTab = new TwoLevelTab(new ViewName(Tab.Summary.NAME, MSG.common_title_summary()), ImageManager.getResourceIcon( - ResourceCategory.SERVICE, AvailabilityType.UP)); - SubTab summaryActivity = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.ACTIVITY, MSG.view_tabs_common_activity()), null); - SubTab summaryTimeline = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.TIMELINE, MSG.view_tabs_common_timeline()), null); + TwoLevelTab summaryTab = new TwoLevelTab(new ViewName(Tab.Summary.NAME, MSG.common_title_summary()), + ImageManager.getResourceIcon(ResourceCategory.SERVICE, AvailabilityType.UP)); + SubTab summaryActivity = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.ACTIVITY, + MSG.view_tabs_common_activity()), null); + SubTab summaryTimeline = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.TIMELINE, + MSG.view_tabs_common_timeline()), null); summaryTab.registerSubTabs(summaryActivity, summaryTimeline); tabs.add(summaryTab); TwoLevelTab inventoryTab = new TwoLevelTab(new ViewName(Tab.Inventory.NAME, MSG.view_tabs_common_inventory()), IconEnum.INVENTORY_SUMMARY); - SubTab inventoryChildren = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CHILDREN, MSG.view_tabs_common_child_resources()), - null); - SubTab inventoryChildHistory = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CHILD_HISTORY, + SubTab inventoryChildren = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CHILDREN, + MSG.view_tabs_common_child_resources()), null); + SubTab inventoryChildHistory = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CHILD_HISTORY, MSG.view_tabs_common_child_history()), null); - SubTab inventoryConn = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CONNECTION_SETTINGS, + SubTab inventoryConn = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CONNECTION_SETTINGS, MSG.view_tabs_common_connectionSettings()), null); SubTab inventoryConnHistory = new SubTab(inventoryTab, PluginConfigurationHistoryListView.VIEW_ID, null); - SubTab inventoryGroups = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.GROUPS, MSG.view_tabs_common_groups()), null); - SubTab inventoryAgent = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.AGENT, MSG.view_tabs_common_agent()), null); - inventoryTab.registerSubTabs(inventoryChildren, inventoryChildHistory, inventoryConn, - inventoryConnHistory, inventoryGroups, inventoryAgent); + SubTab inventoryGroups = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.GROUPS, + MSG.view_tabs_common_groups()), null); + SubTab inventoryAgent = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.AGENT, + MSG.view_tabs_common_agent()), null); + inventoryTab.registerSubTabs(inventoryChildren, inventoryChildHistory, inventoryConn, inventoryConnHistory, + inventoryGroups, inventoryAgent); tabs.add(inventoryTab); - TwoLevelTab alertsTab = new TwoLevelTab(new ViewName(Tab.Alerts.NAME, MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); - SubTab alertHistory = new SubTab(alertsTab, new ViewName( - Tab.Alerts.SubTab.HISTORY, MSG.view_tabs_common_history()), null); - SubTab alertDef = new SubTab(alertsTab, new ViewName( - Tab.Alerts.SubTab.DEFINITIONS, MSG.common_title_definitions()), null); + TwoLevelTab alertsTab = new TwoLevelTab(new ViewName(Tab.Alerts.NAME, MSG.common_title_alerts()), + IconEnum.ALERT_DEFINITIONS); + SubTab alertHistory = new SubTab(alertsTab, new ViewName(Tab.Alerts.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); + SubTab alertDef = new SubTab(alertsTab, new ViewName(Tab.Alerts.SubTab.DEFINITIONS, + MSG.common_title_definitions()), null); alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab); - TwoLevelTab monitoringTab = new TwoLevelTab(new ViewName(Tab.Monitoring.NAME, MSG.view_tabs_common_monitoring()), - IconEnum.SUSPECT_METRICS); - - SubTab monitorMetrics = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.METRICS, MSG.view_tabs_common_metrics()), null); - SubTab monitorTraits = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.TRAITS, MSG.view_tabs_common_traits()), null); - SubTab monitorSched = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null); - SubTab monitorCallTime = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.CALL_TIME, MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); + TwoLevelTab monitoringTab = new TwoLevelTab( + new ViewName(Tab.Monitoring.NAME, MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); + + SubTab monitorMetrics = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.METRICS, + MSG.view_tabs_common_metrics()), null); + SubTab monitorTraits = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.TRAITS, + MSG.view_tabs_common_traits()), null); + SubTab monitorSched = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.SCHEDULES, + MSG.view_tabs_common_schedules()), null); + SubTab monitorCallTime = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.CALL_TIME, + MSG.view_tabs_common_calltime()), null); + monitoringTab.registerSubTabs(monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab); - TwoLevelTab eventsTab = new TwoLevelTab(new ViewName(Tab.Events.NAME, MSG.view_tabs_common_events()), IconEnum.EVENTS); - SubTab eventHistory = new SubTab(eventsTab, new ViewName( - Tab.Events.SubTab.HISTORY, MSG.view_tabs_common_history()), null); + TwoLevelTab eventsTab = new TwoLevelTab(new ViewName(Tab.Events.NAME, MSG.view_tabs_common_events()), + IconEnum.EVENTS); + SubTab eventHistory = new SubTab(eventsTab, new ViewName(Tab.Events.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab); TwoLevelTab operationsTab = new TwoLevelTab(new ViewName(Tab.Operations.NAME, MSG.common_title_operations()), IconEnum.RECENT_OPERATIONS); - SubTab operationsSchedules = new SubTab(operationsTab, new ViewName( - Tab.Operations.SubTab.SCHEDULES, + SubTab operationsSchedules = new SubTab(operationsTab, new ViewName(Tab.Operations.SubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null); - SubTab operationsHistory = new SubTab(operationsTab, new ViewName( - Tab.Operations.SubTab.HISTORY, + SubTab operationsHistory = new SubTab(operationsTab, new ViewName(Tab.Operations.SubTab.HISTORY, MSG.view_tabs_common_history()), null); operationsTab.registerSubTabs(operationsSchedules, operationsHistory); tabs.add(operationsTab); - TwoLevelTab configurationTab = new TwoLevelTab(new ViewName(Tab.Configuration.NAME, MSG.common_title_configuration()), - IconEnum.CONFIGURATION_HISTORY); - SubTab configCurrent = new SubTab(configurationTab, new ViewName( - Tab.Configuration.SubTab.CURRENT, + TwoLevelTab configurationTab = new TwoLevelTab(new ViewName(Tab.Configuration.NAME, + MSG.common_title_configuration()), IconEnum.CONFIGURATION_HISTORY); + SubTab configCurrent = new SubTab(configurationTab, new ViewName(Tab.Configuration.SubTab.CURRENT, MSG.view_tabs_common_current()), null); - SubTab configHistory = new SubTab(configurationTab, new ViewName( - Tab.Configuration.SubTab.HISTORY, + SubTab configHistory = new SubTab(configurationTab, new ViewName(Tab.Configuration.SubTab.HISTORY, MSG.view_tabs_common_history()), null); configurationTab.registerSubTabs(configCurrent, configHistory); tabs.add(configurationTab); - TwoLevelTab driftTab = new TwoLevelTab(new ViewName(Tab.Drift.NAME, MSG.view_tabs_common_drift()), IconEnum.DRIFT_COMPLIANCE); - SubTab driftDefinitions = new SubTab(driftTab, new ViewName( - Tab.Drift.SubTab.DEFINITIONS, + TwoLevelTab driftTab = new TwoLevelTab(new ViewName(Tab.Drift.NAME, MSG.view_tabs_common_drift()), + IconEnum.DRIFT_COMPLIANCE); + SubTab driftDefinitions = new SubTab(driftTab, new ViewName(Tab.Drift.SubTab.DEFINITIONS, MSG.common_title_definitions()), null); driftTab.registerSubTabs(driftDefinitions); tabs.add(driftTab); - TwoLevelTab contentTab = new TwoLevelTab(new ViewName(Tab.Content.NAME, MSG.view_tabs_common_content()), IconEnum.CONTENT); - SubTab contentDeployed = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.DEPLOYED, MSG.view_tabs_common_deployed()), null); - SubTab contentNew = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.NEW, MSG.common_button_new()), null); - SubTab contentSubscrip = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.SUBSCRIPTIONS, + TwoLevelTab contentTab = new TwoLevelTab(new ViewName(Tab.Content.NAME, MSG.view_tabs_common_content()), + IconEnum.CONTENT); + SubTab contentDeployed = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.DEPLOYED, + MSG.view_tabs_common_deployed()), null); + SubTab contentNew = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.NEW, MSG.common_button_new()), null); + SubTab contentSubscrip = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.SUBSCRIPTIONS, MSG.view_tabs_common_subscriptions()), null); - SubTab contentHistory = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.HISTORY, MSG.view_tabs_common_history()), null); + SubTab contentHistory = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip, contentHistory); tabs.add(contentTab); @@ -379,23 +282,29 @@ public class ResourceDetailView extends return new ResourceTitleBar(platformTree); } + private static boolean hasMetricsOfType(ResourceComposite resourceComposite, DataType dataType) { + ResourceType type = resourceComposite.getResource().getResourceType(); + Set<MeasurementDefinition> metricDefs = type.getMetricDefinitions(); + for (MeasurementDefinition metricDef : metricDefs) { + if (dataType == null || metricDef.getDataType() == dataType) { + return true; + } + } + return false; + } + @Override protected D3GraphListView createD3GraphListView() { graphListView = D3GraphListView.createSummaryMultipleGraphs(resourceComposite.getResource(), true); return graphListView; } - - @Override protected void updateTabContent(ResourceComposite resourceComposite, boolean isRefresh) { super.updateTabContent(resourceComposite, isRefresh); try { this.resourceComposite = resourceComposite; - // for (ResourceSelectListener selectListener : this.selectListeners) { - // selectListener.onResourceSelected(this.resourceComposite); - // } Resource resource = this.resourceComposite.getResource(); getTitleBar().setResource(this.resourceComposite, isRefresh); @@ -516,7 +425,7 @@ public class ResourceDetailView extends private void updateMonitoringTabContent(final Resource resource, Set<ResourceTypeFacet> facets) { boolean visible = hasMetricsOfType(this.resourceComposite, DataType.MEASUREMENT) - || hasMetricsOfType(this.resourceComposite, DataType.AVAILABILITY); + || hasMetricsOfType(this.resourceComposite, DataType.AVAILABILITY); ViewFactory viewFactory; boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9(); @@ -525,11 +434,21 @@ public class ResourceDetailView extends viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - if(null == metricsResourceView || resource.getId() != lastSelectedResourceId){ - metricsResourceView = new MetricsResourceView(resource); - addViewRenderedListener(metricsResourceView); + // metricsResourceView contains state of opened graphs (unlike other stateless views) + //so we don't need to preserve that state here + boolean isNewView = null == metricsResourceView; + boolean hasResourceChanged = resourceComposite.getResource().getId() != lastSelectedResourceId; + if (isNewView || hasResourceChanged) { + if(null != metricsExpandedRowsMomento){ + metricsExpandedRowsMomento.clear(); + } } - return metricsResourceView; + metricsResourceView = new MetricsResourceView(resourceComposite.getResource(), metricsExpandedRowsMomento); + + // this listener handles the subtab navigation + addViewRenderedListener(metricsResourceView); + + return metricsResourceView; } }; updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory); @@ -695,8 +614,8 @@ public class ResourceDetailView extends //noinspection ThrowableInstanceNeverThrown onFailure(new Exception("Resource with id [" + resourceId + "] does not exist.")); } else { - final ResourceComposite resourceComposite = result.get(0); - loadResourceType(resourceComposite, viewPath); + resourceComposite = result.get(0); + loadResourceType(viewPath); // add this resouce to the user's recently visited list UserSessionManager.getUserPreferences().addRecentResource(resourceId, @@ -718,10 +637,9 @@ public class ResourceDetailView extends }); } - private void loadResourceType(final ResourceComposite resourceComposite, final ViewPath viewPath) { - final Resource resource = resourceComposite.getResource(); + private void loadResourceType(final ViewPath viewPath) { ResourceTypeRepository.Cache.getInstance().getResourceTypes( - resource.getResourceType().getId(), + resourceComposite.getResource().getResourceType().getId(), EnumSet.of(ResourceTypeRepository.MetadataType.children, ResourceTypeRepository.MetadataType.content, ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.measurements, ResourceTypeRepository.MetadataType.events, @@ -743,14 +661,93 @@ public class ResourceDetailView extends }); } - private static boolean hasMetricsOfType(ResourceComposite resourceComposite, DataType dataType) { - ResourceType type = resourceComposite.getResource().getResourceType(); - Set<MeasurementDefinition> metricDefs = type.getMetricDefinitions(); - for (MeasurementDefinition metricDef : metricDefs) { - if (dataType == null || metricDef.getDataType() == dataType) { - return true; + public static class Tab { + public static class Summary { + public static final String NAME = "Summary"; + + public static class SubTab { + public static final String ACTIVITY = "Activity"; + public static final String TIMELINE = "Timeline"; + } + } + + public static class Inventory { + public static final String NAME = "Inventory"; + + public static class SubTab { + public static final String CHILDREN = "Children"; + public static final String CHILD_HISTORY = "ChildHistory"; + public static final String CONNECTION_SETTINGS = "ConnectionSettings"; + public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigurationHistoryListView.VIEW_ID + .getName(); + public static final String GROUPS = "Groups"; + public static final String AGENT = "Agent"; + } + } + + public static class Alerts { + public static final String NAME = "Alerts"; + + public static class SubTab { + public static final String HISTORY = "History"; + public static final String DEFINITIONS = "Definitions"; + } + } + + public static class Monitoring { + public static final String NAME = "Monitoring"; + + public static class SubTab { + public static final String METRICS = "Metrics"; + public static final String TRAITS = "Traits"; + public static final String SCHEDULES = "Schedules"; + public static final String CALL_TIME = "CallTime"; + } + } + + public static class Events { + public static final String NAME = "Events"; + + public static class SubTab { + public static final String HISTORY = "History"; + } + } + + public static class Operations { + public static final String NAME = "Operations"; + + public static class SubTab { + public static final String SCHEDULES = "Schedules"; + public static final String HISTORY = "History"; + } + } + + public static class Configuration { + public static final String NAME = "Configuration"; + + public static class SubTab { + public static final String CURRENT = "Current"; + public static final String HISTORY = "History"; + } + } + + public static class Drift { + public static final String NAME = "Drift"; + + public static class SubTab { + public static final String DEFINITIONS = "Definitions"; + } + } + + public static class Content { + public static final String NAME = "Content"; + + public static class SubTab { + public static final String DEPLOYED = "Deployed"; + public static final String NEW = "New"; + public static final String SUBSCRIPTIONS = "Subscriptions"; + public static final String HISTORY = "History"; } } - return false; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index c4b90a1..7e20007 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; import java.util.List; +import java.util.Set; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -56,13 +57,16 @@ public class MetricsResourceView extends AbstractD3GraphListView implements private final Resource resource; private EnhancedHLayout expandCollapseHLayout; + private MetricsTableView metricsTableView; + private Set<Integer> expandedRows; - public MetricsResourceView(Resource resource) { + public MetricsResourceView(Resource resource, Set<Integer> expandedRows) { super(); setOverflow(Overflow.AUTO); setWidth100(); setHeight100(); this.resource = resource; + this.expandedRows = expandedRows; } @Override @@ -72,7 +76,7 @@ public class MetricsResourceView extends AbstractD3GraphListView implements final ResourceMetricAvailabilityView availabilityDetails = new ResourceMetricAvailabilityView(resource); availabilityDetails.hide(); - final MetricsTableView metricsTableView = new MetricsTableView(resource, this); + metricsTableView = new MetricsTableView(resource, this, expandedRows); metricsTableView.setHeight100(); availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( @@ -99,7 +103,7 @@ public class MetricsResourceView extends AbstractD3GraphListView implements availabilityDetails.show(); } - refreshGraphs(); + drawGraphs(); } }); expandCollapseHLayout.addMember(expandCollapseArrow); @@ -116,7 +120,10 @@ public class MetricsResourceView extends AbstractD3GraphListView implements public void refreshData() { Log.debug("MetricResourceView.refreshData() for: " + resource.getName() + " id: " + resource.getId()); + addAvailabilityGraph(); + } + private void addAvailabilityGraph() { expandCollapseHLayout.removeMember(availabilityGraph); availabilityGraph.destroy(); @@ -129,15 +136,6 @@ public class MetricsResourceView extends AbstractD3GraphListView implements buttonBarDateTimeRangeEditor.getEndTime(), null); } - public void refreshGraphs() { - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - BrowserUtility.graphSparkLines(); - } - }.schedule(150); - } @Override protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed) { @@ -146,32 +144,42 @@ public class MetricsResourceView extends AbstractD3GraphListView implements // now return the availability GWTServiceLookup.getAvailabilityService().getAvailabilitiesForResource(context.getResourceId(), startTime, - endTime, new AsyncCallback<List<Availability>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); - } + endTime, new AsyncCallback<List<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + } - @Override - public void onSuccess(List<Availability> availList) { - Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + @Override + public void onSuccess(List<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - availabilityGraph.setAvailabilityList(availList); - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - - } - }.schedule(150); - } - }); + availabilityGraph.setAvailabilityList(availList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + + } + }.schedule(150); + } + }); + } + + private void drawGraphs() { + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); } @Override public void onViewRendered() { // refresh the graphs on subtab nav because we are a cached view not new - refreshGraphs(); + drawGraphs(); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 9fc2949..436bdd9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -70,22 +70,25 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre public class MetricsTableView extends Table<MetricsViewDataSource> implements Refreshable { private final Resource resource; - private boolean rendered = false; private final AbstractD3GraphListView abstractD3GraphListView; - private final MeasurementUserPreferences measurementUserPrefs; private final AddToDashboardComponent addToDashboardComponent; + Set<Integer> expandedRows; + private boolean rendered = false; private MetricsTableListGrid metricsTableListGrid; - Set<Integer> expandedRows = new HashSet<Integer>(); - - public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView, Set<Integer> expandedRows) { super(); this.resource = resource; this.abstractD3GraphListView = abstractD3GraphListView; measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); setDataSource(new MetricsViewDataSource(resource)); addToDashboardComponent = new AddToDashboardComponent(resource); + if(null == expandedRows){ + this.expandedRows = new HashSet<Integer>(); + }else { + this.expandedRows = expandedRows; + } } /** @@ -105,11 +108,10 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re ArrayList<ListGridField> fields = getDataSource().getListGridFields(); setListGridFields(fields.toArray(new ListGridField[0])); - if(!rendered){ + if (!rendered) { addTableAction(MSG.view_measureTable_getLive(), new TableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - //return selection != null && selection.length != 0; return true; } @@ -135,7 +137,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } } - @Override /** * Redraw Graphs in this context means to refresh the table and redraw open graphs. @@ -152,13 +153,12 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } - public class MetricsTableListGrid extends ListGrid { private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; private static final int NUM_METRIC_POINTS = 60; - private Resource resource; final MetricsTableView metricsTableView; + private Resource resource; public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource) { super(); @@ -198,28 +198,34 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re refreshData(); } }); + addDataArrivedHandler(new DataArrivedHandler() { @Override public void onDataArrived(DataArrivedEvent dataArrivedEvent) { - int startRow = dataArrivedEvent.getStartRow(); - int endRow = dataArrivedEvent.getEndRow(); - - for (int i = startRow; i < endRow; i++) { - ListGridRecord listGridRecord = getRecord(i); - if (null != listGridRecord) { - int metricDefinitionId = listGridRecord - .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); - if (null != metricsTableView && metricsTableView.expandedRows.contains(metricDefinitionId)) { - expandRecord(listGridRecord); - } - } - } + expandOpenedRows(dataArrivedEvent.getStartRow(), dataArrivedEvent.getEndRow(), metricsTableView); } }); } + private void expandOpenedRows(int startRow, int endRow, MetricsTableView metricsTableView) { + + for (int i = startRow; i < endRow; i++) { + ListGridRecord listGridRecord = getRecord(i); + if (null != listGridRecord) { + int metricDefinitionId = listGridRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + if (null != metricsTableView && null != metricsTableView.expandedRows && metricsTableView.expandedRows.contains(metricDefinitionId)) { + expandRecord(listGridRecord); + } + } + } + } + @Override + /** + * If you expand a grid row then create a graph. + */ protected Canvas getExpansionComponent(final ListGridRecord record) { final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); @@ -270,7 +276,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re public void run() { graphView.drawJsniChart(); BrowserUtility.graphSparkLines(); - } }.schedule(150); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java index 75a5429..50d5400 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -45,8 +45,8 @@ public class MeasurementUserPreferences { public static final String PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME = "Default"; public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString(); - public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(8); - public static final Integer DEFAULT_VALUE_RANGE_UNIT = Integer.valueOf(3); + public static final Integer DEFAULT_VALUE_RANGE_LASTN = 8; + public static final Integer DEFAULT_VALUE_RANGE_UNIT = 3; private UserPreferences userPrefs; @@ -79,7 +79,6 @@ public class MeasurementUserPreferences { if (rangeString != null && rangeString.trim().length() > 0) { if (rangeString.contains(",")) { // legacy support: old prefs used to use commas rangeString = rangeString.replace(",", UserPreferences.PREF_LIST_DELIM); - //userPrefs.setPreference(PREF_METRIC_RANGE, rangeString); // TODO set only if we don't support JSF anymore } String[] beginEnd = rangeString.split(UserPreferences.PREF_LIST_DELIM_REGEX); prefs.begin = Long.parseLong(beginEnd[0]); @@ -112,50 +111,23 @@ public class MeasurementUserPreferences { if (prefs.explicitBeginEnd) { // persist advanced mode userPrefs.setPreference(PREF_METRIC_RANGE, Arrays.asList(prefs.begin, prefs.end), allowRefresh); - //unsetPreference(PREF_METRIC_RANGE_LASTN); - //unsetPreference(PREF_METRIC_RANGE_UNIT); } else { userPrefs.setPreference(PREF_METRIC_RANGE_LASTN, String.valueOf(prefs.lastN), allowRefresh); userPrefs.setPreference(PREF_METRIC_RANGE_UNIT, String.valueOf(prefs.unit), allowRefresh); - //unsetPreference(PREF_METRIC_RANGE); } } - /* - * I believe these are now no longer used - these were probably for the old struts pages - * - public Integer getMetricThresholdPreference() throws IllegalArgumentException { - return new Integer(userPrefs.getPreference(PREF_METRIC_THRESHOLD)); - } - public void setMetricThresholdPreference(Integer value) throws IllegalArgumentException { - userPrefs.setPreference(PREF_METRIC_THRESHOLD, String.valueOf(value)); - } - */ public MetricViewsPreferences getMetricViews(String key) { MetricViewsPreferences prefs = new MetricViewsPreferences(); - //TODO: jmarques - externalize default view name - // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle String value = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME); prefs.views = StringUtility.explode(value, UserPreferences.PREF_LIST_DELIM); return prefs; } - // public void setMetricViews(MetricViewsPreferences prefs, String key) { - // StringBuilder builder = new StringBuilder(); - // int index = 0; - // for (String viewName : prefs.views) { - // if (index != 0) { - // builder.append(UserPreferences.PREF_LIST_DELIM); - // } - // builder.append(viewName); - // index++; - // } - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, builder.toString()); - // } + public String getSelectedView(String key) { String value = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, @@ -163,49 +135,4 @@ public class MeasurementUserPreferences { return value; } - // public void setSelectedView(String key, String viewName) { - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, viewName); - // } - // - // public static class MetricViewData { - // public List<String> charts; - // } - - // public MetricViewData getMetricViewData(String context, String viewName) { - // //TODO: jmarques - externalize default view name - // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle - // if (viewName == null || "".equals(viewName)) { - // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; - // } - // MetricViewData chartPreferences = new MetricViewData(); - // // important to let IllegalArgumentException bubble out of here, so the caller can persist the default set - // String data = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); - // chartPreferences.charts = StringUtility.explode(data, UserPreferences.PREF_LIST_DELIM); - // return chartPreferences; - // } - // - // public void setMetricViewData(String context, String viewName, MetricViewData prefs) { - // //TODO: jmarques - externalize default view name - // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle - // if (viewName == null || "".equals(viewName)) { - // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; - // } - // StringBuilder builder = new StringBuilder(); - // int index = 0; - // for (String chart : prefs.charts) { - // if (index != 0) { - // builder.append(UserPreferences.PREF_LIST_DELIM); - // } - // builder.append(chart); - // index++; - // } - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName, builder.toString()); - // } - // - // public void deleteMetricViewData(String context, String viewName) { - // userPrefs.unsetPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); - // } - } commit 85199c15d3f69600c3690750dfbfbdaf06fd7b71 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 17 12:20:49 2013 -0400 download cassandra tarball as maven dependency instead using wget diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index db9a59a..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -106,6 +106,13 @@ <artifactId>netty</artifactId> <version>3.6.6.Final</version> </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>apache-cassandra</artifactId> + <version>${cassandra.version}</version> + <type>tar.gz</type> + <classifier>bin</classifier> + </dependency> </dependencies> <executions> <execution> @@ -128,10 +135,6 @@ value="${project.build.directory}/cassandra-download"/> <mkdir dir="${cassandra.download.dir}"/> <mkdir dir="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}"/> - <get src="http://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/${cas..." - dest="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" - skipexisting="true" - verbose="true"/> <gunzip src="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" dest="${cassandra.download.dir}"/> <untar src="${cassandra.download.dir}/apache-cassandra-${cassandra.version}-bin.tar" commit fa6a4d98c14146068c5f19f5e1ced73d42588a05 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 17 15:53:03 2013 -0400 Bug 1006419 - Improve handling of obfuscated passwords for installation Changes such that the user doe snot have to worry about the management user password for the RHQ Server resource. By using a generated password the user no longer has to set the property value manually in rhq-server.properties. Secured rhq-installer.sh|bat --encodepassword option such that it prompts for the plain text password as opposed to taking at as a command line parameter, thus keeping the value out of command history. Also: - add a string generator to the Obfuscator class - update rhq-server.properties such that the rhq.server.management.user property is no longer mentioned for explicit setting, is moved out of the server settings section. and is not pre-set for dev installs. - remove the deprecated --dbpassword installer option - remove the special case RHQ Server handling code from the AS7 standalone server discovery code. Now relies on the new discovery callback mechanism to override the resource name (along with the new password handling). - fix/add some license headers in the rhq server plugin classes diff --git a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java index 3112a55..4743548 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java @@ -22,6 +22,7 @@ package org.rhq.core.util.obfuscation; import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.util.Random; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -118,4 +119,16 @@ public final class Obfuscator { return new String(decode); } + // adapted from http://stackoverflow.com/questions/2863852/how-to-generate-a-random-strin... + public static String generateString(Random random, String validCharacters, int length) { + validCharacters = (null == validCharacters || validCharacters.isEmpty()) ? "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#$" + : validCharacters; + length = (length < 1) ? 10 : length; + + char[] text = new char[length]; + for (int i = 0; i < length; i++) { + text[i] = validCharacters.charAt(random.nextInt(validCharacters.length())); + } + return new String(text); + } } diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 25fc6ee..c76ba7b 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -23,8 +23,6 @@ <property name="default.jboss.bind.address" value=""/> - <property name="default.rhq.server.management.password" value=""/> - <target name="set-predeploy-prop"> <condition property="predeploy" value="true"> <or> @@ -48,9 +46,8 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> -  +  <property name="jboss.bind.address" value="0.0.0.0"/> - <property name="rhq.server.management.password" value="35c160c1f841a889d4cda53f0bfc94b6"/> </target> <target name="set-default-server-props" unless="predeploy"> @@ -67,9 +64,8 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> -  +  <property name="jboss.bind.address" value="${default.jboss.bind.address}"/> - <property name="rhq.server.management.password" value="${default.rhq.server.management.password}"/> </target> <target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props"> @@ -475,8 +471,8 @@ rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass} ############################################################################# # Server Settings # --------------- -# INSTALLATION ACTION REQUIRED! The following property must be explicitly set: -# rhq.server.management.password +# UPGRADE ACTION REQUIRED! The following property must be explicitly set: +# rhq.server.high-availability.name # # These are miscellaneous settings that the server will use to customize itself # to the environment in which it is running. These are settings you usually @@ -491,16 +487,6 @@ rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass} # as the server being upgraded. rhq.server.high-availability.name= -# The installer will create a default EAP management user named 'rhqadmin'. -# The password is obfuscated and specified here. If set to the commented -# value the RHQ Agent will be able to monitor the RHQ Server resource -# automatically. If set to a different value the same password value will -# need to be supplied in the connection properties for the RHQ Server -# resource. See the installation documentation for more information on how -# to generate an obfuscated password value. -# rhq.server.management.password=35c160c1f841a889d4cda53f0bfc94b6 -rhq.server.management.password=${rhq.server.management.password} - # Email settings used to connect to an SMTP server to send alert emails. rhq.server.email.smtp-host=localhost rhq.server.email.smtp-port=25 @@ -700,6 +686,11 @@ rhq.sync.endpoint-address=false # files that are not known binary types. #rhq.server.drift.store-binary-content=${rhq.server.drift.store-binary-content} +# The installer will create a default EAP management user named 'rhqadmin'. +# The password is generated and obfuscated and specified here. This should +# not be edited. +rhq.server.management.password= + ############################################# # Cassandra cluster configuration settings ############################################# diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java index d9d0509..7d3d4e0 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java @@ -21,14 +21,13 @@ package org.rhq.enterprise.server.installer; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; +import java.io.Console; import java.util.ArrayList; import java.util.HashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.sasl.util.UsernamePasswordHashUtil; - import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.enterprise.server.installer.InstallerService.AlreadyInstalledException; import org.rhq.enterprise.server.installer.InstallerService.AutoInstallDisabledException; @@ -147,19 +146,17 @@ public class Installer { usage.append("\t--force, -f: force the installer to try to install everything").append("\n"); usage.append("\t--listservers, -l: show list of known installed servers (install not performed)").append("\n"); usage.append("\t--setupdb, -b: only perform database schema creation or update").append("\n"); - usage.append("\t--dbpassword, -d: (deprecated, use --encodepassword)").append("\n"); - usage.append("\t--encodepassword, -e: encodes a password for rhq-server.properties (edit file manually)"); + usage.append("\t--encodepassword, -e: prompts for password to encode for editing rhq-server.properties"); usage.append("\n"); LOG.info(usage); } private WhatToDo[] processArguments(String[] args) throws Exception { - String sopts = "-:HD:h:p:d:bflt"; + String sopts = "-:HD:h:p:e:bflt"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'H'), new LongOpt("host", LongOpt.REQUIRED_ARGUMENT, null, 'h'), new LongOpt("port", LongOpt.REQUIRED_ARGUMENT, null, 'p'), - new LongOpt("dbpassword", LongOpt.REQUIRED_ARGUMENT, null, 'd'), - new LongOpt("encodepassword", LongOpt.REQUIRED_ARGUMENT, null, 'e'), + new LongOpt("encodepassword", LongOpt.NO_ARGUMENT, null, 'e'), new LongOpt("setupdb", LongOpt.NO_ARGUMENT, null, 'b'), new LongOpt("listservers", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("force", LongOpt.NO_ARGUMENT, null, 'f'), new LongOpt("test", LongOpt.NO_ARGUMENT, null, 't') }; @@ -230,19 +227,16 @@ public class Installer { break; } - case 'd': { - passwordToEncode = getopt.getOptarg(); - if (passwordToEncode == null) { - throw new IllegalArgumentException("Missing password"); - } - break; - } - case 'e': { - passwordToEncode = getopt.getOptarg(); - if (passwordToEncode == null) { - throw new IllegalArgumentException("Missing password"); + // prompt for the password. we don't use a command line option because then the plain test password + // could get captured in command history. + Console console = System.console(); + if (null != console) { + passwordToEncode = String.valueOf(console.readLine("%s", "Password: ")); + } else { + LOG.error("NO CONSOLE!"); } + break; } @@ -270,14 +264,12 @@ public class Installer { // if a password was asked to be obfuscated, that's all we do on the execution if (passwordToEncode != null) { - String obfuscatedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(passwordToEncode); + String obfuscatedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(String + .valueOf(passwordToEncode)); LOG.info("*** Encoded password properties for rhq-server.properties:"); LOG.info("*** rhq.server.database.password=" + obfuscatedPassword); LOG.info("*** rhq.storage.password=" + obfuscatedPassword); - obfuscatedPassword = new UsernamePasswordHashUtil().generateHashedHexURP("rhqadmin", "ManagementRealm", - passwordToEncode.toCharArray()); - LOG.info("*** rhq.server.management.password=" + obfuscatedPassword); return new WhatToDo[] { WhatToDo.DO_NOTHING }; } diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 38de6cc..906e4ea 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Random; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -43,6 +44,7 @@ import org.rhq.core.db.DatabaseTypeFactory; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.core.util.obfuscation.Obfuscator; import org.rhq.core.util.obfuscation.PicketBoxObfuscator; import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption; import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType; @@ -258,15 +260,22 @@ public class InstallerServiceImpl implements InstallerService { } } - prepareDatabase(serverProperties, serverDetails, existingSchemaOption); - String appServerConfigDir = getAppServerConfigDir(); // create an rhqadmin management user so when discovered, the AS7 plugin can immediately - // connect to the RHQ Server. Note that if the installer sets rhq.server.management.user to - // anything other than our recommended default, the connection properties will need to be updated - // before the plugin can connect, because the default creds in the plugin will be wrong. - ServerInstallUtil.createDefaultManagementUser(serverProperties, serverDetails, appServerConfigDir); + // connect to the RHQ Server. The password is generated as we try to make the RHQ server manageable by + // the plugin without the user having to get involved. + String managementPassword = Obfuscator.generateString(new Random(), null, 8); + ServerInstallUtil.createDefaultManagementUser(managementPassword, serverDetails, appServerConfigDir); + + // Doing this prior to prepareDatabase sets the property before they are validated and saved. + // The generated password is encoded and then saved as rhq.server.management.password. This value can then + // be picked up agent-side by the discovery component, decoded, and set in the connection properties. If all + // works well no dolphins will be harmed, the rhq server will be protected, and the user sleeps through it. + String encodedManagementPassword = Obfuscator.encode(managementPassword); + serverProperties.put(ServerProperties.PROP_MGMT_USER_PASSWORD, encodedManagementPassword); + + prepareDatabase(serverProperties, serverDetails, existingSchemaOption); // perform stuff that has to get done via the JBossAS management client ModelControllerClient mcc = null; @@ -421,7 +430,7 @@ public class InstallerServiceImpl implements InstallerService { } // test the connection to make sure everything is OK - note that if we are in auto-install mode, - // the password will have been obfuscated, so we need to de-obfucate it in order to use it. + // the password will have been obfuscated, so we need to de-obfuscate it in order to use it. // make sure the server properties map itself has an obfuscated password final String dbUrl = serverProperties.get(ServerProperties.PROP_DATABASE_CONNECTION_URL); final String dbUsername = serverProperties.get(ServerProperties.PROP_DATABASE_USERNAME); diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java index d40b97e..8b9ce6f 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java @@ -46,6 +46,7 @@ import org.apache.tools.ant.helper.ProjectHelper2; import org.jboss.as.controller.client.ModelControllerClient; import org.jboss.dmr.ModelNode; +import org.jboss.sasl.util.UsernamePasswordHashUtil; import org.rhq.common.jbossas.client.controller.Address; import org.rhq.common.jbossas.client.controller.CoreJBossASClient; @@ -937,10 +938,9 @@ public class ServerInstallUtil { try { LOG.info("Persisting to database new storage nodes for values specified in server configuration property [rhq.storage.nodes]"); - insertStorageNode = connection.prepareStatement( - "INSERT INTO rhq_storage_node (id, address, cql_port, operation_mode, ctime, mtime, maintenance_pending) " + - "VALUES (?, ?, ?, ?, ?, ?, ?)" - ); + insertStorageNode = connection + .prepareStatement("INSERT INTO rhq_storage_node (id, address, cql_port, operation_mode, ctime, mtime, maintenance_pending) " + + "VALUES (?, ?, ?, ?, ?, ?, ?)"); int id = 1001; for (StorageNode storageNode : storageNodes) { @@ -958,8 +958,8 @@ public class ServerInstallUtil { connection.commit(); } catch (SQLException e) { - LOG.error("Failed to persist to database the storage nodes specified by server configuration " + - "property [rhq.storage.nodes]. Transaction will be rolled back.", e); + LOG.error("Failed to persist to database the storage nodes specified by server configuration " + + "property [rhq.storage.nodes]. Transaction will be rolled back.", e); connection.rollback(); throw e; } @@ -996,10 +996,9 @@ public class ServerInstallUtil { connection = getDatabaseConnection(dbUrl, userName, password); connection.setAutoCommit(false); - updateClusterSetting = connection.prepareStatement( - "UPDATE rhq_system_config " + - "SET property_value = ?, default_property_value = ? " + - "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL"); + updateClusterSetting = connection.prepareStatement("UPDATE rhq_system_config " + + "SET property_value = ?, default_property_value = ? " + + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL"); updateClusterSetting.setString(1, serverProperties.get("rhq.storage.cql-port")); updateClusterSetting.setString(2, serverProperties.get("rhq.storage.cql-port")); @@ -1561,19 +1560,17 @@ public class ServerInstallUtil { * the password, if not set to the default then the AS7 plugin will fail to connect, and the * RHQ Server resource connection properties will need to be updated after discovery and import. * - * @param serverProperties the server properties + * @param password the management password * @param serverDetails details of the server being installed * @param configDirStr location of a configuration directory where the mgmt-users.properties file lives */ - public static void createDefaultManagementUser(HashMap<String, String> serverProperties, - ServerDetails serverDetails, String configDirStr) { + public static void createDefaultManagementUser(String password, ServerDetails serverDetails, String configDirStr) { File confDir = new File(configDirStr); File mgmtUsers = new File(confDir, "mgmt-users.properties"); - String password = serverProperties.get(RHQ_MGMT_USER_PASSWORD); if (ServerInstallUtil.isEmpty(password)) { - LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : " - + RHQ_MGMT_USER_PASSWORD + " is not set in rhq-server.properties."); + LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : invalid password [" + + password + "]."); return; } @@ -1593,8 +1590,11 @@ public class ServerInstallUtil { FileOutputStream fos = null; try { + String encodedPassword = new UsernamePasswordHashUtil().generateHashedHexURP(RHQ_MGMT_USER, + "ManagementRealm", password.toCharArray()); + fos = new FileOutputStream(mgmtUsers, true); - fos.write(("\n" + RHQ_MGMT_USER + "=" + password + "\n").getBytes()); + fos.write(("\n" + RHQ_MGMT_USER + "=" + encodedPassword + "\n").getBytes()); } catch (Exception e) { LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : ", e); diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java index 2d35030..6177830 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java @@ -27,6 +27,8 @@ import java.util.Set; * @author John Mazzitelli */ public class ServerProperties { + public static final String PROP_FILENAME = "rhq-server.properties"; + public static final String PROP_DATABASE_TYPE = "rhq.server.database.type-mapping"; public static final String PROP_DATABASE_CONNECTION_URL = "rhq.server.database.connection-url"; public static final String PROP_DATABASE_USERNAME = "rhq.server.database.user-name"; @@ -152,7 +154,6 @@ public class ServerProperties { static { STRING_PROPERTIES = new HashSet<String>(); STRING_PROPERTIES.add(PROP_JBOSS_BIND_ADDRESS); - STRING_PROPERTIES.add(PROP_MGMT_USER_PASSWORD); } public static final Set<String> CLIENT_AUTH_MODES; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index a14553b..5579af8 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -517,7 +517,15 @@ public abstract class AbstractInstall extends ControlCommand { private Properties loadStorageProperties(String path) throws IOException { Properties properties = new Properties(); - properties.load(new FileInputStream(new File(path))); + FileInputStream fis = null; + try { + fis = new FileInputStream(new File(path)); + properties.load(fis); + } finally { + if (null != fis) { + fis.close(); + } + } return properties; } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 0d0c5ad..3363291 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -480,13 +480,6 @@ public class Upgrade extends AbstractInstall { copyReferredFile(commandLine, oldServerProps, "rhq.server.client.security.keystore.file"); copyReferredFile(commandLine, oldServerProps, "rhq.server.client.security.truststore.file"); - // In 4.8 the AS management user was always rhqadmin/obfuscated(rhqadmin); so, if not already in the - // old properties, insert the new property with the obfuscated value. - String managementPassword = oldServerProps.getProperty("rhq.server.management.password"); - if (null == managementPassword) { - oldServerProps.setProperty("rhq.server.management.password", "35c160c1f841a889d4cda53f0bfc94b6"); - } - // now merge the old settings in with the default properties from the new server install String newServerPropsFilePath = new File(getBinDir(), "rhq-server.properties").getAbsolutePath(); PropertiesFileUpdate newServerPropsFile = new PropertiesFileUpdate(newServerPropsFilePath); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 34cd79b..2978343 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -18,9 +18,6 @@ */ package org.rhq.modules.plugins.jbossas7; -import java.io.File; -import java.util.Arrays; - import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.ProcessInfo; @@ -84,12 +81,6 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { DiscoveredResourceDetails resourceDetails = super.buildResourceDetails(discoveryContext, process, commandLine); - // Do RHQ Server specific work - if (isRhqServer(process)) { - String name = resourceDetails.getResourceName(); - resourceDetails.setResourceName(name + " RHQ Server"); - } - return resourceDetails; } @@ -99,24 +90,4 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { return process.getParentProcess(); } - private boolean isRhqServer(ProcessInfo process) { - - // LINUX - if (File.separatorChar == '/') { - String prop = process.getEnvironmentVariable("JAVA_OPTS"); - return (null != prop && prop.contains("-Dapp.name=rhq-server")); - } - - // Windows - ProcessInfo parentProcess = process.getParentProcess(); - if (null != parentProcess) { - String commandLine = Arrays.toString(parentProcess.getCommandLine()); - if (null != commandLine && commandLine.contains("rhq-server-wrapper.conf")) { - return true; - } - } - - return false; - } - } diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java index f4c7aef..2eafa44 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java index b80ab50..6f879fa 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java new file mode 100644 index 0000000..23bab25 --- /dev/null +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java @@ -0,0 +1,137 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.plugins.server; + +import java.io.File; +import java.io.FileInputStream; +import java.util.Arrays; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryCallback; +import org.rhq.core.system.ProcessInfo; +import org.rhq.core.util.obfuscation.Obfuscator; + +public class DiscoveryCallbackImpl implements ResourceDiscoveryCallback { + + private static final String PLUGIN_CONFIG_HOME_DIR = "homeDir"; + private static final String PLUGIN_CONFIG_PASSWORD = "password"; + private static final String PROP_SERVER_PROP_FILE = "../bin/rhq-server.properties"; + private static final String PROP_SERVER_MGMT_USER_PASSWORD = "rhq.server.management.password"; + + private Log log = LogFactory.getLog(DiscoveryCallbackImpl.class); + + @Override + public DiscoveryCallbackResults discoveredResources(DiscoveredResourceDetails discoveredDetails) throws Exception { + + ProcessInfo processInfo = discoveredDetails.getProcessInfo(); + DiscoveryCallbackResults result = DiscoveryCallbackResults.UNPROCESSED; + + // Do RHQ Server specific work + if (!isRhqServer(processInfo)) { + return result; + } + + result = DiscoveryCallbackResults.PROCESSED; + + // Make the name reflect the fact that this is the RHQ Server resource + String name = discoveredDetails.getResourceName(); + discoveredDetails.setResourceName(name + " RHQ Server"); + + // Update the plugin config and set the proper management user password + String homeDirStr = discoveredDetails.getPluginConfiguration().getSimpleValue(PLUGIN_CONFIG_HOME_DIR); + + if (null == homeDirStr || homeDirStr.isEmpty()) { + log.warn("The configuration property [" + PLUGIN_CONFIG_HOME_DIR + + "] is not set - will not be able to connect to the RHQ Server instance"); + return result; + } + + File homeDirFile = new File(homeDirStr); + File serverPropertiesFile = new File(homeDirFile, PROP_SERVER_PROP_FILE); + if (!serverPropertiesFile.exists()) { + log.warn("The server properties file [" + serverPropertiesFile.getAbsolutePath() + + "] does not exist - will not be able to connect to the RHQ Server instance"); + return result; + } + + try { + Properties props = new Properties(); + FileInputStream fis = null; + try { + fis = new FileInputStream(serverPropertiesFile); + props.load(fis); + } finally { + if (null != fis) { + fis.close(); + } + } + + String encodedPassword = props.getProperty(PROP_SERVER_MGMT_USER_PASSWORD); + + if (null == encodedPassword || encodedPassword.isEmpty()) { + log.warn("The server property [" + PROP_SERVER_MGMT_USER_PASSWORD + + "] is not set - will not be able to connect to the RHQ Server instance"); + return result; + } + + String password = Obfuscator.decode(encodedPassword); + Configuration pluginConfig = discoveredDetails.getPluginConfiguration(); + pluginConfig.put(new PropertySimple(PLUGIN_CONFIG_PASSWORD, password)); + discoveredDetails.setPluginConfiguration(pluginConfig); + + } catch (Throwable t) { + log.warn( + "Problem setting RHQ Server management password - will not be able to connect to the RHQ Server instance", + t); + } + + return result; + } + + private boolean isRhqServer(ProcessInfo process) { + + // LINUX + if (File.separatorChar == '/') { + String prop = process.getEnvironmentVariable("JAVA_OPTS"); + return (null != prop && prop.contains("-Dapp.name=rhq-server")); + } + + // Windows + ProcessInfo parentProcess = process.getParentProcess(); + if (null != parentProcess) { + String commandLine = Arrays.toString(parentProcess.getCommandLine()); + if (null != commandLine && commandLine.contains("rhq-server-wrapper.conf")) { + return true; + } + } + + return false; + } + +} diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java index 252bd22..e6a4106 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java index 4011716..67b917c 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java @@ -1,3 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.plugins.server; import java.util.Properties; diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java index 154735f..378dd1d 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java @@ -1,3 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.plugins.server; import java.io.File; diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java index 46c4193..e7edc7b 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -29,7 +29,6 @@ import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.enterprise.communications.command.server.CommandProcessorMetrics.Calltime; import org.rhq.plugins.jmx.MBeanResourceComponent; /** diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml index ee3fbd1..af0f2a2 100644 --- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml @@ -10,6 +10,10 @@ plugin="JBossAS7" useClasses="true" />  + <discovery-callbacks> + <type-callback plugin="JBossAS7" type="JBossAS7 Standalone Server" callbackClass="DiscoveryCallbackImpl" /> + </discovery-callbacks> + <service name="RHQ Server Subsystem Services" discovery="JBossAS7JMXDiscoveryComponent" commit d055252dc1e4b3f28bb16e8003fb4eae725c1621 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 17 12:20:49 2013 -0400 download cassandra tarball as maven dependency instead using wget diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 975c94e..7cdd274 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -106,6 +106,13 @@ <artifactId>netty</artifactId> <version>3.6.6.Final</version> </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>apache-cassandra</artifactId> + <version>${cassandra.version}</version> + <type>tar.gz</type> + <classifier>bin</classifier> + </dependency> </dependencies> <executions> <execution> @@ -128,10 +135,6 @@ value="${project.build.directory}/cassandra-download"/> <mkdir dir="${cassandra.download.dir}"/> <mkdir dir="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}"/> - <get src="http://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/${cas..." - dest="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" - skipexisting="true" - verbose="true"/> <gunzip src="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" dest="${cassandra.download.dir}"/> <untar src="${cassandra.download.dir}/apache-cassandra-${cassandra.version}-bin.tar" commit a7747a6389c5bade4ad7aa6cac9966544b1e93a1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Sep 17 07:34:31 2013 -0700 [BZ 1007538] - Add versioning to *.js and *.css files to prevent browser caching. Fixed current versioning issues with upgrading from RHQ 4.8.0 with manual versioning of css and js assets. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index a71b26e..e6be67e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -50,8 +50,8 @@ <when-type-assignable class="com.google.gwt.user.client.rpc.RemoteService"/> </generate-with> - <script src="/coregui/js/moment.min.js"/> - <script src="/coregui/js/rhq.js"/> + <script src="/coregui/js/moment-2.0.0.min.js"/> + <script src="/coregui/js/rhq-4.9.0.js"/>   diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css new file mode 100644 index 0000000..dac51cc --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css @@ -0,0 +1,405 @@ +body { + color: #010101; +} + +body, p, td, th, option, input, textarea, select { + font-family: tahoma, verdana, sans-serif !important; + font-size: 11px !important; +} + +img { + border-style: none; +} + +hr { + background-color: #AAAAAA; + border: 0 none; + color: #AAAAAA; + height: 1px; + margin-left: 0; + margin-right: 0; + text-align: center; + width: 100%; +} + +a, a:link, a:visited, a:hover { + color: #4A5D75 !important; + font-weight: bold !important; +} + +a, a:link, a:visited { + text-decoration: none !important; +} + +a:hover { + text-decoration: underline !important; +} + +a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover { + color: inherit !important; +} + + +.backLink { + color: #4A5D75; + font-weight: bold; + text-decoration: none; +} + + +.HeaderLabel { + height: 35px; + font-size: 11pt; + font-weight: bold; + color: #444444; +} + + +.OddRow { + background-color: #ffffff; + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.OddRowDisabled { + background-color: #ffffff; + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.EvenRow { + background-color: rgb(246, 246, 246); + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.EvenRowDisabled { + background-color: rgb(246, 246, 246); + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.inheritColor { + color: inherit !important; +} + +.TopSectionLink, .TopSectionLinkSelected { + font-size: 12px !important; +} + +.TopSectionLink { + color: #4A5D75 !important; +} + +.TopSectionLinkSelected { + color: white !important; +} + +.TopSectionLinkDiv { +} + +.TopSectionLinkDivSelected { + background-image: url('images/header/header_bg_selected.png'); +} + +.BreadCrumb { + font-size: 10pt; + font-weight: bold; + text-decoration: none; + color: #363636; + height: 28px; +} + +.SectionHeader { + font-size: 16pt; + font-weight: bold; +} + +.textItemDisabled { + background: rgb(214, 213, 217); +} + +.formTitle, .formTitleFocused { + font-weight: bold; +} + +.subtitle { + color: #D6D6D6; + font-variant: small-caps; + font-weight: bold; + font-size: 12pt; +} + + +/* Availability Bar */ +.availBarLeftCap { + background-image: url("images/availBar/leftCap.png"); + width: 8px; + height: 28px; +} +.availBarRightCap { + background-image: url("images/availBar/rightCap.png"); + width: 8px; + height: 28px; +} + +.availBarUp { + background-image: url("images/availBar/up.png"); + background-repeat: repeat-x; + height: 28px; +} + +.availBarDown { + background: url("images/availBar/down.png") repeat-x; + height: 28px; +} + + + +.GraphTooltip { + background-color:#B5D5FF; + font-weight:bold; + padding:5px; +} + + +/* About Modal Window */ +.DisplayContent,.DisplayLabel { + font-size: 11px; +} + +.DisplayLabel { + font-weight: bold; +} + +.DisplaySubhead { + font-weight: bolder; + font-size: 16px; + color: #DE652D; +} + + +.SubTabButton, +.SubTabButtonOver, +.SubTabButtonFocused, +.SubTabButtonFocusedOver, +.SubTabButtonDown, +.SubTabButtonFocusedDown, +.SubTabButtonSelected, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedDown, +.SubTabButtonSelectedFocusedDown, +.SubTabButtonSelectedOver, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonDisabled, +.SubTabButtonSelectedDisabled { + font-family: tahoma, verdona, sans-serif; + font-size: 11px; + padding: 2px; + } + +.SubTabButtonDisabled { + +} + +.SubTabButtonDisabled, +.SubTabButtonSelectedDisabled { + font-weight: normal; + color: #AAAAAA; +} + +.SubTabButtonFocused, +.SubTabButtonFocusedOver, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonSelectedFocusedDown { + +} + +.SubTabButtonOver, +.SubTabButtonFocusedOver, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedFocusedOver { + font-weight: bold; +} + +.SubTabButtonDown, +.SubTabButtonFocusedDown, +.SubTabButtonSelectedDown, +.SubTabButtonSelectedFocusedDown { + font-weight: bold; + font-size: 12px; +} + +.SubTabButtonSelected, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedOver, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonSelectedDisabled { + font-weight: bold; +} + + + +.SimpleButton, +.SimpleButtonOver, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonDisabled, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonOver, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver , +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedDisabled{ + font-family: tahoma, verdana, sans-serif; + font-size: 11px; + padding: 2px; + font-weight: bold; +} + + +.topMenuBar { + background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD; +} + +.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { + border: none !important; + font-weight: bold !important; +} + + + +/** Not used right now **/ +.gwtMenuBar { + background: url('images/header/header_bg.png') repeat-x; + /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/s...");*/ + padding: 0px; + -moz-box-sizing: border-box; + overflow: hidden; + cursor: auto; +} + +.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup { + background-color: white; +} + +.gwt-MenuItem { + padding: 0 10px; + font-weight: bold; + color: #666666; + font-size: 9pt; +} + +.gwt-MenuItemSeparator { + background-color: #666666; +} + +.gwt-MenuItem-Selected { + background-color: #999999; +} + +.selectedTag { + background-color: lightblue; + padding: 5px; + border: 1px solid darkblue; +} + + +/* This sets table mouse-over highlights to have an alpha component on browsers that support it. + It particularly helps with tables that have bar charts as a background component. + (e.g. problem metrics or call time) +*/ +.tallCellOver, .tallCellOverDark { + background-color: rgb(230,230,230) !important; /* for browsers that don't like alpha */ + background-color: rgba(230,230,230,0.6) !important; +} + +.editableText { + color: #070; +} + +.InfoBlock,.ConfirmationBlock,.WarnBlock,.ErrorBlock,.FatalBlock { + border: 1px solid; + color: #000000; +} + +.InfoBlock,.ConfirmationBlock { + background-color: #BFF1B5; /* light green */ + border-color: #00AC3D; /* medium green */ +} + +.WarnBlock { + background-color: #FFFD99; /* light yellow */ + border-color: #FF9C15; /* medium orange */ +} + +.ErrorBlock { + background-color: #FF9999; /* light red */ + border-color: #EE4444; /* medium red */ +} + +.FatalBlock { + background-color: #FF6666; /* slightly darker light red */ + border-color: #EE1111; /* slightly darker medium red */ +} + +.InlineNote { + color: #C22; +} + +.InlineInfo { + color: #00AC3D; /* medium green */ +} + +.InlineError { + color: #EE4444; /* medium red */ +} + +.log-panel { + z-index: 9999999 !important; +} + +.requiredFieldMarker { + font-weight: bolder; + color: #B77 /* medium red */ +} + +.configurationEditorHeaderCell { + border: 1px solid; + background-color: #EEE; /* light gray */ + font-weight: bolder; +} + +.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { + border: none; + font-weight: bold; +} + +.noOutline { + outline:0; +} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css deleted file mode 100644 index dac51cc..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css +++ /dev/null @@ -1,405 +0,0 @@ -body { - color: #010101; -} - -body, p, td, th, option, input, textarea, select { - font-family: tahoma, verdana, sans-serif !important; - font-size: 11px !important; -} - -img { - border-style: none; -} - -hr { - background-color: #AAAAAA; - border: 0 none; - color: #AAAAAA; - height: 1px; - margin-left: 0; - margin-right: 0; - text-align: center; - width: 100%; -} - -a, a:link, a:visited, a:hover { - color: #4A5D75 !important; - font-weight: bold !important; -} - -a, a:link, a:visited { - text-decoration: none !important; -} - -a:hover { - text-decoration: underline !important; -} - -a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover { - color: inherit !important; -} - - -.backLink { - color: #4A5D75; - font-weight: bold; - text-decoration: none; -} - - -.HeaderLabel { - height: 35px; - font-size: 11pt; - font-weight: bold; - color: #444444; -} - - -.OddRow { - background-color: #ffffff; - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.OddRowDisabled { - background-color: #ffffff; - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.EvenRow { - background-color: rgb(246, 246, 246); - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.EvenRowDisabled { - background-color: rgb(246, 246, 246); - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.inheritColor { - color: inherit !important; -} - -.TopSectionLink, .TopSectionLinkSelected { - font-size: 12px !important; -} - -.TopSectionLink { - color: #4A5D75 !important; -} - -.TopSectionLinkSelected { - color: white !important; -} - -.TopSectionLinkDiv { -} - -.TopSectionLinkDivSelected { - background-image: url('images/header/header_bg_selected.png'); -} - -.BreadCrumb { - font-size: 10pt; - font-weight: bold; - text-decoration: none; - color: #363636; - height: 28px; -} - -.SectionHeader { - font-size: 16pt; - font-weight: bold; -} - -.textItemDisabled { - background: rgb(214, 213, 217); -} - -.formTitle, .formTitleFocused { - font-weight: bold; -} - -.subtitle { - color: #D6D6D6; - font-variant: small-caps; - font-weight: bold; - font-size: 12pt; -} - - -/* Availability Bar */ -.availBarLeftCap { - background-image: url("images/availBar/leftCap.png"); - width: 8px; - height: 28px; -} -.availBarRightCap { - background-image: url("images/availBar/rightCap.png"); - width: 8px; - height: 28px; -} - -.availBarUp { - background-image: url("images/availBar/up.png"); - background-repeat: repeat-x; - height: 28px; -} - -.availBarDown { - background: url("images/availBar/down.png") repeat-x; - height: 28px; -} - - - -.GraphTooltip { - background-color:#B5D5FF; - font-weight:bold; - padding:5px; -} - - -/* About Modal Window */ -.DisplayContent,.DisplayLabel { - font-size: 11px; -} - -.DisplayLabel { - font-weight: bold; -} - -.DisplaySubhead { - font-weight: bolder; - font-size: 16px; - color: #DE652D; -} - - -.SubTabButton, -.SubTabButtonOver, -.SubTabButtonFocused, -.SubTabButtonFocusedOver, -.SubTabButtonDown, -.SubTabButtonFocusedDown, -.SubTabButtonSelected, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedDown, -.SubTabButtonSelectedFocusedDown, -.SubTabButtonSelectedOver, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonDisabled, -.SubTabButtonSelectedDisabled { - font-family: tahoma, verdona, sans-serif; - font-size: 11px; - padding: 2px; - } - -.SubTabButtonDisabled { - -} - -.SubTabButtonDisabled, -.SubTabButtonSelectedDisabled { - font-weight: normal; - color: #AAAAAA; -} - -.SubTabButtonFocused, -.SubTabButtonFocusedOver, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonSelectedFocusedDown { - -} - -.SubTabButtonOver, -.SubTabButtonFocusedOver, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedFocusedOver { - font-weight: bold; -} - -.SubTabButtonDown, -.SubTabButtonFocusedDown, -.SubTabButtonSelectedDown, -.SubTabButtonSelectedFocusedDown { - font-weight: bold; - font-size: 12px; -} - -.SubTabButtonSelected, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedOver, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonSelectedDisabled { - font-weight: bold; -} - - - -.SimpleButton, -.SimpleButtonOver, -.SimpleButtonFocused, -.SimpleButtonFocusedOver, -.SimpleButtonDown, -.SimpleButtonFocusedDown, -.SimpleButtonSelected, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedDown, -.SimpleButtonSelectedFocusedDown, -.SimpleButtonSelectedOver, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonDisabled, -.SimpleButtonSelectedDisabled, -.SimpleButtonDisabled, -.SimpleButtonDisabled, -.SimpleButtonSelectedDisabled, -.SimpleButtonFocused, -.SimpleButtonFocusedOver, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonSelectedFocusedDown , -.SimpleButtonOver, -.SimpleButtonFocusedOver, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedFocusedOver , -.SimpleButtonDown, -.SimpleButtonFocusedDown, -.SimpleButtonSelectedDown, -.SimpleButtonSelectedFocusedDown , -.SimpleButtonSelected, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedOver, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonSelectedDisabled{ - font-family: tahoma, verdana, sans-serif; - font-size: 11px; - padding: 2px; - font-weight: bold; -} - - -.topMenuBar { - background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD; -} - -.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { - border: none !important; - font-weight: bold !important; -} - - - -/** Not used right now **/ -.gwtMenuBar { - background: url('images/header/header_bg.png') repeat-x; - /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/s...");*/ - padding: 0px; - -moz-box-sizing: border-box; - overflow: hidden; - cursor: auto; -} - -.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup { - background-color: white; -} - -.gwt-MenuItem { - padding: 0 10px; - font-weight: bold; - color: #666666; - font-size: 9pt; -} - -.gwt-MenuItemSeparator { - background-color: #666666; -} - -.gwt-MenuItem-Selected { - background-color: #999999; -} - -.selectedTag { - background-color: lightblue; - padding: 5px; - border: 1px solid darkblue; -} - - -/* This sets table mouse-over highlights to have an alpha component on browsers that support it. - It particularly helps with tables that have bar charts as a background component. - (e.g. problem metrics or call time) -*/ -.tallCellOver, .tallCellOverDark { - background-color: rgb(230,230,230) !important; /* for browsers that don't like alpha */ - background-color: rgba(230,230,230,0.6) !important; -} - -.editableText { - color: #070; -} - -.InfoBlock,.ConfirmationBlock,.WarnBlock,.ErrorBlock,.FatalBlock { - border: 1px solid; - color: #000000; -} - -.InfoBlock,.ConfirmationBlock { - background-color: #BFF1B5; /* light green */ - border-color: #00AC3D; /* medium green */ -} - -.WarnBlock { - background-color: #FFFD99; /* light yellow */ - border-color: #FF9C15; /* medium orange */ -} - -.ErrorBlock { - background-color: #FF9999; /* light red */ - border-color: #EE4444; /* medium red */ -} - -.FatalBlock { - background-color: #FF6666; /* slightly darker light red */ - border-color: #EE1111; /* slightly darker medium red */ -} - -.InlineNote { - color: #C22; -} - -.InlineInfo { - color: #00AC3D; /* medium green */ -} - -.InlineError { - color: #EE4444; /* medium red */ -} - -.log-panel { - z-index: 9999999 !important; -} - -.requiredFieldMarker { - font-weight: bolder; - color: #B77 /* medium red */ -} - -.configurationEditorHeaderCell { - border: 1px solid; - background-color: #EEE; /* light gray */ - font-weight: bolder; -} - -.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { - border: none; - font-weight: bold; -} - -.noOutline { - outline:0; -} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html index 2567253..6499483 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html @@ -10,9 +10,9 @@  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> - <link rel="stylesheet" href="CoreGUI.css"> + <link rel="stylesheet" href="CoreGUI-4.9.0.css">  - <link rel="stylesheet" href="css/charts.css"> + <link rel="stylesheet" href="css/charts-4.9.0.css"> <script type="text/javascript"> var search = location.search; diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css new file mode 100644 index 0000000..0d123b2 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css @@ -0,0 +1,252 @@ +/*** + * CSS for the d3 SVG charts. This is SVG css not HTML css so some elements + * may look different from standard CSS. + * NOTE: the SVG <defs> section that contains gradients etc. is in the + * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java + * + */ + +svg { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + /* Trying to get SVG to act like a greedy block in all browsers */ + display: block; + width:100%; + height:100%; +} + + + +.axis path, .axis line { + fill: none; + stroke: #000; + shape-rendering: crispEdges; +} + +/* Horizontal gridlines */ + +.grid .tick { + stroke: #f7f7f7; +} + +.y.axis .tick.minor { + stroke: #a7a7ac; +} + +.x.axis .tick.minor { + stroke: #a7a7ac; +} + +.y.axis text, .x.axis text { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + font-weight: normal; + font-style: normal; + fill: #50505a; + text-rendering: optimize-legibility; + +} + +.x.axis path { + stroke: #50505a; +} + +.y.axis path { + stroke: #50505a; +} + /* Brush related css rules */ +.brush rect.extent { + fill: #0757ff; + fill-opacity: .15; + shape-rendering: crispEdges; +} + +.brush .resize path { + fill: #666; + fill-opacity: .8; + stroke: #000; + stroke-width: 1.5px; +} + +.minLabel, .avgLabel, .highLabel { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + font-weight: bold; + text-anchor: start; + fill: #003168; + text-rendering: optimize-legibility; +} + +.minText, .avgText, .highText { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + text-anchor: start; + fill: #003168; + text-rendering: optimize-legibility; +} + +.chartTitleName { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + font-weight: bold; + fill: #003168; +} +.chartTitleBox { + fill:none; + +} + +rect.high { + fill: #1794bc; +} + +rect.low { + fill: #70c4e2; +} + + + +/* CSS for new Chart Hovers*/ + +#availTooltip { + z-index: 990000; + position: absolute; + width: 150px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.8; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#availTooltip.hidden { + display: none; +} + +#availTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 9px; + color: #d3d3d6; +} + +.availTooltipLabel { + width: 40px; + font-weight: bold; + color: #d3d3d6; +} + +/* CSS for metric graph tooltips */ +#metricGraphTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#metricGraphTooltip.hidden { + display: none; +} + +#metricGraphTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + +#metricGraphTooltipLabel { + width: 40px; + font-weight: bold; + color: #d3d3d6; +} + +#metricGraphTooltipMaxLabel { + color: #1794BC; +} + +#metricGraphTooltipAvgLabel { + color: #2e376a; +} + +#metricGraphTooltipMinLabel { + color: #70c4e2; +} + +#noDataTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#noDataTooltip.hidden { + display: none; +} + +#noDataTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + + +#singleValueTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#singleValueTooltip.hidden { + display: none; +} + +#singleValueTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css deleted file mode 100644 index 0d123b2..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css +++ /dev/null @@ -1,252 +0,0 @@ -/*** - * CSS for the d3 SVG charts. This is SVG css not HTML css so some elements - * may look different from standard CSS. - * NOTE: the SVG <defs> section that contains gradients etc. is in the - * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java - * - */ - -svg { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - /* Trying to get SVG to act like a greedy block in all browsers */ - display: block; - width:100%; - height:100%; -} - - - -.axis path, .axis line { - fill: none; - stroke: #000; - shape-rendering: crispEdges; -} - -/* Horizontal gridlines */ - -.grid .tick { - stroke: #f7f7f7; -} - -.y.axis .tick.minor { - stroke: #a7a7ac; -} - -.x.axis .tick.minor { - stroke: #a7a7ac; -} - -.y.axis text, .x.axis text { - font-family: Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: normal; - font-style: normal; - fill: #50505a; - text-rendering: optimize-legibility; - -} - -.x.axis path { - stroke: #50505a; -} - -.y.axis path { - stroke: #50505a; -} - /* Brush related css rules */ -.brush rect.extent { - fill: #0757ff; - fill-opacity: .15; - shape-rendering: crispEdges; -} - -.brush .resize path { - fill: #666; - fill-opacity: .8; - stroke: #000; - stroke-width: 1.5px; -} - -.minLabel, .avgLabel, .highLabel { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - font-weight: bold; - text-anchor: start; - fill: #003168; - text-rendering: optimize-legibility; -} - -.minText, .avgText, .highText { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - text-anchor: start; - fill: #003168; - text-rendering: optimize-legibility; -} - -.chartTitleName { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - font-weight: bold; - fill: #003168; -} -.chartTitleBox { - fill:none; - -} - -rect.high { - fill: #1794bc; -} - -rect.low { - fill: #70c4e2; -} - - - -/* CSS for new Chart Hovers*/ - -#availTooltip { - z-index: 990000; - position: absolute; - width: 150px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.8; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#availTooltip.hidden { - display: none; -} - -#availTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 9px; - color: #d3d3d6; -} - -.availTooltipLabel { - width: 40px; - font-weight: bold; - color: #d3d3d6; -} - -/* CSS for metric graph tooltips */ -#metricGraphTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#metricGraphTooltip.hidden { - display: none; -} - -#metricGraphTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - -#metricGraphTooltipLabel { - width: 40px; - font-weight: bold; - color: #d3d3d6; -} - -#metricGraphTooltipMaxLabel { - color: #1794BC; -} - -#metricGraphTooltipAvgLabel { - color: #2e376a; -} - -#metricGraphTooltipMinLabel { - color: #70c4e2; -} - -#noDataTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#noDataTooltip.hidden { - display: none; -} - -#noDataTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - - -#singleValueTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#singleValueTooltip.hidden { - display: none; -} - -#singleValueTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js new file mode 100644 index 0000000..30a0a6c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js @@ -0,0 +1,1400 @@ +// moment.js +// version : 2.0.0 +// author : Tim Wood +// license : MIT +// momentjs.com + +(function (undefined) { + + /************************************ + Constants + ************************************/ + + var moment, + VERSION = "2.0.0", + round = Math.round, i, + // internal storage for language config files + languages = {}, + + // check for nodeJS + hasModule = (typeof module !== 'undefined' && module.exports), + + // ASP.NET json date format regex + aspNetJsonRegex = /^\/?Date$(\-?\d+)/i, + + // format tokens + formattingTokens = /(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, + localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, + + // parsing tokens + parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi, + + // parsing token regexes + parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 + parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 + parseTokenThreeDigits = /\d{3}/, // 000 - 999 + parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 + parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 + parseTokenWord = /[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i, // any word (or two) characters or numbers including two word month in arabic. + parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z + parseTokenT = /T/i, // T (ISO seperator) + parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 + + // preliminary iso regex + // 0000-00-00 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 + isoRegex = /^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/, + isoFormat = 'YYYY-MM-DDTHH:mm:ssZ', + + // iso time formats and regexes + isoTimes = [ + ['HH:mm:ss.S', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/], + ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/], + ['HH:mm', /(T| )\d\d:\d\d/], + ['HH', /(T| )\d\d/] + ], + + // timezone chunker "+10:00" > ["10", "00"] or "-1530" > ["-15", "30"] + parseTimezoneChunker = /([\+\-]|\d\d)/gi, + + // getter and setter names + proxyGettersAndSetters = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), + unitMillisecondFactors = { + 'Milliseconds' : 1, + 'Seconds' : 1e3, + 'Minutes' : 6e4, + 'Hours' : 36e5, + 'Days' : 864e5, + 'Months' : 2592e6, + 'Years' : 31536e6 + }, + + // format function strings + formatFunctions = {}, + + // tokens to ordinalize and pad + ordinalizeTokens = 'DDD w W M D d'.split(' '), + paddedTokens = 'M D H h m s w W'.split(' '), + + formatTokenFunctions = { + M : function () { + return this.month() + 1; + }, + MMM : function (format) { + return this.lang().monthsShort(this, format); + }, + MMMM : function (format) { + return this.lang().months(this, format); + }, + D : function () { + return this.date(); + }, + DDD : function () { + return this.dayOfYear(); + }, + d : function () { + return this.day(); + }, + dd : function (format) { + return this.lang().weekdaysMin(this, format); + }, + ddd : function (format) { + return this.lang().weekdaysShort(this, format); + }, + dddd : function (format) { + return this.lang().weekdays(this, format); + }, + w : function () { + return this.week(); + }, + W : function () { + return this.isoWeek(); + }, + YY : function () { + return leftZeroFill(this.year() % 100, 2); + }, + YYYY : function () { + return leftZeroFill(this.year(), 4); + }, + YYYYY : function () { + return leftZeroFill(this.year(), 5); + }, + a : function () { + return this.lang().meridiem(this.hours(), this.minutes(), true); + }, + A : function () { + return this.lang().meridiem(this.hours(), this.minutes(), false); + }, + H : function () { + return this.hours(); + }, + h : function () { + return this.hours() % 12 || 12; + }, + m : function () { + return this.minutes(); + }, + s : function () { + return this.seconds(); + }, + S : function () { + return ~~(this.milliseconds() / 100); + }, + SS : function () { + return leftZeroFill(~~(this.milliseconds() / 10), 2); + }, + SSS : function () { + return leftZeroFill(this.milliseconds(), 3); + }, + Z : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(~~(a / 60), 2) + ":" + leftZeroFill(~~a % 60, 2); + }, + ZZ : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(~~(10 * a / 6), 4); + }, + X : function () { + return this.unix(); + } + }; + + function padToken(func, count) { + return function (a) { + return leftZeroFill(func.call(this, a), count); + }; + } + function ordinalizeToken(func) { + return function (a) { + return this.lang().ordinal(func.call(this, a)); + }; + } + + while (ordinalizeTokens.length) { + i = ordinalizeTokens.pop(); + formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i]); + } + while (paddedTokens.length) { + i = paddedTokens.pop(); + formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2); + } + formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3); + + + /************************************ + Constructors + ************************************/ + + function Language() { + + } + + // Moment prototype object + function Moment(config) { + extend(this, config); + } + + // Duration Constructor + function Duration(duration) { + var data = this._data = {}, + years = duration.years || duration.year || duration.y || 0, + months = duration.months || duration.month || duration.M || 0, + weeks = duration.weeks || duration.week || duration.w || 0, + days = duration.days || duration.day || duration.d || 0, + hours = duration.hours || duration.hour || duration.h || 0, + minutes = duration.minutes || duration.minute || duration.m || 0, + seconds = duration.seconds || duration.second || duration.s || 0, + milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; + + // representation for dateAddRemove + this._milliseconds = milliseconds + + seconds * 1e3 + // 1000 + minutes * 6e4 + // 1000 * 60 + hours * 36e5; // 1000 * 60 * 60 + // Because of dateAddRemove treats 24 hours as different from a + // day when working around DST, we need to store them separately + this._days = days + + weeks * 7; + // It is impossible translate months into days without knowing + // which months you are are talking about, so we have to store + // it separately. + this._months = months + + years * 12; + + // The following code bubbles up values, see the tests for + // examples of what that means. + data.milliseconds = milliseconds % 1000; + seconds += absRound(milliseconds / 1000); + + data.seconds = seconds % 60; + minutes += absRound(seconds / 60); + + data.minutes = minutes % 60; + hours += absRound(minutes / 60); + + data.hours = hours % 24; + days += absRound(hours / 24); + + days += weeks * 7; + data.days = days % 30; + + months += absRound(days / 30); + + data.months = months % 12; + years += absRound(months / 12); + + data.years = years; + } + + + /************************************ + Helpers + ************************************/ + + + function extend(a, b) { + for (var i in b) { + if (b.hasOwnProperty(i)) { + a[i] = b[i]; + } + } + return a; + } + + function absRound(number) { + if (number < 0) { + return Math.ceil(number); + } else { + return Math.floor(number); + } + } + + // left zero fill a number + // see http://jsperf.com/left-zero-filling for performance comparison + function leftZeroFill(number, targetLength) { + var output = number + ''; + while (output.length < targetLength) { + output = '0' + output; + } + return output; + } + + // helper function for _.addTime and _.subtractTime + function addOrSubtractDurationFromMoment(mom, duration, isAdding) { + var ms = duration._milliseconds, + d = duration._days, + M = duration._months, + currentDate; + + if (ms) { + mom._d.setTime(+mom + ms * isAdding); + } + if (d) { + mom.date(mom.date() + d * isAdding); + } + if (M) { + currentDate = mom.date(); + mom.date(1) + .month(mom.month() + M * isAdding) + .date(Math.min(currentDate, mom.daysInMonth())); + } + } + + // check if is an array + function isArray(input) { + return Object.prototype.toString.call(input) === '[object Array]'; + } + + // compare two arrays, return the number of differences + function compareArrays(array1, array2) { + var len = Math.min(array1.length, array2.length), + lengthDiff = Math.abs(array1.length - array2.length), + diffs = 0, + i; + for (i = 0; i < len; i++) { + if (~~array1[i] !== ~~array2[i]) { + diffs++; + } + } + return diffs + lengthDiff; + } + + + /************************************ + Languages + ************************************/ + + + Language.prototype = { + set : function (config) { + var prop, i; + for (i in config) { + prop = config[i]; + if (typeof prop === 'function') { + this[i] = prop; + } else { + this['_' + i] = prop; + } + } + }, + + _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + months : function (m) { + return this._months[m.month()]; + }, + + _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + monthsShort : function (m) { + return this._monthsShort[m.month()]; + }, + + monthsParse : function (monthName) { + var i, mom, regex, output; + + if (!this._monthsParse) { + this._monthsParse = []; + } + + for (i = 0; i < 12; i++) { + // make the regex if we don't have it already + if (!this._monthsParse[i]) { + mom = moment([2000, i]); + regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); + this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (this._monthsParse[i].test(monthName)) { + return i; + } + } + }, + + _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdays : function (m) { + return this._weekdays[m.day()]; + }, + + _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysShort : function (m) { + return this._weekdaysShort[m.day()]; + }, + + _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + weekdaysMin : function (m) { + return this._weekdaysMin[m.day()]; + }, + + _longDateFormat : { + LT : "h:mm A", + L : "MM/DD/YYYY", + LL : "MMMM D YYYY", + LLL : "MMMM D YYYY LT", + LLLL : "dddd, MMMM D YYYY LT" + }, + longDateFormat : function (key) { + var output = this._longDateFormat[key]; + if (!output && this._longDateFormat[key.toUpperCase()]) { + output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) { + return val.slice(1); + }); + this._longDateFormat[key] = output; + } + return output; + }, + + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'pm' : 'PM'; + } else { + return isLower ? 'am' : 'AM'; + } + }, + + _calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[last] dddd [at] LT', + sameElse : 'L' + }, + calendar : function (key, mom) { + var output = this._calendar[key]; + return typeof output === 'function' ? output.apply(mom) : output; + }, + + _relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + relativeTime : function (number, withoutSuffix, string, isFuture) { + var output = this._relativeTime[string]; + return (typeof output === 'function') ? + output(number, withoutSuffix, string, isFuture) : + output.replace(/%d/i, number); + }, + pastFuture : function (diff, output) { + var format = this._relativeTime[diff > 0 ? 'future' : 'past']; + return typeof format === 'function' ? format(output) : format.replace(/%s/i, output); + }, + + ordinal : function (number) { + return this._ordinal.replace("%d", number); + }, + _ordinal : "%d", + + preparse : function (string) { + return string; + }, + + postformat : function (string) { + return string; + }, + + week : function (mom) { + return weekOfYear(mom, this._week.dow, this._week.doy); + }, + _week : { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + } + }; + + // Loads a language definition into the `languages` cache. The function + // takes a key and optionally values. If not in the browser and no values + // are provided, it will load the language file module. As a convenience, + // this function also returns the language values. + function loadLang(key, values) { + values.abbr = key; + if (!languages[key]) { + languages[key] = new Language(); + } + languages[key].set(values); + return languages[key]; + } + + // Determines which language definition to use and returns it. + // + // With no parameters, it will return the global language. If you + // pass in a language key, such as 'en', it will return the + // definition for 'en', so long as 'en' has already been loaded using + // moment.lang. + function getLangDefinition(key) { + if (!key) { + return moment.fn._lang; + } + if (!languages[key] && hasModule) { + require('./lang/' + key); + } + return languages[key]; + } + + + /************************************ + Formatting + ************************************/ + + + function removeFormattingTokens(input) { + if (input.match(/\[.*\]/)) { + return input.replace(/^\[|\]$/g, ""); + } + return input.replace(/\\/g, ""); + } + + function makeFormatFunction(format) { + var array = format.match(formattingTokens), i, length; + + for (i = 0, length = array.length; i < length; i++) { + if (formatTokenFunctions[array[i]]) { + array[i] = formatTokenFunctions[array[i]]; + } else { + array[i] = removeFormattingTokens(array[i]); + } + } + + return function (mom) { + var output = ""; + for (i = 0; i < length; i++) { + output += typeof array[i].call === 'function' ? array[i].call(mom, format) : array[i]; + } + return output; + }; + } + + // format date using native date object + function formatMoment(m, format) { + var i = 5; + + function replaceLongDateFormatTokens(input) { + return m.lang().longDateFormat(input) || input; + } + + while (i-- && localFormattingTokens.test(format)) { + format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); + } + + if (!formatFunctions[format]) { + formatFunctions[format] = makeFormatFunction(format); + } + + return formatFunctions[format](m); + } + + + /************************************ + Parsing + ************************************/ + + + // get the regex to find the next token + function getParseRegexForToken(token) { + switch (token) { + case 'DDDD': + return parseTokenThreeDigits; + case 'YYYY': + return parseTokenFourDigits; + case 'YYYYY': + return parseTokenSixDigits; + case 'S': + case 'SS': + case 'SSS': + case 'DDD': + return parseTokenOneToThreeDigits; + case 'MMM': + case 'MMMM': + case 'dd': + case 'ddd': + case 'dddd': + case 'a': + case 'A': + return parseTokenWord; + case 'X': + return parseTokenTimestampMs; + case 'Z': + case 'ZZ': + return parseTokenTimezone; + case 'T': + return parseTokenT; + case 'MM': + case 'DD': + case 'YY': + case 'HH': + case 'hh': + case 'mm': + case 'ss': + case 'M': + case 'D': + case 'd': + case 'H': + case 'h': + case 'm': + case 's': + return parseTokenOneOrTwoDigits; + default : + return new RegExp(token.replace('\\', '')); + } + } + + // function to convert string input to date + function addTimeToArrayFromToken(token, input, config) { + var a, b, + datePartArray = config._a; + + switch (token) { + // MONTH + case 'M' : // fall through to MM + case 'MM' : + datePartArray[1] = (input == null) ? 0 : ~~input - 1; + break; + case 'MMM' : // fall through to MMMM + case 'MMMM' : + a = getLangDefinition(config._l).monthsParse(input); + // if we didn't find a month name, mark the date as invalid. + if (a != null) { + datePartArray[1] = a; + } else { + config._isValid = false; + } + break; + // DAY OF MONTH + case 'D' : // fall through to DDDD + case 'DD' : // fall through to DDDD + case 'DDD' : // fall through to DDDD + case 'DDDD' : + if (input != null) { + datePartArray[2] = ~~input; + } + break; + // YEAR + case 'YY' : + datePartArray[0] = ~~input + (~~input > 68 ? 1900 : 2000); + break; + case 'YYYY' : + case 'YYYYY' : + datePartArray[0] = ~~input; + break; + // AM / PM + case 'a' : // fall through to A + case 'A' : + config._isPm = ((input + '').toLowerCase() === 'pm'); + break; + // 24 HOUR + case 'H' : // fall through to hh + case 'HH' : // fall through to hh + case 'h' : // fall through to hh + case 'hh' : + datePartArray[3] = ~~input; + break; + // MINUTE + case 'm' : // fall through to mm + case 'mm' : + datePartArray[4] = ~~input; + break; + // SECOND + case 's' : // fall through to ss + case 'ss' : + datePartArray[5] = ~~input; + break; + // MILLISECOND + case 'S' : + case 'SS' : + case 'SSS' : + datePartArray[6] = ~~ (('0.' + input) * 1000); + break; + // UNIX TIMESTAMP WITH MS + case 'X': + config._d = new Date(parseFloat(input) * 1000); + break; + // TIMEZONE + case 'Z' : // fall through to ZZ + case 'ZZ' : + config._useUTC = true; + a = (input + '').match(parseTimezoneChunker); + if (a && a[1]) { + config._tzh = ~~a[1]; + } + if (a && a[2]) { + config._tzm = ~~a[2]; + } + // reverse offsets + if (a && a[0] === '+') { + config._tzh = -config._tzh; + config._tzm = -config._tzm; + } + break; + } + + // if the input is null, the date is not valid + if (input == null) { + config._isValid = false; + } + } + + // convert an array to a date. + // the array should mirror the parameters below + // note: all values past the year are optional and will default to the lowest possible value. + // [year, month, day , hour, minute, second, millisecond] + function dateFromArray(config) { + var i, date, input = []; + + if (config._d) { + return; + } + + for (i = 0; i < 7; i++) { + config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; + } + + // add the offsets to the time to be parsed so that we can have a clean array for checking isValid + input[3] += config._tzh || 0; + input[4] += config._tzm || 0; + + date = new Date(0); + + if (config._useUTC) { + date.setUTCFullYear(input[0], input[1], input[2]); + date.setUTCHours(input[3], input[4], input[5], input[6]); + } else { + date.setFullYear(input[0], input[1], input[2]); + date.setHours(input[3], input[4], input[5], input[6]); + } + + config._d = date; + } + + // date from string and format string + function makeDateFromStringAndFormat(config) { + // This array is used to make a Date, either with `new Date` or `Date.UTC` + var tokens = config._f.match(formattingTokens), + string = config._i, + i, parsedInput; + + config._a = []; + + for (i = 0; i < tokens.length; i++) { + parsedInput = (getParseRegexForToken(tokens[i]).exec(string) || [])[0]; + if (parsedInput) { + string = string.slice(string.indexOf(parsedInput) + parsedInput.length); + } + // don't parse if its not a known token + if (formatTokenFunctions[tokens[i]]) { + addTimeToArrayFromToken(tokens[i], parsedInput, config); + } + } + // handle am pm + if (config._isPm && config._a[3] < 12) { + config._a[3] += 12; + } + // if is 12 am, change hours to 0 + if (config._isPm === false && config._a[3] === 12) { + config._a[3] = 0; + } + // return + dateFromArray(config); + } + + // date from string and array of format strings + function makeDateFromStringAndArray(config) { + var tempConfig, + tempMoment, + bestMoment, + + scoreToBeat = 99, + i, + currentDate, + currentScore; + + while (config._f.length) { + tempConfig = extend({}, config); + tempConfig._f = config._f.pop(); + makeDateFromStringAndFormat(tempConfig); + tempMoment = new Moment(tempConfig); + + if (tempMoment.isValid()) { + bestMoment = tempMoment; + break; + } + + currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); + + if (currentScore < scoreToBeat) { + scoreToBeat = currentScore; + bestMoment = tempMoment; + } + } + + extend(config, bestMoment); + } + + // date from iso format + function makeDateFromString(config) { + var i, + string = config._i; + if (isoRegex.exec(string)) { + config._f = 'YYYY-MM-DDT'; + for (i = 0; i < 4; i++) { + if (isoTimes[i][1].exec(string)) { + config._f += isoTimes[i][0]; + break; + } + } + if (parseTokenTimezone.exec(string)) { + config._f += " Z"; + } + makeDateFromStringAndFormat(config); + } else { + config._d = new Date(string); + } + } + + function makeDateFromInput(config) { + var input = config._i, + matched = aspNetJsonRegex.exec(input); + + if (input === undefined) { + config._d = new Date(); + } else if (matched) { + config._d = new Date(+matched[1]); + } else if (typeof input === 'string') { + makeDateFromString(config); + } else if (isArray(input)) { + config._a = input.slice(0); + dateFromArray(config); + } else { + config._d = input instanceof Date ? new Date(+input) : new Date(input); + } + } + + + /************************************ + Relative Time + ************************************/ + + + // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize + function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) { + return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture); + } + + function relativeTime(milliseconds, withoutSuffix, lang) { + var seconds = round(Math.abs(milliseconds) / 1000), + minutes = round(seconds / 60), + hours = round(minutes / 60), + days = round(hours / 24), + years = round(days / 365), + args = seconds < 45 && ['s', seconds] || + minutes === 1 && ['m'] || + minutes < 45 && ['mm', minutes] || + hours === 1 && ['h'] || + hours < 22 && ['hh', hours] || + days === 1 && ['d'] || + days <= 25 && ['dd', days] || + days <= 45 && ['M'] || + days < 345 && ['MM', round(days / 30)] || + years === 1 && ['y'] || ['yy', years]; + args[2] = withoutSuffix; + args[3] = milliseconds > 0; + args[4] = lang; + return substituteTimeAgo.apply({}, args); + } + + + /************************************ + Week of Year + ************************************/ + + + // firstDayOfWeek 0 = sun, 6 = sat + // the day of the week that starts the week + // (usually sunday or monday) + // firstDayOfWeekOfYear 0 = sun, 6 = sat + // the first week is the week that contains the first + // of this day of the week + // (eg. ISO weeks use thursday (4)) + function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { + var end = firstDayOfWeekOfYear - firstDayOfWeek, + daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(); + + + if (daysToDayOfWeek > end) { + daysToDayOfWeek -= 7; + } + + if (daysToDayOfWeek < end - 7) { + daysToDayOfWeek += 7; + } + + return Math.ceil(moment(mom).add('d', daysToDayOfWeek).dayOfYear() / 7); + } + + + /************************************ + Top Level Functions + ************************************/ + + function makeMoment(config) { + var input = config._i, + format = config._f; + + if (input === null || input === '') { + return null; + } + + if (typeof input === 'string') { + config._i = input = getLangDefinition().preparse(input); + } + + if (moment.isMoment(input)) { + config = extend({}, input); + config._d = new Date(+input._d); + } else if (format) { + if (isArray(format)) { + makeDateFromStringAndArray(config); + } else { + makeDateFromStringAndFormat(config); + } + } else { + makeDateFromInput(config); + } + + return new Moment(config); + } + + moment = function (input, format, lang) { + return makeMoment({ + _i : input, + _f : format, + _l : lang, + _isUTC : false + }); + }; + + // creating with utc + moment.utc = function (input, format, lang) { + return makeMoment({ + _useUTC : true, + _isUTC : true, + _l : lang, + _i : input, + _f : format + }); + }; + + // creating with unix timestamp (in seconds) + moment.unix = function (input) { + return moment(input * 1000); + }; + + // duration + moment.duration = function (input, key) { + var isDuration = moment.isDuration(input), + isNumber = (typeof input === 'number'), + duration = (isDuration ? input._data : (isNumber ? {} : input)), + ret; + + if (isNumber) { + if (key) { + duration[key] = input; + } else { + duration.milliseconds = input; + } + } + + ret = new Duration(duration); + + if (isDuration && input.hasOwnProperty('_lang')) { + ret._lang = input._lang; + } + + return ret; + }; + + // version number + moment.version = VERSION; + + // default format + moment.defaultFormat = isoFormat; + + // This function will load languages and then set the global language. If + // no arguments are passed in, it will simply return the current global + // language key. + moment.lang = function (key, values) { + var i; + + if (!key) { + return moment.fn._lang._abbr; + } + if (values) { + loadLang(key, values); + } else if (!languages[key]) { + getLangDefinition(key); + } + moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + }; + + // returns language data + moment.langData = function (key) { + if (key && key._lang && key._lang._abbr) { + key = key._lang._abbr; + } + return getLangDefinition(key); + }; + + // compare moment object + moment.isMoment = function (obj) { + return obj instanceof Moment; + }; + + // for typechecking Duration objects + moment.isDuration = function (obj) { + return obj instanceof Duration; + }; + + + /************************************ + Moment Prototype + ************************************/ + + + moment.fn = Moment.prototype = { + + clone : function () { + return moment(this); + }, + + valueOf : function () { + return +this._d; + }, + + unix : function () { + return Math.floor(+this._d / 1000); + }, + + toString : function () { + return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); + }, + + toDate : function () { + return this._d; + }, + + toJSON : function () { + return moment.utc(this).format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + }, + + toArray : function () { + var m = this; + return [ + m.year(), + m.month(), + m.date(), + m.hours(), + m.minutes(), + m.seconds(), + m.milliseconds() + ]; + }, + + isValid : function () { + if (this._isValid == null) { + if (this._a) { + this._isValid = !compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()); + } else { + this._isValid = !isNaN(this._d.getTime()); + } + } + return !!this._isValid; + }, + + utc : function () { + this._isUTC = true; + return this; + }, + + local : function () { + this._isUTC = false; + return this; + }, + + format : function (inputString) { + var output = formatMoment(this, inputString || moment.defaultFormat); + return this.lang().postformat(output); + }, + + add : function (input, val) { + var dur; + // switch args to support add('s', 1) and add(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, 1); + return this; + }, + + subtract : function (input, val) { + var dur; + // switch args to support subtract('s', 1) and subtract(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, -1); + return this; + }, + + diff : function (input, units, asFloat) { + var that = this._isUTC ? moment(input).utc() : moment(input).local(), + zoneDiff = (this.zone() - that.zone()) * 6e4, + diff, output; + + if (units) { + // standardize on singular form + units = units.replace(/s$/, ''); + } + + if (units === 'year' || units === 'month') { + diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 + output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); + output += ((this - moment(this).startOf('month')) - (that - moment(that).startOf('month'))) / diff; + if (units === 'year') { + output = output / 12; + } + } else { + diff = (this - that) - zoneDiff; + output = units === 'second' ? diff / 1e3 : // 1000 + units === 'minute' ? diff / 6e4 : // 1000 * 60 + units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 + units === 'day' ? diff / 864e5 : // 1000 * 60 * 60 * 24 + units === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7 + diff; + } + return asFloat ? output : absRound(output); + }, + + from : function (time, withoutSuffix) { + return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix); + }, + + fromNow : function (withoutSuffix) { + return this.from(moment(), withoutSuffix); + }, + + calendar : function () { + var diff = this.diff(moment().startOf('day'), 'days', true), + format = diff < -6 ? 'sameElse' : + diff < -1 ? 'lastWeek' : + diff < 0 ? 'lastDay' : + diff < 1 ? 'sameDay' : + diff < 2 ? 'nextDay' : + diff < 7 ? 'nextWeek' : 'sameElse'; + return this.format(this.lang().calendar(format, this)); + }, + + isLeapYear : function () { + var year = this.year(); + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + }, + + isDST : function () { + return (this.zone() < moment([this.year()]).zone() || + this.zone() < moment([this.year(), 5]).zone()); + }, + + day : function (input) { + var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); + return input == null ? day : + this.add({ d : input - day }); + }, + + startOf: function (units) { + units = units.replace(/s$/, ''); + // the following switch intentionally omits break keywords + // to utilize falling through the cases. + switch (units) { + case 'year': + this.month(0); + /* falls through */ + case 'month': + this.date(1); + /* falls through */ + case 'week': + case 'day': + this.hours(0); + /* falls through */ + case 'hour': + this.minutes(0); + /* falls through */ + case 'minute': + this.seconds(0); + /* falls through */ + case 'second': + this.milliseconds(0); + /* falls through */ + } + + // weeks are a special case + if (units === 'week') { + this.day(0); + } + + return this; + }, + + endOf: function (units) { + return this.startOf(units).add(units.replace(/s?$/, 's'), 1).subtract('ms', 1); + }, + + isAfter: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) > +moment(input).startOf(units); + }, + + isBefore: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) < +moment(input).startOf(units); + }, + + isSame: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) === +moment(input).startOf(units); + }, + + zone : function () { + return this._isUTC ? 0 : this._d.getTimezoneOffset(); + }, + + daysInMonth : function () { + return moment.utc([this.year(), this.month() + 1, 0]).date(); + }, + + dayOfYear : function (input) { + var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1; + return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); + }, + + isoWeek : function (input) { + var week = weekOfYear(this, 1, 4); + return input == null ? week : this.add("d", (input - week) * 7); + }, + + week : function (input) { + var week = this.lang().week(this); + return input == null ? week : this.add("d", (input - week) * 7); + }, + + // If passed a language key, it will set the language for this + // instance. Otherwise, it will return the language configuration + // variables for this instance. + lang : function (key) { + if (key === undefined) { + return this._lang; + } else { + this._lang = getLangDefinition(key); + return this; + } + } + }; + + // helper for adding shortcuts + function makeGetterAndSetter(name, key) { + moment.fn[name] = moment.fn[name + 's'] = function (input) { + var utc = this._isUTC ? 'UTC' : ''; + if (input != null) { + this._d['set' + utc + key](input); + return this; + } else { + return this._d['get' + utc + key](); + } + }; + } + + // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) + for (i = 0; i < proxyGettersAndSetters.length; i ++) { + makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); + } + + // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') + makeGetterAndSetter('year', 'FullYear'); + + // add plural methods + moment.fn.days = moment.fn.day; + moment.fn.weeks = moment.fn.week; + moment.fn.isoWeeks = moment.fn.isoWeek; + + /************************************ + Duration Prototype + ************************************/ + + + moment.duration.fn = Duration.prototype = { + weeks : function () { + return absRound(this.days() / 7); + }, + + valueOf : function () { + return this._milliseconds + + this._days * 864e5 + + this._months * 2592e6; + }, + + humanize : function (withSuffix) { + var difference = +this, + output = relativeTime(difference, !withSuffix, this.lang()); + + if (withSuffix) { + output = this.lang().pastFuture(difference, output); + } + + return this.lang().postformat(output); + }, + + lang : moment.fn.lang + }; + + function makeDurationGetter(name) { + moment.duration.fn[name] = function () { + return this._data[name]; + }; + } + + function makeDurationAsGetter(name, factor) { + moment.duration.fn['as' + name] = function () { + return +this / factor; + }; + } + + for (i in unitMillisecondFactors) { + if (unitMillisecondFactors.hasOwnProperty(i)) { + makeDurationAsGetter(i, unitMillisecondFactors[i]); + makeDurationGetter(i.toLowerCase()); + } + } + + makeDurationAsGetter('Weeks', 6048e5); + + + /************************************ + Default Lang + ************************************/ + + + // Set default language, other languages will inherit from English. + moment.lang('en', { + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); + + + /************************************ + Exposing Moment + ************************************/ + + + // CommonJS module is defined + if (hasModule) { + module.exports = moment; + } + /*global ender:false */ + if (typeof ender === 'undefined') { + // here, `this` means `window` in the browser, or `global` on the server + // add `moment` as a global object via a string identifier, + // for Closure Compiler "advanced" mode + this['moment'] = moment; + } + /*global define:false */ + if (typeof define === "function" && define.amd) { + define("moment", [], function () { + return moment; + }); + } +}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js new file mode 100644 index 0000000..4e8497a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js @@ -0,0 +1,6 @@ +// moment.js +// version : 2.0.0 +// author : Tim Wood +// license : MIT +// momentjs.com +(function(e){function O(e,t){return function(n){return j(e.call(this,n),t)}}function M(e){return function(t){return this.lang().ordinal(e.call(this,t))}}function _(){}function D(e){H(this,e)}function P(e){var t=this._data={},n=e.years||e.year||e.y||0,r=e.months||e.month||e.M||0,i=e.weeks||e.week||e.w||0,s=e.days||e.day||e.d||0,o=e.hours||e.hour||e.h||0,u=e.minutes||e.minute||e.m||0,a=e.seconds||e.second||e.s||0,f=e.milliseconds||e.millisecond||e.ms||0;this._milliseconds=f+a*1e3+u*6e4+o*36e5,this._days=s+i*7,this._months=r+n*12,t.milliseconds=f%1e3,a+=B(f/1e3),t.seconds=a%60,u+=B(a/60),t.minutes=u%60,o+=B(u/60),t.hours=o%24,s+=B(o/24),s+=i*7,t.days=s%30,r+=B(s/30),t.months=r%12,n+=B(r/12),t.years=n}function H(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}function B(e){return e<0?Math.ceil(e):Math.floor(e)}function j(e,t){var n=e+"";while(n.length<t)n="0"+n;return n}function F(e,t,n){var r=t._milliseconds,i=t._days,s=t._months,o;r&&e._d.setTime(+e+r*n),i&&e.dat e(e.date()+i*n),s&&(o=e.date(),e.date(1).month(e.month()+s*n).date(Math.min(o,e.daysInMonth())))}function I(e){return Object.prototype.toString.call(e)==="[object Array]"}function q(e,t){var n=Math.min(e.length,t.length),r=Math.abs(e.length-t.length),i=0,s;for(s=0;s<n;s++)~~e[s]!==~~t[s]&&i++;return i+r}function R(e,t){return t.abbr=e,s[e]||(s[e]=new _),s[e].set(t),s[e]}function U(e){return e?(!s[e]&&o&&require("./lang/"+e),s[e]):t.fn._lang}function z(e){return e.match(/\[.*\]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function W(e){var t=e.match(a),n,r;for(n=0,r=t.length;n<r;n++)A[t[n]]?t[n]=A[t[n]]:t[n]=z(t[n]);return function(i){var s="";for(n=0;n<r;n++)s+=typeof t[n].call=="function"?t[n].call(i,e):t[n];return s}}function X(e,t){function r(t){return e.lang().longDateFormat(t)||t}var n=5;while(n--&&f.test(t))t=t.replace(f,r);return C[t]||(C[t]=W(t)),C[t](e)}function V(e){switch(e){case"DDDD":return p;case"YYYY":return d;case"YYYYY":return v;case"S":case"SS":case"SSS": case"DDD":return h;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":case"a":case"A":return m;case"X":return b;case"Z":case"ZZ":return g;case"T":return y;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return c;default:return new RegExp(e.replace("\\",""))}}function $(e,t,n){var r,i,s=n._a;switch(e){case"M":case"MM":s[1]=t==null?0:~~t-1;break;case"MMM":case"MMMM":r=U(n._l).monthsParse(t),r!=null?s[1]=r:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":t!=null&&(s[2]=~~t);break;case"YY":s[0]=~~t+(~~t>68?1900:2e3);break;case"YYYY":case"YYYYY":s[0]=~~t;break;case"a":case"A":n._isPm=(t+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":s[3]=~~t;break;case"m":case"mm":s[4]=~~t;break;case"s":case"ss":s[5]=~~t;break;case"S":case"SS":case"SSS":s[6]=~~(("0."+t)*1e3);break;case"X":n._d=new Date(parseFloat(t)*1e3);break;case"Z":case"ZZ":n._useUTC=!0,r=(t+"").match(x),r&&r[1]&&(n._tzh=~~r[1]),r &&r[2]&&(n._tzm=~~r[2]),r&&r[0]==="+"&&(n._tzh=-n._tzh,n._tzm=-n._tzm)}t==null&&(n._isValid=!1)}function J(e){var t,n,r=[];if(e._d)return;for(t=0;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];r[3]+=e._tzh||0,r[4]+=e._tzm||0,n=new Date(0),e._useUTC?(n.setUTCFullYear(r[0],r[1],r[2]),n.setUTCHours(r[3],r[4],r[5],r[6])):(n.setFullYear(r[0],r[1],r[2]),n.setHours(r[3],r[4],r[5],r[6])),e._d=n}function K(e){var t=e._f.match(a),n=e._i,r,i;e._a=[];for(r=0;r<t.length;r++)i=(V(t[r]).exec(n)||[])[0],i&&(n=n.slice(n.indexOf(i)+i.length)),A[t[r]]&&$(t[r],i,e);e._isPm&&e._a[3]<12&&(e._a[3]+=12),e._isPm===!1&&e._a[3]===12&&(e._a[3]=0),J(e)}function Q(e){var t,n,r,i=99,s,o,u;while(e._f.length){t=H({},e),t._f=e._f.pop(),K(t),n=new D(t);if(n.isValid()){r=n;break}u=q(t._a,n.toArray()),u<i&&(i=u,r=n)}H(e,r)}function G(e){var t,n=e._i;if(w.exec(n)){e._f="YYYY-MM-DDT";for(t=0;t<4;t++)if(S[t][1].exec(n)){e._f+=S[t][0];break}g.exec(n)&&(e._f+=" Z"),K(e)}else e._d=new Date(n)}function Y(t){var n=t._i,r=u.exec(n);n===e?t._d=new Date:r?t._d=new Date(+r[1]):typeof n=="string"?G(t):I(n)?(t._a=n.slice(0),J(t)):t._d=n instanceof Date?new Date(+n):new Date(n)}function Z(e,t,n,r,i){return i.relativeTime(t||1,!!n,e,r)}function et(e,t,n){var i=r(Math.abs(e)/1e3),s=r(i/60),o=r(s/60),u=r(o/24),a=r(u/365),f=i<45&&["s",i]||s===1&&["m"]||s<45&&["mm",s]||o===1&&["h"]||o<22&&["hh",o]||u===1&&["d"]||u<=25&&["dd",u]||u<=45&&["M"]||u<345&&["MM",r(u/30)]||a===1&&["y"]||["yy",a];return f[2]=t,f[3]=e>0,f[4]=n,Z.apply({},f)}function tt(e,n,r){var i=r-n,s=r-e.day();return s>i&&(s-=7),s<i-7&&(s+=7),Math.ceil(t(e).add("d",s).dayOfYear()/7)}function nt(e){var n=e._i,r=e._f;return n===null||n===""?null:(typeof n=="string"&&(e._i=n=U().preparse(n)),t.isMoment(n)?(e=H({},n),e._d=new Date(+n._d)):r?I(r)?Q(e):K(e):Y(e),new D(e))}function rt(e,n){t.fn[e]=t.fn[e+"s"]=function(e){var t=this._isUTC?"UTC":"";return e!=null?(this._d["set"+t+n](e),this):this._d["get"+t+n]()}}function it(e){t.duration.fn [e]=function(){return this._data[e]}}function st(e,n){t.duration.fn["as"+e]=function(){return+this/n}}var t,n="2.0.0",r=Math.round,i,s={},o=typeof module!="undefined"&&module.exports,u=/^\/?Date$(\-?\d+)/i,a=/(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,f=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,l=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,c=/\d\d?/,h=/\d{1,3}/,p=/\d{3}/,d=/\d{1,4}/,v=/[+\-]?\d{1,6}/,m=/[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i,g=/Z|[\+\-]\d\d:?\d\d/i,y=/T/i,b=/[\+\-]?\d+(\.\d{1,3})?/,w=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,E="YYYY-MM-DDTHH:mm:ssZ",S=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],x=/([\+\-]|\d\d)/gi,T="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("| "),N={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},C={},k="DDD w W M D d".split(" "),L="M D H h m s w W".split(" "),A={M:function(){return this.month()+1},MMM:function(e){return this.lang().monthsShort(this,e)},MMMM:function(e){return this.lang().months(this,e)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(e){return this.lang().weekdaysMin(this,e)},ddd:function(e){return this.lang().weekdaysShort(this,e)},dddd:function(e){return this.lang().weekdays(this,e)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return j(this.year()%100,2)},YYYY:function(){return j(this.year(),4)},YYYYY:function(){return j(this.year(),5)},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours() %12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return j(~~(this.milliseconds()/10),2)},SSS:function(){return j(this.milliseconds(),3)},Z:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(e/60),2)+":"+j(~~e%60,2)},ZZ:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(10*e/6),4)},X:function(){return this.unix()}};while(k.length)i=k.pop(),A[i+"o"]=M(A[i]);while(L.length)i=L.pop(),A[i+i]=O(A[i],2);A.DDDD=O(A.DDD,3),_.prototype={set:function(e){var t,n;for(n in e)t=e[n],typeof t=="function"?this[n]=t:this["_"+n]=t},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(e){return this._months[e.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(e){return this._monthsShort[e.month()]},monthsParse:function(e){var n,r,i,s;this._monthsP arse||(this._monthsParse=[]);for(n=0;n<12;n++){this._monthsParse[n]||(r=t([2e3,n]),i="^"+this.months(r,"")+"|^"+this.monthsShort(r,""),this._monthsParse[n]=new RegExp(i.replace(".",""),"i"));if(this._monthsParse[n].test(e))return n}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(e){return this._weekdays[e.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(e){return this._weekdaysShort[e.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(e){return this._weekdaysMin[e.day()]},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(e){var t=this._longDateFormat[e];return!t&&this._longDateFormat[e.toUpperCase()]&&(t=this._longDateFormat[e.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e]=t),t},meridiem:function(e,t,n){return e>11?n?"pm":"PM":n ?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[last] dddd [at] LT",sameElse:"L"},calendar:function(e,t){var n=this._calendar[e];return typeof n=="function"?n.apply(t):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(e,t,n,r){var i=this._relativeTime[n];return typeof i=="function"?i(e,t,n,r):i.replace(/%d/i,e)},pastFuture:function(e,t){var n=this._relativeTime[e>0?"future":"past"];return typeof n=="function"?n(t):n.replace(/%s/i,t)},ordinal:function(e){return this._ordinal.replace("%d",e)},_ordinal:"%d",preparse:function(e){return e},postformat:function(e){return e},week:function(e){return tt(e,this._week.dow,this._week.doy)},_week:{dow:0,doy:6}},t=function(e,t,n){return nt({_i:e,_f:t,_l:n,_isUTC:!1})},t.utc=function(e,t, n){return nt({_useUTC:!0,_isUTC:!0,_l:n,_i:e,_f:t})},t.unix=function(e){return t(e*1e3)},t.duration=function(e,n){var r=t.isDuration(e),i=typeof e=="number",s=r?e._data:i?{}:e,o;return i&&(n?s[n]=e:s.milliseconds=e),o=new P(s),r&&e.hasOwnProperty("_lang")&&(o._lang=e._lang),o},t.version=n,t.defaultFormat=E,t.lang=function(e,n){var r;if(!e)return t.fn._lang._abbr;n?R(e,n):s[e]||U(e),t.duration.fn._lang=t.fn._lang=U(e)},t.langData=function(e){return e&&e._lang&&e._lang._abbr&&(e=e._lang._abbr),U(e)},t.isMoment=function(e){return e instanceof D},t.isDuration=function(e){return e instanceof P},t.fn=D.prototype={clone:function(){return t(this)},valueOf:function(){return+this._d},unix:function(){return Math.floor(+this._d/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._d},toJSON:function(){return t.utc(this).format("YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var e=this;return[e.year(),e.month(),e.date(),e.hou rs(),e.minutes(),e.seconds(),e.milliseconds()]},isValid:function(){return this._isValid==null&&(this._a?this._isValid=!q(this._a,(this._isUTC?t.utc(this._a):t(this._a)).toArray()):this._isValid=!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this._isUTC=!0,this},local:function(){return this._isUTC=!1,this},format:function(e){var n=X(this,e||t.defaultFormat);return this.lang().postformat(n)},add:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,1),this},subtract:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,-1),this},diff:function(e,n,r){var i=this._isUTC?t(e).utc():t(e).local(),s=(this.zone()-i.zone())*6e4,o,u;return n&&(n=n.replace(/s$/,"")),n==="year"||n==="month"?(o=(this.daysInMonth()+i.daysInMonth())*432e5,u=(this.year()-i.year())*12+(this.month()-i.month()),u+=(this-t(this).startOf("month")-(i-t(i).startOf("month")))/o,n==="year"&&(u/=12)):(o=this-i-s,u=n==="second "?o/1e3:n==="minute"?o/6e4:n==="hour"?o/36e5:n==="day"?o/864e5:n==="week"?o/6048e5:o),r?u:B(u)},from:function(e,n){return t.duration(this.diff(e)).lang(this.lang()._abbr).humanize(!n)},fromNow:function(e){return this.from(t(),e)},calendar:function(){var e=this.diff(t().startOf("day"),"days",!0),n=e<-6?"sameElse":e<-1?"lastWeek":e<0?"lastDay":e<1?"sameDay":e<2?"nextDay":e<7?"nextWeek":"sameElse";return this.format(this.lang().calendar(n,this))},isLeapYear:function(){var e=this.year();return e%4===0&&e%100!==0||e%400===0},isDST:function(){return this.zone()<t([this.year()]).zone()||this.zone()<t([this.year(),5]).zone()},day:function(e){var t=this._isUTC?this._d.getUTCDay():this._d.getDay();return e==null?t:this.add({d:e-t})},startOf:function(e){e=e.replace(/s$/,"");switch(e){case"year":this.month(0);case"month":this.date(1);case"week":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return e==="week"&&this.day(0) ,this},endOf:function(e){return this.startOf(e).add(e.replace(/s?$/,"s"),1).subtract("ms",1)},isAfter:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)>+t(e).startOf(n)},isBefore:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)<+t(e).startOf(n)},isSame:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)===+t(e).startOf(n)},zone:function(){return this._isUTC?0:this._d.getTimezoneOffset()},daysInMonth:function(){return t.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(e){var n=r((t(this).startOf("day")-t(this).startOf("year"))/864e5)+1;return e==null?n:this.add("d",e-n)},isoWeek:function(e){var t=tt(this,1,4);return e==null?t:this.add("d",(e-t)*7)},week:function(e){var t=this.lang().week(this);return e==null?t:this.add("d",(e-t)*7)},lang:function(t){return t===e?this._lang:(this._lang=U(t),this)}};for(i=0;i<T.length;i++)rt(T[i].toLowerCase().replace(/s$/,"" ),T[i]);rt("year","FullYear"),t.fn.days=t.fn.day,t.fn.weeks=t.fn.week,t.fn.isoWeeks=t.fn.isoWeek,t.duration.fn=P.prototype={weeks:function(){return B(this.days()/7)},valueOf:function(){return this._milliseconds+this._days*864e5+this._months*2592e6},humanize:function(e){var t=+this,n=et(t,!e,this.lang());return e&&(n=this.lang().pastFuture(t,n)),this.lang().postformat(n)},lang:t.fn.lang};for(i in N)N.hasOwnProperty(i)&&(st(i,N[i]),it(i.toLowerCase()));st("Weeks",6048e5),t.lang("en",{ordinal:function(e){var t=e%10,n=~~(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}}),o&&(module.exports=t),typeof ender=="undefined"&&(this.moment=t),typeof define=="function"&&define.amd&&define("moment",[],function(){return t})}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js deleted file mode 100644 index 30a0a6c..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js +++ /dev/null @@ -1,1400 +0,0 @@ -// moment.js -// version : 2.0.0 -// author : Tim Wood -// license : MIT -// momentjs.com - -(function (undefined) { - - /************************************ - Constants - ************************************/ - - var moment, - VERSION = "2.0.0", - round = Math.round, i, - // internal storage for language config files - languages = {}, - - // check for nodeJS - hasModule = (typeof module !== 'undefined' && module.exports), - - // ASP.NET json date format regex - aspNetJsonRegex = /^\/?Date$(\-?\d+)/i, - - // format tokens - formattingTokens = /(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, - localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, - - // parsing tokens - parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi, - - // parsing token regexes - parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 - parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 - parseTokenThreeDigits = /\d{3}/, // 000 - 999 - parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 - parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 - parseTokenWord = /[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i, // any word (or two) characters or numbers including two word month in arabic. - parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z - parseTokenT = /T/i, // T (ISO seperator) - parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 - - // preliminary iso regex - // 0000-00-00 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 - isoRegex = /^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/, - isoFormat = 'YYYY-MM-DDTHH:mm:ssZ', - - // iso time formats and regexes - isoTimes = [ - ['HH:mm:ss.S', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/], - ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/], - ['HH:mm', /(T| )\d\d:\d\d/], - ['HH', /(T| )\d\d/] - ], - - // timezone chunker "+10:00" > ["10", "00"] or "-1530" > ["-15", "30"] - parseTimezoneChunker = /([\+\-]|\d\d)/gi, - - // getter and setter names - proxyGettersAndSetters = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), - unitMillisecondFactors = { - 'Milliseconds' : 1, - 'Seconds' : 1e3, - 'Minutes' : 6e4, - 'Hours' : 36e5, - 'Days' : 864e5, - 'Months' : 2592e6, - 'Years' : 31536e6 - }, - - // format function strings - formatFunctions = {}, - - // tokens to ordinalize and pad - ordinalizeTokens = 'DDD w W M D d'.split(' '), - paddedTokens = 'M D H h m s w W'.split(' '), - - formatTokenFunctions = { - M : function () { - return this.month() + 1; - }, - MMM : function (format) { - return this.lang().monthsShort(this, format); - }, - MMMM : function (format) { - return this.lang().months(this, format); - }, - D : function () { - return this.date(); - }, - DDD : function () { - return this.dayOfYear(); - }, - d : function () { - return this.day(); - }, - dd : function (format) { - return this.lang().weekdaysMin(this, format); - }, - ddd : function (format) { - return this.lang().weekdaysShort(this, format); - }, - dddd : function (format) { - return this.lang().weekdays(this, format); - }, - w : function () { - return this.week(); - }, - W : function () { - return this.isoWeek(); - }, - YY : function () { - return leftZeroFill(this.year() % 100, 2); - }, - YYYY : function () { - return leftZeroFill(this.year(), 4); - }, - YYYYY : function () { - return leftZeroFill(this.year(), 5); - }, - a : function () { - return this.lang().meridiem(this.hours(), this.minutes(), true); - }, - A : function () { - return this.lang().meridiem(this.hours(), this.minutes(), false); - }, - H : function () { - return this.hours(); - }, - h : function () { - return this.hours() % 12 || 12; - }, - m : function () { - return this.minutes(); - }, - s : function () { - return this.seconds(); - }, - S : function () { - return ~~(this.milliseconds() / 100); - }, - SS : function () { - return leftZeroFill(~~(this.milliseconds() / 10), 2); - }, - SSS : function () { - return leftZeroFill(this.milliseconds(), 3); - }, - Z : function () { - var a = -this.zone(), - b = "+"; - if (a < 0) { - a = -a; - b = "-"; - } - return b + leftZeroFill(~~(a / 60), 2) + ":" + leftZeroFill(~~a % 60, 2); - }, - ZZ : function () { - var a = -this.zone(), - b = "+"; - if (a < 0) { - a = -a; - b = "-"; - } - return b + leftZeroFill(~~(10 * a / 6), 4); - }, - X : function () { - return this.unix(); - } - }; - - function padToken(func, count) { - return function (a) { - return leftZeroFill(func.call(this, a), count); - }; - } - function ordinalizeToken(func) { - return function (a) { - return this.lang().ordinal(func.call(this, a)); - }; - } - - while (ordinalizeTokens.length) { - i = ordinalizeTokens.pop(); - formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i]); - } - while (paddedTokens.length) { - i = paddedTokens.pop(); - formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2); - } - formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3); - - - /************************************ - Constructors - ************************************/ - - function Language() { - - } - - // Moment prototype object - function Moment(config) { - extend(this, config); - } - - // Duration Constructor - function Duration(duration) { - var data = this._data = {}, - years = duration.years || duration.year || duration.y || 0, - months = duration.months || duration.month || duration.M || 0, - weeks = duration.weeks || duration.week || duration.w || 0, - days = duration.days || duration.day || duration.d || 0, - hours = duration.hours || duration.hour || duration.h || 0, - minutes = duration.minutes || duration.minute || duration.m || 0, - seconds = duration.seconds || duration.second || duration.s || 0, - milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; - - // representation for dateAddRemove - this._milliseconds = milliseconds + - seconds * 1e3 + // 1000 - minutes * 6e4 + // 1000 * 60 - hours * 36e5; // 1000 * 60 * 60 - // Because of dateAddRemove treats 24 hours as different from a - // day when working around DST, we need to store them separately - this._days = days + - weeks * 7; - // It is impossible translate months into days without knowing - // which months you are are talking about, so we have to store - // it separately. - this._months = months + - years * 12; - - // The following code bubbles up values, see the tests for - // examples of what that means. - data.milliseconds = milliseconds % 1000; - seconds += absRound(milliseconds / 1000); - - data.seconds = seconds % 60; - minutes += absRound(seconds / 60); - - data.minutes = minutes % 60; - hours += absRound(minutes / 60); - - data.hours = hours % 24; - days += absRound(hours / 24); - - days += weeks * 7; - data.days = days % 30; - - months += absRound(days / 30); - - data.months = months % 12; - years += absRound(months / 12); - - data.years = years; - } - - - /************************************ - Helpers - ************************************/ - - - function extend(a, b) { - for (var i in b) { - if (b.hasOwnProperty(i)) { - a[i] = b[i]; - } - } - return a; - } - - function absRound(number) { - if (number < 0) { - return Math.ceil(number); - } else { - return Math.floor(number); - } - } - - // left zero fill a number - // see http://jsperf.com/left-zero-filling for performance comparison - function leftZeroFill(number, targetLength) { - var output = number + ''; - while (output.length < targetLength) { - output = '0' + output; - } - return output; - } - - // helper function for _.addTime and _.subtractTime - function addOrSubtractDurationFromMoment(mom, duration, isAdding) { - var ms = duration._milliseconds, - d = duration._days, - M = duration._months, - currentDate; - - if (ms) { - mom._d.setTime(+mom + ms * isAdding); - } - if (d) { - mom.date(mom.date() + d * isAdding); - } - if (M) { - currentDate = mom.date(); - mom.date(1) - .month(mom.month() + M * isAdding) - .date(Math.min(currentDate, mom.daysInMonth())); - } - } - - // check if is an array - function isArray(input) { - return Object.prototype.toString.call(input) === '[object Array]'; - } - - // compare two arrays, return the number of differences - function compareArrays(array1, array2) { - var len = Math.min(array1.length, array2.length), - lengthDiff = Math.abs(array1.length - array2.length), - diffs = 0, - i; - for (i = 0; i < len; i++) { - if (~~array1[i] !== ~~array2[i]) { - diffs++; - } - } - return diffs + lengthDiff; - } - - - /************************************ - Languages - ************************************/ - - - Language.prototype = { - set : function (config) { - var prop, i; - for (i in config) { - prop = config[i]; - if (typeof prop === 'function') { - this[i] = prop; - } else { - this['_' + i] = prop; - } - } - }, - - _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), - months : function (m) { - return this._months[m.month()]; - }, - - _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), - monthsShort : function (m) { - return this._monthsShort[m.month()]; - }, - - monthsParse : function (monthName) { - var i, mom, regex, output; - - if (!this._monthsParse) { - this._monthsParse = []; - } - - for (i = 0; i < 12; i++) { - // make the regex if we don't have it already - if (!this._monthsParse[i]) { - mom = moment([2000, i]); - regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); - this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); - } - // test the regex - if (this._monthsParse[i].test(monthName)) { - return i; - } - } - }, - - _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), - weekdays : function (m) { - return this._weekdays[m.day()]; - }, - - _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), - weekdaysShort : function (m) { - return this._weekdaysShort[m.day()]; - }, - - _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), - weekdaysMin : function (m) { - return this._weekdaysMin[m.day()]; - }, - - _longDateFormat : { - LT : "h:mm A", - L : "MM/DD/YYYY", - LL : "MMMM D YYYY", - LLL : "MMMM D YYYY LT", - LLLL : "dddd, MMMM D YYYY LT" - }, - longDateFormat : function (key) { - var output = this._longDateFormat[key]; - if (!output && this._longDateFormat[key.toUpperCase()]) { - output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) { - return val.slice(1); - }); - this._longDateFormat[key] = output; - } - return output; - }, - - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'pm' : 'PM'; - } else { - return isLower ? 'am' : 'AM'; - } - }, - - _calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', - sameElse : 'L' - }, - calendar : function (key, mom) { - var output = this._calendar[key]; - return typeof output === 'function' ? output.apply(mom) : output; - }, - - _relativeTime : { - future : "in %s", - past : "%s ago", - s : "a few seconds", - m : "a minute", - mm : "%d minutes", - h : "an hour", - hh : "%d hours", - d : "a day", - dd : "%d days", - M : "a month", - MM : "%d months", - y : "a year", - yy : "%d years" - }, - relativeTime : function (number, withoutSuffix, string, isFuture) { - var output = this._relativeTime[string]; - return (typeof output === 'function') ? - output(number, withoutSuffix, string, isFuture) : - output.replace(/%d/i, number); - }, - pastFuture : function (diff, output) { - var format = this._relativeTime[diff > 0 ? 'future' : 'past']; - return typeof format === 'function' ? format(output) : format.replace(/%s/i, output); - }, - - ordinal : function (number) { - return this._ordinal.replace("%d", number); - }, - _ordinal : "%d", - - preparse : function (string) { - return string; - }, - - postformat : function (string) { - return string; - }, - - week : function (mom) { - return weekOfYear(mom, this._week.dow, this._week.doy); - }, - _week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } - }; - - // Loads a language definition into the `languages` cache. The function - // takes a key and optionally values. If not in the browser and no values - // are provided, it will load the language file module. As a convenience, - // this function also returns the language values. - function loadLang(key, values) { - values.abbr = key; - if (!languages[key]) { - languages[key] = new Language(); - } - languages[key].set(values); - return languages[key]; - } - - // Determines which language definition to use and returns it. - // - // With no parameters, it will return the global language. If you - // pass in a language key, such as 'en', it will return the - // definition for 'en', so long as 'en' has already been loaded using - // moment.lang. - function getLangDefinition(key) { - if (!key) { - return moment.fn._lang; - } - if (!languages[key] && hasModule) { - require('./lang/' + key); - } - return languages[key]; - } - - - /************************************ - Formatting - ************************************/ - - - function removeFormattingTokens(input) { - if (input.match(/\[.*\]/)) { - return input.replace(/^\[|\]$/g, ""); - } - return input.replace(/\\/g, ""); - } - - function makeFormatFunction(format) { - var array = format.match(formattingTokens), i, length; - - for (i = 0, length = array.length; i < length; i++) { - if (formatTokenFunctions[array[i]]) { - array[i] = formatTokenFunctions[array[i]]; - } else { - array[i] = removeFormattingTokens(array[i]); - } - } - - return function (mom) { - var output = ""; - for (i = 0; i < length; i++) { - output += typeof array[i].call === 'function' ? array[i].call(mom, format) : array[i]; - } - return output; - }; - } - - // format date using native date object - function formatMoment(m, format) { - var i = 5; - - function replaceLongDateFormatTokens(input) { - return m.lang().longDateFormat(input) || input; - } - - while (i-- && localFormattingTokens.test(format)) { - format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); - } - - if (!formatFunctions[format]) { - formatFunctions[format] = makeFormatFunction(format); - } - - return formatFunctions[format](m); - } - - - /************************************ - Parsing - ************************************/ - - - // get the regex to find the next token - function getParseRegexForToken(token) { - switch (token) { - case 'DDDD': - return parseTokenThreeDigits; - case 'YYYY': - return parseTokenFourDigits; - case 'YYYYY': - return parseTokenSixDigits; - case 'S': - case 'SS': - case 'SSS': - case 'DDD': - return parseTokenOneToThreeDigits; - case 'MMM': - case 'MMMM': - case 'dd': - case 'ddd': - case 'dddd': - case 'a': - case 'A': - return parseTokenWord; - case 'X': - return parseTokenTimestampMs; - case 'Z': - case 'ZZ': - return parseTokenTimezone; - case 'T': - return parseTokenT; - case 'MM': - case 'DD': - case 'YY': - case 'HH': - case 'hh': - case 'mm': - case 'ss': - case 'M': - case 'D': - case 'd': - case 'H': - case 'h': - case 'm': - case 's': - return parseTokenOneOrTwoDigits; - default : - return new RegExp(token.replace('\\', '')); - } - } - - // function to convert string input to date - function addTimeToArrayFromToken(token, input, config) { - var a, b, - datePartArray = config._a; - - switch (token) { - // MONTH - case 'M' : // fall through to MM - case 'MM' : - datePartArray[1] = (input == null) ? 0 : ~~input - 1; - break; - case 'MMM' : // fall through to MMMM - case 'MMMM' : - a = getLangDefinition(config._l).monthsParse(input); - // if we didn't find a month name, mark the date as invalid. - if (a != null) { - datePartArray[1] = a; - } else { - config._isValid = false; - } - break; - // DAY OF MONTH - case 'D' : // fall through to DDDD - case 'DD' : // fall through to DDDD - case 'DDD' : // fall through to DDDD - case 'DDDD' : - if (input != null) { - datePartArray[2] = ~~input; - } - break; - // YEAR - case 'YY' : - datePartArray[0] = ~~input + (~~input > 68 ? 1900 : 2000); - break; - case 'YYYY' : - case 'YYYYY' : - datePartArray[0] = ~~input; - break; - // AM / PM - case 'a' : // fall through to A - case 'A' : - config._isPm = ((input + '').toLowerCase() === 'pm'); - break; - // 24 HOUR - case 'H' : // fall through to hh - case 'HH' : // fall through to hh - case 'h' : // fall through to hh - case 'hh' : - datePartArray[3] = ~~input; - break; - // MINUTE - case 'm' : // fall through to mm - case 'mm' : - datePartArray[4] = ~~input; - break; - // SECOND - case 's' : // fall through to ss - case 'ss' : - datePartArray[5] = ~~input; - break; - // MILLISECOND - case 'S' : - case 'SS' : - case 'SSS' : - datePartArray[6] = ~~ (('0.' + input) * 1000); - break; - // UNIX TIMESTAMP WITH MS - case 'X': - config._d = new Date(parseFloat(input) * 1000); - break; - // TIMEZONE - case 'Z' : // fall through to ZZ - case 'ZZ' : - config._useUTC = true; - a = (input + '').match(parseTimezoneChunker); - if (a && a[1]) { - config._tzh = ~~a[1]; - } - if (a && a[2]) { - config._tzm = ~~a[2]; - } - // reverse offsets - if (a && a[0] === '+') { - config._tzh = -config._tzh; - config._tzm = -config._tzm; - } - break; - } - - // if the input is null, the date is not valid - if (input == null) { - config._isValid = false; - } - } - - // convert an array to a date. - // the array should mirror the parameters below - // note: all values past the year are optional and will default to the lowest possible value. - // [year, month, day , hour, minute, second, millisecond] - function dateFromArray(config) { - var i, date, input = []; - - if (config._d) { - return; - } - - for (i = 0; i < 7; i++) { - config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; - } - - // add the offsets to the time to be parsed so that we can have a clean array for checking isValid - input[3] += config._tzh || 0; - input[4] += config._tzm || 0; - - date = new Date(0); - - if (config._useUTC) { - date.setUTCFullYear(input[0], input[1], input[2]); - date.setUTCHours(input[3], input[4], input[5], input[6]); - } else { - date.setFullYear(input[0], input[1], input[2]); - date.setHours(input[3], input[4], input[5], input[6]); - } - - config._d = date; - } - - // date from string and format string - function makeDateFromStringAndFormat(config) { - // This array is used to make a Date, either with `new Date` or `Date.UTC` - var tokens = config._f.match(formattingTokens), - string = config._i, - i, parsedInput; - - config._a = []; - - for (i = 0; i < tokens.length; i++) { - parsedInput = (getParseRegexForToken(tokens[i]).exec(string) || [])[0]; - if (parsedInput) { - string = string.slice(string.indexOf(parsedInput) + parsedInput.length); - } - // don't parse if its not a known token - if (formatTokenFunctions[tokens[i]]) { - addTimeToArrayFromToken(tokens[i], parsedInput, config); - } - } - // handle am pm - if (config._isPm && config._a[3] < 12) { - config._a[3] += 12; - } - // if is 12 am, change hours to 0 - if (config._isPm === false && config._a[3] === 12) { - config._a[3] = 0; - } - // return - dateFromArray(config); - } - - // date from string and array of format strings - function makeDateFromStringAndArray(config) { - var tempConfig, - tempMoment, - bestMoment, - - scoreToBeat = 99, - i, - currentDate, - currentScore; - - while (config._f.length) { - tempConfig = extend({}, config); - tempConfig._f = config._f.pop(); - makeDateFromStringAndFormat(tempConfig); - tempMoment = new Moment(tempConfig); - - if (tempMoment.isValid()) { - bestMoment = tempMoment; - break; - } - - currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); - - if (currentScore < scoreToBeat) { - scoreToBeat = currentScore; - bestMoment = tempMoment; - } - } - - extend(config, bestMoment); - } - - // date from iso format - function makeDateFromString(config) { - var i, - string = config._i; - if (isoRegex.exec(string)) { - config._f = 'YYYY-MM-DDT'; - for (i = 0; i < 4; i++) { - if (isoTimes[i][1].exec(string)) { - config._f += isoTimes[i][0]; - break; - } - } - if (parseTokenTimezone.exec(string)) { - config._f += " Z"; - } - makeDateFromStringAndFormat(config); - } else { - config._d = new Date(string); - } - } - - function makeDateFromInput(config) { - var input = config._i, - matched = aspNetJsonRegex.exec(input); - - if (input === undefined) { - config._d = new Date(); - } else if (matched) { - config._d = new Date(+matched[1]); - } else if (typeof input === 'string') { - makeDateFromString(config); - } else if (isArray(input)) { - config._a = input.slice(0); - dateFromArray(config); - } else { - config._d = input instanceof Date ? new Date(+input) : new Date(input); - } - } - - - /************************************ - Relative Time - ************************************/ - - - // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize - function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) { - return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture); - } - - function relativeTime(milliseconds, withoutSuffix, lang) { - var seconds = round(Math.abs(milliseconds) / 1000), - minutes = round(seconds / 60), - hours = round(minutes / 60), - days = round(hours / 24), - years = round(days / 365), - args = seconds < 45 && ['s', seconds] || - minutes === 1 && ['m'] || - minutes < 45 && ['mm', minutes] || - hours === 1 && ['h'] || - hours < 22 && ['hh', hours] || - days === 1 && ['d'] || - days <= 25 && ['dd', days] || - days <= 45 && ['M'] || - days < 345 && ['MM', round(days / 30)] || - years === 1 && ['y'] || ['yy', years]; - args[2] = withoutSuffix; - args[3] = milliseconds > 0; - args[4] = lang; - return substituteTimeAgo.apply({}, args); - } - - - /************************************ - Week of Year - ************************************/ - - - // firstDayOfWeek 0 = sun, 6 = sat - // the day of the week that starts the week - // (usually sunday or monday) - // firstDayOfWeekOfYear 0 = sun, 6 = sat - // the first week is the week that contains the first - // of this day of the week - // (eg. ISO weeks use thursday (4)) - function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { - var end = firstDayOfWeekOfYear - firstDayOfWeek, - daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(); - - - if (daysToDayOfWeek > end) { - daysToDayOfWeek -= 7; - } - - if (daysToDayOfWeek < end - 7) { - daysToDayOfWeek += 7; - } - - return Math.ceil(moment(mom).add('d', daysToDayOfWeek).dayOfYear() / 7); - } - - - /************************************ - Top Level Functions - ************************************/ - - function makeMoment(config) { - var input = config._i, - format = config._f; - - if (input === null || input === '') { - return null; - } - - if (typeof input === 'string') { - config._i = input = getLangDefinition().preparse(input); - } - - if (moment.isMoment(input)) { - config = extend({}, input); - config._d = new Date(+input._d); - } else if (format) { - if (isArray(format)) { - makeDateFromStringAndArray(config); - } else { - makeDateFromStringAndFormat(config); - } - } else { - makeDateFromInput(config); - } - - return new Moment(config); - } - - moment = function (input, format, lang) { - return makeMoment({ - _i : input, - _f : format, - _l : lang, - _isUTC : false - }); - }; - - // creating with utc - moment.utc = function (input, format, lang) { - return makeMoment({ - _useUTC : true, - _isUTC : true, - _l : lang, - _i : input, - _f : format - }); - }; - - // creating with unix timestamp (in seconds) - moment.unix = function (input) { - return moment(input * 1000); - }; - - // duration - moment.duration = function (input, key) { - var isDuration = moment.isDuration(input), - isNumber = (typeof input === 'number'), - duration = (isDuration ? input._data : (isNumber ? {} : input)), - ret; - - if (isNumber) { - if (key) { - duration[key] = input; - } else { - duration.milliseconds = input; - } - } - - ret = new Duration(duration); - - if (isDuration && input.hasOwnProperty('_lang')) { - ret._lang = input._lang; - } - - return ret; - }; - - // version number - moment.version = VERSION; - - // default format - moment.defaultFormat = isoFormat; - - // This function will load languages and then set the global language. If - // no arguments are passed in, it will simply return the current global - // language key. - moment.lang = function (key, values) { - var i; - - if (!key) { - return moment.fn._lang._abbr; - } - if (values) { - loadLang(key, values); - } else if (!languages[key]) { - getLangDefinition(key); - } - moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); - }; - - // returns language data - moment.langData = function (key) { - if (key && key._lang && key._lang._abbr) { - key = key._lang._abbr; - } - return getLangDefinition(key); - }; - - // compare moment object - moment.isMoment = function (obj) { - return obj instanceof Moment; - }; - - // for typechecking Duration objects - moment.isDuration = function (obj) { - return obj instanceof Duration; - }; - - - /************************************ - Moment Prototype - ************************************/ - - - moment.fn = Moment.prototype = { - - clone : function () { - return moment(this); - }, - - valueOf : function () { - return +this._d; - }, - - unix : function () { - return Math.floor(+this._d / 1000); - }, - - toString : function () { - return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); - }, - - toDate : function () { - return this._d; - }, - - toJSON : function () { - return moment.utc(this).format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); - }, - - toArray : function () { - var m = this; - return [ - m.year(), - m.month(), - m.date(), - m.hours(), - m.minutes(), - m.seconds(), - m.milliseconds() - ]; - }, - - isValid : function () { - if (this._isValid == null) { - if (this._a) { - this._isValid = !compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()); - } else { - this._isValid = !isNaN(this._d.getTime()); - } - } - return !!this._isValid; - }, - - utc : function () { - this._isUTC = true; - return this; - }, - - local : function () { - this._isUTC = false; - return this; - }, - - format : function (inputString) { - var output = formatMoment(this, inputString || moment.defaultFormat); - return this.lang().postformat(output); - }, - - add : function (input, val) { - var dur; - // switch args to support add('s', 1) and add(1, 's') - if (typeof input === 'string') { - dur = moment.duration(+val, input); - } else { - dur = moment.duration(input, val); - } - addOrSubtractDurationFromMoment(this, dur, 1); - return this; - }, - - subtract : function (input, val) { - var dur; - // switch args to support subtract('s', 1) and subtract(1, 's') - if (typeof input === 'string') { - dur = moment.duration(+val, input); - } else { - dur = moment.duration(input, val); - } - addOrSubtractDurationFromMoment(this, dur, -1); - return this; - }, - - diff : function (input, units, asFloat) { - var that = this._isUTC ? moment(input).utc() : moment(input).local(), - zoneDiff = (this.zone() - that.zone()) * 6e4, - diff, output; - - if (units) { - // standardize on singular form - units = units.replace(/s$/, ''); - } - - if (units === 'year' || units === 'month') { - diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 - output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); - output += ((this - moment(this).startOf('month')) - (that - moment(that).startOf('month'))) / diff; - if (units === 'year') { - output = output / 12; - } - } else { - diff = (this - that) - zoneDiff; - output = units === 'second' ? diff / 1e3 : // 1000 - units === 'minute' ? diff / 6e4 : // 1000 * 60 - units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 - units === 'day' ? diff / 864e5 : // 1000 * 60 * 60 * 24 - units === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7 - diff; - } - return asFloat ? output : absRound(output); - }, - - from : function (time, withoutSuffix) { - return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix); - }, - - fromNow : function (withoutSuffix) { - return this.from(moment(), withoutSuffix); - }, - - calendar : function () { - var diff = this.diff(moment().startOf('day'), 'days', true), - format = diff < -6 ? 'sameElse' : - diff < -1 ? 'lastWeek' : - diff < 0 ? 'lastDay' : - diff < 1 ? 'sameDay' : - diff < 2 ? 'nextDay' : - diff < 7 ? 'nextWeek' : 'sameElse'; - return this.format(this.lang().calendar(format, this)); - }, - - isLeapYear : function () { - var year = this.year(); - return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; - }, - - isDST : function () { - return (this.zone() < moment([this.year()]).zone() || - this.zone() < moment([this.year(), 5]).zone()); - }, - - day : function (input) { - var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); - return input == null ? day : - this.add({ d : input - day }); - }, - - startOf: function (units) { - units = units.replace(/s$/, ''); - // the following switch intentionally omits break keywords - // to utilize falling through the cases. - switch (units) { - case 'year': - this.month(0); - /* falls through */ - case 'month': - this.date(1); - /* falls through */ - case 'week': - case 'day': - this.hours(0); - /* falls through */ - case 'hour': - this.minutes(0); - /* falls through */ - case 'minute': - this.seconds(0); - /* falls through */ - case 'second': - this.milliseconds(0); - /* falls through */ - } - - // weeks are a special case - if (units === 'week') { - this.day(0); - } - - return this; - }, - - endOf: function (units) { - return this.startOf(units).add(units.replace(/s?$/, 's'), 1).subtract('ms', 1); - }, - - isAfter: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) > +moment(input).startOf(units); - }, - - isBefore: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) < +moment(input).startOf(units); - }, - - isSame: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) === +moment(input).startOf(units); - }, - - zone : function () { - return this._isUTC ? 0 : this._d.getTimezoneOffset(); - }, - - daysInMonth : function () { - return moment.utc([this.year(), this.month() + 1, 0]).date(); - }, - - dayOfYear : function (input) { - var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1; - return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); - }, - - isoWeek : function (input) { - var week = weekOfYear(this, 1, 4); - return input == null ? week : this.add("d", (input - week) * 7); - }, - - week : function (input) { - var week = this.lang().week(this); - return input == null ? week : this.add("d", (input - week) * 7); - }, - - // If passed a language key, it will set the language for this - // instance. Otherwise, it will return the language configuration - // variables for this instance. - lang : function (key) { - if (key === undefined) { - return this._lang; - } else { - this._lang = getLangDefinition(key); - return this; - } - } - }; - - // helper for adding shortcuts - function makeGetterAndSetter(name, key) { - moment.fn[name] = moment.fn[name + 's'] = function (input) { - var utc = this._isUTC ? 'UTC' : ''; - if (input != null) { - this._d['set' + utc + key](input); - return this; - } else { - return this._d['get' + utc + key](); - } - }; - } - - // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) - for (i = 0; i < proxyGettersAndSetters.length; i ++) { - makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); - } - - // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') - makeGetterAndSetter('year', 'FullYear'); - - // add plural methods - moment.fn.days = moment.fn.day; - moment.fn.weeks = moment.fn.week; - moment.fn.isoWeeks = moment.fn.isoWeek; - - /************************************ - Duration Prototype - ************************************/ - - - moment.duration.fn = Duration.prototype = { - weeks : function () { - return absRound(this.days() / 7); - }, - - valueOf : function () { - return this._milliseconds + - this._days * 864e5 + - this._months * 2592e6; - }, - - humanize : function (withSuffix) { - var difference = +this, - output = relativeTime(difference, !withSuffix, this.lang()); - - if (withSuffix) { - output = this.lang().pastFuture(difference, output); - } - - return this.lang().postformat(output); - }, - - lang : moment.fn.lang - }; - - function makeDurationGetter(name) { - moment.duration.fn[name] = function () { - return this._data[name]; - }; - } - - function makeDurationAsGetter(name, factor) { - moment.duration.fn['as' + name] = function () { - return +this / factor; - }; - } - - for (i in unitMillisecondFactors) { - if (unitMillisecondFactors.hasOwnProperty(i)) { - makeDurationAsGetter(i, unitMillisecondFactors[i]); - makeDurationGetter(i.toLowerCase()); - } - } - - makeDurationAsGetter('Weeks', 6048e5); - - - /************************************ - Default Lang - ************************************/ - - - // Set default language, other languages will inherit from English. - moment.lang('en', { - ordinal : function (number) { - var b = number % 10, - output = (~~ (number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - } - }); - - - /************************************ - Exposing Moment - ************************************/ - - - // CommonJS module is defined - if (hasModule) { - module.exports = moment; - } - /*global ender:false */ - if (typeof ender === 'undefined') { - // here, `this` means `window` in the browser, or `global` on the server - // add `moment` as a global object via a string identifier, - // for Closure Compiler "advanced" mode - this['moment'] = moment; - } - /*global define:false */ - if (typeof define === "function" && define.amd) { - define("moment", [], function () { - return moment; - }); - } -}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js deleted file mode 100644 index 4e8497a..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js +++ /dev/null @@ -1,6 +0,0 @@ -// moment.js -// version : 2.0.0 -// author : Tim Wood -// license : MIT -// momentjs.com -(function(e){function O(e,t){return function(n){return j(e.call(this,n),t)}}function M(e){return function(t){return this.lang().ordinal(e.call(this,t))}}function _(){}function D(e){H(this,e)}function P(e){var t=this._data={},n=e.years||e.year||e.y||0,r=e.months||e.month||e.M||0,i=e.weeks||e.week||e.w||0,s=e.days||e.day||e.d||0,o=e.hours||e.hour||e.h||0,u=e.minutes||e.minute||e.m||0,a=e.seconds||e.second||e.s||0,f=e.milliseconds||e.millisecond||e.ms||0;this._milliseconds=f+a*1e3+u*6e4+o*36e5,this._days=s+i*7,this._months=r+n*12,t.milliseconds=f%1e3,a+=B(f/1e3),t.seconds=a%60,u+=B(a/60),t.minutes=u%60,o+=B(u/60),t.hours=o%24,s+=B(o/24),s+=i*7,t.days=s%30,r+=B(s/30),t.months=r%12,n+=B(r/12),t.years=n}function H(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}function B(e){return e<0?Math.ceil(e):Math.floor(e)}function j(e,t){var n=e+"";while(n.length<t)n="0"+n;return n}function F(e,t,n){var r=t._milliseconds,i=t._days,s=t._months,o;r&&e._d.setTime(+e+r*n),i&&e.dat e(e.date()+i*n),s&&(o=e.date(),e.date(1).month(e.month()+s*n).date(Math.min(o,e.daysInMonth())))}function I(e){return Object.prototype.toString.call(e)==="[object Array]"}function q(e,t){var n=Math.min(e.length,t.length),r=Math.abs(e.length-t.length),i=0,s;for(s=0;s<n;s++)~~e[s]!==~~t[s]&&i++;return i+r}function R(e,t){return t.abbr=e,s[e]||(s[e]=new _),s[e].set(t),s[e]}function U(e){return e?(!s[e]&&o&&require("./lang/"+e),s[e]):t.fn._lang}function z(e){return e.match(/\[.*\]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function W(e){var t=e.match(a),n,r;for(n=0,r=t.length;n<r;n++)A[t[n]]?t[n]=A[t[n]]:t[n]=z(t[n]);return function(i){var s="";for(n=0;n<r;n++)s+=typeof t[n].call=="function"?t[n].call(i,e):t[n];return s}}function X(e,t){function r(t){return e.lang().longDateFormat(t)||t}var n=5;while(n--&&f.test(t))t=t.replace(f,r);return C[t]||(C[t]=W(t)),C[t](e)}function V(e){switch(e){case"DDDD":return p;case"YYYY":return d;case"YYYYY":return v;case"S":case"SS":case"SSS": case"DDD":return h;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":case"a":case"A":return m;case"X":return b;case"Z":case"ZZ":return g;case"T":return y;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return c;default:return new RegExp(e.replace("\\",""))}}function $(e,t,n){var r,i,s=n._a;switch(e){case"M":case"MM":s[1]=t==null?0:~~t-1;break;case"MMM":case"MMMM":r=U(n._l).monthsParse(t),r!=null?s[1]=r:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":t!=null&&(s[2]=~~t);break;case"YY":s[0]=~~t+(~~t>68?1900:2e3);break;case"YYYY":case"YYYYY":s[0]=~~t;break;case"a":case"A":n._isPm=(t+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":s[3]=~~t;break;case"m":case"mm":s[4]=~~t;break;case"s":case"ss":s[5]=~~t;break;case"S":case"SS":case"SSS":s[6]=~~(("0."+t)*1e3);break;case"X":n._d=new Date(parseFloat(t)*1e3);break;case"Z":case"ZZ":n._useUTC=!0,r=(t+"").match(x),r&&r[1]&&(n._tzh=~~r[1]),r &&r[2]&&(n._tzm=~~r[2]),r&&r[0]==="+"&&(n._tzh=-n._tzh,n._tzm=-n._tzm)}t==null&&(n._isValid=!1)}function J(e){var t,n,r=[];if(e._d)return;for(t=0;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];r[3]+=e._tzh||0,r[4]+=e._tzm||0,n=new Date(0),e._useUTC?(n.setUTCFullYear(r[0],r[1],r[2]),n.setUTCHours(r[3],r[4],r[5],r[6])):(n.setFullYear(r[0],r[1],r[2]),n.setHours(r[3],r[4],r[5],r[6])),e._d=n}function K(e){var t=e._f.match(a),n=e._i,r,i;e._a=[];for(r=0;r<t.length;r++)i=(V(t[r]).exec(n)||[])[0],i&&(n=n.slice(n.indexOf(i)+i.length)),A[t[r]]&&$(t[r],i,e);e._isPm&&e._a[3]<12&&(e._a[3]+=12),e._isPm===!1&&e._a[3]===12&&(e._a[3]=0),J(e)}function Q(e){var t,n,r,i=99,s,o,u;while(e._f.length){t=H({},e),t._f=e._f.pop(),K(t),n=new D(t);if(n.isValid()){r=n;break}u=q(t._a,n.toArray()),u<i&&(i=u,r=n)}H(e,r)}function G(e){var t,n=e._i;if(w.exec(n)){e._f="YYYY-MM-DDT";for(t=0;t<4;t++)if(S[t][1].exec(n)){e._f+=S[t][0];break}g.exec(n)&&(e._f+=" Z"),K(e)}else e._d=new Date(n)}function Y(t){var n=t._i,r=u.exec(n);n===e?t._d=new Date:r?t._d=new Date(+r[1]):typeof n=="string"?G(t):I(n)?(t._a=n.slice(0),J(t)):t._d=n instanceof Date?new Date(+n):new Date(n)}function Z(e,t,n,r,i){return i.relativeTime(t||1,!!n,e,r)}function et(e,t,n){var i=r(Math.abs(e)/1e3),s=r(i/60),o=r(s/60),u=r(o/24),a=r(u/365),f=i<45&&["s",i]||s===1&&["m"]||s<45&&["mm",s]||o===1&&["h"]||o<22&&["hh",o]||u===1&&["d"]||u<=25&&["dd",u]||u<=45&&["M"]||u<345&&["MM",r(u/30)]||a===1&&["y"]||["yy",a];return f[2]=t,f[3]=e>0,f[4]=n,Z.apply({},f)}function tt(e,n,r){var i=r-n,s=r-e.day();return s>i&&(s-=7),s<i-7&&(s+=7),Math.ceil(t(e).add("d",s).dayOfYear()/7)}function nt(e){var n=e._i,r=e._f;return n===null||n===""?null:(typeof n=="string"&&(e._i=n=U().preparse(n)),t.isMoment(n)?(e=H({},n),e._d=new Date(+n._d)):r?I(r)?Q(e):K(e):Y(e),new D(e))}function rt(e,n){t.fn[e]=t.fn[e+"s"]=function(e){var t=this._isUTC?"UTC":"";return e!=null?(this._d["set"+t+n](e),this):this._d["get"+t+n]()}}function it(e){t.duration.fn [e]=function(){return this._data[e]}}function st(e,n){t.duration.fn["as"+e]=function(){return+this/n}}var t,n="2.0.0",r=Math.round,i,s={},o=typeof module!="undefined"&&module.exports,u=/^\/?Date$(\-?\d+)/i,a=/(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,f=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,l=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,c=/\d\d?/,h=/\d{1,3}/,p=/\d{3}/,d=/\d{1,4}/,v=/[+\-]?\d{1,6}/,m=/[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i,g=/Z|[\+\-]\d\d:?\d\d/i,y=/T/i,b=/[\+\-]?\d+(\.\d{1,3})?/,w=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,E="YYYY-MM-DDTHH:mm:ssZ",S=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],x=/([\+\-]|\d\d)/gi,T="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("| "),N={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},C={},k="DDD w W M D d".split(" "),L="M D H h m s w W".split(" "),A={M:function(){return this.month()+1},MMM:function(e){return this.lang().monthsShort(this,e)},MMMM:function(e){return this.lang().months(this,e)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(e){return this.lang().weekdaysMin(this,e)},ddd:function(e){return this.lang().weekdaysShort(this,e)},dddd:function(e){return this.lang().weekdays(this,e)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return j(this.year()%100,2)},YYYY:function(){return j(this.year(),4)},YYYYY:function(){return j(this.year(),5)},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours() %12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return j(~~(this.milliseconds()/10),2)},SSS:function(){return j(this.milliseconds(),3)},Z:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(e/60),2)+":"+j(~~e%60,2)},ZZ:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(10*e/6),4)},X:function(){return this.unix()}};while(k.length)i=k.pop(),A[i+"o"]=M(A[i]);while(L.length)i=L.pop(),A[i+i]=O(A[i],2);A.DDDD=O(A.DDD,3),_.prototype={set:function(e){var t,n;for(n in e)t=e[n],typeof t=="function"?this[n]=t:this["_"+n]=t},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(e){return this._months[e.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(e){return this._monthsShort[e.month()]},monthsParse:function(e){var n,r,i,s;this._monthsP arse||(this._monthsParse=[]);for(n=0;n<12;n++){this._monthsParse[n]||(r=t([2e3,n]),i="^"+this.months(r,"")+"|^"+this.monthsShort(r,""),this._monthsParse[n]=new RegExp(i.replace(".",""),"i"));if(this._monthsParse[n].test(e))return n}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(e){return this._weekdays[e.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(e){return this._weekdaysShort[e.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(e){return this._weekdaysMin[e.day()]},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(e){var t=this._longDateFormat[e];return!t&&this._longDateFormat[e.toUpperCase()]&&(t=this._longDateFormat[e.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e]=t),t},meridiem:function(e,t,n){return e>11?n?"pm":"PM":n ?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[last] dddd [at] LT",sameElse:"L"},calendar:function(e,t){var n=this._calendar[e];return typeof n=="function"?n.apply(t):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(e,t,n,r){var i=this._relativeTime[n];return typeof i=="function"?i(e,t,n,r):i.replace(/%d/i,e)},pastFuture:function(e,t){var n=this._relativeTime[e>0?"future":"past"];return typeof n=="function"?n(t):n.replace(/%s/i,t)},ordinal:function(e){return this._ordinal.replace("%d",e)},_ordinal:"%d",preparse:function(e){return e},postformat:function(e){return e},week:function(e){return tt(e,this._week.dow,this._week.doy)},_week:{dow:0,doy:6}},t=function(e,t,n){return nt({_i:e,_f:t,_l:n,_isUTC:!1})},t.utc=function(e,t, n){return nt({_useUTC:!0,_isUTC:!0,_l:n,_i:e,_f:t})},t.unix=function(e){return t(e*1e3)},t.duration=function(e,n){var r=t.isDuration(e),i=typeof e=="number",s=r?e._data:i?{}:e,o;return i&&(n?s[n]=e:s.milliseconds=e),o=new P(s),r&&e.hasOwnProperty("_lang")&&(o._lang=e._lang),o},t.version=n,t.defaultFormat=E,t.lang=function(e,n){var r;if(!e)return t.fn._lang._abbr;n?R(e,n):s[e]||U(e),t.duration.fn._lang=t.fn._lang=U(e)},t.langData=function(e){return e&&e._lang&&e._lang._abbr&&(e=e._lang._abbr),U(e)},t.isMoment=function(e){return e instanceof D},t.isDuration=function(e){return e instanceof P},t.fn=D.prototype={clone:function(){return t(this)},valueOf:function(){return+this._d},unix:function(){return Math.floor(+this._d/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._d},toJSON:function(){return t.utc(this).format("YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var e=this;return[e.year(),e.month(),e.date(),e.hou rs(),e.minutes(),e.seconds(),e.milliseconds()]},isValid:function(){return this._isValid==null&&(this._a?this._isValid=!q(this._a,(this._isUTC?t.utc(this._a):t(this._a)).toArray()):this._isValid=!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this._isUTC=!0,this},local:function(){return this._isUTC=!1,this},format:function(e){var n=X(this,e||t.defaultFormat);return this.lang().postformat(n)},add:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,1),this},subtract:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,-1),this},diff:function(e,n,r){var i=this._isUTC?t(e).utc():t(e).local(),s=(this.zone()-i.zone())*6e4,o,u;return n&&(n=n.replace(/s$/,"")),n==="year"||n==="month"?(o=(this.daysInMonth()+i.daysInMonth())*432e5,u=(this.year()-i.year())*12+(this.month()-i.month()),u+=(this-t(this).startOf("month")-(i-t(i).startOf("month")))/o,n==="year"&&(u/=12)):(o=this-i-s,u=n==="second "?o/1e3:n==="minute"?o/6e4:n==="hour"?o/36e5:n==="day"?o/864e5:n==="week"?o/6048e5:o),r?u:B(u)},from:function(e,n){return t.duration(this.diff(e)).lang(this.lang()._abbr).humanize(!n)},fromNow:function(e){return this.from(t(),e)},calendar:function(){var e=this.diff(t().startOf("day"),"days",!0),n=e<-6?"sameElse":e<-1?"lastWeek":e<0?"lastDay":e<1?"sameDay":e<2?"nextDay":e<7?"nextWeek":"sameElse";return this.format(this.lang().calendar(n,this))},isLeapYear:function(){var e=this.year();return e%4===0&&e%100!==0||e%400===0},isDST:function(){return this.zone()<t([this.year()]).zone()||this.zone()<t([this.year(),5]).zone()},day:function(e){var t=this._isUTC?this._d.getUTCDay():this._d.getDay();return e==null?t:this.add({d:e-t})},startOf:function(e){e=e.replace(/s$/,"");switch(e){case"year":this.month(0);case"month":this.date(1);case"week":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return e==="week"&&this.day(0) ,this},endOf:function(e){return this.startOf(e).add(e.replace(/s?$/,"s"),1).subtract("ms",1)},isAfter:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)>+t(e).startOf(n)},isBefore:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)<+t(e).startOf(n)},isSame:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)===+t(e).startOf(n)},zone:function(){return this._isUTC?0:this._d.getTimezoneOffset()},daysInMonth:function(){return t.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(e){var n=r((t(this).startOf("day")-t(this).startOf("year"))/864e5)+1;return e==null?n:this.add("d",e-n)},isoWeek:function(e){var t=tt(this,1,4);return e==null?t:this.add("d",(e-t)*7)},week:function(e){var t=this.lang().week(this);return e==null?t:this.add("d",(e-t)*7)},lang:function(t){return t===e?this._lang:(this._lang=U(t),this)}};for(i=0;i<T.length;i++)rt(T[i].toLowerCase().replace(/s$/,"" ),T[i]);rt("year","FullYear"),t.fn.days=t.fn.day,t.fn.weeks=t.fn.week,t.fn.isoWeeks=t.fn.isoWeek,t.duration.fn=P.prototype={weeks:function(){return B(this.days()/7)},valueOf:function(){return this._milliseconds+this._days*864e5+this._months*2592e6},humanize:function(e){var t=+this,n=et(t,!e,this.lang());return e&&(n=this.lang().pastFuture(t,n)),this.lang().postformat(n)},lang:t.fn.lang};for(i in N)N.hasOwnProperty(i)&&(st(i,N[i]),it(i.toLowerCase()));st("Weeks",6048e5),t.lang("en",{ordinal:function(e){var t=e%10,n=~~(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}}),o&&(module.exports=t),typeof ender=="undefined"&&(this.moment=t),typeof define=="function"&&define.amd&&define("moment",[],function(){return t})}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js new file mode 100644 index 0000000..7e89bb1 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js @@ -0,0 +1,183 @@ +/** + * RHQ Charting Javascript Functions. + */ + +/** + * ChartContext Constructor Object + * Contains all of the data required to render a chart. + * A ChartContext can be passed to multiple chart renders to display different chart types + * of that data. + * @param chartId + * @param chartHeight + * @param metricsData + * @param xAxisLabel + * @param chartTitle + * @param yAxisUnits + * @param minChartTitle + * @param avgChartTitle + * @param peakChartTitle + * @param dateLabel + * @param timeLabel + * @param downLabel + * @param unknownLabel + * @param noDataLabel + * @param hoverStartLabel + * @param hoverEndLabel + * @param hoverPeriodLabel + * @param hoverBarLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param isPortalGraph + * @param portalId + * @param buttonBarDateTimeFormat + * @param singleValueLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @param hideLegend + * @constructor + */ +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { + "use strict"; + if (!(this instanceof ChartContext)) { + throw new Error("ChartContext function cannot be called as a function."); + } + this.chartId = chartId; + this.chartHeight = chartHeight; + this.data = jQuery.parseJSON(metricsData); // make into json + this.xAxisLabel = xAxisLabel; + this.chartTitle = chartTitle; + this.yAxisUnits = yAxisUnits; + this.minChartTitle = minChartTitle; + this.avgChartTitle = avgChartTitle; + this.peakChartTitle = peakChartTitle; + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.downLabel = downLabel; + this.unknownLabel = unknownLabel; + this.singleValueLabel = singleValueLabel; + this.noDataLabel = noDataLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverEndLabel = hoverEndLabel; + this.hoverPeriodLabel = hoverPeriodLabel; + this.hoverBarLabel = hoverBarLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.isPortalGraph = isPortalGraph; + this.portalId = portalId; + if (isPortalGraph) { + this.chartHandle = "rChart-" + chartId + "-" + portalId; + } + else { + this.chartHandle = "rChart-" + chartId; + } + this.chartSelection = this.chartHandle + " svg"; + this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + this.hideLegend = hideLegend; + + }, + /** + * Availability Context object constructor + * @param chartId + * @param availData + * @param dateLabel + * @param timeLabel + * @param hoverStartLabel + * @param hoverBarLabel + * @param availabilityLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param chartTitle + * @param chartUpLabel + * @param chartDownLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @constructor + */ + AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof AvailChartContext)) { + throw new Error("AvailChartContext function cannot be called as a function."); + } + this.chartId = chartId; + this.chartHandle = "#availChart-" + this.chartId; + this.chartSelection = this.chartHandle + " svg"; + this.data = jQuery.parseJSON(availData); // make into json + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverBarLabel = hoverBarLabel; + this.hoverBarAvailabilityLabel = availabilityLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.chartTitle = chartTitle; + this.chartDownLabel = chartDownLabel; + this.chartUpLabel = chartUpLabel; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + + }, + + /** + * GraphDateContext object constructor. + * @param startDate moment object representing startDate range + * @param endDate moment object representing endDate range + * @constructor + */ + GraphDateContext = function (startDate, endDate) { + "use strict"; + if (!(this instanceof GraphDateContext)) { + throw new Error("GraphDateContext function cannot be called as a function."); + } + this.startDate = startDate; + this.endDate = endDate; + }, + rhqCommon = (function () { + "use strict"; + + + var timeFormat = function (formats) { + return function(date) { + var i = formats.length - 1, f = formats[i]; + while (!f[1](date)) f = formats[--i]; + return f[0](date); + }; + }; + + return { + getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { + return timeFormat([ + [d3.time.format("%Y"), function () { + return true; + }], + [d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [d3.time.format(xAxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + } + + }; + })(); + + + + diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js deleted file mode 100644 index 7e89bb1..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ /dev/null @@ -1,183 +0,0 @@ -/** - * RHQ Charting Javascript Functions. - */ - -/** - * ChartContext Constructor Object - * Contains all of the data required to render a chart. - * A ChartContext can be passed to multiple chart renders to display different chart types - * of that data. - * @param chartId - * @param chartHeight - * @param metricsData - * @param xAxisLabel - * @param chartTitle - * @param yAxisUnits - * @param minChartTitle - * @param avgChartTitle - * @param peakChartTitle - * @param dateLabel - * @param timeLabel - * @param downLabel - * @param unknownLabel - * @param noDataLabel - * @param hoverStartLabel - * @param hoverEndLabel - * @param hoverPeriodLabel - * @param hoverBarLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param isPortalGraph - * @param portalId - * @param buttonBarDateTimeFormat - * @param singleValueLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @param hideLegend - * @constructor - */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { - "use strict"; - if (!(this instanceof ChartContext)) { - throw new Error("ChartContext function cannot be called as a function."); - } - this.chartId = chartId; - this.chartHeight = chartHeight; - this.data = jQuery.parseJSON(metricsData); // make into json - this.xAxisLabel = xAxisLabel; - this.chartTitle = chartTitle; - this.yAxisUnits = yAxisUnits; - this.minChartTitle = minChartTitle; - this.avgChartTitle = avgChartTitle; - this.peakChartTitle = peakChartTitle; - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.downLabel = downLabel; - this.unknownLabel = unknownLabel; - this.singleValueLabel = singleValueLabel; - this.noDataLabel = noDataLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverEndLabel = hoverEndLabel; - this.hoverPeriodLabel = hoverPeriodLabel; - this.hoverBarLabel = hoverBarLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.isPortalGraph = isPortalGraph; - this.portalId = portalId; - if (isPortalGraph) { - this.chartHandle = "rChart-" + chartId + "-" + portalId; - } - else { - this.chartHandle = "rChart-" + chartId; - } - this.chartSelection = this.chartHandle + " svg"; - this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - this.hideLegend = hideLegend; - - }, - /** - * Availability Context object constructor - * @param chartId - * @param availData - * @param dateLabel - * @param timeLabel - * @param hoverStartLabel - * @param hoverBarLabel - * @param availabilityLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param chartTitle - * @param chartUpLabel - * @param chartDownLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @constructor - */ - AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { - "use strict"; - if (!(this instanceof AvailChartContext)) { - throw new Error("AvailChartContext function cannot be called as a function."); - } - this.chartId = chartId; - this.chartHandle = "#availChart-" + this.chartId; - this.chartSelection = this.chartHandle + " svg"; - this.data = jQuery.parseJSON(availData); // make into json - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverBarLabel = hoverBarLabel; - this.hoverBarAvailabilityLabel = availabilityLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.chartTitle = chartTitle; - this.chartDownLabel = chartDownLabel; - this.chartUpLabel = chartUpLabel; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - - }, - - /** - * GraphDateContext object constructor. - * @param startDate moment object representing startDate range - * @param endDate moment object representing endDate range - * @constructor - */ - GraphDateContext = function (startDate, endDate) { - "use strict"; - if (!(this instanceof GraphDateContext)) { - throw new Error("GraphDateContext function cannot be called as a function."); - } - this.startDate = startDate; - this.endDate = endDate; - }, - rhqCommon = (function () { - "use strict"; - - - var timeFormat = function (formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - }; - }; - - return { - getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { - return timeFormat([ - [d3.time.format("%Y"), function () { - return true; - }], - [d3.time.format("%B"), function (d) { - return d.getMonth(); - }], - [d3.time.format("%b %d"), function (d) { - return d.getDate() != 1; - }], - [d3.time.format("%a %d"), function (d) { - return d.getDay() && d.getDate() != 1; - }], - [d3.time.format(xAxisTimeFormatHours), function (d) { - return d.getHours(); - }], - [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { - return d.getMinutes(); - }], - [d3.time.format(":%S"), function (d) { - return d.getSeconds(); - }], - [d3.time.format(".%L"), function (d) { - return d.getMilliseconds(); - }] - ]); - } - - }; - })(); - - - - commit a9feadf7e8b1fbc5215dd7ba7e6cc4f1a4e78cc8 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Sep 17 12:51:30 2013 +0200 Bug 1008570 - Agent shutdown hangs because one thread is still alive diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java index a781641..a993178 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java @@ -29,6 +29,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; @@ -76,6 +78,7 @@ class SigarAccessHandler implements InvocationHandler { private final ScheduledExecutorService scheduledExecutorService; private volatile int localSigarInstancesCount; private Sigar sharedSigar; + private volatile boolean closed; SigarAccessHandler() { this(new DefaultSigarFactory()); @@ -85,9 +88,24 @@ class SigarAccessHandler implements InvocationHandler { this.sigarFactory = sigarFactory; sharedSigarLock = new ReentrantLock(); localSigarLock = new ReentrantLock(); - scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); + scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { + + private ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory(); + + private AtomicInteger threadCounter = new AtomicInteger(0); + + @Override + public Thread newThread(Runnable runnable) { + Thread thread = defaultThreadFactory.newThread(runnable); + thread.setName("SigarAccessHandler-" + threadCounter.incrementAndGet()); + // With daemon threads, there is no need to call #shutdown on the executor to let the JVM go down + thread.setDaemon(true); + return thread; + } + }); scheduledExecutorService.scheduleWithFixedDelay(new ThresholdChecker(), 1, 5, MINUTES); localSigarInstancesCount = 0; + closed = false; } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -100,10 +118,13 @@ class SigarAccessHandler implements InvocationHandler { // Acquire lock for shared Sigar instance. Wait 'sharedSigarLockMaxWait' seconds at most boolean acquiredLock = sharedSigarLock.tryLock(SHARED_SIGAR_LOCK_MAX_WAIT, SECONDS); if (acquiredLock) { - if (sharedSigar == null) { - this.sharedSigar = sigarFactory.createSigarInstance(); - } try { + if (closed) { + throw new SystemInfoException("SigarAccess has been closed"); + } + if (sharedSigar == null) { + this.sharedSigar = sigarFactory.createSigarInstance(); + } return method.invoke(sharedSigar, args); } catch (InvocationTargetException e) { throw e.getTargetException(); @@ -150,6 +171,7 @@ class SigarAccessHandler implements InvocationHandler { if (sharedSigar != null) { sharedSigarLock.lock(); try { + closed = true; sharedSigar.close(); sharedSigar = null; } finally { commit c1eac03204ec862d2ac087dd9a4ccbd9b8140eb1 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Mon Sep 9 22:54:25 2013 -0400 [BZ 997669] fix incorrect attribute type. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index db6bf28..3960407 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -855,7 +855,7 @@ <!ENTITY sharedThreadPoolResourceConfig ' <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> - <c:simple-property name="handoff-executor:expr" displayName="Handoff Executor" required="false" type="string" readOnly="false" description="An executor to delegate tasks to in the event that a task cannot be accepted. If not specified, tasks that cannot be accepted will be silently discarded."/> + <c:simple-property name="handoff-executor" displayName="Handoff Executor" required="false" type="string" readOnly="false" description="An executor to delegate tasks to in the event that a task cannot be accepted. If not specified, tasks that cannot be accepted will be silently discarded."/> '> <!ENTITY threadPoolTemplateResourceConfig ' commit 9818e05300dd93b5d07f4ed55ebf388e9a73f484 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Wed Sep 4 14:45:03 2013 -0400 [BZ 997669] adding core-threads, allow-core-timeout and handoff-executor to templated thread-pools. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 0873c17..db6bf28 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -852,6 +852,12 @@ <c:simple-property name="queue-length:expr" required="false" type="integer" readOnly="false" displayName="Queue Length" description="The queue length. Required only for Bounded and Blocking Bounded Thread Pools."/> '> + <!ENTITY sharedThreadPoolResourceConfig ' + <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> + <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> + <c:simple-property name="handoff-executor:expr" displayName="Handoff Executor" required="false" type="string" readOnly="false" description="An executor to delegate tasks to in the event that a task cannot be accepted. If not specified, tasks that cannot be accepted will be silently discarded."/> +'> + <!ENTITY threadPoolTemplateResourceConfig ' <c:simple-property name="__type" readOnly="true" default="scheduled-thread-pool" displayName="Thread Pool Type" description="Thread pool type"> <c:property-options> @@ -3209,6 +3215,7 @@ &queueLengthResourceConfig; <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/> + &sharedThreadPoolResourceConfig; &threadPoolTemplateResourceConfig; </resource-configuration> </service> @@ -5598,8 +5605,7 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> - <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> + &sharedThreadPoolResourceConfig; <c:map-property name="keepalive-time" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down."> <c:simple-property name="time" type="long" readOnly="false" description="The time"/> <c:simple-property name="unit" type="string" readOnly="false" description="The time unit"/> @@ -5622,8 +5628,7 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> - <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> + &sharedThreadPoolResourceConfig; <c:map-property name="keepalive-time" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down."> <c:simple-property name="time" type="long" readOnly="false" description="The time"/> <c:simple-property name="unit" type="string" readOnly="false" description="The time unit"/> @@ -6036,6 +6041,7 @@ &queueLengthResourceConfig; <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/> + &sharedThreadPoolResourceConfig; &threadPoolTemplateResourceConfig; </resource-configuration> </service> @@ -10372,8 +10378,7 @@ <metric property="rejected-count" description="The number of tasks that have been passed to the handoff-executor (if one is specified) or discarded."/> <resource-configuration> - <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> - <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> + &sharedThreadPoolResourceConfig; <c:map-property name="keepalive-time" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down."> <c:simple-property name="time" type="long" readOnly="false" description="The time"/> <c:simple-property name="unit" type="string" readOnly="false" description="The time unit"/> @@ -10400,8 +10405,7 @@ <metric property="rejected-count" description="The number of tasks that have been passed to the handoff-executor (if one is specified) or discarded."/> <resource-configuration> - <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/> - <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/> + &sharedThreadPoolResourceConfig; <c:map-property name="keepalive-time" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down."> <c:simple-property name="time" type="long" readOnly="false" description="The time"/> <c:simple-property name="unit" type="string" readOnly="false" description="The time unit"/> @@ -10968,6 +10972,7 @@ &queueLengthResourceConfig; <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/> + &sharedThreadPoolResourceConfig; &threadPoolTemplateResourceConfig; </resource-configuration> </service> commit 776a67ef98ae13a7aa8c3e054e0915104e4ed542 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Sep 16 10:25:09 2013 -0400 [BZ 1008090] Set default thread stack size to 256k across the board diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java index 4c79543..7a3f207 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java @@ -35,21 +35,11 @@ public class DeploymentOptionsFactory { /** * @return A new {@link DeploymentOptions}. This method checks the platform arch * (32 bit vs 64 bit) and the JRE being used to determine if any particular defaults - * need to be set. For example, on 32 bit arches running on OpenJDK 6, Cassandra - * cannot use its default thread stack stack of 180k. It causes the JVM to segfault on - * start up. When this runtime environment is detected, the factory will set the - * appropriate system property so that a default thread stack of 240k is used. That - * can be overridden by calling {@link DeploymentOptions#setStackSize(String)}. + * need to be set. */ public DeploymentOptions newDeploymentOptions() { - String arch = System.getProperty("os.arch"); - String javaVMName = System.getProperty("java.vm.name"); - String javaVersion = System.getProperty("java.version"); - - if ((arch.equals("i386") || arch.equals("amd64") || arch.equals("i686")) && javaVMName.startsWith("OpenJDK")) { - System.setProperty("rhq.cassandra.stack.size", "240k"); - } - + // Make sure we have a high enough stack size. See https://bugzilla.redhat.com/show_bug.cgi?id=1008090 + System.setProperty("rhq.cassandra.stack.size", "256k"); return new DeploymentOptions(); } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties index ebadc27..f9bdc30 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties @@ -85,7 +85,7 @@ rhq.cassandra.max.heap.size=\${MAX_HEAP_SIZE} rhq.cassandra.heap.new.size=\${HEAP_NEWSIZE} # The JVM stack size for Cassandra. This value is passed directly to the -Xss option. -rhq.cassandra.stack.size=180k +rhq.cassandra.stack.size=256k # The log4j logging level to use. rhq.cassandra.logging.level=DEBUG diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index 2951eaa..5dacf36 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -15,7 +15,7 @@ heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" heap_dump_dir= -thread_stack_size=-Xss180k +thread_stack_size=-Xss256k # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 3ecfdb4..6b5d9d7 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -138,6 +138,7 @@ public class StorageInstallerTest { assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); } @Test commit 937f14fa6e2e83e6f5fb77df38cba7f8bed11049 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Sep 6 17:13:56 2013 +0200 Bug 862893 - When availability check fails due to rhq.agent.plugins.availability-scan.timeout being exceeded, the event should be logged at DEBUG diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java index 41a1c41..339e46c 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java @@ -68,6 +68,7 @@ public class ResourceContext<T extends ResourceComponent<?>> { private final String resourceUuid; private final ResourceType resourceType; private final String version; + private final String resourceDetails; private final T parentResourceComponent; private final ResourceContext<?> parentResourceContext; private final Configuration pluginConfiguration; @@ -185,6 +186,7 @@ public class ResourceContext<T extends ResourceComponent<?>> { this.resourceKey = resource.getResourceKey(); this.resourceType = resource.getResourceType(); this.version = resource.getVersion(); + this.resourceDetails = resource.toString(); this.parentResourceComponent = parentResourceComponent; this.parentResourceContext = parentResourceContext; this.resourceDiscoveryComponent = resourceDiscoveryComponent; @@ -599,4 +601,12 @@ public class ResourceContext<T extends ResourceComponent<?>> { public ComponentInvocationContext getComponentInvocationContext() { return componentInvocationContext; } + + /** + * Returns the {@link String} representation of the underlying resource. + * @return a {@link String} representation of the underlying resource + */ + public String getResourceDetails() { + return resourceDetails; + } } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java index c28975e..3176b13 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java @@ -18,6 +18,10 @@ */ package org.rhq.core.pc.inventory; +import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; +import static org.rhq.core.domain.measurement.AvailabilityType.UNKNOWN; +import static org.rhq.core.domain.measurement.AvailabilityType.UP; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; @@ -175,8 +179,8 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo Resource parent = scanRoot.getParentResource(); while (parent != null) { Availability parentAvail = inventoryManager.getAvailabilityIfKnown(parent); - if (parentAvail != null && parentAvail.getAvailabilityType() == AvailabilityType.DOWN) { - parentAvailabilityType = AvailabilityType.DOWN; + if (parentAvail != null && parentAvail.getAvailabilityType() == DOWN) { + parentAvailabilityType = DOWN; break; } @@ -186,7 +190,7 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo //we've gone up past the platform but didn't encounter a single down resource, hence the parent avail type //is to be considered UP (because it either truly is UP or is UNKNOWN as of now) if (parentAvailabilityType == null) { - parentAvailabilityType = AvailabilityType.UP; + parentAvailabilityType = UP; } try { @@ -302,13 +306,13 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // find out what the avail was the last time we checked it. this may be null Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource); - AvailabilityType current = (null == previous) ? AvailabilityType.UNKNOWN : previous.getAvailabilityType(); + AvailabilityType current = (null == previous) ? UNKNOWN : previous.getAvailabilityType(); // If the resource's parent is DOWN, the rules are that the resource and all of the parent's other // descendants, must also be DOWN. So, there's no need to even ask the resource component // for its current availability - its current avail is set to the parent avail type and that's that. // Otherwise, checkAvail as needed. - if (deferToParent || (AvailabilityType.DOWN == parentAvailType)) { + if (deferToParent || (DOWN == parentAvailType)) { current = parentAvailType; ++scan.numDeferToParent; @@ -324,7 +328,7 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo } if (checkAvail) { - current = AvailabilityType.UNKNOWN; + current = UNKNOWN; try { ++scan.numGetAvailabilityCalls; @@ -345,25 +349,27 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo ResourceError resourceError = new ResourceError(resource, ResourceErrorType.AVAILABILITY_CHECK, t.getLocalizedMessage(), ThrowableUtil.getStackAsString(t), System.currentTimeMillis()); this.inventoryManager.sendResourceErrorToServer(resourceError); - if (LOG.isDebugEnabled()) { - if (t instanceof TimeoutException) { - // no need to log the stack trace for timeouts... - LOG.debug("Failed to collect availability on " + resource + " (call timed out)"); - } else { - LOG.debug("Failed to collect availability on " + resource, t); - } + if (t instanceof TimeoutException) { + // no need to log the stack trace for timeouts... + LOG.warn("Availability collection timed out on " + resource + + ", availability will be reported as " + DOWN.name()); + current = DOWN; + } else { + LOG.warn("Availability collection failed with exception on " + resource + + ", availability will be reported as " + DOWN.name(), t); + current = DOWN; } } // Assume DOWN if for some reason the avail check failed - if (AvailabilityType.UNKNOWN == current) { - current = AvailabilityType.DOWN; + if (UNKNOWN == current) { + current = DOWN; } } } // Add the availability to the report if it changed from its previous state or if this is a full report. // Update the resource container only if the avail has changed. - boolean availChanged = (null != current && AvailabilityType.UNKNOWN != current && (null == previous || current != previous + boolean availChanged = (null != current && UNKNOWN != current && (null == previous || current != previous .getAvailabilityType())); if (availChanged || scan.isFull) { @@ -377,7 +383,7 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // if the resource avail changed to UP then we must perform avail checks for all // children, to ensure their avails are up to date. Note that if it changed to NOT UP // then the children will just get the parent avail type and there is no avail check anyway. - if (!isForced && (AvailabilityType.UP == current)) { + if (!isForced && (UP == current)) { isForced = true; } } else { @@ -400,15 +406,15 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo AvailabilityType availType = component.getAvailability(); switch (availType) { case UP: - return AvailabilityType.UP; + return UP; case DOWN: - return AvailabilityType.DOWN; + return DOWN; default: if (LOG.isDebugEnabled()) { LOG.debug("ResourceComponent " + component + " getAvailability() returned " + availType + ". This is invalid and is being replaced with DOWN."); } - return AvailabilityType.DOWN; + return DOWN; } } diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java index 2a2b839..31ff452 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,14 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.apache; +import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; +import static org.rhq.core.domain.measurement.AvailabilityType.UP; + import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -104,13 +107,13 @@ import org.rhq.rhqtransform.AugeasRHQComponent; public class ApacheServerComponent implements AugeasRHQComponent, ResourceComponent<PlatformComponent>, MeasurementFacet, OperationFacet, ConfigurationFacet, CreateChildResourceFacet { + private static final Log LOG = LogFactory.getLog(ApacheServerComponent.class); + public static final String CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE = "Configuration and child resource creation/deletion support for Apache is optional. " + "If you switched it on by enabling Augeas support in the connection settings of the Apache server resource and still get this message, " + "it means that either your Apache version is not supported (only Apache 2.x is supported) or Augeas is not available on your platform."; - private final Log log = LogFactory.getLog(this.getClass()); - public static final String PLUGIN_CONFIG_PROP_SERVER_ROOT = "serverRoot"; public static final String PLUGIN_CONFIG_PROP_EXECUTABLE_PATH = "executablePath"; public static final String PLUGIN_CONFIG_PROP_CONTROL_SCRIPT_PATH = "controlScriptPath"; @@ -174,8 +177,10 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon */ private ApacheServerOperationsDelegate operationsDelegate; + private AvailabilityType lastKnownAvailability; + public void start(ResourceContext<PlatformComponent> resourceContext) throws Exception { - log.info("Initializing Resource component for Apache Server [" + resourceContext.getResourceKey() + "]..."); + LOG.info("Initializing Resource component for Apache Server [" + resourceContext.getResourceKey() + "]..."); this.resourceContext = resourceContext; this.eventContext = resourceContext.getEventContext(); @@ -186,13 +191,13 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon SNMPSession snmpSession = getSNMPSession(); if (!snmpSession.ping()) { - log.warn("Failed to connect to SNMP agent at " - + snmpSession - + "\n" - + ". Make sure\n1) the managed Apache server has been instrumented with the JON SNMP module,\n" - + "2) the Apache server is running, and\n" - + "3) the SNMP agent host, port, and community are set correctly in this resource's connection properties.\n" - + "The agent will not be able to record metrics from apache httpd without SNMP"); + LOG.warn("Failed to connect to SNMP agent at " + + snmpSession + + "\n" + + ". Make sure\n1) the managed Apache server has been instrumented with the JON SNMP module,\n" + + "2) the Apache server is running, and\n" + + "3) the SNMP agent host, port, and community are set correctly in this resource's connection properties.\n" + + "The agent will not be able to record metrics from apache httpd without SNMP"); } else { configured = true; } @@ -203,10 +208,10 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon try { this.url = new URL(url); if (this.url.getPort() == 0) { - log.error("The 'url' connection property is invalid - 0 is not a valid port; please change the value to the " - + "port the \"main\" Apache server is listening on. NOTE: If the 'url' property was set this way " - + "after autodiscovery, you most likely did not include the port in the ServerName directive for " - + "the \"main\" Apache server in httpd.conf."); + LOG.error("The 'url' connection property is invalid - 0 is not a valid port; please change the value to the " + + "port the \"main\" Apache server is listening on. NOTE: If the 'url' property was set this way " + + "after autodiscovery, you most likely did not include the port in the ServerName directive for " + + "the \"main\" Apache server in httpd.conf."); } else { configured = true; } @@ -248,9 +253,9 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon String moduleName = map.getSimpleValue(PLUGIN_CONFIG_MODULE_NAME, null); if (sourceFile == null || moduleName == null) { - log.info("A corrupted module name mapping found (" + sourceFile + " = " + moduleName - + "). Check your module mappings in the plugin configuration for the server: " - + resourceContext.getResourceKey()); + LOG.info("A corrupted module name mapping found (" + sourceFile + " = " + moduleName + + "). Check your module mappings in the plugin configuration for the server: " + + resourceContext.getResourceKey()); continue; } @@ -265,6 +270,8 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon } throw e; } + + this.lastKnownAvailability = UP; } public void stop() { @@ -273,43 +280,66 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon if (this.snmpClient != null) { this.snmpClient.close(); } - return; + this.lastKnownAvailability = null; } public AvailabilityType getAvailability() { + lastKnownAvailability = getAvailabilityInternal(); + return lastKnownAvailability; + } + + private AvailabilityType getAvailabilityInternal() { // TODO: If URL is not set, rather than falling back to pinging the SNMP agent, // try to find a pid file under the server root, and then check if the // process is running. boolean available; try { if (this.url != null) { - if (log.isDebugEnabled()) { - log.debug("Trying to ping the server for availability: " + this.url); + if (LOG.isDebugEnabled()) { + LOG.debug("Trying to ping the server for availability: " + this.url); } long t1 = System.currentTimeMillis(); int timeout = PluginUtility.getAvailabilityFacetTimeout(); - available = WWWUtils.isAvailable(this.url, timeout); + AvailabilityResult availabilityResult = WWWUtils.checkAvailability(this.url, timeout); + if (availabilityResult.getAvailabilityType() == UP) { + available = true; + } else { + available = false; + if (lastKnownAvailability == UP) { + switch (availabilityResult.getErrorType()) { + case CANNOT_CONNECT: + LOG.warn("Could not connect to Apache server " + resourceContext.getResourceDetails() + + ", availability will be reported as " + DOWN.name()); + break; + case CONNECTION_TIMEOUT: + LOG.warn("Connection to Apache server " + resourceContext.getResourceDetails() + + " timed out, availability will be reported as " + DOWN.name()); + break; + default: + } + } + } availPingTime = System.currentTimeMillis() - t1; } else { - if (log.isDebugEnabled()) { - log.debug("Trying to ping the server for availability through SNMP " + if (LOG.isDebugEnabled()) { + LOG.debug("Trying to ping the server for availability through SNMP " + getSNMPAddressString(resourceContext.getPluginConfiguration())); } available = getSNMPSession().ping(); availPingTime = -1; } } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("Exception while checking availability.", e); + if (LOG.isDebugEnabled()) { + LOG.debug("Exception while checking availability.", e); } available = false; } - if (log.isDebugEnabled()) { - log.debug("Availability determined: " + (available ? AvailabilityType.UP : AvailabilityType.DOWN)); + if (LOG.isDebugEnabled()) { + LOG.debug("Availability determined: " + (available ? UP : DOWN)); } - return (available) ? AvailabilityType.UP : AvailabilityType.DOWN; + return (available) ? UP : DOWN; } public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> schedules) throws Exception { @@ -336,18 +366,20 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon String mibName = metricName; List<SNMPValue> snmpValues = snmpSession.getColumn(mibName); if (snmpValues.isEmpty()) { - log.error("No values found for MIB name [" + mibName + "]."); + LOG.error("No values found for MIB name [" + mibName + "]."); continue; } SNMPValue snmpValue = snmpValues.get(0); boolean valueIsTimestamp = isValueTimestamp(mibName); - log.debug("Collected SNMP metric [" + mibName + "], value = " + snmpValue); + if (LOG.isDebugEnabled()) { + LOG.debug("Collected SNMP metric [" + mibName + "], value = " + snmpValue); + } addSnmpMetricValueToReport(report, schedule, snmpValue, valueIsTimestamp); } catch (SNMPException e) { - log.error("An error occurred while attempting to collect an SNMP metric.", e); + LOG.error("An error occurred while attempting to collect an SNMP metric.", e); } } } @@ -359,7 +391,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon @Nullable public OperationResult invokeOperation(@NotNull String name, @NotNull Configuration params) throws Exception { - log.info("Invoking operation [" + name + "] on server [" + this.resourceContext.getResourceKey() + "]..."); + LOG.info("Invoking operation [" + name + "] on server [" + this.resourceContext.getResourceKey() + "]..."); return this.operationsDelegate.invokeOperation(name, params); } @@ -377,7 +409,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree); return mapping.updateConfiguration(tree.getRootNode(), resourceConfigDef); } catch (Exception e) { - log.error("Failed to load Apache configuration.", e); + LOG.error("Failed to load Apache configuration.", e); throw e; } finally { comp.close(); @@ -404,22 +436,22 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon mapping.updateAugeas(tree.getRootNode(), report.getConfiguration(), resourceConfigDef); tree.save(); - log.info("Apache configuration was updated"); + LOG.info("Apache configuration was updated"); report.setStatus(ConfigurationUpdateStatus.SUCCESS); finishConfigurationUpdate(report); } catch (Exception e) { if (tree != null) { - log.error("Augeas failed to save configuration " + tree.summarizeAugeasError()); + LOG.error("Augeas failed to save configuration " + tree.summarizeAugeasError()); e = new AugeasException("Failed to save configuration: " + tree.summarizeAugeasError() + " ", e); } else - log.error("Augeas failed to save configuration", e); + LOG.error("Augeas failed to save configuration", e); report.setStatus(ConfigurationUpdateStatus.FAILURE); report.setErrorMessageFromThrowable(e); if (!originalConfig.equals(report.getConfiguration())) { - log.error("Configuration has changed"); + LOG.error("Configuration has changed"); } else { - log.error("Configuratio has not changed"); + LOG.error("Configuratio has not changed"); } } finally { comp.close(); @@ -561,7 +593,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon try { vhostFileFile.createNewFile(); } catch (IOException e) { - log.error("Failed to create a new vhost file: " + vhostFile, e); + LOG.error("Failed to create a new vhost file: " + vhostFile, e); } comp.close(); @@ -746,7 +778,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon serverRoot = directives.get(0).getValues().get(0); } catch (Exception e) { - log.error("Could not load configuration parser.", e); + LOG.error("Could not load configuration parser.", e); } if (serverRoot != null) { for (String path : CONTROL_SCRIPT_PATHS) { @@ -1032,7 +1064,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon try { ag = new Augeas(); } catch (Exception e) { - log.error("Augeas is enabled in configuration but was not found on the system.", e); + LOG.error("Augeas is enabled in configuration but was not found on the system.", e); throw new RuntimeException(CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE); } finally { if (ag != null) { @@ -1046,7 +1078,7 @@ public class ApacheServerComponent implements AugeasRHQComponent, ResourceCompon String version = getVersion(); if (!version.startsWith("2.")) { - log.error(CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE); + LOG.error(CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE); throw new RuntimeException(CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE); } return true; diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java index 8a3c36f..0aecf8f 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java @@ -16,8 +16,12 @@ * along with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + package org.rhq.plugins.apache; +import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; +import static org.rhq.core.domain.measurement.AvailabilityType.UP; + import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -91,14 +95,16 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac /** Multiply by 1/1000 to convert logged response times, which are in microseconds, to milliseconds. */ private static final double RESPONSE_TIME_LOG_TIME_MULTIPLIER = 0.001; + public static final String RESOURCE_TYPE_NAME = "Apache Virtual Host"; + private ResourceContext<ApacheServerComponent> resourceContext; private URL url; private ResponseTimeLogParser logParser; private ConfigurationTimestamp lastConfigurationTimeStamp = new ConfigurationTimestamp(); private int snmpWwwServiceIndex = -1; - - public static final String RESOURCE_TYPE_NAME = "Apache Virtual Host"; + + private AvailabilityType lastKnownAvailability; public void start(ResourceContext<ApacheServerComponent> resourceContext) throws Exception { this.resourceContext = resourceContext; @@ -127,35 +133,60 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac this.logParser.setExcludes(responseTimeConfig.getExcludes()); this.logParser.setTransforms(responseTimeConfig.getTransforms()); } + this.lastKnownAvailability = UP; } public void stop() { this.resourceContext = null; this.url = null; + this.lastKnownAvailability = null; } public AvailabilityType getAvailability() { + lastKnownAvailability = getAvailabilityInternal(); + return lastKnownAvailability; + } + + private AvailabilityType getAvailabilityInternal() { if (url != null) { int timeout = PluginUtility.getAvailabilityFacetTimeout(); - return WWWUtils.isAvailable(url, timeout) ? AvailabilityType.UP : AvailabilityType.DOWN; + AvailabilityResult availabilityResult = WWWUtils.checkAvailability(this.url, timeout); + if (availabilityResult.getAvailabilityType() == UP) { + return UP; + } else { + if (lastKnownAvailability == UP) { + switch (availabilityResult.getErrorType()) { + case CANNOT_CONNECT: + LOG.warn("Could not connect to Virtual Host " + resourceContext.getResourceDetails() + + ", availability will be reported as " + DOWN.name()); + break; + case CONNECTION_TIMEOUT: + LOG.warn("Connection to Virtual Host " + resourceContext.getResourceDetails() + + " timed out, availability will be reported as " + DOWN.name()); + break; + default: + } + } + return DOWN; + } } else { try { //we don't need the SNMP connection to figure out the index on which the SNMP //module would report this vhost. So first, let's check if that index is valid //(i.e. check that the vhost is actually still present in the apache configuration) if (getWwwServiceIndex() < 1) { - return AvailabilityType.DOWN; + return DOWN; } //ok, so the vhost is present. Now let's just ping the SNMP module to see //if it is reachable and base our availability on that... SNMPSession snmpSession = resourceContext.getParentResourceComponent().getSNMPSession(); - return snmpSession.ping() ? AvailabilityType.UP : AvailabilityType.DOWN; + return snmpSession.ping() ? UP : DOWN; } catch (Exception e) { LOG.debug("Determining the availability of the vhost [" + resourceContext.getResourceKey() + "] using SNMP failed.", e); - return AvailabilityType.DOWN; + return DOWN; } } } diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/AvailabilityResult.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/AvailabilityResult.java new file mode 100644 index 0000000..420da8d --- /dev/null +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/AvailabilityResult.java @@ -0,0 +1,94 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.plugins.apache; + +import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; +import static org.rhq.core.domain.measurement.AvailabilityType.UP; + +import org.rhq.core.domain.measurement.AvailabilityType; + +/** + * @author Thomas Segismont + */ +public final class AvailabilityResult { + + public enum ErrorType { + CANNOT_CONNECT, CONNECTION_TIMEOUT, UNKNOWN, NONE + } + + private final AvailabilityType availabilityType; + + private final ErrorType errorType; + + private final String message; + + private final Throwable throwable; + + private AvailabilityResult(AvailabilityType availabilityType, ErrorType errorType, String message, + Throwable throwable) { + this.availabilityType = availabilityType; + this.errorType = errorType; + this.message = message; + this.throwable = throwable; + } + + public static AvailabilityResult availabilityIsUp() { + return new AvailabilityResult(UP, ErrorType.NONE, null, null); + } + + public static AvailabilityResult availabilityIsDown(String message) { + return availabilityIsDown(ErrorType.UNKNOWN, message, null); + } + + public static AvailabilityResult availabilityIsDown(String message, Throwable throwable) { + return availabilityIsDown(ErrorType.UNKNOWN, message, throwable); + } + + public static AvailabilityResult availabilityIsDown(ErrorType errorType, String message) { + return availabilityIsDown(errorType, message, null); + } + + public static AvailabilityResult availabilityIsDown(ErrorType errorType, String message, Throwable throwable) { + if (errorType == null) { + throw new IllegalArgumentException("errorType is null"); + } + if (errorType == ErrorType.NONE) { + throw new IllegalArgumentException("Cannot set errorType to '" + ErrorType.NONE.name() + + "' for availabilityType '" + DOWN.name() + "'"); + } + return new AvailabilityResult(DOWN, errorType, null, null); + } + + public AvailabilityType getAvailabilityType() { + return availabilityType; + } + + public ErrorType getErrorType() { + return errorType; + } + + public String getMessage() { + return message; + } + + public Throwable getThrowable() { + return throwable; + } +} diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java index ab4cc57..206db58 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,15 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.www.util; +import static org.rhq.core.domain.measurement.AvailabilityType.UP; +import static org.rhq.plugins.apache.AvailabilityResult.availabilityIsDown; +import static org.rhq.plugins.apache.AvailabilityResult.availabilityIsUp; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -39,6 +43,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.util.stream.StreamUtil; +import org.rhq.plugins.apache.AvailabilityResult; +import org.rhq.plugins.apache.AvailabilityResult.ErrorType; /** * Helper class that contains methods that send HTTP requests and evaluate results. @@ -60,34 +66,58 @@ public class WWWUtils { * @param timeout timeout, in milliseconds * * @return true if connecting to the URL succeeds, or false otherwise + * + * @deprecated as of RHQ 4.10. Use {@link #checkAvailability(java.net.URL, int)} instead. */ + @Deprecated public static boolean isAvailable(URL httpURL, int timeout) { + return checkAvailability(httpURL, timeout).getAvailabilityType() == UP; + } + + /** + * Checks availability of the <code>httpURL</code>. + * + * Will first try with HEAD request and fallback to GET. + * + * @param httpURL a http or https URL to check + * @param timeout timeout, in milliseconds + * @return an {@link AvailabilityResult} + */ + public static AvailabilityResult checkAvailability(URL httpURL, int timeout) { + if (timeout < 0) { throw new IllegalArgumentException("Timeout cannot be negative."); } if (timeout == 0) { - LOG.debug("Pinging [" + httpURL + "] with no timeout..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Pinging [" + httpURL + "] with no timeout..."); + } } else { - LOG.debug("Pinging [" + httpURL + "] with timeout of " + timeout + " milliseconds..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Pinging [" + httpURL + "] with timeout of " + timeout + " milliseconds..."); + } } HttpURLConnection connection; try { connection = (HttpURLConnection) httpURL.openConnection(); } catch (IOException e) { - LOG.error("Failed to open URLConnection for [" + httpURL + "].", e); - return false; + String errorMessage = "Failed to open URLConnection for [" + httpURL + "]."; + LOG.error(errorMessage, e); + return availabilityIsDown(errorMessage, e); } try { connection.setRequestMethod("HEAD"); - } catch (ProtocolException e) { + } catch (ProtocolException ignore) { try { connection.setRequestMethod("GET"); - } catch (ProtocolException e1) { - LOG.error("Failed to set request method to HEAD or GET on URLConnection for [" + httpURL + "].", e1); - return false; + } catch (ProtocolException e) { + String errorMessage = "Failed to set request method to HEAD or GET on URLConnection for [" + httpURL + + "]."; + LOG.error(errorMessage, e); + return availabilityIsDown(errorMessage, e); } } @@ -100,79 +130,106 @@ public class WWWUtils { // First just connect to the HTTP server. long connectStartTime = System.currentTimeMillis(); - LOG.debug("Connecting to [" + httpURL + "]..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Connecting to [" + httpURL + "]..."); + } try { connection.connect(); } catch (IOException e) { + String errorMessage; + ErrorType errorType = ErrorType.UNKNOWN; if (e instanceof ConnectException) { // This most likely just means the server is down. - LOG.debug("Failed to connect to [" + httpURL + "]."); + errorMessage = "Failed to connect to [" + httpURL + "]."; + errorType = ErrorType.CANNOT_CONNECT; } else if (e instanceof SocketTimeoutException) { // This probably means the server is up but not properly accepting connection requests. long connectDuration = System.currentTimeMillis() - connectStartTime; - LOG.debug("Attempt to connect to [" + httpURL + "] timed out after " + connectDuration - + " milliseconds."); + errorMessage = "Attempt to connect to [" + httpURL + "] timed out after " + connectDuration + + " milliseconds."; + errorType = ErrorType.CONNECTION_TIMEOUT; } else { - // Log all other IOExceptions as warnings, since they may likely provide useful details to users. - logWarnWithStackTraceOnlyIfDebugEnabled("An error occurred while attempting to connect to [" + httpURL - + "].", e); + errorMessage = "An error occurred while attempting to connect to [" + httpURL + "]."; + } + if (LOG.isDebugEnabled()) { + LOG.warn(errorMessage, e); } - return false; + return availabilityIsDown(errorType, errorMessage, e); } int connectDuration = (int) (System.currentTimeMillis() - connectStartTime); - LOG.debug("Connected to [" + httpURL + "] in " + connectDuration + " milliseconds."); + if (LOG.isDebugEnabled()) { + LOG.debug("Connected to [" + httpURL + "] in " + connectDuration + " milliseconds."); + } if ((timeout > 0) && (connectDuration >= timeout)) { - LOG.debug("Attempt to ping [" + httpURL + "] timed out after " + connectDuration + " milliseconds."); - return false; + String errorMessage = "Attempt to ping [" + httpURL + "] timed out after " + connectDuration + + " milliseconds."; + if (LOG.isDebugEnabled()) { + LOG.warn(errorMessage); + } + return availabilityIsDown(ErrorType.CONNECTION_TIMEOUT, errorMessage); } try { int readTimeout = (timeout > 0) ? (timeout - connectDuration) : 0; connection.setReadTimeout(readTimeout); if (connection.getReadTimeout() != readTimeout) { - LOG.debug("Failed to set read timeout on URLConnection for [" + httpURL - + "] - this most likely means we're running in a non-standard JRE."); + if (LOG.isDebugEnabled()) { + LOG.warn("Failed to set read timeout on URLConnection for [" + httpURL + + "] - this most likely means we're running in a non-standard JRE."); + } } // Now actually send the request and read the response. long readStartTime = System.currentTimeMillis(); - LOG.debug("Sending " + connection.getRequestMethod() + " request to [" + httpURL + "]..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Sending " + connection.getRequestMethod() + " request to [" + httpURL + "]..."); + } try { // Calling getResponseCode() will cause the request to be sent. int responseCode = connection.getResponseCode(); - if (responseCode == -1) { - LOG.warn("Ping request to [" + httpURL + "] returned an invalid response: " + if (LOG.isDebugEnabled()) { + if (responseCode == -1) { + LOG.warn("Ping request to [" + httpURL + "] returned an invalid response: " + + getResponseBody(connection)); + } else if (responseCode >= 500) { + LOG.warn("Ping request to [" + httpURL + "] returned a response with server error " + + responseCode + " (" + connection.getResponseMessage() + "): " + getResponseBody(connection)); - } else if (responseCode >= 500) { - LOG.warn("Ping request to [" + httpURL + "] returned a response with server error " + responseCode - + " (" + connection.getResponseMessage() + "): " + getResponseBody(connection)); - } else if (responseCode >= 400) { - LOG.warn("Ping request to [" + httpURL + "] returned a response with client error " + responseCode - + " (" + connection.getResponseMessage() + ")."); + } else if (responseCode >= 400) { + LOG.warn("Ping request to [" + httpURL + "] returned a response with client error " + + responseCode + " (" + connection.getResponseMessage() + ")."); + } } } catch (IOException e) { + String errorMessage; + ErrorType errorType = ErrorType.UNKNOWN; if (e instanceof SocketTimeoutException) { long readDuration = System.currentTimeMillis() - readStartTime; - LOG.debug("Attempt to read response from " + connection.getRequestMethod() - + " request to [" + httpURL + "] timed out after " + readDuration - + " milliseconds."); + errorMessage = "Attempt to read response from " + connection.getRequestMethod() + " request to [" + + httpURL + "] timed out after " + readDuration + " milliseconds."; + errorType = ErrorType.CONNECTION_TIMEOUT; } else { - logWarnWithStackTraceOnlyIfDebugEnabled("An error occurred while attempting to read response from " - + connection.getRequestMethod() + " to [" + httpURL + "].", e); + errorMessage = "An error occurred while attempting to read response from " + + connection.getRequestMethod() + " to [" + httpURL + "]."; } - return false; + if (LOG.isDebugEnabled()) { + LOG.warn(errorMessage, e); + } + return availabilityIsDown(errorType, errorMessage, e); } long readDuration = System.currentTimeMillis() - readStartTime; - LOG.debug("Read response from " + connection.getRequestMethod() + " request to [" + httpURL - + "] in " + readDuration + " milliseconds."); + if (LOG.isDebugEnabled()) { + LOG.debug("Read response from " + connection.getRequestMethod() + " request to [" + httpURL + "] in " + + readDuration + " milliseconds."); + } } finally { // We don't care about keeping the connection around. We're only going to be pinging each server once every // minute. connection.disconnect(); } - return true; + return availabilityIsUp(); } /** commit af0e6faa75da4b3e054412b84ca237eb34910128 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Sep 16 06:53:25 2013 -0400 update helper method to use method arg diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index f40daf3..3ecfdb4 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -295,7 +295,7 @@ public class StorageInstallerTest { fail("Failed to verify that " + serverPropsFile + " was updated", e); } - assertEquals(properties.getProperty("rhq.storage.nodes"), "127.0.0.1"); + assertEquals(properties.getProperty("rhq.storage.nodes"), address); assertEquals(properties.getProperty("rhq.storage.cql-port"), "9142"); } commit 1235addbf5e819b8b18f5b5ee4a92b4c1bf2d51e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Sat Sep 14 22:15:16 2013 -0400 Bug 1000175 - Metrics UI tab does not refresh properly between different resources Fix refresh issue brought on by the fact that when the metric view refreshed istelf it updated the user prefs tracking the "sliding" time range, which in turn triggered the standard CoreGUI.refresh that refreshed the entire page. These stepped on each other. - Enhance UserPreferences API to let the caller suppress refresh on preference change. - Use the new UserPreferences hooks in ButtonBarDateTimeEditor and MeasurementUserPreferences to suppress refresh as needed. - Restructure MetricsResourceView to minimize impact when asked to refreshData. Now also maintains availDetail collapse state on auto refresh. - Add isRefreshing support to AbstractD3GraphListView (although this is not likely to be needed, it's a little more protection) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index 5b71877..d89ba19 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -42,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre * Provide the shared stuff for create GraphListViews like Availability graphs * and User Preferences pickers for the date range. */ -public abstract class AbstractD3GraphListView extends EnhancedVLayout implements AutoRefresh,Refreshable { +public abstract class AbstractD3GraphListView extends EnhancedVLayout implements AutoRefresh, Refreshable { protected final static int SINGLE_CHART_HEIGHT = 225; protected final static int MULTI_CHART_HEIGHT = 210; protected static final Label loadingLabel = new Label(MSG.common_msg_loading()); @@ -53,11 +53,12 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements protected boolean showAvailabilityGraph = false; protected final ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; protected Timer refreshTimer; + protected boolean isRefreshing; public AbstractD3GraphListView() { super(); measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - buttonBarDateTimeRangeEditor = new ButtonBarDateTimeRangeEditor(measurementUserPrefs,this); + buttonBarDateTimeRangeEditor = new ButtonBarDateTimeRangeEditor(measurementUserPrefs, this); startRefreshCycle(); } @@ -66,7 +67,6 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements protected abstract void queryAvailability(final EntityContext context, Long startTime, Long endTime, final CountDownLatch countDownLatch); - @Override public void startRefreshCycle() { refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); @@ -74,28 +74,34 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements @Override protected void onDestroy() { - AutoRefreshUtil.onDestroy( refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer); super.onDestroy(); } @Override public boolean isRefreshing() { - return false; + return isRefreshing; } //Custom refresh operation as we are not directly extending Table @Override public void refresh() { if (isVisible() && !isRefreshing()) { - Date now = new Date(); - AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs.getMetricRangePreferences(); - long timeRange = metricRangePreferences.end - metricRangePreferences.begin; - Date newStartDate = new Date(now.getTime() - timeRange); - buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now); - buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(), now.getTime()); + isRefreshing = true; + try { + Date now = new Date(); + AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs + .getMetricRangePreferences(); + long timeRange = metricRangePreferences.end - metricRangePreferences.begin; + Date newStartDate = new Date(now.getTime() - timeRange); + buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now); + buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(), now.getTime()); - refreshData(); + refreshData(); + } finally { + isRefreshing = false; + } } } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index 7855545..2ff0003 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -211,11 +211,11 @@ public abstract class AbstractMetricGraph extends VLayout implements HasD3Metric } /** - * Whenever we make a change to the date range save it here so it gets propogated to + * Whenever we make a change to the date range save it here so it gets propagated to * the correct places. * - * @param startTime double because JSNI doesnt support long - * @param endTime double because JSNI doesnt support long + * @param startTime double because JSNI doesn't support long + * @param endTime double because JSNI doesn't support long */ public void saveDateRange(double startTime, double endTime) { MeasurementUserPreferences measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 9f86c1e..891fb9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -19,10 +19,8 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph; import java.util.Date; -import java.util.HashMap; import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.FormErrorOrientation; import com.smartgwt.client.types.SelectionType; import com.smartgwt.client.types.VerticalAlignment; @@ -38,19 +36,12 @@ import com.smartgwt.client.widgets.form.fields.DateItem; import com.smartgwt.client.widgets.form.fields.RowSpacerItem; import com.smartgwt.client.widgets.form.fields.TimeItem; import com.smartgwt.client.widgets.layout.HLayout; -import com.smartgwt.client.widgets.menu.IMenuButton; -import com.smartgwt.client.widgets.menu.Menu; -import com.smartgwt.client.widgets.menu.MenuItem; -import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; import com.smartgwt.client.widgets.toolbar.ToolStrip; -import org.rhq.core.domain.auth.Subject; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.measurement.RefreshIntervalMenu; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -76,12 +67,16 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { private AbstractMeasurementRangeEditor.MetricRangePreferences prefs; final private ButtonBarDateTimeRangeEditor self; private RefreshIntervalMenu refreshIntervalMenu; + private boolean allowPreferenceUpdateRefresh; - public ButtonBarDateTimeRangeEditor(MeasurementUserPreferences measurementUserPrefs, - Refreshable d3GraphListView) { + public ButtonBarDateTimeRangeEditor(MeasurementUserPreferences measurementUserPrefs, Refreshable d3GraphListView) { this.self = this; this.measurementUserPreferences = measurementUserPrefs; this.d3GraphListView = d3GraphListView; + // if the encompassing view already handles its own refresh (e.g. AbstractD3GrpahListView) then don't + // let a preference update cause a whole gui refresh (which it does by default to apply the new preference). + // the two refreshes are redundant at best, step on each other at worst.. + this.allowPreferenceUpdateRefresh = !(this.d3GraphListView instanceof AutoRefresh); dateTimeButtonBarClickHandler = new DateTimeButtonBarClickHandler(); prefs = measurementUserPreferences.getMetricRangePreferences(); @@ -138,7 +133,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { addMember(toolStrip); } - public void redrawGraphs() { d3GraphListView.refreshData(); } @@ -184,19 +178,17 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { public void updateDateTimeRangeDisplay(Date startDate, Date endDate) { String rangeString = fmt.format(startDate) + " - " + fmt.format(endDate); - if(null != dateRangeLabel){ + if (null != dateRangeLabel) { dateRangeLabel.setContents(rangeString); } } - - /** - * Whenever we make a change to the date range save it here so it gets propogated to + * Whenever we make a change to the date range save it here so it gets propagated to * the correct places. * - * @param startTime double because JSNI doesnt support long - * @param endTime double because JSNI doesnt support long + * @param startTime double because JSNI doesn't support long + * @param endTime double because JSNI doesn't support long */ public void saveDateRange(double startTime, double endTime) { final boolean advanced = true; @@ -206,7 +198,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { if (null != prefs.begin && null != prefs.end && prefs.begin > prefs.end) { CoreGUI.getMessageCenter().notify(new Message(MSG.view_measureTable_startBeforeEnd())); } else { - measurementUserPreferences.setMetricRangePreferences(prefs); + measurementUserPreferences.setMetricRangePreferences(prefs, allowPreferenceUpdateRefresh); } } @@ -229,15 +221,9 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { * This enum defines the button labels and time ranges used in the toolbar. */ private enum DateTimeButton { - oneHour( "1h", 60 * 60 ), - fourHour( "4h", 4 * 60 * 60 ), - eightHour( "8h", 8 * 60 * 60 ), - twelveHour( "12h", 12 * 60 * 60 ), - oneDay("1d", 24 * 60 * 60 ), - fiveDay("5d", 5 * 24 * 60 * 60 ), - oneMonth("1m", 30 * 24 * 60 * 60 ), - threeMonth("3m", 3 * 30 * 24 * 60 * 60 ), - sixMonth("6m", 6 * 30 * 24 * 60 * 60 ); + oneHour("1h", 60 * 60), fourHour("4h", 4 * 60 * 60), eightHour("8h", 8 * 60 * 60), twelveHour("12h", + 12 * 60 * 60), oneDay("1d", 24 * 60 * 60), fiveDay("5d", 5 * 24 * 60 * 60), oneMonth("1m", + 30 * 24 * 60 * 60), threeMonth("3m", 3 * 30 * 24 * 60 * 60), sixMonth("6m", 6 * 30 * 24 * 60 * 60); private final String label; private final long timeSpanInSeconds; @@ -316,9 +302,13 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { Date startTimeDate = (Date) startTimeItem.getValue(); Date endTimeDate = (Date) endTimeItem.getValue(); - Date newStartDate = new Date(startDateItem.getValueAsDate().getYear(), startDateItem.getValueAsDate().getMonth(),startDateItem.getValueAsDate().getDate(), startTimeDate.getHours(), startTimeDate.getMinutes()); - Date newEndDate = new Date(endDateItem.getValueAsDate().getYear(), endDateItem.getValueAsDate().getMonth(),endDateItem.getValueAsDate().getDate(), endTimeDate.getHours(), endTimeDate.getMinutes()); - buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),newEndDate.getTime()); + Date newStartDate = new Date(startDateItem.getValueAsDate().getYear(), startDateItem + .getValueAsDate().getMonth(), startDateItem.getValueAsDate().getDate(), startTimeDate + .getHours(), startTimeDate.getMinutes()); + Date newEndDate = new Date(endDateItem.getValueAsDate().getYear(), endDateItem.getValueAsDate() + .getMonth(), endDateItem.getValueAsDate().getDate(), endTimeDate.getHours(), endTimeDate + .getMinutes()); + buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(), newEndDate.getTime()); redrawGraphs(); updateDateTimeRangeDisplay(startDateItem.getValueAsDate(), endDateItem.getValueAsDate()); CustomDateRangeWindow.this.destroy(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 669944b..c4b90a1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -33,7 +33,6 @@ import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.IconEnum; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwoLevelTabSetView; @@ -49,17 +48,14 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; * * @author Mike Thompson */ -public class MetricsResourceView extends AbstractD3GraphListView implements AbstractTwoLevelTabSetView.ViewRenderedListener{ +public class MetricsResourceView extends AbstractD3GraphListView implements + AbstractTwoLevelTabSetView.ViewRenderedListener { private static final String COLLAPSED_TOOLTIP = MSG.chart_metrics_collapse_tooltip(); private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); private final Resource resource; - private Img expandCollapseArrow; - private final MetricsTableView metricsTableView; - private final ResourceMetricAvailabilityView availabilityDetails; - private Timer refreshTimer; - + private EnhancedHLayout expandCollapseHLayout; public MetricsResourceView(Resource resource) { super(); @@ -67,43 +63,24 @@ public class MetricsResourceView extends AbstractD3GraphListView implements Abst setWidth100(); setHeight100(); this.resource = resource; - metricsTableView = new MetricsTableView(resource, this); - availabilityDetails = new ResourceMetricAvailabilityView(resource); - startRefreshCycle(); - - } - - - public void refreshData() { - this.onDraw(); - } - - public void refreshGraphs(){ - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - BrowserUtility.graphSparkLines(); - } - }.schedule(150); } @Override - protected void onDraw() { - super.onDraw(); - Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); - destroyMembers(); + public void onInit() { + super.onInit(); + final ResourceMetricAvailabilityView availabilityDetails = new ResourceMetricAvailabilityView(resource); + availabilityDetails.hide(); - addMember(buttonBarDateTimeRangeEditor); + final MetricsTableView metricsTableView = new MetricsTableView(resource, this); + metricsTableView.setHeight100(); availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( - new AvailabilityOverUnderGraphType(resource.getId())); - - EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); + new AvailabilityOverUnderGraphType(resource.getId())); + expandCollapseHLayout = new EnhancedHLayout(); //add expand/collapse icon - expandCollapseArrow = new Img(IconEnum.COLLAPSED_ICON.getIcon16x16Path(), 16, 16); + final Img expandCollapseArrow = new Img(IconEnum.COLLAPSED_ICON.getIcon16x16Path(), 16, 16); expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM); expandCollapseArrow.addClickHandler(new ClickHandler() { @@ -125,25 +102,45 @@ public class MetricsResourceView extends AbstractD3GraphListView implements Abst refreshGraphs(); } }); - - expandCollapseHLayout.addMember(expandCollapseArrow); expandCollapseHLayout.addMember(availabilityGraph); - addMember(expandCollapseHLayout); - availabilityDetails.hide(); + addMember(buttonBarDateTimeRangeEditor); + addMember(expandCollapseHLayout); addMember(availabilityDetails); - - metricsTableView.setHeight100(); addMember(metricsTableView); + queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), + buttonBarDateTimeRangeEditor.getEndTime(), null); + } + + public void refreshData() { + Log.debug("MetricResourceView.refreshData() for: " + resource.getName() + " id: " + resource.getId()); + + expandCollapseHLayout.removeMember(availabilityGraph); + availabilityGraph.destroy(); + + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + + expandCollapseHLayout.addMember(availabilityGraph); queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), - buttonBarDateTimeRangeEditor.getEndTime(), null); + buttonBarDateTimeRangeEditor.getEndTime(), null); + } + + public void refreshGraphs() { + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); } @Override - protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed ) { + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed) { final long timerStart = System.currentTimeMillis(); @@ -172,11 +169,6 @@ public class MetricsResourceView extends AbstractD3GraphListView implements Abst } @Override - public void startRefreshCycle() { - refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); - } - - @Override public void onViewRendered() { // refresh the graphs on subtab nav because we are a cached view not new diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java index 4a853c7..75a5429 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -98,15 +98,25 @@ public class MeasurementUserPreferences { } public void setMetricRangePreferences(MetricRangePreferences prefs) { - userPrefs.setPreference(PREF_METRIC_RANGE_BEGIN_END_FLAG, String.valueOf(prefs.explicitBeginEnd)); + setMetricRangePreferences(prefs, true); + } + + /** + * @param prefs The updated preferences + * @param allowRefresh setting false will inhibit a preference change from calling CoreGui.refresh(). By + * default a preference change will call for a refresh, so the current view can have the change applied. In + * situations where refresh is being handled by the caller, this can be used to avoid a redundant refresh. + */ + public void setMetricRangePreferences(MetricRangePreferences prefs, boolean allowRefresh) { + userPrefs.setPreference(PREF_METRIC_RANGE_BEGIN_END_FLAG, String.valueOf(prefs.explicitBeginEnd), allowRefresh); if (prefs.explicitBeginEnd) { // persist advanced mode - userPrefs.setPreference(PREF_METRIC_RANGE, Arrays.asList(prefs.begin, prefs.end)); + userPrefs.setPreference(PREF_METRIC_RANGE, Arrays.asList(prefs.begin, prefs.end), allowRefresh); //unsetPreference(PREF_METRIC_RANGE_LASTN); //unsetPreference(PREF_METRIC_RANGE_UNIT); } else { - userPrefs.setPreference(PREF_METRIC_RANGE_LASTN, String.valueOf(prefs.lastN)); - userPrefs.setPreference(PREF_METRIC_RANGE_UNIT, String.valueOf(prefs.unit)); + userPrefs.setPreference(PREF_METRIC_RANGE_LASTN, String.valueOf(prefs.lastN), allowRefresh); + userPrefs.setPreference(PREF_METRIC_RANGE_UNIT, String.valueOf(prefs.unit), allowRefresh); //unsetPreference(PREF_METRIC_RANGE); } } @@ -134,18 +144,18 @@ public class MeasurementUserPreferences { return prefs; } -// public void setMetricViews(MetricViewsPreferences prefs, String key) { -// StringBuilder builder = new StringBuilder(); -// int index = 0; -// for (String viewName : prefs.views) { -// if (index != 0) { -// builder.append(UserPreferences.PREF_LIST_DELIM); -// } -// builder.append(viewName); -// index++; -// } -// userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, builder.toString()); -// } + // public void setMetricViews(MetricViewsPreferences prefs, String key) { + // StringBuilder builder = new StringBuilder(); + // int index = 0; + // for (String viewName : prefs.views) { + // if (index != 0) { + // builder.append(UserPreferences.PREF_LIST_DELIM); + // } + // builder.append(viewName); + // index++; + // } + // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, builder.toString()); + // } public String getSelectedView(String key) { String value = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, @@ -153,49 +163,49 @@ public class MeasurementUserPreferences { return value; } -// public void setSelectedView(String key, String viewName) { -// userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, viewName); -// } -// -// public static class MetricViewData { -// public List<String> charts; -// } - -// public MetricViewData getMetricViewData(String context, String viewName) { -// //TODO: jmarques - externalize default view name -// // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME -// // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle -// if (viewName == null || "".equals(viewName)) { -// viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; -// } -// MetricViewData chartPreferences = new MetricViewData(); -// // important to let IllegalArgumentException bubble out of here, so the caller can persist the default set -// String data = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); -// chartPreferences.charts = StringUtility.explode(data, UserPreferences.PREF_LIST_DELIM); -// return chartPreferences; -// } -// -// public void setMetricViewData(String context, String viewName, MetricViewData prefs) { -// //TODO: jmarques - externalize default view name -// // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME -// // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle -// if (viewName == null || "".equals(viewName)) { -// viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; -// } -// StringBuilder builder = new StringBuilder(); -// int index = 0; -// for (String chart : prefs.charts) { -// if (index != 0) { -// builder.append(UserPreferences.PREF_LIST_DELIM); -// } -// builder.append(chart); -// index++; -// } -// userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName, builder.toString()); -// } -// -// public void deleteMetricViewData(String context, String viewName) { -// userPrefs.unsetPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); -// } + // public void setSelectedView(String key, String viewName) { + // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, viewName); + // } + // + // public static class MetricViewData { + // public List<String> charts; + // } + + // public MetricViewData getMetricViewData(String context, String viewName) { + // //TODO: jmarques - externalize default view name + // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME + // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle + // if (viewName == null || "".equals(viewName)) { + // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; + // } + // MetricViewData chartPreferences = new MetricViewData(); + // // important to let IllegalArgumentException bubble out of here, so the caller can persist the default set + // String data = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); + // chartPreferences.charts = StringUtility.explode(data, UserPreferences.PREF_LIST_DELIM); + // return chartPreferences; + // } + // + // public void setMetricViewData(String context, String viewName, MetricViewData prefs) { + // //TODO: jmarques - externalize default view name + // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME + // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle + // if (viewName == null || "".equals(viewName)) { + // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; + // } + // StringBuilder builder = new StringBuilder(); + // int index = 0; + // for (String chart : prefs.charts) { + // if (index != 0) { + // builder.append(UserPreferences.PREF_LIST_DELIM); + // } + // builder.append(chart); + // index++; + // } + // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName, builder.toString()); + // } + // + // public void deleteMetricViewData(String context, String viewName) { + // userPrefs.unsetPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); + // } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java index c06d285..b2e4f5e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java @@ -19,6 +19,8 @@ package org.rhq.enterprise.gui.coregui.client.util.preferences; /** + * Immutable. + * * @author Greg Hinkle */ public class UserPreferenceChangeEvent { @@ -26,11 +28,17 @@ public class UserPreferenceChangeEvent { String name; String newValue; String oldValue; + boolean allowRefresh; public UserPreferenceChangeEvent(String name, String newValue, String oldValue) { + this(name, newValue, oldValue, true); + } + + public UserPreferenceChangeEvent(String name, String newValue, String oldValue, boolean allowRefresh) { this.name = name; this.newValue = newValue; this.oldValue = oldValue; + this.allowRefresh = allowRefresh; } public String getName() { @@ -44,4 +52,9 @@ public class UserPreferenceChangeEvent { public String getOldValue() { return oldValue; } + + public boolean isAllowRefresh() { + return allowRefresh; + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java index 4847085..83abeaf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java @@ -50,6 +50,18 @@ public class UserPreferences { protected static final String PREF_LIST_DELIM = "|"; protected static final String PREF_LIST_DELIM_REGEX = "\\|"; + // when these preferences change, they should not trigger a refresh. + private static ArrayList<String> preferencesThatShouldNeverCauseRefresh; + static { + preferencesThatShouldNeverCauseRefresh = new ArrayList<String>(); + // this is auto-set while navigating around and does not affect the current page + preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCES); + // this is auto-set while navigating around and does not affect the current page + preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCE_GROUPS); + // this update is already applied to current portlets by the dashboard impl + preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.PAGE_REFRESH_PERIOD); + } + private Subject subject; private Configuration userConfiguration; private SubjectGWTServiceAsync subjectService = GWTServiceLookup.getSubjectService(); @@ -59,19 +71,7 @@ public class UserPreferences { private ArrayList<UserPreferenceChangeListener> changeListeners = new ArrayList<UserPreferenceChangeListener>(); private HashSet<String> changedPreferenceKeys = new HashSet<String>(); - - // when these preferences change, they should not trigger a refresh. - private static ArrayList<String> preferencesThatShouldNotCauseRefresh; - static { - preferencesThatShouldNotCauseRefresh = new ArrayList<String>(); - // this is auto-set while navigating around and does not affect the current page - preferencesThatShouldNotCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCES); - // this is auto-set while navigating around and does not affect the current page - preferencesThatShouldNotCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCE_GROUPS); - // this update is already applied to current portlets by the dashboard impl - preferencesThatShouldNotCauseRefresh.add(UserPreferenceNames.PAGE_REFRESH_PERIOD); - } - + public UserPreferences(Subject subject) { this.subject = subject; this.userConfiguration = subject.getUserConfiguration(); @@ -115,7 +115,8 @@ public class UserPreferences { // Don't announce anything to message center, this should happen under the covers - just refresh the current page. // But we should not blindly refresh - if we are changing preferences that should not affect the current // page, don't refresh as this could cause additional and unnecessary server-side hits (BZ 680167) - if (!preferencesThatShouldNotCauseRefresh.contains(event.getName())) { + if (event.isAllowRefresh() + && !preferencesThatShouldNeverCauseRefresh.contains(event.getName())) { CoreGUI.refresh(); } } @@ -243,11 +244,16 @@ public class UserPreferences { return value; } - protected void setPreference(String name, Collection<?> value) { - setPreference(name, value, null); + protected void setPreference(String name, Collection<?> value, boolean allowRefresh) { + setPreference(name, value, allowRefresh, null); } protected void setPreference(String name, Collection<?> value, AsyncCallback<Subject> persistCallback) { + setPreference(name, value, true, persistCallback); + } + + protected void setPreference(String name, Collection<?> value, boolean allowRefresh, + AsyncCallback<Subject> persistCallback) { StringBuilder buffer = new StringBuilder(); boolean first = true; for (Object item : value) { @@ -258,14 +264,22 @@ public class UserPreferences { } buffer.append(item); } - setPreference(name, buffer.toString(), persistCallback); + setPreference(name, buffer.toString(), allowRefresh, persistCallback); } protected void setPreference(String name, String value) { setPreference(name, value, null); } + protected void setPreference(String name, String value, boolean allowRefresh) { + setPreference(name, value, allowRefresh, null); + } + protected void setPreference(String name, String value, AsyncCallback<Subject> persistCallback) { + setPreference(name, value, true, persistCallback); + } + + protected void setPreference(String name, String value, boolean allowRefresh, AsyncCallback<Subject> persistCallback) { PropertySimple prop = this.userConfiguration.getSimple(name); String oldValue = null; if (prop == null) { @@ -276,30 +290,36 @@ public class UserPreferences { } changedPreferenceKeys.add(name); - - UserPreferenceChangeEvent event = new AutoPersistAwareChangeEvent(name, value, oldValue, persistCallback); + + UserPreferenceChangeEvent event = new AutoPersistAwareChangeEvent(name, value, oldValue, allowRefresh, + persistCallback); for (UserPreferenceChangeListener listener : changeListeners) { listener.onPreferenceChange(event); } } protected void unsetPreference(String name) { - unsetPreference(name, null); + unsetPreference(name, true, null); } protected void unsetPreference(String name, AsyncCallback<Subject> persistCallback) { + unsetPreference(name, true, persistCallback); + } + + protected void unsetPreference(String name, boolean allowRefresh, AsyncCallback<Subject> persistCallback) { PropertySimple doomedProp = this.userConfiguration.getSimple(name); // it's possible property was already removed, and thus this operation becomes a no-op if (doomedProp != null) { String oldValue = doomedProp.getStringValue(); this.userConfiguration.remove(name); - UserPreferenceChangeEvent event = new AutoPersistAwareChangeEvent(name, null, oldValue, persistCallback); + UserPreferenceChangeEvent event = new AutoPersistAwareChangeEvent(name, null, oldValue, allowRefresh, + persistCallback); for (UserPreferenceChangeListener listener : changeListeners) { listener.onPreferenceRemove(event); } } - + changedPreferenceKeys.add(name); } @@ -393,8 +413,13 @@ public class UserPreferences { public AutoPersistAwareChangeEvent(String name, String newValue, String oldValue, AsyncCallback<Subject> persistCallback) { + this(name, newValue, oldValue, true, persistCallback); + } + + public AutoPersistAwareChangeEvent(String name, String newValue, String oldValue, boolean allowRefresh, + AsyncCallback<Subject> persistCallback) { - super(name, newValue, oldValue); + super(name, newValue, oldValue, allowRefresh); this.persistCallback = persistCallback; } commit 3ebdd2da7f80555ab6d5c5a627d45f53a2c68d78 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Sep 14 11:46:59 2013 -0400 removing scratch file diff --git a/maven.dependency.tree b/maven.dependency.tree deleted file mode 100644 index 1d71ab2..0000000 --- a/maven.dependency.tree +++ /dev/null @@ -1,8846 +0,0 @@ -/usr/java/latest/ -[INFO] Scanning for projects... -[INFO] ------------------------------------------------------------------------ -[INFO] Reactor Build Order: -[INFO] -[INFO] RHQ -[INFO] RHQ Modules -[INFO] RHQ Test Utils -[INFO] RHQ Core Modules -[INFO] RHQ Utilities -[INFO] RHQ Native System API -[INFO] RHQ Enterprise Agent-Server Communications Annotations API -[INFO] RHQ Database Utilities -[INFO] RHQ Domain Model -[INFO] RHQ Plugin API -[INFO] RHQ Common Plugin Libraries -[INFO] RHQ Drift Common Library -[INFO] RHQ Client API -[INFO] RHQ Plugin Container -[INFO] RHQ Shared GUI Classes -[INFO] RHQ Plugin Validator Maven 2 Plugin -[INFO] RHQ Arquillian Integration Modules -[INFO] RHQ Agent Plugin Archive -[INFO] RHQ Plugins -[INFO] RHQ JMX Plugin -[INFO] RHQ Arquillian Plugin Container -[INFO] RHQ Arquillian Suite Extension -[INFO] RHQ Plugin Test API -[INFO] RHQ Plugin Test Util -[INFO] RHQ Plugin Container Integration Tests -[INFO] RHQ JBossAS 4/5 Plugins Common Library -[INFO] RHQ File Template Bundle Plugins Common Library -[INFO] RHQ Ant Bundle Plugins Common Library -[INFO] RHQ JBoss AS DMR Client -[INFO] RHQ Platform Plugin -[INFO] RHQ Enterprise Agent-Server Communications Layer -[INFO] RHQ Enterprise Agent -[INFO] RHQ RHQ-Agent Plugin -[INFO] RHQ No-op Plugin -[INFO] RHQ Augeas Plugin -[INFO] RHQ Apache Plugin -[INFO] RHQ Tomcat Plugin -[INFO] RHQ Hibernate Plugin -[INFO] RHQ JBossAS 5.x/6.x Plugin -[INFO] RHQ JBossAS 3.2.x/4.x Plugin -[INFO] RHQ mod_cluster Plugin -[INFO] RHQ JBossCache 4.x Plugin -[INFO] RHQ JBossAS 7.x Plugin -[INFO] RHQ Server Plugin -[INFO] RHQ JBossCache 3.x Plugin -[INFO] RHQ Database Plugin -[INFO] RHQ Postgres Plugin -[INFO] RHQ Script Plugin -[INFO] RHQ IIS Plugin -[INFO] RHQ File Template Bundle Plugin -[INFO] RHQ Ant Bundle Plugin -[INFO] RHQ Augeas-based Cron Plugin -[INFO] RHQ GRUB Plugin -[INFO] RHQ Hosts File Plugin -[INFO] RHQ Cobbler File Plugin -[INFO] RHQ Augeas-based Sudoers Plugin -[INFO] RHQ Network Services Plugin -[INFO] RHQ Augeas-based Samba Plugin -[INFO] RHQ Augeas-based Postfix Plugin -[INFO] RHQ Aliases File Plugin -[INFO] RHQ SSHD Plugin -[INFO] RHQ Byteman Plugin -[INFO] RHQ IRC Server Plugin -[INFO] RHQ Hadoop Plugin -[INFO] RHQ Hudson Plugin -[INFO] RHQ MySql Plugin -[INFO] RHQ Oracle Plugin -[INFO] RHQ Performance Test Plugin -[INFO] RHQ Script2 Plugin -[INFO] RHQ SnmpTrapd Plugin -[INFO] RHQ Twitter Plugin -[INFO] RHQ Virtualization Plugin -[INFO] RHQ Kickstart Plugin -[INFO] RHQ pattern Plugin -[INFO] RHQ Cassandra Plugin -[INFO] RHQ Validate All Plugins -[INFO] RHQ Helpers -[INFO] RHQ Response-Time Filter -[INFO] RHQ Response-Time Filter - JBoss AS7 Subsystem -[INFO] bundleGen -[INFO] jeeGen -[INFO] Performance Testing Support -[INFO] rest-docs-generator -[INFO] RHQ Enterprise Agent Update -[INFO] RHQ Server XML Schemas -[INFO] RHQ Enterprise Safe Invoker -[INFO] RHQ Enterprise Server JAR -[INFO] RHQ Enterprise Server JBoss AS SARs -[INFO] RHQ Enterprise Server Internal Services SAR -[INFO] RHQ Enterprise Modules -[INFO] RHQ Scripting Parent Module -[INFO] RHQ Scripting API -[INFO] RHQ Javascript support -[INFO] RHQ Python support -[INFO] RHQ Script Bindings -[INFO] RHQ Enterprise Remote Client API -[INFO] RHQ Remote Client Dependencies -[INFO] RHQ Enterprise Remote CLI -[INFO] RHQ Remoting Parent POM -[INFO] RHQ REST interface -[INFO] RHQ Enterprise Portal -[INFO] RHQ Enterprise GUI -[INFO] RHQ Enterprise Content HTTP Support -[INFO] RHQ Enterprise Core GUI -[INFO] RHQ REST interface examples -[INFO] RHQ Remoting WAR -[INFO] RHQ Enterprise Server Plugins -[INFO] RHQ Enterprise Server Disk Content Source Plugin -[INFO] RHQ Enterprise Server Yum Content Source Plugin -[INFO] RHQ Enterprise Server URL Content Source Plugin -[INFO] RHQ Enterprise Server JBoss Software Plugin -[INFO] RHQ Enterprise Server Email Alert Plugin -[INFO] RHQ Enterprise Server IRC Alert Plugin -[INFO] RHQ Enterprise Server Mobicents Alert Plugin -[INFO] RHQ Enterprise Server Microblog Alert Plugin -[INFO] RHQ Enterprise Server Opertions Alert Plugin -[INFO] RHQ Enterprise Server Roles Alert Plugin -[INFO] RHQ Enterprise Server SNMP Alert Plugin -[INFO] RHQ Enterprise Server Subject Alert Plugin -[INFO] RHQ Enterprise Server Client API -[INFO] RHQ Enterprise Server CLI Script Alert Plugin -[INFO] RHQ Enterprise Server Log4J Alert Plugin -[INFO] RHQ Enterprise Server Cobbler Plugin -[INFO] RHQ Drift Server Plugin -[INFO] RHQ File Template Bundle Server Plugin -[INFO] RHQ Ant Bundle Server Plugin -[INFO] RHQ Validate All Server Plugins -[INFO] RHQ Enterprise Server CLI Package Type Plugin -[INFO] RHQ Enterprise Server EAR -[INFO] RHQ Server Startup AS7 Subsystem -[INFO] RHQ Enterprise Installer Utility -[INFO] RHQ Server JAR Integration Tests -[INFO] RHQ Code Coverage -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-parent --- -[INFO] org.rhq:rhq-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Modules 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-modules-parent --- -[INFO] org.rhq:rhq-modules-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Test Utils 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ test-utils --- -[INFO] org.rhq:test-utils:jar:4.7.0-SNAPSHOT -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- javax.transaction:jta:jar:1.1:compile -[INFO] +- org.testng:testng:jar:6.5.2:compile -[INFO] | +- junit:junit:jar:4.10:compile -[INFO] | +- org.beanshell:bsh:jar:2.0b4:compile -[INFO] | +- com.beust:jcommander:jar:1.12:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] +- org.jmock:jmock:jar:2.5.1:compile -[INFO] | +- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | \- org.hamcrest:hamcrest-library:jar:1.1:compile -[INFO] +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] +- org.unitils:unitils-dbunit:jar:3.1:compile -[INFO] | +- org.unitils:unitils-core:jar:3.1:compile -[INFO] | | +- commons-lang:commons-lang:jar:2.4:compile (version managed from 2.3) -[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile (version managed from 3.2) -[INFO] | | \- ognl:ognl:jar:2.6.9:compile -[INFO] | +- org.unitils:unitils-database:jar:3.1:compile -[INFO] | | \- commons-dbcp:commons-dbcp:jar:1.2.2:compile -[INFO] | | \- commons-pool:commons-pool:jar:1.3:compile -[INFO] | +- org.dbunit:dbunit:jar:2.2.2:compile -[INFO] | | +- junit-addons:junit-addons:jar:1.4:compile -[INFO] | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:compile (version managed from 2.6.2) -[INFO] | | | \- xerces:xmlParserAPIs:jar:2.6.2:compile -[INFO] | | +- poi:poi:jar:2.5.1-final-20040804:compile -[INFO] | | +- org.slf4j:slf4j-api:jar:1.4.3:compile -[INFO] | | \- org.slf4j:slf4j-nop:jar:1.4.3:runtime -[INFO] | \- org.springframework:spring-jdbc:jar:2.5.2:compile -[INFO] | +- org.springframework:spring-beans:jar:2.5.2:compile -[INFO] | +- org.springframework:spring-core:jar:2.5.2:compile -[INFO] | \- org.springframework:spring-tx:jar:2.5.2:compile -[INFO] +- org.unitils:unitils-orm:jar:3.1:compile -[INFO] | +- org.unitils:unitils-spring:jar:3.1:compile -[INFO] | | \- org.springframework:spring-test:jar:2.5.2:compile -[INFO] | +- org.springframework:spring-context:jar:2.5.2:compile -[INFO] | | \- aopalliance:aopalliance:jar:1.0:compile -[INFO] | \- org.springframework:spring-orm:jar:2.5.2:compile -[INFO] +- org.unitils:unitils-dbmaintainer:jar:3.1:compile -[INFO] +- org.unitils:unitils-easymock:jar:3.1:compile -[INFO] | +- org.easymock:easymock:jar:2.3:compile -[INFO] | \- org.easymock:easymockclassextension:jar:2.3:compile -[INFO] +- org.unitils:unitils-testng:jar:3.1:compile -[INFO] +- org.unitils:unitils-inject:jar:3.1:compile -[INFO] +- org.unitils:unitils-mock:jar:3.1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Core Modules 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-parent --- -[INFO] org.rhq:rhq-core-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Utilities 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-util --- -[INFO] org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT -[INFO] +- jdom:jdom:jar:1.0:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- commons-io:commons-io:jar:1.4:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Native System API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-native-system --- -[INFO] org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] +- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] +- org.mockito:mockito-core:jar:1.9.0:test -[INFO] | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | \- org.objenesis:objenesis:jar:1.0:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Agent-Server Communications Annotations API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-comm-api --- -[INFO] org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Database Utilities 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-dbutils --- -[INFO] org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- ant:ant:jar:1.6.5:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.1:compile -[INFO] +- ant:ant-launcher:jar:1.6.5:test -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] +- com.h2database:h2:jar:1.2.139:test -[INFO] +- net.sourceforge.jtds:jtds:jar:1.2.2:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Domain Model 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-domain --- -[INFO] org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided -[INFO] +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] +- org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar:1.0.2.Final:provided -[INFO] +- org.jboss.as:jboss-as-dist:zip:7.1.1.Final:test -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:test -[INFO] +- org.jboss.spec:jboss-javaee-6.0:pom:3.0.0.Final:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- javax.enterprise:cdi-api:jar:1.0-SP4:provided -[INFO] | +- javax.inject:javax.inject:jar:1:provided -[INFO] | +- javax.jws:jsr181-api:jar:1.0-MR1:provided -[INFO] | +- javax.mail:mail:jar:1.4.4:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec:jar:2.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar:1.0.0.Final:provided (version managed from 1.0.1.Final) -[INFO] | +- org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec:jar:1.0.3.Final:provided -[INFO] | | \- xalan:xalan:jar:2.7.1.jbossorg-2:provided -[INFO] | | \- xalan:serializer:jar:2.7.1.jbossorg-2:provided -[INFO] | +- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar:1.0.4.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar:1.0.2.Final:provided -[INFO] | \- org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar:2.0.1.Final:provided -[INFO] +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | +- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.jboss.arquillian.protocol:arquillian-protocol-servlet:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] +- antlr:antlr:jar:2.7.7:test -[INFO] +- cglib:cglib-nodep:jar:2.1_3:test -[INFO] +- commons-io:commons-io:jar:1.4:test -[INFO] +- commons-collections:commons-collections:jar:3.2.1:test -[INFO] +- commons-codec:commons-codec:jar:1.4:test -[INFO] +- dom4j:dom4j:jar:1.6.1-jboss:test -[INFO] | \- xml-apis:xml-apis:jar:1.0.b2:test -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4:test -[INFO] +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test -[INFO] +- org.jboss.as:jboss-as-arquillian-container-managed:jar:7.1.1.Final:test -[INFO] | +- org.jboss.as:jboss-as-arquillian-common:jar:7.1.1.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-osgi:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-cdi:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-ejb:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-initialcontext:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-osgi:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-resource:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.as:jboss-as-arquillian-testenricher-msc:jar:7.1.1.Final:test -[INFO] | | | \- org.jboss.msc:jboss-msc:jar:1.0.2.GA:test -[INFO] | | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:test -[INFO] | | | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:test -[INFO] | | | +- org.jboss:jboss-dmr:jar:1.1.1.Final:test -[INFO] | | | \- org.jboss.threads:jboss-threads:jar:2.0.0.GA:test -[INFO] | | +- org.jboss.as:jboss-as-jmx:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:test -[INFO] | | | +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss:staxmapper:jar:1.1.0.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:test -[INFO] | | | | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:test -[INFO] | | | | | \- system:jdk-tools:jar:jdk:system -[INFO] | | | | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:test -[INFO] | | | | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss:jandex:jar:1.0.3.Final:test -[INFO] | | | | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:test -[INFO] | | | | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:test -[INFO] | | | | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:test -[INFO] | | | | \- org.jboss:jboss-vfs:jar:3.1.0.Final:test -[INFO] | | | \- org.jboss.marshalling:jboss-marshalling-river:jar:1.3.11.GA:test -[INFO] | | +- org.jboss.osgi.spi:jbosgi-spi:jar:3.0.1.Final:test -[INFO] | | | \- org.jboss.osgi.vfs:jbosgi-vfs:jar:1.0.7.Final:test -[INFO] | | \- org.osgi:org.osgi.core:jar:4.2.0:test -[INFO] | +- org.jboss.as:jboss-as-arquillian-protocol-jmx:jar:7.1.1.Final:test -[INFO] | | +- org.jboss.as:jboss-as-osgi-service:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-ee:jar:7.1.1.Final:test -[INFO] | | | | +- org.hibernate:hibernate-validator:jar:4.2.0.Final:test -[INFO] | | | | +- org.jboss.interceptor:jboss-interceptor-spi:jar:2.0.0.Final:test -[INFO] | | | | +- org.jboss.metadata:jboss-metadata-common:jar:7.0.1.Final:test -[INFO] | | | | \- org.jboss.metadata:jboss-metadata-ear:jar:7.0.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:test -[INFO] | | | | \- org.jboss:jboss-remote-naming:jar:1.0.2.Final:test -[INFO] | | | | \- org.jboss:jboss-ejb-client:jar:1.0.0.Final:test -[INFO] | | | +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:test -[INFO] | | | +- org.jboss.osgi.framework:jbosgi-framework-core:jar:1.1.8.Final:test -[INFO] | | | | +- org.jboss.osgi.deployment:jbosgi-deployment:jar:1.0.12.Final:test -[INFO] | | | | +- org.jboss.osgi.resolver:jbosgi-resolver-felix:jar:1.0.13.Final:test -[INFO] | | | | | +- org.jboss.osgi.resolver:jbosgi-resolver-api:jar:1.0.13.Final:test -[INFO] | | | | | | \- org.jboss.osgi.metadata:jbosgi-metadata:jar:2.0.3.Final:test -[INFO] | | | | | \- org.jboss.osgi.resolver:jbosgi-resolver-spi:jar:1.0.13.Final:test -[INFO] | | | | +- org.jboss.osgi.vfs:jbosgi-vfs30:jar:1.0.7.Final:test -[INFO] | | | | \- org.osgi:org.osgi.compendium:jar:4.2.0:test -[INFO] | | | +- org.jboss.osgi.repository:jbosgi-repository-core:jar:1.0.5:test -[INFO] | | | | \- org.jboss.osgi.repository:jbosgi-repository-api:jar:1.0.5:test -[INFO] | | | | \- org.jboss.osgi.resolver:jbosgi-resolver-api-v2:jar:2.0.0.Beta2:test -[INFO] | | | | \- org.apache.felix:org.apache.felix.resolver:jar:0.1.0.Beta1:test -[INFO] | | | \- org.osgi:org.osgi.enterprise:jar:4.2.0:test -[INFO] | | \- org.jboss.arquillian.protocol:arquillian-protocol-jmx:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:test -[INFO] | | \- org.jboss.xnio:xnio-api:jar:3.0.0.GA:test -[INFO] | +- org.jboss.remotingjmx:remoting-jmx:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:test -[INFO] | | \- org.jboss.marshalling:jboss-marshalling:jar:1.3.9.GA:test -[INFO] | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:test -[INFO] | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-plugin-api --- -[INFO] org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- jdom:jdom:jar:1.0:compile -[INFO] | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] +- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | \- javax.activation:activation:jar:1.1:compile -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test (version managed from 3.16.1-GA) -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Common Plugin Libraries 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-common-parent --- -[INFO] org.rhq:rhq-common-parent:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Drift Common Library 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-common-drift --- -[INFO] org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Client API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-client-api --- -[INFO] org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- commons-io:commons-io:jar:1.4:provided -[INFO] +- commons-jxpath:commons-jxpath:jar:1.3:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin Container 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-plugin-container --- -[INFO] org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | \- javax.activation:activation:jar:1.1:compile -[INFO] +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- commons-io:commons-io:jar:1.4:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Shared GUI Classes 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-gui --- -[INFO] org.rhq:rhq-core-gui:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- javax.el:el-api:jar:1.0:provided -[INFO] +- javax.servlet:servlet-api:jar:2.4:provided -[INFO] +- javax.servlet:jsp-api:jar:2.0:provided -[INFO] +- javax.faces:jsf-api:jar:1.2_14:provided -[INFO] +- javax.faces:jsf-impl:jar:1.2_14:provided -[INFO] +- org.richfaces.framework:richfaces-api:jar:3.3.3.Final:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile (version managed from 3.2) -[INFO] | \- commons-beanutils:commons-beanutils:jar:1.8.2:compile (version managed from 1.8.0) -[INFO] +- org.richfaces.framework:richfaces-impl:jar:3.3.3.Final:compile -[INFO] | \- commons-digester:commons-digester:jar:1.8.1:compile -[INFO] +- org.richfaces.ui:richfaces-ui:jar:3.3.3.Final:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin Validator Maven 2 Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-plugin-validator --- -[INFO] org.rhq:rhq-plugin-validator:maven-plugin:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | | \- javax.activation:activation:jar:1.1:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] | \- commons-io:commons-io:jar:1.4:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.apache.maven:maven-plugin-api:jar:2.0.8:compile -[INFO] +- org.apache.maven:maven-project:jar:2.0.8:compile -[INFO] | +- org.apache.maven:maven-settings:jar:2.0.8:compile -[INFO] | +- org.apache.maven:maven-profile:jar:2.0.8:compile -[INFO] | +- org.apache.maven:maven-model:jar:2.0.8:compile -[INFO] | +- org.apache.maven:maven-artifact-manager:jar:2.0.8:compile -[INFO] | | +- org.apache.maven:maven-repository-metadata:jar:2.0.8:compile -[INFO] | | \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile -[INFO] | +- org.apache.maven:maven-plugin-registry:jar:2.0.8:compile -[INFO] | +- org.codehaus.plexus:plexus-utils:jar:1.4.6:compile -[INFO] | +- org.apache.maven:maven-artifact:jar:2.0.8:compile -[INFO] | \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile -[INFO] | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | \- classworlds:classworlds:jar:1.1-alpha-2:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Arquillian Integration Modules 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-arquillian-parent --- -[INFO] org.rhq:rhq-arquillian-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Agent Plugin Archive 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-shrinkwrap-agent-plugin-archive --- -[INFO] org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugins 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-plugins-parent --- -[INFO] org.rhq:rhq-plugins-parent:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JMX Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-jmx-plugin --- -[INFO] org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] +- com.sun:tools:jar:1.6.0:system -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Arquillian Plugin Container 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-arquillian-agent-plugin-container-embedded --- -[INFO] org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:compile -[INFO] | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:compile -[INFO] +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:compile -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:compile -[INFO] +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:compile -[INFO] | | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:compile -[INFO] | +- org.sonatype.aether:aether-api:jar:1.13.1:compile -[INFO] | +- org.sonatype.aether:aether-impl:jar:1.13.1:compile -[INFO] | +- org.sonatype.aether:aether-spi:jar:1.13.1:compile -[INFO] | +- org.sonatype.aether:aether-util:jar:1.13.1:compile -[INFO] | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:compile -[INFO] | +- org.apache.maven:maven-aether-provider:jar:3.0.4:compile -[INFO] | +- org.apache.maven:maven-model:jar:3.0.4:compile -[INFO] | +- org.apache.maven:maven-model-builder:jar:3.0.4:compile -[INFO] | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:compile -[INFO] | +- org.apache.maven:maven-settings:jar:3.0.4:compile -[INFO] | +- org.apache.maven:maven-settings-builder:jar:3.0.4:compile -[INFO] | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:runtime -[INFO] | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:compile -[INFO] | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:compile -[INFO] | +- org.apache.maven.wagon:wagon-file:jar:2.2:compile -[INFO] | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:compile -[INFO] | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:compile -[INFO] | +- org.jsoup:jsoup:jar:1.6.1:compile -[INFO] | \- org.apache.httpcomponents:httpcore:jar:4.1.2:compile -[INFO] +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- jdom:jdom:jar:1.0:compile -[INFO] | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | \- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | | \- javax.activation:activation:jar:1.1:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] | \- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:compile -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:compile -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:compile -[INFO] | | \- org.objenesis:objenesis:jar:1.2:compile -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:compile -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:compile -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:compile -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:compile -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:test -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:test -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- junit:junit:jar:4.10:test (scope not updated to compile) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Arquillian Suite Extension 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-arquillian-suite-extension --- -[INFO] org.rhq:rhq-arquillian-suite-extension:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:compile -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:compile -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:compile -[INFO] | +- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin Test API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-plugin-test-api --- -[INFO] org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- jdom:jdom:jar:1.0:compile -[INFO] | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | | \- javax.activation:activation:jar:1.1:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] | \- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- javax.transaction:jta:jar:1.1:compile -[INFO] | +- org.jmock:jmock:jar:2.5.1:compile -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:compile -[INFO] | | +- org.unitils:unitils-core:jar:3.1:compile -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:compile (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:compile (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:compile -[INFO] | | +- org.unitils:unitils-database:jar:3.1:compile -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:compile -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:compile -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:compile -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:compile -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:compile (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:compile -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:compile -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:compile -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:runtime -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:compile -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:compile -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:compile -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:compile -[INFO] | +- org.unitils:unitils-orm:jar:3.1:compile -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:compile -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:compile -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:compile -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:compile -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:compile -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from compile) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:compile -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:compile -[INFO] | | +- org.easymock:easymock:jar:2.3:compile -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:compile -[INFO] | +- org.unitils:unitils-testng:jar:3.1:compile -[INFO] | +- org.unitils:unitils-inject:jar:3.1:compile -[INFO] | \- org.unitils:unitils-mock:jar:3.1:compile -[INFO] +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:compile -[INFO] | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:compile -[INFO] | | +- org.sonatype.aether:aether-api:jar:1.13.1:compile -[INFO] | | +- org.sonatype.aether:aether-impl:jar:1.13.1:compile -[INFO] | | +- org.sonatype.aether:aether-spi:jar:1.13.1:compile -[INFO] | | +- org.sonatype.aether:aether-util:jar:1.13.1:compile -[INFO] | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:compile -[INFO] | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:compile -[INFO] | | +- org.apache.maven:maven-model:jar:3.0.4:compile -[INFO] | | +- org.apache.maven:maven-model-builder:jar:3.0.4:compile -[INFO] | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:compile -[INFO] | | +- org.apache.maven:maven-settings:jar:3.0.4:compile -[INFO] | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:compile -[INFO] | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:runtime -[INFO] | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:compile -[INFO] | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:compile -[INFO] | | +- org.apache.maven.wagon:wagon-file:jar:2.2:compile -[INFO] | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:compile -[INFO] | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:compile -[INFO] | | +- org.jsoup:jsoup:jar:1.6.1:compile -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:compile -[INFO] | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:compile -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:compile -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:compile -[INFO] | | \- org.objenesis:objenesis:jar:1.2:compile -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:compile -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:compile -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:compile -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:compile -[INFO] +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:compile -[INFO] | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:compile -[INFO] +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:compile -[INFO] +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:compile -[INFO] +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:compile -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:runtime -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:runtime -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:runtime -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:runtime -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin Test Util 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-plugin-test-util --- -[INFO] org.rhq:rhq-core-plugin-test-util:jar:4.7.0-SNAPSHOT -[INFO] +- org.testng:testng:jar:6.5.2:compile -[INFO] | +- junit:junit:jar:4.10:compile -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | +- org.beanshell:bsh:jar:2.0b4:compile -[INFO] | +- com.beust:jcommander:jar:1.12:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] +- org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | +- jdom:jdom:jar:1.0:compile -[INFO] | | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | | | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | | | \- javax.activation:activation:jar:1.1:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] | | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | | +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- javax.transaction:jta:jar:1.1:compile -[INFO] | | +- org.jmock:jmock:jar:2.5.1:compile -[INFO] | | | \- org.hamcrest:hamcrest-library:jar:1.1:compile -[INFO] | | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | | +- org.unitils:unitils-dbunit:jar:3.1:compile -[INFO] | | | +- org.unitils:unitils-core:jar:3.1:compile -[INFO] | | | | +- commons-lang:commons-lang:jar:2.4:compile (version managed from 2.3) -[INFO] | | | | +- commons-collections:commons-collections:jar:3.2.1:compile (version managed from 3.2) -[INFO] | | | | \- ognl:ognl:jar:2.6.9:compile -[INFO] | | | +- org.unitils:unitils-database:jar:3.1:compile -[INFO] | | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:compile -[INFO] | | | | \- commons-pool:commons-pool:jar:1.3:compile -[INFO] | | | +- org.dbunit:dbunit:jar:2.2.2:compile -[INFO] | | | | +- junit-addons:junit-addons:jar:1.4:compile -[INFO] | | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:compile (version managed from 2.6.2) -[INFO] | | | | | \- xerces:xmlParserAPIs:jar:2.6.2:compile -[INFO] | | | | +- poi:poi:jar:2.5.1-final-20040804:compile -[INFO] | | | | +- org.slf4j:slf4j-api:jar:1.4.3:compile -[INFO] | | | | \- org.slf4j:slf4j-nop:jar:1.4.3:runtime -[INFO] | | | \- org.springframework:spring-jdbc:jar:2.5.2:compile -[INFO] | | | +- org.springframework:spring-beans:jar:2.5.2:compile -[INFO] | | | +- org.springframework:spring-core:jar:2.5.2:compile -[INFO] | | | \- org.springframework:spring-tx:jar:2.5.2:compile -[INFO] | | +- org.unitils:unitils-orm:jar:3.1:compile -[INFO] | | | +- org.unitils:unitils-spring:jar:3.1:compile -[INFO] | | | | \- org.springframework:spring-test:jar:2.5.2:compile -[INFO] | | | +- org.springframework:spring-context:jar:2.5.2:compile -[INFO] | | | | \- aopalliance:aopalliance:jar:1.0:compile -[INFO] | | | +- org.springframework:spring-orm:jar:2.5.2:compile -[INFO] | | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from compile) -[INFO] | | +- org.unitils:unitils-dbmaintainer:jar:3.1:compile -[INFO] | | +- org.unitils:unitils-easymock:jar:3.1:compile -[INFO] | | | +- org.easymock:easymock:jar:2.3:compile -[INFO] | | | \- org.easymock:easymockclassextension:jar:2.3:compile -[INFO] | | +- org.unitils:unitils-testng:jar:3.1:compile -[INFO] | | +- org.unitils:unitils-inject:jar:3.1:compile -[INFO] | | \- org.unitils:unitils-mock:jar:3.1:compile -[INFO] | +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:compile -[INFO] | | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:compile -[INFO] | | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:compile -[INFO] | | | +- org.sonatype.aether:aether-api:jar:1.13.1:compile -[INFO] | | | +- org.sonatype.aether:aether-impl:jar:1.13.1:compile -[INFO] | | | +- org.sonatype.aether:aether-spi:jar:1.13.1:compile -[INFO] | | | +- org.sonatype.aether:aether-util:jar:1.13.1:compile -[INFO] | | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:compile -[INFO] | | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:compile -[INFO] | | | +- org.apache.maven:maven-model:jar:3.0.4:compile -[INFO] | | | +- org.apache.maven:maven-model-builder:jar:3.0.4:compile -[INFO] | | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:compile -[INFO] | | | +- org.apache.maven:maven-settings:jar:3.0.4:compile -[INFO] | | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:compile -[INFO] | | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:runtime -[INFO] | | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:compile -[INFO] | | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:compile -[INFO] | | | +- org.apache.maven.wagon:wagon-file:jar:2.2:compile -[INFO] | | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:compile -[INFO] | | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:compile -[INFO] | | | +- org.jsoup:jsoup:jar:1.6.1:compile -[INFO] | | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:compile -[INFO] | | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] | +- org.powermock:powermock-module-testng:jar:1.4.12:compile -[INFO] | | +- org.powermock:powermock-core:jar:1.4.12:compile -[INFO] | | | \- org.powermock:powermock-reflect:jar:1.4.12:compile -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:compile -[INFO] | | \- org.powermock:powermock-module-testng-common:jar:1.4.12:compile -[INFO] | +- org.powermock:powermock-api-mockito:jar:1.4.12:compile -[INFO] | | +- org.mockito:mockito-all:jar:1.9.0:compile -[INFO] | | \- org.powermock:powermock-api-support:jar:1.4.12:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:compile -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:compile -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:compile -[INFO] | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:compile -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:compile -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:compile -[INFO] | | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:compile -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:compile -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:compile -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:runtime -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:runtime -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:runtime -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:runtime -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:runtime -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Plugin Container Integration Tests 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-core-plugin-container-itest --- -[INFO] org.rhq:rhq-core-plugin-container-itest:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | | \- commons-io:commons-io:jar:1.4:test -[INFO] | +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- javax.transaction:jta:jar:1.1:test -[INFO] | | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] | +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] | | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | | +- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:test -[INFO] | | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] | +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:test -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:test -[INFO] | +- jdom:jdom:jar:1.0:test -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:test -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:test -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:test -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:test -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:test -[INFO] | \- javax.activation:activation:jar:1.1:test -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossAS 4/5 Plugins Common Library 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-jboss-as-common --- -[INFO] org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT -[INFO] +- ant:ant:jar:1.6.5:compile -[INFO] +- jboss:jbpm:jar:3.1.1:compile -[INFO] +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | \- xml-apis:xml-apis:jar:1.0.b2:compile -[INFO] +- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ File Template Bundle Plugins Common Library 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-filetemplate-bundle-common --- -[INFO] org.rhq:rhq-filetemplate-bundle-common:jar:4.7.0-SNAPSHOT -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Ant Bundle Plugins Common Library 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-ant-bundle-common --- -[INFO] org.rhq:rhq-ant-bundle-common:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.apache.ant:ant:jar:1.8.0:compile -[INFO] +- org.apache.ant:ant-launcher:jar:1.8.0:compile -[INFO] +- org.apache.ant:ant-nodeps:jar:1.8.0:compile -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:runtime -[INFO] +- org.liquibase:liquibase-core:jar:1.9.5:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBoss AS DMR Client 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-jboss-as-dmr-client --- -[INFO] org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.msc:jboss-msc:jar:1.0.2.GA:provided -[INFO] +- org.jboss:jboss-dmr:jar:1.1.1.Final:provided -[INFO] +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:provided -[INFO] | +- org.jboss:jboss-remote-naming:jar:1.0.2.Final:provided -[INFO] | | +- org.jboss:jboss-ejb-client:jar:1.0.0.Final:provided -[INFO] | | +- org.jboss.marshalling:jboss-marshalling:jar:1.3.0.GA:provided -[INFO] | | +- org.jboss.xnio:xnio-api:jar:3.0.0.GA:provided -[INFO] | | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:provided -[INFO] | | \- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:provided -[INFO] | | | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:provided -[INFO] | | | \- org.jboss:staxmapper:jar:1.1.0.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:provided -[INFO] | | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:provided -[INFO] | | | | \- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:provided -[INFO] | | | \- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:provided -[INFO] | | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:provided -[INFO] | | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:provided -[INFO] | | | \- system:jdk-tools:jar:jdk:system -[INFO] | | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:provided -[INFO] | | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:provided -[INFO] | | | \- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss:jandex:jar:1.0.3.Final:provided -[INFO] | | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:provided -[INFO] | | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:provided -[INFO] | | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:provided -[INFO] | | +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:provided -[INFO] | | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:provided -[INFO] | | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:provided -[INFO] | | +- org.jboss.threads:jboss-threads:jar:2.0.0.GA:provided -[INFO] | | \- org.jboss:jboss-vfs:jar:3.1.0.Final:provided -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Platform Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-platform-plugin --- -[INFO] org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Agent-Server Communications Layer 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-comm --- -[INFO] org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- dom4j:dom4j:jar:1.6.1:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] +- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Agent 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-agent --- -[INFO] org.rhq:rhq-enterprise-agent:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- jdom:jdom:jar:1.0:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | +- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:compile -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | \- javax.activation:activation:jar:1.1:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] | \- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- jline:jline:jar:0.9.94:compile -[INFO] | \- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ RHQ-Agent Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-agent-plugin --- -[INFO] org.rhq:rhq-agent-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-agent:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jline:jline:jar:0.9.94:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | \- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- jdom:jdom:jar:1.0:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ No-op Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-no-op-plugin --- -[INFO] org.rhq:rhq-no-op-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Augeas Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-augeas-plugin --- -[INFO] org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:compile -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:compile -[INFO] +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] +- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.testng:testng:jar:6.5.2:compile -[INFO] | +- junit:junit:jar:4.10:compile -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | +- org.beanshell:bsh:jar:2.0b4:compile -[INFO] | +- com.beust:jcommander:jar:1.12:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] +- net.augeas:augeas:jar:0.0.2:compile -[INFO] +- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Apache Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-apache-plugin --- -[INFO] org.rhq:rhq-apache-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] +- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | \- net.augeas:augeas:jar:0.0.2:compile -[INFO] +- org.hyperic:sigar:jar:1.6.5.132-5:provided (scope not updated to compile) -[INFO] +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Tomcat Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-tomcat-plugin --- -[INFO] org.jboss.on:jopr-tomcat-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test (version managed from 3.16.1-GA) -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Hibernate Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-hibernate-plugin --- -[INFO] org.jboss.on:jopr-hibernate-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossAS 5.x/6.x Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-jboss-as-5-plugin --- -[INFO] org.jboss.on:jopr-jboss-as-5-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- ant:ant:jar:1.6.5:compile -[INFO] | +- jboss:jbpm:jar:3.1.1:compile -[INFO] | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:compile -[INFO] | \- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] +- org.apache.commons:commons-io:jar:1.3.2:compile -[INFO] +- commons-lang:commons-lang:jar:2.4:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.jboss.integration:jboss-profileservice-spi:jar:6.0.0.Alpha9:provided -[INFO] | +- org.jboss:jboss-vfs:jar:2.2.0.Alpha1:provided (version managed from 3.0.0.CR1) -[INFO] | \- org.jboss.kernel:jboss-dependency:jar:2.2.0.Alpha6:provided -[INFO] | \- org.jboss:jbossxb:jar:2.0.2.Beta3:provided (version managed from 2.0.2.Beta4) -[INFO] | +- apache-xerces:xml-apis:jar:2.9.1:provided -[INFO] | +- wutka-dtdparser:dtdparser121:jar:1.2.1:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided (version managed from 1.1.1) -[INFO] +- org.jboss.man:jboss-managed:jar:2.1.1.GA:provided -[INFO] | \- org.jboss:jboss-mdr:jar:2.0.2.GA:provided (version managed from 2.0.1.GA) -[INFO] +- org.jboss.man:jboss-metatype:jar:2.1.1.GA:provided -[INFO] | +- org.jboss:jboss-reflect:jar:2.0.2.GA:provided (version managed from 2.2.0.Alpha2) -[INFO] | \- org.jboss.logging:jboss-logging-spi:jar:2.1.1.GA:provided -[INFO] +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] +- org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] | | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | | +- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:test -[INFO] | | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.rhq:rhq-core-plugin-test-util:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar:1.0.0.Final:test -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.5.6:test (version managed from 1.4.3) -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.5:test (version managed from 2.5.2) -[INFO] | | +- org.springframework:spring-core:jar:2.5.5:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.5:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.4:test (version managed from 2.3) -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:1.3.0:test (version managed from 2.0b4) -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossAS 3.2.x/4.x Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-jboss-as-plugin --- -[INFO] org.jboss.on:jopr-jboss-as-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- ant:ant:jar:1.6.5:compile -[INFO] | +- jboss:jbpm:jar:3.1.1:compile -[INFO] | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:compile -[INFO] | \- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] +- bsh:bsh:jar:1.3.0:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test (version managed from 3.16.1-GA) -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ mod_cluster Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ modcluster-plugin --- -[INFO] org.rhq:modcluster-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.jboss.on:jopr-jboss-as-5-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.apache.commons:commons-io:jar:1.3.2:provided -[INFO] | \- commons-lang:commons-lang:jar:2.4:provided -[INFO] +- org.jboss.on:jopr-jboss-as-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- ant:ant:jar:1.6.5:compile -[INFO] | | +- jboss:jbpm:jar:3.1.1:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:compile -[INFO] | | \- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] | +- bsh:bsh:jar:1.3.0:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossCache 4.x Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-jboss-cache-plugin --- -[INFO] org.jboss.on:jopr-jboss-cache-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.jboss.on:jopr-jboss-as-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- ant:ant:jar:1.6.5:compile -[INFO] | | +- jboss:jbpm:jar:3.1.1:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:compile -[INFO] | | \- mc4j:org-mc4j-ems:jar:1.3:compile -[INFO] | +- bsh:bsh:jar:1.3.0:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossAS 7.x Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-jboss-as-7-plugin --- -[INFO] org.rhq:rhq-jboss-as-7-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.codehaus.jackson:jackson-core-asl:jar:1.9.5:compile -[INFO] +- org.codehaus.jackson:jackson-mapper-asl:jar:1.9.5:compile -[INFO] +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:compile -[INFO] | \- org.jboss.logging:jboss-logging:jar:3.1.0.GA:compile -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | \- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] +- commons-codec:commons-codec:jar:1.4:compile -[INFO] +- org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] | | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | | +- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:test -[INFO] | | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] | +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.rhq:rhq-core-plugin-test-util:jar:4.7.0-SNAPSHOT:test -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:test -[INFO] +- org.hyperic:sigar-dist:zip:1.6.5.132-5:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Server Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-rhqserver-plugin --- -[INFO] org.rhq:rhq-rhqserver-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- jdom:jdom:jar:1.0:provided -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | +- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ JBossCache 3.x Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jopr-jboss-cache-v3-plugin --- -[INFO] org.jboss.on:jopr-jboss-cache-v3-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.jboss.on:jopr-jboss-as-5-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-jboss-as-common:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- ant:ant:jar:1.6.5:provided -[INFO] | | +- jboss:jbpm:jar:3.1.1:provided -[INFO] | | \- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:provided -[INFO] | +- org.apache.commons:commons-io:jar:1.3.2:provided -[INFO] | +- commons-lang:commons-lang:jar:2.4:provided -[INFO] | \- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] +- org.jboss.integration:jboss-profileservice-spi:jar:5.1.0.SP1:provided -[INFO] | +- org.jboss.man:jboss-managed:jar:2.1.1.GA:provided (version managed from 2.1.0.SP1) -[INFO] | +- org.jboss.man:jboss-metatype:jar:2.1.1.GA:provided -[INFO] | \- org.jboss:jboss-vfs:jar:2.2.0.Alpha1:provided (version managed from 2.1.2.GA) -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] +- org.jboss.naming:jnp-client:jar:5.0.4.GA:test -[INFO] +- org.jboss.microcontainer:jboss-kernel:jar:2.0.9.GA:test -[INFO] | \- org.jboss:jbossxb:jar:2.0.2.Beta3:test -[INFO] | +- wutka-dtdparser:dtdparser121:jar:1.2.1:test -[INFO] | \- javax.activation:activation:jar:1.1:test (version managed from 1.1.1) -[INFO] +- org.jboss.jbossas:jboss-as-aspects:jar:jboss-aspect-jdk50-client:5.1.0.CR1:test -[INFO] | +- org.jboss.aspects:jboss-remoting-aspects:jar:1.0.1.GA:test -[INFO] | +- org.jboss.aspects:jboss-transaction-aspects:jar:1.0.0.GA:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-as-int:jar:1.1.21:test (version managed from 1.1.4) -[INFO] | | +- org.jboss.ejb3:jboss-ejb3:pom:1.1.21:test -[INFO] | | | +- org.jboss.ejb3:jboss-ejb3-core:jar:1.1.21:test -[INFO] | | | \- org.jboss.ejb3:jboss-ejb3-deployers:jar:1.0.0:test -[INFO] | | +- org.jboss.ejb3:jboss-ejb3-mc-int:jar:1.0.1:test -[INFO] | | \- org.jboss.ejb3:jboss-ejb3-metrics-deployer:jar:1.0.1:test -[INFO] | | \- org.jboss.microcontainer:jboss-jmx-mc-int:jar:2.2.0.M2:test -[INFO] | | +- org.jboss.mx:jboss-jmx:jar:6.0.0.Beta2:test -[INFO] | | | +- org.jboss.mx:jboss-j2se:jar:6.0.0.Beta2:test -[INFO] | | | \- org.jboss.mx:jboss-mbeans:jar:6.0.0.Beta2:test -[INFO] | | \- org.jboss.mx:jboss-mbeanserver:jar:6.0.0.Beta2:test -[INFO] | +- org.jboss.cluster:jboss-ha-client:jar:1.1.1.GA:test -[INFO] | +- org.jboss.cluster:jboss-ha-server-api:jar:1.1.1.GA:test -[INFO] | +- org.jboss.aop:jboss-aop:jar:2.1.6.GA:test (version managed from 2.1.0.CR3) -[INFO] | +- org.jboss.aop:jboss-aop-aspects:jar:2.1.6.GA:test (version managed from 2.1.0.CR3) -[INFO] | +- org.jboss.aop:jboss-aop-asintegration-core:jar:2.1.6.GA:test (version managed from 2.1.0.CR3) -[INFO] | | \- org.jboss.aop:pluggable-instrumentor:jar:2.1.6.GA:test -[INFO] | +- org.jboss.aop:jboss-aop-asintegration-jmx:jar:2.1.0.CR3:test -[INFO] | +- org.jboss.aop:jboss-aop-asintegration-mc:jar:2.1.6.GA:test (version managed from 2.1.0.CR3) -[INFO] | | +- org.jboss.cl:jboss-classloader:jar:2.0.8.GA:test -[INFO] | | \- org.jboss.deployers:jboss-deployers-vfs:jar:2.0.9.GA:test -[INFO] | | +- org.jboss.cl:jboss-classloading-vfs:jar:2.0.8.GA:test -[INFO] | | +- org.jboss.deployers:jboss-deployers-core:jar:2.0.9.GA:test -[INFO] | | \- org.jboss.deployers:jboss-deployers-client:jar:2.0.9.GA:test -[INFO] | +- apache-xerces:xml-apis:jar:2.9.1:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.jboss.jbossas:jboss-as-j2se:jar:6.0.0.M1:test (version managed from 5.1.0.CR1) -[INFO] | | \- org.jboss.integration:jboss-classloading-spi:jar:5.1.0.SP1:test -[INFO] | +- org.jboss.jbossas:jboss-as-system-jmx:jar:6.0.0.M1:test (version managed from 5.1.0.CR1) -[INFO] | | \- org.jboss.deployers:jboss-deployers-impl:jar:2.0.9.GA:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jboss.test:jboss-test:jar:1.1.5-alpha-2:test -[INFO] | | +- org.apache.ant:ant-junit:jar:1.7.0:test -[INFO] | | +- jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:test -[INFO] | | \- org.jboss.jbossas:jboss-server-manager:jar:1.0.3-alpha-2:test -[INFO] | \- javassist:javassist:jar:3.11.0.GA:test -[INFO] +- trove:trove:jar:1.0.2:test -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] +- org.jboss.security:jboss-security-spi:jar:2.0.4.SP2:test -[INFO] +- org.jboss.javaee:jboss-javaee:jar:5.2.0.Beta1:test -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:test -[INFO] +- org.jboss.jbossas:jboss-as-server:jar:client:6.0.0.M1:test -[INFO] | +- sun-jaxb:jaxb-api:jar:2.1.9-brew:test -[INFO] | +- org.jboss.jbossas:jboss-as-deployment:jar:6.0.0.M1:test -[INFO] | | \- org.jboss.javaee:jboss-jad-api:jar:1.2.0.GA:test -[INFO] | +- org.jboss.bootstrap:jboss-bootstrap-impl-as:jar:2.0.0-alpha-4:test -[INFO] | | +- org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar:2.0.0-alpha-3:test -[INFO] | | | +- org.mortbay.jetty:jetty:jar:6.1.16:test -[INFO] | | | | +- org.mortbay.jetty:jetty-util:jar:6.1.16:test -[INFO] | | | | \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:test -[INFO] | | | +- org.jboss.bootstrap:jboss-bootstrap-impl-base:jar:2.0.0-alpha-4:test -[INFO] | | | | \- org.jboss.bootstrap:jboss-bootstrap-spi:jar:2.0.0-alpha-3:test -[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar:2.0.0-alpha-2:test -[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-api-mc:jar:2.0.0-alpha-1:test -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-spi-as:jar:2.0.0-alpha-4:test -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api-as:jar:2.0.0-alpha-2:test (version managed from 2.0.0-alpha-1) -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api:jar:2.0.0-alpha-2:test -[INFO] | +- org.jboss.integration:jboss-deployment-spi:jar:5.1.0.SP1:test -[INFO] | +- org.jboss.jpa:jboss-jpa-deployers:jar:1.0.1:test -[INFO] | | +- org.jboss.jpa:jboss-jpa-impl:jar:2.0.0:test (version managed from 1.0.0) -[INFO] | | | \- javax.validation:validation-api:jar:1.0.0.GA:test -[INFO] | | \- org.jboss.jpa:jboss-jpa-spi:jar:1.0.0:test -[INFO] | +- org.jboss.security:jbosssx:jar:2.0.4.SP2:test -[INFO] | +- org.jboss.metadata:jboss-metadata:jar:1.0.2.Beta2:test -[INFO] | | +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:test -[INFO] | | \- jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:test -[INFO] | +- org.jboss.jbossas:jboss-as-jmx:jar:6.0.0.M1:test -[INFO] | | \- org.jboss.jbossas:jboss-as-mbeans:jar:6.0.0.M1:test -[INFO] | +- org.jboss.jbossas:jboss-as-system:jar:6.0.0.M1:test -[INFO] | +- org.jboss.javaee:jboss-ejb-api:jar:3.0.0.GA_SP1:test -[INFO] | | \- org.jboss.ws.native:jbossws-native-jaxrpc:jar:3.2.1.GA:test (version managed from 3.0.4.GA) -[INFO] | +- org.jboss.interceptor:jboss-interceptor-api:jar:1.0.1-CR1:test -[INFO] | +- org.jboss.jbossas:jboss-as-security:jar:6.0.0.M1:test -[INFO] | | \- org.apache:xmlsec:jar:1.4.3:test -[INFO] | +- org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA_SP1:test -[INFO] | | \- jboss.web:servlet-api:jar:2.1.6.GA:test (version managed from 2.1.1.GA) -[INFO] | +- org.hibernate.java-persistence:jpa-api:jar:2.0-cr-1:test -[INFO] | +- org.jboss.javaee:jboss-jms-api:jar:1.1.0.GA:test -[INFO] | +- org.jboss.ws.native:jbossws-native-saaj:jar:3.2.1.GA:test -[INFO] | +- javax.xml.ws:jaxws-api:jar:2.1:test -[INFO] | +- org.jboss.javaee:jboss-jca-api:jar:1.5.0.GA:test -[INFO] | +- bcel:bcel:jar:5.1:test -[INFO] | \- org.jboss.naming:jnpserver:jar:5.0.4.GA:test -[INFO] +- org.jboss:jboss-mdr:jar:2.0.2.GA:test -[INFO] +- org.jboss.logging:jboss-logging-spi:jar:2.1.1.GA:test -[INFO] +- org.jboss.logging:jboss-logging-log4j:jar:2.1.1.GA:test -[INFO] | \- org.jboss.cl:jboss-classloading:jar:2.0.8.GA:test (version managed from 2.0.7.GA) -[INFO] +- org.jboss.jbossas:jboss-as-security:jar:client:5.1.0.CR1:test -[INFO] | +- javax.security:jaas:jar:1.0.01:test -[INFO] | +- org.jboss.javaee:jboss-jaspi-api:jar:1.0.0.GA:test -[INFO] | \- org.jboss.security:jbossxacml:jar:2.0.4:test -[INFO] +- org.jboss.integration:jboss-transaction-spi:jar:5.1.0.SP1:test -[INFO] | \- org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-common:jar:client:1.0.1:test -[INFO] | \- org.jboss.deployers:jboss-deployers-spi:jar:2.0.9.GA:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-core:jar:client:1.1.21:test -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:test -[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:test -[INFO] | | +- antlr:antlr:jar:2.7.7:test -[INFO] | | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:test -[INFO] | | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:test -[INFO] | | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:test -[INFO] | | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:test -[INFO] | +- org.hibernate:hibernate-annotations:jar:3.5.6-Final:test -[INFO] | | +- org.hibernate:hibernate-commons-annotations:jar:3.2.0.Beta1:test (version managed from 3.2.0.Final) -[INFO] | | \- org.slf4j:slf4j-api:jar:1.5.6:test -[INFO] | +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:test -[INFO] | +- org.jboss.integration:jboss-jca-spi:jar:5.0.3.GA:test -[INFO] | +- org.jboss.cache:jbosscache-core:jar:3.2.1.GA:test -[INFO] | | \- jgroups:jgroups:jar:2.6.13.GA:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-cache:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-common:jar:1.0.1:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-endpoint:jar:0.1.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-jpa-int:jar:2.0.0-alpha-1:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-security:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-interceptors:jar:1.0.5:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-metadata:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:1.0.6:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:1.0.2:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:1.0.0:test -[INFO] | +- org.jboss.ejb3:jboss-ejb3-transactions:jar:1.0.2:test -[INFO] | +- org.jboss.ws:jbossws-spi:jar:1.2.1.GA:test -[INFO] | +- quartz:quartz:jar:1.5.2:test -[INFO] | +- sun-jaxws:jaxws-api:jar:2.1.1:test -[INFO] | \- sun-jaxws:jsr181-api:jar:2.1.1:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-ext-api:jar:1.0.0:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client:1.0.0:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client:1.0.6:test -[INFO] | \- org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.9.GA:test -[INFO] +- org.jboss.ejb3:jboss-ejb3-security:jar:client:1.0.0:test -[INFO] | \- org.jboss.aspects:jboss-current-invocation-aspects:jar:1.0.0.GA:test -[INFO] +- org.jboss.microcontainer:jboss-dependency:jar:2.0.9.GA:test -[INFO] +- org.jboss.security:jbosssx-client:jar:2.0.4.SP2:test -[INFO] +- org.jboss.aspects:jboss-security-aspects:jar:1.0.1:test -[INFO] +- org.jboss.aop:jboss-aop:jar:client:2.1.6.GA:test -[INFO] | +- org.apache.ant:ant:jar:1.8.0:test -[INFO] | | \- org.apache.ant:ant-launcher:jar:1.8.0:test -[INFO] | \- qdox:qdox:jar:1.6.1:test -[INFO] +- org.jboss:jboss-common-core:jar:2.2.17.GA:test -[INFO] +- org.jboss:jboss-reflect:jar:2.0.2.GA:test -[INFO] +- jboss:jboss-serialization:jar:1.0.3.GA:test -[INFO] +- org.jboss.deployers:jboss-deployers-core-spi:jar:2.0.9.GA:test -[INFO] +- org.jboss.deployers:jboss-deployers-client-spi:jar:2.0.9.GA:test -[INFO] +- org.jboss.jbossas:jboss-as-profileservice:jar:client:6.0.0.M1:test -[INFO] | +- org.jboss.jbossas:jboss-as-aspects:jar:6.0.0.M1:test -[INFO] | +- org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.0.9.GA:test -[INFO] | +- org.jboss.deployers:jboss-deployers-structure-spi:jar:2.0.9.GA:test -[INFO] | \- stax:stax-api:jar:1.0:test -[INFO] +- org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:6.0.0.M1:test -[INFO] +- jboss.messaging:jboss-messaging-client:jar:1.4.3.GA:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.5:test (version managed from 2.5.2) -[INFO] | | +- org.springframework:spring-core:jar:2.5.5:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.5:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.4:test (version managed from 2.3) -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:1.3.0:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Database Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-database-plugin --- -[INFO] org.rhq:rhq-database-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- com.h2database:h2:jar:1.2.139:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Postgres Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-postgres-plugin --- -[INFO] org.rhq:rhq-postgres-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:test -[INFO] +- org.rhq:rhq-database-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Script Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-script-plugin --- -[INFO] org.rhq:rhq-script-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ IIS Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-iis-plugin --- -[INFO] org.rhq:rhq-iis-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ File Template Bundle Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-filetemplate-bundle-plugin --- -[INFO] org.rhq:rhq-filetemplate-bundle-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-filetemplate-bundle-common:jar:4.7.0-SNAPSHOT:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Ant Bundle Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-ant-bundle-plugin --- -[INFO] org.rhq:rhq-ant-bundle-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-ant-bundle-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- jdom:jdom:jar:1.0:compile -[INFO] | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- org.apache.ant:ant:jar:1.8.0:compile -[INFO] | +- org.apache.ant:ant-launcher:jar:1.8.0:compile -[INFO] | +- org.apache.ant:ant-nodeps:jar:1.8.0:compile -[INFO] | +- ant-contrib:ant-contrib:jar:1.0b3:provided (scope managed from runtime) -[INFO] | \- org.liquibase:liquibase-core:jar:1.9.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Augeas-based Cron Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-cron-plugin --- -[INFO] org.rhq:rhq-cron-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ GRUB Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-grub-plugin --- -[INFO] org.rhq:rhq-grub-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- net.augeas:augeas:jar:0.0.2:compile -[INFO] +- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Hosts File Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-hosts-plugin --- -[INFO] org.rhq:rhq-hosts-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Cobbler File Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-cobbler-plugin --- -[INFO] org.rhq:rhq-cobbler-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- commons-io:commons-io:jar:1.4:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Augeas-based Sudoers Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-sudoers-plugin --- -[INFO] org.rhq:rhq-sudoers-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Network Services Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-netservices-plugin --- -[INFO] org.rhq:rhq-netservices-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | \- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] +- commons-codec:commons-codec:jar:1.4:compile -[INFO] +- org.mockito:mockito-core:jar:1.9.5:test -[INFO] | \- org.objenesis:objenesis:jar:1.0:test -[INFO] +- org.eclipse.jetty.aggregate:jetty-all:jar:8.1.8.v20121106:test -[INFO] | \- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Augeas-based Samba Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-samba-plugin --- -[INFO] org.rhq:rhq-samba-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Augeas-based Postfix Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-postfix-plugin --- -[INFO] org.rhq:rhq-postfix-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Aliases File Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-aliases-plugin --- -[INFO] org.rhq:rhq-aliases-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- org.rhq:rhq-augeas-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-platform-plugin:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:1.4:compile -[INFO] | +- net.augeas:augeas:jar:0.0.2:compile -[INFO] | \- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test (scope not updated to compile) -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:test -[INFO] | \- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ SSHD Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-sshd-plugin --- -[INFO] org.rhq:rhq-sshd-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- ant-contrib:ant-contrib:jar:1.0b3:provided -[INFO] | \- ant:ant:jar:1.5:provided -[INFO] +- net.augeas:augeas:jar:0.0.2:compile -[INFO] +- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Byteman Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-byteman-plugin --- -[INFO] org.rhq:rhq-byteman-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.byteman:byteman:jar:1.2.1:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ IRC Server Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-irc-plugin --- -[INFO] org.rhq:rhq-irc-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- pircbot:pircbot:jar:1.4.2:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Hadoop Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ hadoop-plugin --- -[INFO] org.rhq:hadoop-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Hudson Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-hudson-plugin --- -[INFO] org.rhq:rhq-hudson-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.json:json:jar:20080701:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ MySql Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-mysql-plugin --- -[INFO] org.rhq:rhq-mysql-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- mysql:mysql-connector-java:jar:5.1.6:test -[INFO] +- org.rhq:rhq-database-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Oracle Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-oracle-plugin --- -[INFO] org.rhq:rhq-oracle-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-database-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Performance Test Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-perftest-plugin --- -[INFO] org.rhq:rhq-perftest-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar:1.0.4.Final:compile -[INFO] +- com.sun.xml.bind:jaxb-impl:jar:2.2.4:compile -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:compile -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:compile -[INFO] | \- javax.activation:activation:jar:1.1:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Script2 Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-script2-plugin --- -[INFO] org.rhq:rhq-script2-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.jruby:jruby-complete:jar:1.4.0:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ SnmpTrapd Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-snmptrapd-plugin --- -[INFO] org.rhq:rhq-snmptrapd-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- javax.xml.bind:jaxb-api:jar:2.1:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Twitter Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-twitter-plugin --- -[INFO] org.rhq:rhq-twitter-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.twitter4j:twitter4j-core:jar:2.2.4:compile -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Virtualization Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-virt-plugin --- -[INFO] org.rhq:rhq-virt-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- net.java.dev.jna:jna:jar:3.2.5:compile -[INFO] +- org.libvirt:libvirt:jar:0.4.1:compile -[INFO] +- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Kickstart Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-kickstart-plugin --- -[INFO] org.rhq:rhq-kickstart-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ pattern Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ pattern-plugin --- -[INFO] org.rhq:pattern-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Cassandra Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-cassandra-plugin --- -[INFO] org.rhq:rhq-cassandra-plugin:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-jmx-plugin:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- mc4j:org-mc4j-ems:jar:1.3:provided -[INFO] | \- com.sun:tools:jar:1.6.0:system -[INFO] +- org.apache.cassandra:cassandra-all:jar:1.1.5:compile -[INFO] | +- org.xerial.snappy:snappy-java:jar:1.0.4.1:compile -[INFO] | +- com.ning:compress-lzf:jar:0.8.4:compile -[INFO] | +- com.google.guava:guava:jar:r08:compile -[INFO] | +- commons-cli:commons-cli:jar:1.1:compile -[INFO] | +- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar:1.3:compile -[INFO] | +- org.antlr:antlr:jar:3.2:compile -[INFO] | | \- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | | \- antlr:antlr:jar:2.7.7:compile -[INFO] | +- org.slf4j:slf4j-api:jar:1.6.1:compile -[INFO] | +- org.apache.cassandra.deps:avro:jar:1.4.0-cassandra-1:compile -[INFO] | | \- org.mortbay.jetty:jetty:jar:6.1.22:compile -[INFO] | | +- org.mortbay.jetty:jetty-util:jar:6.1.22:compile -[INFO] | | \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:compile -[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.9.2:compile -[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.9.2:compile -[INFO] | +- jline:jline:jar:0.9.94:compile -[INFO] | +- com.googlecode.json-simple:json-simple:jar:1.1:compile -[INFO] | +- com.github.stephenc.high-scale-lib:high-scale-lib:jar:1.1.2:compile -[INFO] | +- edu.stanford.ppl:snaptree:jar:0.1:compile -[INFO] | +- com.yammer.metrics:metrics-core:jar:2.0.3:compile -[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.6.1:runtime -[INFO] | +- org.apache.cassandra:cassandra-thrift:jar:1.1.5:compile -[INFO] | \- com.github.stephenc:jamm:jar:0.2.5:compile -[INFO] +- org.apache.thrift:libthrift:jar:0.7.0:compile -[INFO] | +- javax.servlet:servlet-api:jar:2.4:compile (version managed from 2.5) -[INFO] | \- org.apache.httpcomponents:httpclient:jar:4.0.1:compile -[INFO] | \- org.apache.httpcomponents:httpcore:jar:4.0.1:compile -[INFO] +- org.hectorclient:hector-core:jar:1.1-1:compile -[INFO] | +- commons-pool:commons-pool:jar:1.5.3:compile -[INFO] | +- com.github.stephenc.eaio-uuid:uuid:jar:3.2.0:compile -[INFO] | \- com.ecyrd.speed4j:speed4j:jar:0.9:compile -[INFO] +- org.yaml:snakeyaml:jar:1.10:compile -[INFO] +- org.rhq:rhq-core-plugin-test-api:pom:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-arquillian-agent-plugin-container-embedded:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | | | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] | | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | | \- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | +- org.rhq:rhq-shrinkwrap-agent-plugin-archive:jar:4.7.0-SNAPSHOT:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] | +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.rhq:rhq-core-plugin-test-util:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- log4j:log4j:jar:1.2.16:provided (scope not updated to compile) -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Validate All Plugins 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ validate-all-plugins --- -[INFO] org.rhq:validate-all-plugins:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | \- javax.activation:activation:jar:1.1:provided -[INFO] +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- net.augeas:augeas-native:zip:el5:0.9.0-4:test -[INFO] | \- commons-io:commons-io:jar:1.4:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | +- commons-lang:commons-lang:jar:2.4:test (version managed from 2.3) -[INFO] | | | +- commons-collections:commons-collections:jar:3.2.1:test (version managed from 3.2) -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- jboss.jboss-embeddable-ejb3:hibernate-all:jar:1.0.0.Alpha9:provided -[INFO] +- org.rhq:rhq-core-plugin-container:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test (version managed from 3.8.1) -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Helpers 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-helpers --- -[INFO] org.rhq.helpers:rhq-helpers:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Response-Time Filter 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-rtfilter --- -[INFO] org.rhq.helpers:rhq-rtfilter:jar:4.7.0-SNAPSHOT -[INFO] +- javax.servlet:servlet-api:jar:2.4:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.1:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Response-Time Filter - JBoss AS7 Subsystem 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-rtfilter-subsystem --- -[INFO] org.rhq.helpers:rhq-rtfilter-subsystem:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:provided -[INFO] | +- org.jboss:jboss-dmr:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:provided -[INFO] | +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:provided -[INFO] | +- org.jboss.msc:jboss-msc:jar:1.0.2.GA:provided -[INFO] | +- org.jboss:staxmapper:jar:1.1.0.Final:provided -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:provided -[INFO] +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:provided -[INFO] | | \- system:jdk-tools:jar:jdk:system -[INFO] | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-api:jar:3.0.3.GA:provided -[INFO] | +- org.jboss:jandex:jar:1.0.3.Final:provided -[INFO] | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:provided -[INFO] | +- org.jboss.marshalling:jboss-marshalling:jar:1.3.11.GA:provided -[INFO] | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:provided -[INFO] | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:provided -[INFO] | +- org.jboss.threads:jboss-threads:jar:2.0.0.GA:provided -[INFO] | \- org.jboss:jboss-vfs:jar:3.1.0.Final:provided -[INFO] +- org.jboss.as:jboss-as-ee:jar:7.1.1.Final:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.hibernate:hibernate-validator:jar:4.2.0.Final:provided -[INFO] | | \- org.slf4j:slf4j-api:jar:1.6.1:provided -[INFO] | +- org.jboss.interceptor:jboss-interceptor-spi:jar:2.0.0.Final:provided -[INFO] | +- org.jboss.metadata:jboss-metadata-common:jar:7.0.1.Final:provided -[INFO] | +- org.jboss.metadata:jboss-metadata-ear:jar:7.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss:jboss-remote-naming:jar:1.0.2.Final:provided -[INFO] | | \- org.jboss:jboss-ejb-client:jar:1.0.0.Final:provided -[INFO] | \- org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] +- org.jboss.as:jboss-as-web:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec:jar:2.0.1.Final:provided -[INFO] | +- com.sun.faces:jsf-impl:jar:2.1.7-jbossorg-2:provided -[INFO] | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | +- org.jboss.as:jboss-as-clustering-web-spi:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.as:jboss-as-clustering-api:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-security:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-clustering-infinispan:jar:7.1.1.Final:provided -[INFO] | | | +- org.jboss.as:jboss-as-clustering-jgroups:jar:7.1.1.Final:provided -[INFO] | | | | +- org.jboss.as:jboss-as-clustering-common:jar:7.1.1.Final:provided -[INFO] | | | | \- org.jgroups:jgroups:jar:3.0.6.Final:provided -[INFO] | | | +- org.jboss.as:jboss-as-jmx:jar:7.1.1.Final:provided -[INFO] | | | | +- org.jboss.remotingjmx:remoting-jmx:jar:1.0.2.Final:provided -[INFO] | | | | \- org.jboss.marshalling:jboss-marshalling-river:jar:1.3.11.GA:provided -[INFO] | | | +- org.infinispan:infinispan-core:jar:5.1.2.FINAL:provided -[INFO] | | | | \- org.rhq.helpers:rhq-pluginAnnotations:jar:3.0.4:provided -[INFO] | | | +- org.infinispan:infinispan-cachestore-jdbc:jar:5.1.2.FINAL:provided -[INFO] | | | +- org.infinispan:infinispan-cachestore-remote:jar:5.1.2.FINAL:provided -[INFO] | | | +- org.infinispan:infinispan-client-hotrod:jar:5.1.2.FINAL:provided -[INFO] | | | \- net.jcip:jcip-annotations:jar:1.0:provided -[INFO] | | +- org.jboss.as:jboss-as-transactions:jar:7.1.1.Final:provided -[INFO] | | | +- org.jacorb:jacorb:jar:2.3.1.jbossorg-1:provided -[INFO] | | | +- org.jboss:jboss-transaction-spi:jar:7.0.0.Final:provided -[INFO] | | | +- org.jboss.jbossts:jbossjts:jar:4.16.2.Final:provided -[INFO] | | | | +- org.hornetq:hornetq-core:jar:2.2.7.Final:provided -[INFO] | | | | +- org.jboss.netty:netty:jar:3.2.5.Final:provided -[INFO] | | | | \- org.jboss.ws:jbossws-api:jar:1.0.0.CR1:provided -[INFO] | | | +- org.jboss.jbossts:jbossjts-integration:jar:4.16.2.Final:provided -[INFO] | | | \- org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec:jar:1.0.0.Final:provided -[INFO] | | +- org.jboss.security:jboss-negotiation-extras:jar:2.2.0.SP1:provided -[INFO] | | | \- org.jboss.security:jboss-negotiation-common:jar:2.2.0.SP1:provided -[INFO] | | +- org.jboss.security:jboss-negotiation-spnego:jar:2.2.0.SP1:provided -[INFO] | | +- org.picketbox:picketbox:jar:4.0.7.Final:provided -[INFO] | | +- org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar:1.0.1.Final:provided -[INFO] | | +- org.picketbox:picketbox-infinispan:jar:4.0.7.Final:provided -[INFO] | | \- org.picketbox:picketbox-commons:jar:1.0.0.final:provided -[INFO] | +- org.jboss.metadata:jboss-metadata-web:jar:7.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar:1.0.0.Final:provided -[INFO] | | \- org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.web:jasper-jdt:jar:7.0.3.Final:provided -[INFO] | \- org.jboss.web:jbossweb:jar:7.0.13.Final:provided -[INFO] +- org.rhq.helpers:rhq-rtfilter:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.jboss.as:jboss-as-subsystem-test:jar:7.1.1.Final:test -[INFO] | \- junit:junit:jar:4.10:test -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building bundleGen 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ bundleGen --- -[INFO] org.rhq.helpers:bundleGen:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.freemarker:freemarker:jar:2.3.11:compile -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building jeeGen 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ jeeGen --- -[INFO] org.rhq.helpers:jeeGen:jar:4.7.0-SNAPSHOT -[INFO] +- org.freemarker:freemarker:jar:2.3.18:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:compile -[INFO] +- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:compile -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:compile -[INFO] +- javax.ejb:ejb-api:jar:3.0:compile -[INFO] +- javax.jms:jms-api:jar:1.1-rev-1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building Performance Testing Support 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ perftest-support --- -[INFO] org.rhq.helpers:perftest-support:jar:4.7.0-SNAPSHOT -[INFO] +- ant:ant:jar:1.6.5:compile -[INFO] +- ant:ant-launcher:jar:1.6.5:runtime -[INFO] +- org.dbunit:dbunit:jar:2.4.8:compile -[INFO] | +- org.slf4j:slf4j-api:jar:1.5.6:compile -[INFO] | \- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.testng:testng:jar:6.5.2:compile -[INFO] | +- junit:junit:jar:4.10:compile -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | +- org.beanshell:bsh:jar:2.0b4:compile -[INFO] | +- com.beust:jcommander:jar:1.12:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] +- org.slf4j:slf4j-jcl:jar:1.5.6:runtime -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:runtime (scope not updated to compile) -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:runtime -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- jdom:jdom:jar:1.0:compile -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.apache.poi:poi:jar:3.7:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building rest-docs-generator 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rest-docs-generator --- -[INFO] org.rhq.helpers:rest-docs-generator:jar:4.7.0-SNAPSHOT -[INFO] +- javax.ws.rs:jsr311-api:jar:1.1.1:compile -[INFO] +- javax.ejb:ejb-api:jar:3.0:compile -[INFO] +- com.wordnik:swagger-annotations_2.9.1:jar:1.1.1-SNAPSHOT:compile -[INFO] +- org.jboss.resteasy:resteasy-jaxrs:jar:2.3.4.Final:compile -[INFO] | +- org.jboss.resteasy:jaxrs-api:jar:2.3.4.Final:compile -[INFO] | +- org.scannotation:scannotation:jar:1.0.3:compile -[INFO] | | \- javassist:javassist:jar:3.12.1.GA:compile -[INFO] | +- javax.annotation:jsr250-api:jar:1.0:compile -[INFO] | +- javax.activation:activation:jar:1.1:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile (version managed from 3.1) -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.1.2:compile -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:compile -[INFO] | \- net.jcip:jcip-annotations:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Agent Update 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-agentupdate --- -[INFO] org.rhq:rhq-enterprise-agentupdate:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-agent:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | | | \- jdom:jdom:jar:1.0:provided -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- org.rhq:rhq-core-plugin-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:provided -[INFO] | | | \- org.hyperic:sigar-dist:zip:1.6.5.132-5:provided -[INFO] | | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | | +- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] | | \- javax.activation:activation:jar:1.1:provided -[INFO] | +- org.rhq:rhq-core-plugin-container:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.hyperic:sigar:jar:1.6.5.132-5:provided -[INFO] | | +- net.augeas:augeas-native:zip:el5:0.9.0-4:provided -[INFO] | | \- commons-io:commons-io:jar:1.4:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jline:jline:jar:0.9.94:provided -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | \- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] +- org.apache.ant:ant:jar:1.8.0:provided -[INFO] +- org.apache.ant:ant-launcher:jar:1.8.0:provided -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Server XML Schemas 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-xml-schemas --- -[INFO] org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar:1.0.4.Final:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Safe Invoker 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ safe-invoker --- -[INFO] org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT -[INFO] +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:provided -[INFO] | +- antlr:antlr:jar:2.7.7:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:provided -[INFO] | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided (version managed from 3.1.0.CR2) -[INFO] | +- org.javassist:javassist:jar:3.15.0-GA:provided -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server JAR 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server --- -[INFO] org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- jdom:jdom:jar:1.0:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- commons-io:commons-io:jar:1.4:compile -[INFO] +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss:staxmapper:jar:1.1.0.Final:provided -[INFO] | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:provided -[INFO] | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:provided -[INFO] | | \- system:jdk-tools:jar:jdk:system -[INFO] | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-api:jar:3.0.3.GA:provided -[INFO] | +- org.jboss:jandex:jar:1.0.3.Final:provided -[INFO] | +- org.jboss:jboss-dmr:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:provided -[INFO] | +- org.jboss.marshalling:jboss-marshalling:jar:1.3.11.GA:provided -[INFO] | +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:provided -[INFO] | +- org.jboss.msc:jboss-msc:jar:1.0.2.GA:provided -[INFO] | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:provided -[INFO] | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:provided -[INFO] | +- org.jboss.threads:jboss-threads:jar:2.0.0.GA:provided -[INFO] | +- org.jboss:jboss-vfs:jar:3.1.0.Final:provided -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:provided -[INFO] +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:provided -[INFO] | \- org.jboss:jboss-remote-naming:jar:1.0.2.Final:provided -[INFO] | \- org.jboss:jboss-ejb-client:jar:1.0.0.Final:provided -[INFO] +- org.jboss.spec:jboss-javaee-6.0:pom:3.0.0.Final:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- javax.enterprise:cdi-api:jar:1.0-SP4:provided -[INFO] | +- javax.inject:javax.inject:jar:1:provided -[INFO] | +- javax.jws:jsr181-api:jar:1.0-MR1:provided -[INFO] | +- javax.mail:mail:jar:1.4.4:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec:jar:2.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec:jar:1.0.3.Final:provided -[INFO] | | \- xalan:xalan:jar:2.7.1.jbossorg-2:provided -[INFO] | | \- xalan:serializer:jar:2.7.1.jbossorg-2:provided -[INFO] | +- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar:1.0.4.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar:1.0.2.Final:provided -[INFO] | \- org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar:2.0.1.Final:provided -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] +- antlr:antlr:jar:2.7.7:provided (version managed from 2.7.6) -[INFO] +- org.infinispan:infinispan-core:jar:5.1.2.FINAL:provided -[INFO] | +- org.jgroups:jgroups:jar:3.0.6.Final:provided -[INFO] | +- org.jboss.marshalling:jboss-marshalling-river:jar:1.3.6.GA:provided -[INFO] | +- org.codehaus.woodstox:woodstox-core-asl:jar:4.1.1:provided -[INFO] | +- org.codehaus.woodstox:stax2-api:jar:3.1.1:provided -[INFO] | \- org.rhq.helpers:rhq-pluginAnnotations:jar:3.0.4:provided -[INFO] +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | +- junit:junit:jar:4.10:compile -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] +- commons-lang:commons-lang:jar:2.4:compile -[INFO] +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:provided -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided -[INFO] | +- org.javassist:javassist:jar:3.15.0-GA:provided -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided (scope not updated to compile) -[INFO] | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-ext-api:jar:2.0.0:provided -[INFO] +- org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] +- org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] +- org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar:1.0.2.Final:provided -[INFO] +- org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] +- org.picketbox:picketbox:jar:4.0.7.Final:provided -[INFO] +- org.jboss.jbossts:jbossjts:jar:4.16.2.Final:provided -[INFO] | +- emma:emma:jar:2.0.5312:provided -[INFO] | +- emma:emma_ant:jar:2.0.5312:provided -[INFO] | | \- ant:ant:jar:1.6.3:provided -[INFO] | +- org.hornetq:hornetq-core:jar:2.2.7.Final:provided -[INFO] | +- org.jboss.netty:netty:jar:3.2.5.Final:provided -[INFO] | +- tanukisoft:wrapper:jar:3.2.3:provided -[INFO] | +- jacorb:jacorb:jar:2.3.1jboss.patch01-brew:provided -[INFO] | +- jacorb:idl:jar:2.3.1jboss.patch01-brew:provided -[INFO] | +- org.jboss:jboss-transaction-spi:jar:7.0.0.CR1:provided -[INFO] | +- org.jboss.integration:jboss-corba-ots-spi:jar:6.0.0.CR1:provided -[INFO] | | \- org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:provided -[INFO] | +- org.jboss.jbossas:jboss-server-manager:jar:1.0.4.Final:provided -[INFO] | | +- org.jboss.naming:jnp-client:jar:5.0.5.Final:provided -[INFO] | | +- org.picketbox:jbosssx-client:jar:3.0.0.CR2:provided -[INFO] | | \- org.picketbox:jboss-security-spi:jar:3.0.0.CR2:provided -[INFO] | +- org.jboss.logging:jboss-logging-processor:jar:1.0.0.CR4:provided -[INFO] | | \- org.jboss.logging:jboss-logging-generator:jar:1.0.0.CR4:provided -[INFO] | \- org.jboss.ws:jbossws-api:jar:1.0.0.CR1:provided -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:provided -[INFO] +- org.opensymphony.quartz:quartz-oracle:jar:1.6.5:provided -[INFO] +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] +- tomcat:catalina:jar:5.5.20:provided -[INFO] +- tomcat:tomcat-jk:jar:4.1.31:provided -[INFO] +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] +- org.jboss.resteasy:resteasy-jaxrs:jar:2.3.4.Final:provided -[INFO] | +- org.jboss.resteasy:jaxrs-api:jar:2.3.4.Final:provided -[INFO] | +- org.scannotation:scannotation:jar:1.0.3:provided -[INFO] | | \- javassist:javassist:jar:3.12.1.GA:provided -[INFO] | +- javax.annotation:jsr250-api:jar:1.0:provided -[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.1.2:provided -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:provided -[INFO] | \- net.jcip:jcip-annotations:jar:1.0:provided -[INFO] +- org.jboss.resteasy:resteasy-jackson-provider:jar:2.3.4.Final:provided -[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.5:provided -[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.5:provided -[INFO] | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.5:provided -[INFO] | \- org.codehaus.jackson:jackson-xc:jar:1.8.5:provided -[INFO] +- org.jboss.resteasy:resteasy-links:jar:2.3.4.Final:provided -[INFO] | +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] | \- org.jboss.el:jboss-el:jar:1.0_02.CR4:provided -[INFO] | \- javax.el:el-api:jar:1.0:provided -[INFO] +- org.jboss.resteasy:resteasy-yaml-provider:jar:2.3.4.Final:provided -[INFO] +- org.jboss.resteasy:resteasy-jaxb-provider:jar:2.3.4.Final:provided -[INFO] +- com.wordnik:swagger-annotations_2.9.1:jar:1.1.1-SNAPSHOT:provided -[INFO] +- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.freemarker:freemarker:jar:2.3.18:provided -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.rhq.helpers:rest-docs-generator:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- javax.ws.rs:jsr311-api:jar:1.1.1:provided -[INFO] | \- javax.ejb:ejb-api:jar:3.0:provided -[INFO] +- org.rhq:rhq-core-domain:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server JBoss AS SARs 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-sars-parent --- -[INFO] org.rhq:rhq-enterprise-server-sars-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Internal Services SAR 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-services-sar --- -[INFO] org.rhq:rhq-enterprise-server-services-sar:jboss-sar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Modules 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-parent --- -[INFO] org.rhq:rhq-enterprise-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Scripting Parent Module 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-scripting-parent --- -[INFO] org.rhq:rhq-scripting-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Scripting API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-scripting-api --- -[INFO] org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Javascript support 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-scripting-javascript --- -[INFO] org.rhq:rhq-scripting-javascript:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.mozilla:rhino:jar:1.7R4:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Python support 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-scripting-python --- -[INFO] org.rhq:rhq-scripting-python:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.python:jython-standalone:jar:2.5.2:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Script Bindings 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-script-bindings --- -[INFO] org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-scripting-javascript:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-scripting-python:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- commons-lang:commons-lang:jar:2.4:test -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] +- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:test -[INFO] +- org.rhq:rhq-core-domain:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Remote Client API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-remoting-client-api --- -[INFO] org.rhq:rhq-remoting-client-api:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | \- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] | \- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Remote Client Dependencies 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ remote-client-deps --- -[INFO] org.rhq:remote-client-deps:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-remoting-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | | | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | | | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | | | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | | | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] | | \- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- log4j:log4j:jar:1.2.16:compile -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Remote CLI 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-remoting-cli --- -[INFO] org.rhq:rhq-remoting-cli:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-remoting-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] +- org.rhq:rhq-scripting-javascript:jar:4.7.0-SNAPSHOT:runtime -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:compile -[INFO] +- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- jline:jline:jar:0.9.94:compile -[INFO] | \- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] +- org.testng:testng:jar:6.5.2:compile -[INFO] | +- org.beanshell:bsh:jar:2.0b4:compile -[INFO] | +- com.beust:jcommander:jar:1.12:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.6:compile -[INFO] +- log4j:log4j:jar:1.2.16:runtime -[INFO] +- commons-lang:commons-lang:jar:2.4:test -[INFO] +- org.rhq:rhq-core-domain:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-scripting-python:jar:4.7.0-SNAPSHOT:runtime -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Remoting Parent POM 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-remoting-parent --- -[INFO] org.rhq:rhq-remoting-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ REST interface 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-rest --- -[INFO] org.rhq:rhq-rest:war:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:provided -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- commons-io:commons-io:jar:1.4:provided -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:provided -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:provided -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:provided -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:provided -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:provided -[INFO] | | \- commons-codec:commons-codec:jar:1.4:provided (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:provided -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:provided -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:provided -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:provided -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:provided -[INFO] | +- com.jcraft:jsch:jar:0.1.29:provided -[INFO] | \- org.yaml:snakeyaml:jar:1.8:provided -[INFO] +- javax.servlet:javax.servlet-api:jar:3.0.1:provided -[INFO] +- org.jboss.resteasy:resteasy-jaxrs:jar:2.3.4.Final:provided -[INFO] | +- org.jboss.resteasy:jaxrs-api:jar:2.3.4.Final:provided -[INFO] | +- org.scannotation:scannotation:jar:1.0.3:provided -[INFO] | | \- javassist:javassist:jar:3.12.1.GA:provided -[INFO] | +- javax.annotation:jsr250-api:jar:1.0:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.1.2:provided -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:provided -[INFO] | \- net.jcip:jcip-annotations:jar:1.0:provided -[INFO] +- org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar:1.0.2.Final:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Portal 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-portal --- -[INFO] org.rhq:rhq-portal:war:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-gui:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:provided -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:provided -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:provided -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:provided -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:provided -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:provided -[INFO] | +- com.jcraft:jsch:jar:0.1.29:provided -[INFO] | \- org.yaml:snakeyaml:jar:1.8:provided -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | \- jdom:jdom:jar:1.0:provided -[INFO] +- com.sun.facelets:jsf-facelets:jar:1.1.15.B1:compile -[INFO] +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] +- commons-dbcp:commons-dbcp:jar:1.2.2:compile -[INFO] | \- commons-pool:commons-pool:jar:1.3:compile -[INFO] +- commons-el:commons-el:jar:1.0:compile -[INFO] +- commons-fileupload:commons-fileupload:jar:1.2:compile -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:provided -[INFO] | \- commons-codec:commons-codec:jar:1.4:provided (version managed from 1.2) -[INFO] +- commons-io:commons-io:jar:1.3.1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:provided -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided -[INFO] | | \- antlr:antlr:jar:2.7.7:provided -[INFO] | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- javax.el:el-api:jar:1.0:provided -[INFO] +- javax.servlet:servlet-api:jar:2.4:provided -[INFO] +- javax.servlet:jsp-api:jar:2.0:provided -[INFO] +- javax.faces:jsf-api:jar:1.2_14:provided -[INFO] +- javax.faces:jsf-impl:jar:1.2_14:provided -[INFO] +- org.apache.geronimo.specs:geronimo-javamail_1.3.1_spec:jar:1.3:provided -[INFO] +- javax.servlet:jstl:jar:1.1.2:compile -[INFO] +- junit:junit:jar:4.10:compile -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:provided -[INFO] +- org.opensymphony.quartz:quartz-oracle:jar:1.6.5:provided -[INFO] +- org.jvnet:inflector:jar:0.7.0:compile -[INFO] +- org.richfaces.framework:richfaces-api:jar:3.3.3.Final:compile -[INFO] | \- commons-beanutils:commons-beanutils:jar:1.8.2:compile (version managed from 1.8.0) -[INFO] +- org.richfaces.framework:richfaces-impl:jar:3.3.3.Final:compile -[INFO] | \- commons-digester:commons-digester:jar:1.8.1:compile -[INFO] +- org.richfaces.ui:richfaces-ui:jar:3.3.3.Final:compile -[INFO] +- struts:struts:jar:1.2.9:compile -[INFO] | \- oro:oro:jar:2.0.7:compile -[INFO] +- struts:struts-el:jar:1.2.9:compile -[INFO] +- struts-menu:struts-menu:jar:2.3:compile -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | \- hsqldb:hsqldb:jar:1.7.1:compile -[INFO] +- taglibs:standard:jar:1.1.2:compile -[INFO] +- xalan:xalan:jar:2.5.1:provided (scope not updated to compile) -[INFO] +- xerces:xercesImpl:jar:2.9.1-jbossas-2:provided -[INFO] +- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] +- org.codehaus.groovy:groovy-all:jar:1.7.5:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided (scope not updated to compile) -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise GUI 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-gui-parent --- -[INFO] org.rhq:rhq-enterprise-gui-parent:pom:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Content HTTP Support 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-content_http --- -[INFO] org.rhq:rhq-content_http:war:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-gui:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.richfaces.framework:richfaces-api:jar:3.3.3.Final:compile -[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile (version managed from 3.2) -[INFO] | | \- commons-beanutils:commons-beanutils:jar:1.8.2:compile (version managed from 1.8.0) -[INFO] | +- org.richfaces.framework:richfaces-impl:jar:3.3.3.Final:compile -[INFO] | | \- commons-digester:commons-digester:jar:1.8.1:compile -[INFO] | \- org.richfaces.ui:richfaces-ui:jar:3.3.3.Final:compile -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:provided -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:provided -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:provided -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:provided -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:provided -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:provided -[INFO] | +- com.jcraft:jsch:jar:0.1.29:provided -[INFO] | \- org.yaml:snakeyaml:jar:1.8:provided -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:provided -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided -[INFO] | | \- antlr:antlr:jar:2.7.7:provided -[INFO] | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | +- org.javassist:javassist:jar:3.15.0-GA:provided -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] +- javax.servlet:servlet-api:jar:2.4:provided -[INFO] +- jboss.web:jbossweb:jar:2.0.1.GA:provided -[INFO] +- commons-codec:commons-codec:jar:1.4:compile -[INFO] +- commons-fileupload:commons-fileupload:jar:1.2:compile -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:provided -[INFO] | \- junit:junit:jar:4.10:provided (version managed from 3.8.1) -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:provided -[INFO] +- commons-io:commons-io:jar:1.3.1:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] +- commons-lang:commons-lang:jar:2.4:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Core GUI 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-coregui --- -[INFO] org.rhq:rhq-coregui:war:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:provided -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:provided -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:provided -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:provided -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:provided -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:provided -[INFO] | | \- commons-codec:commons-codec:jar:1.4:provided (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:provided -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:provided -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:provided -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:provided -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:provided -[INFO] | +- com.jcraft:jsch:jar:0.1.29:provided -[INFO] | \- org.yaml:snakeyaml:jar:1.8:provided -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- jdom:jdom:jar:1.0:provided -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] +- com.google.gwt:gwt-servlet:jar:2.5.0:compile -[INFO] +- com.google.gwt:gwt-user:jar:2.5.0:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- javax.validation:validation-api:jar:sources:1.0.0.GA:provided -[INFO] | \- org.json:json:jar:20090211:provided -[INFO] +- com.google.gwt:gwt-dev:jar:2.5.0:provided -[INFO] +- com.smartgwt:smartgwt:jar:3.0:compile -[INFO] +- com.googlecode.gflot:gflot:jar:2.4.3:provided -[INFO] +- commons-fileupload:commons-fileupload:jar:1.2:compile -[INFO] +- commons-io:commons-io:jar:1.3.1:compile -[INFO] +- commons-logging:commons-logging:jar:1.0.4:provided (scope not updated to compile) -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:provided -[INFO] +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] +- org.hibernate:hibernate-annotations:jar:3.5.6-Final:provided -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:provided (version managed from 3.5.6-Final) -[INFO] | | +- antlr:antlr:jar:2.7.7:provided -[INFO] | | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided (version managed from 3.1.0.CR2) -[INFO] | | +- org.javassist:javassist:jar:3.15.0-GA:provided -[INFO] | | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:provided -[INFO] | +- org.hibernate:hibernate-commons-annotations:jar:3.2.0.Final:provided -[INFO] | \- org.slf4j:slf4j-api:jar:1.5.8:provided -[INFO] +- org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar:1.0.2.Final:provided -[INFO] +- org.jboss.resteasy:resteasy-jaxrs:jar:2.3.4.Final:provided -[INFO] | +- org.jboss.resteasy:jaxrs-api:jar:2.3.4.Final:provided -[INFO] | +- org.scannotation:scannotation:jar:1.0.3:provided -[INFO] | | \- javassist:javassist:jar:3.12.1.GA:provided -[INFO] | +- javax.annotation:jsr250-api:jar:1.0:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.1.2:provided -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:provided -[INFO] | \- net.jcip:jcip-annotations:jar:1.0:provided -[INFO] +- org.apache.xmlgraphics:batik-transcoder:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:fop:jar:0.94:compile -[INFO] | | +- org.apache.xmlgraphics:xmlgraphics-commons:jar:1.2:compile -[INFO] | | +- org.apache.avalon.framework:avalon-framework-api:jar:4.3.1:compile -[INFO] | | \- org.apache.avalon.framework:avalon-framework-impl:jar:4.3.1:compile -[INFO] | +- org.apache.xmlgraphics:batik-awt-util:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-bridge:jar:1.7:compile -[INFO] | | +- org.apache.xmlgraphics:batik-anim:jar:1.7:compile -[INFO] | | +- org.apache.xmlgraphics:batik-css:jar:1.7:compile -[INFO] | | +- org.apache.xmlgraphics:batik-ext:jar:1.7:compile -[INFO] | | +- org.apache.xmlgraphics:batik-parser:jar:1.7:compile -[INFO] | | +- org.apache.xmlgraphics:batik-script:jar:1.7:compile -[INFO] | | \- xalan:xalan:jar:2.6.0:compile -[INFO] | +- org.apache.xmlgraphics:batik-dom:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-gvt:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-svg-dom:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-svggen:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-util:jar:1.7:compile -[INFO] | +- org.apache.xmlgraphics:batik-xml:jar:1.7:compile -[INFO] | +- xml-apis:xml-apis:jar:1.3.04:compile -[INFO] | \- xml-apis:xml-apis-ext:jar:1.3.04:compile -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ REST interface examples 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-rest-examples --- -[INFO] org.rhq:rhq-rest-examples:war:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Remoting WAR 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-remoting-war --- -[INFO] org.rhq:rhq-remoting-war:war:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:provided -[INFO] | | \- jdom:jdom:jar:1.0:provided -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:provided -[INFO] | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:provided -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:provided -[INFO] | +- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:provided -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:provided -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:provided -[INFO] | +- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] +- javax.servlet:javax.servlet-api:jar:3.0.1:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Plugins 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-plugins-parent --- -[INFO] org.rhq:rhq-enterprise-server-plugins-parent:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Disk Content Source Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-disk --- -[INFO] org.rhq:rhq-serverplugin-disk:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | +- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | | \- org.javassist:javassist:jar:3.15.0-GA:test (version managed from 3.16.1-GA) -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Yum Content Source Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-yum --- -[INFO] org.rhq:rhq-serverplugin-yum:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- jdom:jdom:jar:1.0:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server URL Content Source Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-url --- -[INFO] org.rhq:rhq-serverplugin-url:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:provided (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:provided (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:provided -[INFO] | \- commons-codec:commons-codec:jar:1.4:provided (version managed from 1.2) -[INFO] +- rss4j:rss4j:jar:0.92-on.2:provided (scope not updated to compile) -[INFO] +- xerces:xercesImpl:jar:2.9.1-jbossas-2:provided -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server JBoss Software Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-jboss-software --- -[INFO] org.rhq:rhq-serverplugin-jboss-software:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- commons-httpclient:commons-httpclient:jar:3.0.1:provided (scope not updated to compile) -[INFO] | +- junit:junit:jar:4.10:provided (version managed from 3.8.1) -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:provided -[INFO] | \- commons-codec:commons-codec:jar:1.4:provided (version managed from 1.2) -[INFO] +- rss4j:rss4j:jar:0.92-on.2:provided (scope not updated to compile) -[INFO] +- xerces:xercesImpl:jar:2.9.1-jbossas-2:provided -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Email Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-email --- -[INFO] org.rhq.server:alert-email:jar:4.7.0-SNAPSHOT -[INFO] +- org.apache.geronimo.specs:geronimo-javamail_1.3.1_spec:jar:1.3:provided -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server IRC Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-irc --- -[INFO] org.rhq:alert-irc:jar:4.7.0-SNAPSHOT -[INFO] +- pircbot:pircbot:jar:1.4.2:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Mobicents Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-mobicents --- -[INFO] org.rhq:alert-mobicents:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Microblog Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-microblog --- -[INFO] org.rhq:alert-microblog:jar:4.7.0-SNAPSHOT -[INFO] +- org.twitter4j:twitter4j-core:jar:2.2.4:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Opertions Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-operations --- -[INFO] org.rhq:alert-operations:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Roles Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-roles --- -[INFO] org.rhq:alert-roles:jar:4.7.0-SNAPSHOT -[INFO] +- jboss.jboss-embeddable-ejb3:jboss-ejb3-all:jar:1.0.0.Alpha9:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server SNMP Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-snmp --- -[INFO] org.rhq:alert-snmp:jar:4.7.0-SNAPSHOT -[INFO] +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Subject Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-subject --- -[INFO] org.rhq:alert-subject:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Client API 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-server-client-api --- -[INFO] org.rhq:rhq-server-client-api:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | | \- jdom:jdom:jar:1.0:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | +- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | +- org.dbunit:dbunit:jar:2.2.2:test -[INFO] | | | +- junit-addons:junit-addons:jar:1.4:test -[INFO] | | | | +- xerces:xercesImpl:jar:2.9.1-jbossas-2:test (version managed from 2.6.2) -[INFO] | | | | \- xerces:xmlParserAPIs:jar:2.6.2:test -[INFO] | | | +- poi:poi:jar:2.5.1-final-20040804:test -[INFO] | | | +- org.slf4j:slf4j-api:jar:1.4.3:test -[INFO] | | | \- org.slf4j:slf4j-nop:jar:1.4.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | \- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:test -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server CLI Script Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-cli --- -[INFO] org.rhq:alert-cli:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-server-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | +- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Log4J Alert Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ alert-log4j --- -[INFO] org.rhq:alert-log4j:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server Cobbler Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-cobbler --- -[INFO] org.rhq:rhq-serverplugin-cobbler:jar:4.7.0-SNAPSHOT -[INFO] +- org.fedorahosted.cobbler:cobbler4j:jar:0.1:provided -[INFO] | \- redstone.xmlrpc:xmlrpc:jar:1.1.1:provided -[INFO] +- jboss.jboss-embeddable-ejb3:jboss-ejb3-all:jar:1.0.0.Alpha9:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Drift Server Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-drift --- -[INFO] org.rhq:rhq-serverplugin-drift:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ File Template Bundle Server Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-filetemplate-bundle --- -[INFO] org.rhq:rhq-serverplugin-filetemplate-bundle:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-filetemplate-bundle-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Ant Bundle Server Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-serverplugin-ant-bundle --- -[INFO] org.rhq:rhq-serverplugin-ant-bundle:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:provided (scope not updated to compile) -[INFO] +- org.rhq:rhq-ant-bundle-common:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- jdom:jdom:jar:1.0:compile -[INFO] | | \- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- org.rhq:rhq-core-native-system:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.apache.ant:ant:jar:1.8.0:compile -[INFO] | +- org.apache.ant:ant-launcher:jar:1.8.0:compile -[INFO] | +- org.apache.ant:ant-nodeps:jar:1.8.0:compile -[INFO] | +- ant-contrib:ant-contrib:jar:1.0b3:provided (scope managed from runtime) -[INFO] | \- org.liquibase:liquibase-core:jar:1.9.5:compile -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Validate All Server Plugins 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ validate-all-serverplugins --- -[INFO] org.rhq:validate-all-serverplugins:pom:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server CLI Package Type Plugin 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ packagetype-cli --- -[INFO] org.rhq:packagetype-cli:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | +- com.jcraft:jsch:jar:0.1.29:compile -[INFO] | \- org.yaml:snakeyaml:jar:1.8:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Server EAR 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-ear --- -[INFO] org.rhq:rhq-enterprise-server-ear:ear:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:compile -[INFO] | | \- commons-io:commons-io:jar:1.4:compile -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:compile -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:compile -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:compile -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:compile -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:compile -[INFO] | | +- junit:junit:jar:4.10:compile (version managed from 3.8.1) -[INFO] | | | \- org.hamcrest:hamcrest-core:jar:1.1:compile -[INFO] | | \- commons-codec:commons-codec:jar:1.4:compile (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:compile -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:compile -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:compile -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:compile -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:compile -[INFO] | \- com.jcraft:jsch:jar:0.1.29:compile -[INFO] +- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:compile -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-portal:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-coregui:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-rest:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-rest-examples:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-remoting-war:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-content_http:war:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-enterprise-server-services-sar:sar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:compile -[INFO] | \- net.sf.opencsv:opencsv:jar:1.8:compile -[INFO] +- org.rhq:rhq-scripting-javascript:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-server-client-api:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | \- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] +- org.rhq.helpers:rhq-rtfilter:jar:4.7.0-SNAPSHOT:compile -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:compile -[INFO] +- org.opensymphony.quartz:quartz-oracle:jar:1.6.5:compile -[INFO] +- postgresql:postgresql:jar:9.2-1002.jdbc4:provided (scope not updated to compile) -[INFO] +- org.jboss.resteasy:resteasy-jaxrs:jar:2.3.4.Final:provided -[INFO] | +- org.jboss.resteasy:jaxrs-api:jar:2.3.4.Final:provided -[INFO] | +- org.scannotation:scannotation:jar:1.0.3:provided -[INFO] | | \- javassist:javassist:jar:3.12.1.GA:provided -[INFO] | +- javax.annotation:jsr250-api:jar:1.0:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.1.2:provided -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:provided -[INFO] | \- net.jcip:jcip-annotations:jar:1.0:provided -[INFO] +- org.jboss.resteasy:resteasy-jackson-provider:jar:2.3.4.Final:provided -[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.5:provided -[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.5:provided -[INFO] | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.5:provided -[INFO] | \- org.codehaus.jackson:jackson-xc:jar:1.8.5:provided -[INFO] +- org.jboss.resteasy:resteasy-links:jar:2.3.4.Final:provided -[INFO] | +- javax.persistence:persistence-api:jar:1.0:provided -[INFO] | \- org.jboss.el:jboss-el:jar:1.0_02.CR4:provided -[INFO] | \- javax.el:el-api:jar:1.0:provided -[INFO] +- org.freemarker:freemarker:jar:2.3.18:compile -[INFO] +- org.jboss.resteasy:resteasy-yaml-provider:jar:2.3.4.Final:provided -[INFO] +- org.yaml:snakeyaml:jar:1.8:provided (scope not updated to compile) -[INFO] +- org.jboss.resteasy:resteasy-jaxb-provider:jar:2.3.4.Final:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.2.4:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.2.3:provided -[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] +- org.rhq:rhq-scripting-python:jar:4.7.0-SNAPSHOT:compile -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Server Startup AS7 Subsystem 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-enterprise-server-startup-subsystem --- -[INFO] org.rhq:rhq-enterprise-server-startup-subsystem:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:provided -[INFO] +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:provided -[INFO] | +- org.jboss:jboss-dmr:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:provided -[INFO] | +- org.jboss.msc:jboss-msc:jar:1.0.2.GA:provided -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:provided -[INFO] +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:provided -[INFO] | | | \- org.jboss:jboss-common-core:jar:2.2.17.GA:provided -[INFO] | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:provided -[INFO] | | \- system:jdk-tools:jar:jdk:system -[INFO] | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:provided -[INFO] | | +- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss.xnio:xnio-api:jar:3.0.3.GA:provided -[INFO] | +- org.jboss:jandex:jar:1.0.3.Final:provided -[INFO] | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:provided -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:provided -[INFO] | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:provided -[INFO] | +- org.jboss.marshalling:jboss-marshalling:jar:1.3.11.GA:provided -[INFO] | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:provided -[INFO] | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:provided -[INFO] | +- org.jboss.threads:jboss-threads:jar:2.0.0.GA:provided -[INFO] | \- org.jboss:jboss-vfs:jar:3.1.0.Final:provided -[INFO] +- org.jboss:staxmapper:jar:1.1.0.Final:provided -[INFO] +- org.jboss.as:jboss-as-ee:jar:7.1.1.Final:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.hibernate:hibernate-validator:jar:4.2.0.Final:provided -[INFO] | | \- org.slf4j:slf4j-api:jar:1.6.1:provided -[INFO] | +- org.jboss.interceptor:jboss-interceptor-spi:jar:2.0.0.Final:provided -[INFO] | +- org.jboss.metadata:jboss-metadata-common:jar:7.0.1.Final:provided -[INFO] | +- org.jboss.metadata:jboss-metadata-ear:jar:7.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:provided -[INFO] | | \- org.jboss:jboss-remote-naming:jar:1.0.2.Final:provided -[INFO] | | \- org.jboss:jboss-ejb-client:jar:1.0.0.Final:provided -[INFO] | \- org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] +- org.rhq:rhq-enterprise-server-ear:ear:4.7.0-SNAPSHOT:provided -[INFO] +- org.jboss.as:jboss-as-subsystem-test:jar:7.1.1.Final:test -[INFO] | \- junit:junit:jar:4.10:test -[INFO] | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Enterprise Installer Utility 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-installer-util --- -[INFO] org.rhq:rhq-installer-util:jar:4.7.0-SNAPSHOT -[INFO] +- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- jdom:jdom:jar:1.0:compile -[INFO] +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:compile -[INFO] | \- postgresql:postgresql:jar:9.2-1002.jdbc4:compile -[INFO] +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:compile -[INFO] | +- dom4j:dom4j:jar:1.6.1:compile -[INFO] | +- org.jboss:jboss-common-core:jar:2.2.17.GA:compile -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | +- jboss:jboss-jmx:jar:4.2.3.GA:compile -[INFO] | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:compile -[INFO] | +- jboss:jboss-serialization:jar:1.0.3.GA:compile -[INFO] | \- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:compile -[INFO] +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:compile -[INFO] +- gnu-getopt:getopt:jar:1.0.13:compile -[INFO] +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:compile -[INFO] | +- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:compile -[INFO] | | +- org.jboss.marshalling:jboss-marshalling:jar:1.3.11.GA:compile -[INFO] | | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:compile -[INFO] | | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:compile -[INFO] | | +- org.jboss.xnio:xnio-api:jar:3.0.3.GA:compile -[INFO] | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:compile -[INFO] | +- org.jboss:jboss-dmr:jar:1.1.1.Final:compile -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:compile -[INFO] | +- org.jboss.threads:jboss-threads:jar:2.0.0.GA:compile -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:compile -[INFO] +- ant:ant-launcher:jar:1.6.5:compile -[INFO] +- ant:ant:jar:1.6.5:compile -[INFO] +- i18nlog:i18nlog:jar:1.0.10:compile -[INFO] +- org.mockito:mockito-core:jar:1.9.0:test -[INFO] | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | \- org.objenesis:objenesis:jar:1.0:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided (scope not updated to compile) -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Server JAR Integration Tests 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-server-itests-2 --- -[INFO] org.rhq:rhq-server-itests-2:jar:4.7.0-SNAPSHOT -[INFO] +- org.jboss.as:jboss-as-dist:zip:7.1.1.Final:test -[INFO] | \- org.jboss.as:jboss-as-build-config:jar:7.1.1.Final:test -[INFO] +- org.jboss.spec:jboss-javaee-6.0:pom:3.0.0.Final:provided -[INFO] | +- javax.activation:activation:jar:1.1:provided -[INFO] | +- javax.enterprise:cdi-api:jar:1.0-SP4:provided -[INFO] | +- javax.inject:javax.inject:jar:1:provided -[INFO] | +- javax.jws:jsr181-api:jar:1.0-MR1:provided -[INFO] | +- javax.mail:mail:jar:1.4.4:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec:jar:2.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar:1.0.2.Final:provided -[INFO] | +- org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar:1.0.0.Final:provided (version managed from 1.0.1.Final) -[INFO] | +- org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec:jar:1.0.3.Final:provided -[INFO] | | \- xalan:xalan:jar:2.7.1.jbossorg-2:provided -[INFO] | | \- xalan:serializer:jar:2.7.1.jbossorg-2:provided -[INFO] | +- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar:1.0.0.Final:provided (version managed from 1.0.1.Final) -[INFO] | +- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec:jar:1.0.0.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar:1.0.4.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar:1.0.1.Final:provided -[INFO] | +- org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar:1.0.2.Final:provided -[INFO] | \- org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar:2.0.1.Final:provided -[INFO] +- org.jboss.as:jboss-as-arquillian-container-managed:jar:7.1.1.Final:test -[INFO] | +- org.jboss.as:jboss-as-arquillian-common:jar:7.1.1.Final:test -[INFO] | | +- org.jboss.arquillian.container:arquillian-container-osgi:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-cdi:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-ejb:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-initialcontext:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-osgi:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.arquillian.testenricher:arquillian-testenricher-resource:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | | +- org.jboss.as:jboss-as-arquillian-testenricher-msc:jar:7.1.1.Final:test -[INFO] | | | \- org.jboss.msc:jboss-msc:jar:1.0.2.GA:test -[INFO] | | +- org.jboss.as:jboss-as-controller-client:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-protocol:jar:7.1.1.Final:test -[INFO] | | | | \- org.jboss.xnio:xnio-nio:jar:3.0.3.GA:test -[INFO] | | | +- org.jboss:jboss-dmr:jar:1.1.1.Final:test -[INFO] | | | \- org.jboss.threads:jboss-threads:jar:2.0.0.GA:test -[INFO] | | +- org.jboss.as:jboss-as-jmx:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-server:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-controller:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss:staxmapper:jar:1.1.0.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-domain-http-interface:jar:7.1.1.Final:test -[INFO] | | | | | +- org.jboss.as:jboss-as-domain-management:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss.com.sun.httpserver:httpserver:jar:1.0.0.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-deployment-repository:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-embedded:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-platform-mbean:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss.as:jboss-as-process-controller:jar:7.1.1.Final:test -[INFO] | | | | | \- system:jdk-tools:jar:jdk:system -[INFO] | | | | +- org.jboss.as:jboss-as-remoting:jar:7.1.1.Final:test -[INFO] | | | | | +- org.jboss.as:jboss-as-network:jar:7.1.1.Final:test -[INFO] | | | | | \- org.jboss.as:jboss-as-threads:jar:7.1.1.Final:test -[INFO] | | | | +- org.jboss:jandex:jar:1.0.3.Final:test -[INFO] | | | | +- org.jboss.invocation:jboss-invocation:jar:1.1.1.Final:test -[INFO] | | | | +- org.jboss.logmanager:jboss-logmanager-log4j:jar:1.0.0.GA:test -[INFO] | | | | +- org.jboss.stdio:jboss-stdio:jar:1.0.1.GA:test -[INFO] | | | | \- org.jboss:jboss-vfs:jar:3.1.0.Final:test -[INFO] | | | \- org.jboss.marshalling:jboss-marshalling-river:jar:1.3.11.GA:test -[INFO] | | +- org.jboss.shrinkwrap:shrinkwrap-api:jar:1.0.1:test -[INFO] | | +- org.jboss.osgi.spi:jbosgi-spi:jar:3.0.1.Final:test -[INFO] | | | \- org.jboss.osgi.vfs:jbosgi-vfs:jar:1.0.7.Final:test -[INFO] | | \- org.osgi:org.osgi.core:jar:4.2.0:test -[INFO] | +- org.jboss.as:jboss-as-arquillian-protocol-jmx:jar:7.1.1.Final:test -[INFO] | | +- org.jboss.as:jboss-as-osgi-service:jar:7.1.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-ee:jar:7.1.1.Final:test -[INFO] | | | | +- org.hibernate:hibernate-validator:jar:4.2.0.Final:test -[INFO] | | | | +- org.jboss.interceptor:jboss-interceptor-spi:jar:2.0.0.Final:test -[INFO] | | | | +- org.jboss.metadata:jboss-metadata-common:jar:7.0.1.Final:test -[INFO] | | | | \- org.jboss.metadata:jboss-metadata-ear:jar:7.0.1.Final:test -[INFO] | | | +- org.jboss.as:jboss-as-naming:jar:7.1.1.Final:test -[INFO] | | | | \- org.jboss:jboss-remote-naming:jar:1.0.2.Final:test -[INFO] | | | | \- org.jboss:jboss-ejb-client:jar:1.0.0.Final:test -[INFO] | | | +- org.jboss.modules:jboss-modules:jar:1.1.1.GA:test -[INFO] | | | +- org.jboss.osgi.framework:jbosgi-framework-core:jar:1.1.8.Final:test -[INFO] | | | | +- org.jboss.osgi.deployment:jbosgi-deployment:jar:1.0.12.Final:test -[INFO] | | | | +- org.jboss.osgi.resolver:jbosgi-resolver-felix:jar:1.0.13.Final:test -[INFO] | | | | | +- org.jboss.osgi.resolver:jbosgi-resolver-api:jar:1.0.13.Final:test -[INFO] | | | | | | \- org.jboss.osgi.metadata:jbosgi-metadata:jar:2.0.3.Final:test -[INFO] | | | | | \- org.jboss.osgi.resolver:jbosgi-resolver-spi:jar:1.0.13.Final:test -[INFO] | | | | +- org.jboss.osgi.vfs:jbosgi-vfs30:jar:1.0.7.Final:test -[INFO] | | | | \- org.osgi:org.osgi.compendium:jar:4.2.0:test -[INFO] | | | +- org.jboss.osgi.repository:jbosgi-repository-core:jar:1.0.5:test -[INFO] | | | | \- org.jboss.osgi.repository:jbosgi-repository-api:jar:1.0.5:test -[INFO] | | | | \- org.jboss.osgi.resolver:jbosgi-resolver-api-v2:jar:2.0.0.Beta2:test -[INFO] | | | | \- org.apache.felix:org.apache.felix.resolver:jar:0.1.0.Beta1:test -[INFO] | | | \- org.osgi:org.osgi.enterprise:jar:4.2.0:test -[INFO] | | +- org.jboss.arquillian.core:arquillian-core-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.protocol:arquillian-protocol-jmx:jar:1.0.3.Final:test (version managed from 1.0.0.CR7) -[INFO] | +- org.jboss.logging:jboss-logging:jar:3.1.0.GA:test -[INFO] | +- org.jboss.remoting3:jboss-remoting:jar:3.2.3.GA:test -[INFO] | | \- org.jboss.xnio:xnio-api:jar:3.0.0.GA:test -[INFO] | +- org.jboss.remotingjmx:remoting-jmx:jar:1.0.2.Final:test -[INFO] | | +- org.jboss.logmanager:jboss-logmanager:jar:1.2.2.GA:test -[INFO] | | \- org.jboss.marshalling:jboss-marshalling:jar:1.3.9.GA:test -[INFO] | +- org.jboss.sasl:jboss-sasl:jar:1.0.0.Final:test -[INFO] | \- org.jboss.arquillian.core:arquillian-core-api:jar:1.0.3.Final:test -[INFO] +- org.jboss.arquillian.testng:arquillian-testng-container:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.testng:arquillian-testng-core:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-spi:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-api:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-spi:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.core:arquillian-core-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.test:arquillian-test-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-impl-base:jar:1.0.3.Final:test -[INFO] | | +- org.jboss.arquillian.config:arquillian-config-api:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.arquillian.config:arquillian-config-impl-base:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-test-impl-base:jar:1.0.3.Final:test -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-impl-base:jar:1.0.1:test -[INFO] | \- org.jboss.shrinkwrap:shrinkwrap-spi:jar:1.0.1:test -[INFO] +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:pom:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:jar:2.0.0-alpha-7:test -[INFO] | | +- org.sonatype.aether:aether-api:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-impl:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-spi:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-util:jar:1.13.1:test -[INFO] | | +- org.sonatype.aether:aether-connector-wagon:jar:1.13.1:test -[INFO] | | +- org.apache.maven:maven-aether-provider:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-model:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-model-builder:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-repository-metadata:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-settings:jar:3.0.4:test -[INFO] | | +- org.apache.maven:maven-settings-builder:jar:3.0.4:test -[INFO] | | +- org.codehaus.plexus:plexus-interpolation:jar:1.14:test -[INFO] | | +- org.codehaus.plexus:plexus-utils:jar:2.0.6:test -[INFO] | | +- org.apache.maven.wagon:wagon-provider-api:jar:2.2:test -[INFO] | | +- org.apache.maven.wagon:wagon-file:jar:2.2:test -[INFO] | | \- org.apache.maven.wagon:wagon-http-lightweight:jar:2.2:test -[INFO] | | \- org.apache.maven.wagon:wagon-http-shared4:jar:2.2:test -[INFO] | | +- org.jsoup:jsoup:jar:1.6.1:test -[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.1.2:test -[INFO] | \- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-spi-maven-archive:jar:2.0.0-alpha-7:test -[INFO] | +- org.codehaus.plexus:plexus-compiler-javac:jar:2.1:test -[INFO] | | \- org.codehaus.plexus:plexus-compiler-api:jar:2.1:test -[INFO] | \- org.codehaus.plexus:plexus-component-api:jar:1.0-alpha-33:test -[INFO] | \- org.codehaus.plexus:plexus-classworlds:jar:1.2-alpha-10:test -[INFO] +- org.jboss.arquillian.protocol:arquillian-protocol-servlet:jar:1.0.3.Final:test -[INFO] | +- org.jboss.arquillian.container:arquillian-container-spi:jar:1.0.3.Final:test -[INFO] | | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-base:jar:2.0.0-alpha-3:test -[INFO] | \- org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-spi:jar:2.0.0-alpha-3:test -[INFO] +- org.rhq:rhq-arquillian-suite-extension:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-core-domain:jar:4.7.0-SNAPSHOT:test -[INFO] | \- org.rhq:rhq-core-util:jar:4.7.0-SNAPSHOT:test -[INFO] | +- jdom:jdom:jar:1.0:test -[INFO] | \- i18nlog:i18nlog:jar:1.0.10:test -[INFO] +- org.rhq:rhq-core-domain:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-enterprise-server:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-enterprise-comm:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.rhq:rhq-core-comm-api:jar:4.7.0-SNAPSHOT:test -[INFO] | | +- org.jboss:jboss-common-core:jar:2.2.17.GA:test -[INFO] | | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:test -[INFO] | | +- jboss:jboss-jmx:jar:4.2.3.GA:test -[INFO] | | +- org.jboss.remoting:jboss-remoting:jar:2.5.4.SP4:test -[INFO] | | \- jboss:jboss-serialization:jar:1.0.3.GA:test -[INFO] | +- org.rhq:rhq-enterprise-server-xml-schemas:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-core-dbutils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:safe-invoker:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-common-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | | \- commons-io:commons-io:jar:1.4:test -[INFO] | +- com.googlecode.java-diff-utils:diffutils:jar:1.2.1:test -[INFO] | +- org.rhq:rhq-jboss-as-dmr-client:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.antlr:antlr-runtime:jar:3.2:test -[INFO] | | \- org.antlr:stringtemplate:jar:3.2:test -[INFO] | +- commons-beanutils:commons-beanutils:jar:1.8.2:test -[INFO] | +- commons-httpclient:commons-httpclient:jar:3.0.1:test -[INFO] | | \- commons-codec:commons-codec:jar:1.4:test (version managed from 1.2) -[INFO] | +- commons-lang:commons-lang:jar:2.4:test -[INFO] | +- commons-validator:commons-validator:jar:1.1.4:test -[INFO] | +- gnu-getopt:getopt:jar:1.0.13:test -[INFO] | +- jboss:jboss-cache:jar:1.4.1.SP9:test -[INFO] | +- commons-collections:commons-collections:jar:3.2.1:test -[INFO] | +- org.snmp4j:snmp4j:jar:1.8.2:test -[INFO] | +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:test -[INFO] | +- rss4j:rss4j:jar:0.92-on.2:test -[INFO] | +- com.jcraft:jsch:jar:0.1.29:test -[INFO] | \- org.yaml:snakeyaml:jar:1.8:test -[INFO] +- org.rhq:rhq-script-bindings:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-scripting-api:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-enterprise-server:ejb-client:client:4.7.0-SNAPSHOT:test -[INFO] | +- net.sf.opencsv:opencsv:jar:1.8:test -[INFO] | \- org.javassist:javassist:jar:3.15.0-GA:test -[INFO] +- org.rhq:rhq-server-client-api:jar:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-serverplugin-drift:jar:4.7.0-SNAPSHOT:test -[INFO] | +- org.rhq:rhq-enterprise-server:ejb:4.7.0-SNAPSHOT:test -[INFO] | \- org.rhq:rhq-core-domain:ejb:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:rhq-core-client-api:test-jar:tests:4.7.0-SNAPSHOT:test -[INFO] +- org.rhq:test-utils:jar:4.7.0-SNAPSHOT:test -[INFO] | +- javax.transaction:jta:jar:1.1:test -[INFO] | +- org.jmock:jmock:jar:2.5.1:test -[INFO] | | +- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | | \- org.hamcrest:hamcrest-library:jar:1.1:test -[INFO] | +- org.unitils:unitils-dbunit:jar:3.1:test -[INFO] | | +- org.unitils:unitils-core:jar:3.1:test -[INFO] | | | \- ognl:ognl:jar:2.6.9:test -[INFO] | | +- org.unitils:unitils-database:jar:3.1:test -[INFO] | | | \- commons-dbcp:commons-dbcp:jar:1.2.2:test -[INFO] | | | \- commons-pool:commons-pool:jar:1.3:test -[INFO] | | \- org.springframework:spring-jdbc:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-beans:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-core:jar:2.5.2:test -[INFO] | | \- org.springframework:spring-tx:jar:2.5.2:test -[INFO] | +- org.unitils:unitils-orm:jar:3.1:test -[INFO] | | +- org.unitils:unitils-spring:jar:3.1:test -[INFO] | | | \- org.springframework:spring-test:jar:2.5.2:test -[INFO] | | +- org.springframework:spring-context:jar:2.5.2:test -[INFO] | | | \- aopalliance:aopalliance:jar:1.0:test -[INFO] | | +- org.springframework:spring-orm:jar:2.5.2:test -[INFO] | | \- javax.persistence:persistence-api:jar:1.0:provided (scope managed from test) -[INFO] | +- org.unitils:unitils-dbmaintainer:jar:3.1:test -[INFO] | +- org.unitils:unitils-easymock:jar:3.1:test -[INFO] | | +- org.easymock:easymock:jar:2.3:test -[INFO] | | \- org.easymock:easymockclassextension:jar:2.3:test -[INFO] | +- org.unitils:unitils-testng:jar:3.1:test -[INFO] | +- org.unitils:unitils-inject:jar:3.1:test -[INFO] | \- org.unitils:unitils-mock:jar:3.1:test -[INFO] +- org.rhq.helpers:perftest-support:jar:4.7.0-SNAPSHOT:test -[INFO] | +- ant:ant:jar:1.6.5:test -[INFO] | +- ant:ant-launcher:jar:1.6.5:test -[INFO] | +- org.dbunit:dbunit:jar:2.4.8:test -[INFO] | | \- org.slf4j:slf4j-api:jar:1.5.6:test -[INFO] | +- org.slf4j:slf4j-jcl:jar:1.5.6:test -[INFO] | +- postgresql:postgresql:jar:9.2-1002.jdbc4:test -[INFO] | \- org.apache.poi:poi:jar:3.7:test -[INFO] +- org.hibernate:hibernate-entitymanager:jar:4.0.1.Final:test -[INFO] | +- dom4j:dom4j:jar:1.6.1:test -[INFO] | | \- xml-apis:xml-apis:jar:1.0.b2:test -[INFO] | +- org.hibernate:hibernate-core:jar:4.0.1.Final:test -[INFO] | | \- antlr:antlr:jar:2.7.7:test (version managed from 2.7.6) -[INFO] | \- org.hibernate.common:hibernate-commons-annotations:jar:4.0.1.Final:test -[INFO] +- org.powermock:powermock-module-testng:jar:1.4.12:test -[INFO] | +- org.powermock:powermock-core:jar:1.4.12:test -[INFO] | | \- org.powermock:powermock-reflect:jar:1.4.12:test -[INFO] | | \- org.objenesis:objenesis:jar:1.2:test -[INFO] | \- org.powermock:powermock-module-testng-common:jar:1.4.12:test -[INFO] +- org.powermock:powermock-api-mockito:jar:1.4.12:test -[INFO] | +- org.mockito:mockito-all:jar:1.9.0:test -[INFO] | \- org.powermock:powermock-api-support:jar:1.4.12:test -[INFO] +- org.opensymphony.quartz:quartz:jar:1.6.5:test -[INFO] +- org.liquibase:liquibase-core:jar:2.0.3:test -[INFO] +- joda-time:joda-time:jar:2.1:test -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | \- com.beust:jcommander:jar:1.12:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building RHQ Code Coverage 4.7.0-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) @ rhq-code-coverage --- -[INFO] org.rhq:rhq-code-coverage:jar:4.7.0-SNAPSHOT -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- log4j:log4j:jar:1.2.16:provided -[INFO] +- org.testng:testng:jar:6.5.2:test -[INFO] | +- junit:junit:jar:4.10:test -[INFO] | | \- org.hamcrest:hamcrest-core:jar:1.1:test -[INFO] | +- org.beanshell:bsh:jar:2.0b4:test -[INFO] | +- com.beust:jcommander:jar:1.12:test -[INFO] | \- org.yaml:snakeyaml:jar:1.6:test -[INFO] \- org.jetbrains:annotations:jar:7.0.2:provided -[INFO] ------------------------------------------------------------------------ -[INFO] Reactor Summary: -[INFO] -[INFO] RHQ ............................................... SUCCESS [1.108s] -[INFO] RHQ Modules ....................................... SUCCESS [0.034s] -[INFO] RHQ Test Utils .................................... SUCCESS [0.673s] -[INFO] RHQ Core Modules .................................. SUCCESS [0.031s] -[INFO] RHQ Utilities ..................................... SUCCESS [0.550s] -[INFO] RHQ Native System API ............................. SUCCESS [0.322s] -[INFO] RHQ Enterprise Agent-Server Communications Annotations API SUCCESS [0.021s] -[INFO] RHQ Database Utilities ............................ SUCCESS [0.643s] -[INFO] RHQ Domain Model .................................. SUCCESS [3.345s] -[INFO] RHQ Plugin API .................................... SUCCESS [0.171s] -[INFO] RHQ Common Plugin Libraries ....................... SUCCESS [0.013s] -[INFO] RHQ Drift Common Library .......................... SUCCESS [0.072s] -[INFO] RHQ Client API .................................... SUCCESS [0.097s] -[INFO] RHQ Plugin Container .............................. SUCCESS [0.180s] -[INFO] RHQ Shared GUI Classes ............................ SUCCESS [0.073s] -[INFO] RHQ Plugin Validator Maven 2 Plugin ............... SUCCESS [0.191s] -[INFO] RHQ Arquillian Integration Modules ................ SUCCESS [0.011s] -[INFO] RHQ Agent Plugin Archive .......................... SUCCESS [0.029s] -[INFO] RHQ Plugins ....................................... SUCCESS [0.171s] -[INFO] RHQ JMX Plugin .................................... SUCCESS [0.082s] -[INFO] RHQ Arquillian Plugin Container ................... SUCCESS [0.781s] -[INFO] RHQ Arquillian Suite Extension .................... SUCCESS [0.036s] -[INFO] RHQ Plugin Test API ............................... SUCCESS [0.319s] -[INFO] RHQ Plugin Test Util .............................. SUCCESS [0.190s] -[INFO] RHQ Plugin Container Integration Tests ............ SUCCESS [0.888s] -[INFO] RHQ JBossAS 4/5 Plugins Common Library ............ SUCCESS [0.024s] -[INFO] RHQ File Template Bundle Plugins Common Library ... SUCCESS [0.039s] -[INFO] RHQ Ant Bundle Plugins Common Library ............. SUCCESS [0.047s] -[INFO] RHQ JBoss AS DMR Client ........................... SUCCESS [0.392s] -[INFO] RHQ Platform Plugin ............................... SUCCESS [0.066s] -[INFO] RHQ Enterprise Agent-Server Communications Layer .. SUCCESS [0.039s] -[INFO] RHQ Enterprise Agent .............................. SUCCESS [0.238s] -[INFO] RHQ RHQ-Agent Plugin .............................. SUCCESS [0.219s] -[INFO] RHQ No-op Plugin .................................. SUCCESS [0.065s] -[INFO] RHQ Augeas Plugin ................................. SUCCESS [0.400s] -[INFO] RHQ Apache Plugin ................................. SUCCESS [0.281s] -[INFO] RHQ Tomcat Plugin ................................. SUCCESS [0.066s] -[INFO] RHQ Hibernate Plugin .............................. SUCCESS [0.058s] -[INFO] RHQ JBossAS 5.x/6.x Plugin ........................ SUCCESS [0.400s] -[INFO] RHQ JBossAS 3.2.x/4.x Plugin ...................... SUCCESS [0.073s] -[INFO] RHQ mod_cluster Plugin ............................ SUCCESS [0.173s] -[INFO] RHQ JBossCache 4.x Plugin ......................... SUCCESS [0.064s] -[INFO] RHQ JBossAS 7.x Plugin ............................ SUCCESS [0.216s] -[INFO] RHQ Server Plugin ................................. SUCCESS [0.088s] -[INFO] RHQ JBossCache 3.x Plugin ......................... SUCCESS [2.909s] -[INFO] RHQ Database Plugin ............................... SUCCESS [0.059s] -[INFO] RHQ Postgres Plugin ............................... SUCCESS [0.065s] -[INFO] RHQ Script Plugin ................................. SUCCESS [0.050s] -[INFO] RHQ IIS Plugin .................................... SUCCESS [0.040s] -[INFO] RHQ File Template Bundle Plugin ................... SUCCESS [0.043s] -[INFO] RHQ Ant Bundle Plugin ............................. SUCCESS [0.053s] -[INFO] RHQ Augeas-based Cron Plugin ...................... SUCCESS [0.042s] -[INFO] RHQ GRUB Plugin ................................... SUCCESS [0.035s] -[INFO] RHQ Hosts File Plugin ............................. SUCCESS [0.050s] -[INFO] RHQ Cobbler File Plugin ........................... SUCCESS [0.049s] -[INFO] RHQ Augeas-based Sudoers Plugin ................... SUCCESS [0.051s] -[INFO] RHQ Network Services Plugin ....................... SUCCESS [0.076s] -[INFO] RHQ Augeas-based Samba Plugin ..................... SUCCESS [0.051s] -[INFO] RHQ Augeas-based Postfix Plugin ................... SUCCESS [0.088s] -[INFO] RHQ Aliases File Plugin ........................... SUCCESS [0.046s] -[INFO] RHQ SSHD Plugin ................................... SUCCESS [0.043s] -[INFO] RHQ Byteman Plugin ................................ SUCCESS [0.046s] -[INFO] RHQ IRC Server Plugin ............................. SUCCESS [0.051s] -[INFO] RHQ Hadoop Plugin ................................. SUCCESS [0.048s] -[INFO] RHQ Hudson Plugin ................................. SUCCESS [0.047s] -[INFO] RHQ MySql Plugin .................................. SUCCESS [0.044s] -[INFO] RHQ Oracle Plugin ................................. SUCCESS [0.029s] -[INFO] RHQ Performance Test Plugin ....................... SUCCESS [0.047s] -[INFO] RHQ Script2 Plugin ................................ SUCCESS [0.048s] -[INFO] RHQ SnmpTrapd Plugin .............................. SUCCESS [0.049s] -[INFO] RHQ Twitter Plugin ................................ SUCCESS [0.033s] -[INFO] RHQ Virtualization Plugin ......................... SUCCESS [0.035s] -[INFO] RHQ Kickstart Plugin .............................. SUCCESS [0.030s] -[INFO] RHQ pattern Plugin ................................ SUCCESS [0.762s] -[INFO] RHQ Cassandra Plugin .............................. SUCCESS [0.269s] -[INFO] RHQ Validate All Plugins .......................... SUCCESS [0.045s] -[INFO] RHQ Helpers ....................................... SUCCESS [0.007s] -[INFO] RHQ Response-Time Filter .......................... SUCCESS [0.011s] -[INFO] RHQ Response-Time Filter - JBoss AS7 Subsystem .... SUCCESS [0.739s] -[INFO] bundleGen ......................................... SUCCESS [0.008s] -[INFO] jeeGen ............................................ SUCCESS [0.012s] -[INFO] Performance Testing Support ....................... SUCCESS [0.074s] -[INFO] rest-docs-generator ............................... SUCCESS [0.085s] -[INFO] RHQ Enterprise Agent Update ....................... SUCCESS [0.025s] -[INFO] RHQ Server XML Schemas ............................ SUCCESS [0.014s] -[INFO] RHQ Enterprise Safe Invoker ....................... SUCCESS [0.034s] -[INFO] RHQ Enterprise Server JAR ......................... SUCCESS [1.472s] -[INFO] RHQ Enterprise Server JBoss AS SARs ............... SUCCESS [0.180s] -[INFO] RHQ Enterprise Server Internal Services SAR ....... SUCCESS [0.006s] -[INFO] RHQ Enterprise Modules ............................ SUCCESS [0.005s] -[INFO] RHQ Scripting Parent Module ....................... SUCCESS [0.007s] -[INFO] RHQ Scripting API ................................. SUCCESS [0.005s] -[INFO] RHQ Javascript support ............................ SUCCESS [0.025s] -[INFO] RHQ Python support ................................ SUCCESS [0.007s] -[INFO] RHQ Script Bindings ............................... SUCCESS [0.152s] -[INFO] RHQ Enterprise Remote Client API .................. SUCCESS [0.053s] -[INFO] RHQ Remote Client Dependencies .................... SUCCESS [0.126s] -[INFO] RHQ Enterprise Remote CLI ......................... SUCCESS [0.041s] -[INFO] RHQ Remoting Parent POM ........................... SUCCESS [0.004s] -[INFO] RHQ REST interface ................................ SUCCESS [0.167s] -[INFO] RHQ Enterprise Portal ............................. SUCCESS [0.179s] -[INFO] RHQ Enterprise GUI ................................ SUCCESS [0.004s] -[INFO] RHQ Enterprise Content HTTP Support ............... SUCCESS [0.023s] -[INFO] RHQ Enterprise Core GUI ........................... SUCCESS [0.252s] -[INFO] RHQ REST interface examples ....................... SUCCESS [0.012s] -[INFO] RHQ Remoting WAR .................................. SUCCESS [0.008s] -[INFO] RHQ Enterprise Server Plugins ..................... SUCCESS [0.179s] -[INFO] RHQ Enterprise Server Disk Content Source Plugin .. SUCCESS [0.018s] -[INFO] RHQ Enterprise Server Yum Content Source Plugin ... SUCCESS [0.015s] -[INFO] RHQ Enterprise Server URL Content Source Plugin ... SUCCESS [0.017s] -[INFO] RHQ Enterprise Server JBoss Software Plugin ....... SUCCESS [0.015s] -[INFO] RHQ Enterprise Server Email Alert Plugin .......... SUCCESS [0.018s] -[INFO] RHQ Enterprise Server IRC Alert Plugin ............ SUCCESS [0.015s] -[INFO] RHQ Enterprise Server Mobicents Alert Plugin ...... SUCCESS [0.015s] -[INFO] RHQ Enterprise Server Microblog Alert Plugin ...... SUCCESS [0.015s] -[INFO] RHQ Enterprise Server Opertions Alert Plugin ...... SUCCESS [0.018s] -[INFO] RHQ Enterprise Server Roles Alert Plugin .......... SUCCESS [0.016s] -[INFO] RHQ Enterprise Server SNMP Alert Plugin ........... SUCCESS [0.016s] -[INFO] RHQ Enterprise Server Subject Alert Plugin ........ SUCCESS [0.018s] -[INFO] RHQ Enterprise Server Client API .................. SUCCESS [0.053s] -[INFO] RHQ Enterprise Server CLI Script Alert Plugin ..... SUCCESS [0.030s] -[INFO] RHQ Enterprise Server Log4J Alert Plugin .......... SUCCESS [0.019s] -[INFO] RHQ Enterprise Server Cobbler Plugin .............. SUCCESS [0.081s] -[INFO] RHQ Drift Server Plugin ........................... SUCCESS [0.020s] -[INFO] RHQ File Template Bundle Server Plugin ............ SUCCESS [0.020s] -[INFO] RHQ Ant Bundle Server Plugin ...................... SUCCESS [0.025s] -[INFO] RHQ Validate All Server Plugins ................... SUCCESS [0.019s] -[INFO] RHQ Enterprise Server CLI Package Type Plugin ..... SUCCESS [0.017s] -[INFO] RHQ Enterprise Server EAR ......................... SUCCESS [0.295s] -[INFO] RHQ Server Startup AS7 Subsystem .................. SUCCESS [0.053s] -[INFO] RHQ Enterprise Installer Utility .................. SUCCESS [0.084s] -[INFO] RHQ Server JAR Integration Tests .................. SUCCESS [1.950s] -[INFO] RHQ Code Coverage ................................. SUCCESS [0.008s] -[INFO] ------------------------------------------------------------------------ -[INFO] BUILD SUCCESS -[INFO] ------------------------------------------------------------------------ -[INFO] Total time: 28.582s -[INFO] Finished at: Thu Mar 28 08:06:07 CDT 2013 -[INFO] Final Memory: 119M/555M -[INFO] ------------------------------------------------------------------------ commit ed88dc3530321360018f706ffefb22ffa4c13cb9 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Sep 14 11:44:05 2013 -0400 fix simulator to work with password obfuscation diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java index af012dd..59bafcf 100644 --- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java +++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java @@ -79,14 +79,14 @@ public class Simulator implements ShutdownManager { initCluster(plan); createSchema(); - Session session; - if (plan.getClientCompression() == null) { - session = createSession(); - } else { - ProtocolOptions.Compression compression = Enum.valueOf(ProtocolOptions.Compression.class, - plan.getClientCompression().toUpperCase()); - session = createSession(compression); - } + Session session = createSession(); +// if (plan.getClientCompression() == null) { +// session = createSession(); +// } else { +// ProtocolOptions.Compression compression = Enum.valueOf(ProtocolOptions.Compression.class, +// plan.getClientCompression().toUpperCase()); +// session = createSession(compression); +// } StorageSession storageSession = new StorageSession(session); @@ -208,7 +208,7 @@ public class Simulator implements ShutdownManager { private void createSchema() { try { log.info("Creating schema"); - SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", ccm.getNodes(), ccm.getCqlPort()); + SchemaManager schemaManager = new SchemaManager("rhqadmin", "1eeb2f255e832171df8592078de921bc", ccm.getNodes(), ccm.getCqlPort()); schemaManager.install(); } catch (Exception e) { throw new RuntimeException("Failed to start simulator. An error occurred during schema creation.", e); commit 6d78a7f31dbee1abe2bed3b99a17b1ad9751be3d Author: John Sanda <jsanda(a)redhat.com> Date: Sat Sep 14 11:41:27 2013 -0400 [BZ 1002226] Change default data directories Assuming we install into /opt/rhq, the directory structure (with default settings) will now look like, /opt/rhq | |--rhq-agent | |--rhq-server-<rhq-version> | \ | \--rhq-storage | |--rhq-data diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index f538560..30db17c 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -118,14 +118,6 @@ public class StorageInstaller { private File logDir; - private String dirPrefix = (isWindows()) ? "" : "/var/lib"; - - private String defaultCommitLogDir = dirPrefix + "/rhq/storage/commitlog"; - - private String defaultDataDir = dirPrefix + "/rhq/storage/data"; - - private String defaultSavedCachesDir = dirPrefix + "/rhq/storage/saved_caches"; - private String defaultHeapSize = "512M"; private String defaultHeapNewSize = "128M"; @@ -173,15 +165,15 @@ public class StorageInstaller { checkStatus.setArgName("true|false"); Option commitLogOption = new Option(null, "commitlog", true, "The directory where the storage node keeps " - + "commit log files. Defaults to " + defaultCommitLogDir + "."); + + "commit log files. Defaults to " + getDefaultCommitLogDir() + "."); commitLogOption.setArgName("DIR"); Option dataDirOption = new Option(null, "data", true, "The directory where the storage node keeps data files. " - + "Defaults to " + defaultDataDir + "."); + + "Defaults to " + getDefaultDataDir() + "."); dataDirOption.setArgName("DIR"); Option savedCachesDirOption = new Option(null, "saved-caches", true, "The directory where the storage node " - + "keeps saved cache files. Defaults to " + defaultSavedCachesDir + "."); + + "keeps saved cache files. Defaults to " + getDefaultSavedCachesDir() + "."); savedCachesDirOption.setArgName("DIR"); Option basedirOption = new Option(null, "dir", true, "The directory where the storage node will be installed " @@ -321,6 +313,9 @@ public class StorageInstaller { if (cmdLine.hasOption("dir")) { installerInfo.basedir = new File(cmdLine.getOptionValue("dir")); deploymentOptions.setBasedir(installerInfo.basedir.getAbsolutePath()); + } else { + installerInfo.basedir = new File(serverBasedir, "rhq-storage"); + deploymentOptions.setBasedir(installerInfo.basedir.getAbsolutePath()); } try { @@ -335,9 +330,9 @@ public class StorageInstaller { String seeds = cmdLine.getOptionValue("seeds", installerInfo.hostname); deploymentOptions.setSeeds(seeds); - String commitlogDir = cmdLine.getOptionValue("commitlog", defaultCommitLogDir); - String dataDir = cmdLine.getOptionValue("data", defaultDataDir); - String savedCachesDir = cmdLine.getOptionValue("saved-caches", defaultSavedCachesDir); + String commitlogDir = cmdLine.getOptionValue("commitlog", getDefaultCommitLogDir().getAbsolutePath()); + String dataDir = cmdLine.getOptionValue("data", getDefaultDataDir().getAbsolutePath()); + String savedCachesDir = cmdLine.getOptionValue("saved-caches", getDefaultSavedCachesDir().getAbsolutePath()); File commitLogDirFile = new File(commitlogDir); File dataDirFile = new File(dataDir); @@ -824,6 +819,29 @@ public class StorageInstaller { } } + /** + * @return The parent directory of the server + */ + private File getInstallationDir() { + return serverBasedir.getParentFile(); + } + + private File getDefaultBaseDataDir() { + return new File(getInstallationDir(), "rhq-data"); + } + + private File getDefaultCommitLogDir() { + return new File(getDefaultBaseDataDir(), "commit_log"); + } + + private File getDefaultDataDir() { + return new File(getDefaultBaseDataDir(), "data"); + } + + private File getDefaultSavedCachesDir() { + return new File(getDefaultBaseDataDir(), "saved_caches"); + } + public void printUsage() { HelpFormatter helpFormatter = new HelpFormatter(); String syntax = "rhq-storage-installer.sh|bat [options]"; diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 28992cb..f40daf3 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -11,6 +11,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; +import java.net.InetAddress; import java.util.Properties; import org.apache.commons.cli.CommandLine; @@ -73,6 +74,73 @@ public class StorageInstallerTest { } @Test + public void performDefaultInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {}); + + int status = installer.run(cmdLine); + + String address = InetAddress.getLocalHost().getHostAddress(); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful default install"); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(address); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File baseDataDir = new File(basedir, "rhq-data"); + + File commitLogDir = new File(baseDataDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(baseDataDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(baseDataDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + + File log4jFile = new File(confDir, "log4j-server.properties"); + assertTrue(log4jFile.exists(), log4jFile + " does not exist"); + + File logsDir = new File(serverDir, "logs"); + File logFile = new File(logsDir, "rhq-storage.log"); + + Properties log4jProps = new Properties(); + log4jProps.load(new FileInputStream(log4jFile)); + assertEquals(log4jProps.getProperty("log4j.appender.R.File"), logFile.getAbsolutePath(), + "The log file is wrong"); + + File yamlFile = new File(confDir, "cassandra.yaml"); + ConfigEditor yamlEditor = new ConfigEditor(yamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", + "Failed to set the internode_authenticator property in " + yamlFile); + assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", + "The authenticator property is wrong"); + assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + assertEquals(properties.getProperty("jmx_port"), "7299", "The jmx_port property is wrong"); + assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); + assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); + assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); + } + + @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); @@ -214,6 +282,10 @@ public class StorageInstallerTest { } private void assertRhqServerPropsUpdated() { + assertRhqServerPropsUpdated("127.0.0.1"); + } + + private void assertRhqServerPropsUpdated(String address) { File serverPropsFile = new File(serverDir, "rhq-server.properties"); Properties properties = new Properties(); commit 31ec51e8abbaef22dacd8801c168693be65217ef Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Sep 13 14:34:33 2013 -0400 BZ 824773 - show the results even when the operation failed - it may have more details that are useful to the user diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java index bb03ee9..86a8a0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java @@ -127,7 +127,7 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor @Override protected Canvas buildResultsSection(ResourceOperationHistory operationHistory) { OperationRequestStatus status = operationHistory.getStatus(); - if (status == OperationRequestStatus.SUCCESS) { + if (status == OperationRequestStatus.SUCCESS || status == OperationRequestStatus.FAILURE) { EnhancedVLayout resultsSection = new EnhancedVLayout(); Label title = new Label("<h4>" + MSG.view_operationHistoryDetails_results() + "</h4>"); commit adc08bf4747b275865fbf1d0b325e5b1456cecf1 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Sep 13 12:51:08 2013 +0200 Fix ResourcesDomainServerTest.loadUpdateResourceConfiguration failure: datasources cannot be configured in enabled diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java index 1714b64..450c975 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java @@ -96,10 +96,24 @@ public class ResourcesDomainServerTest extends AbstractJBossAS7PluginTest { ignoredResources.add("Pooled Connection Factory (Managed Server)"); ignoredResources.add("Connection Factory (Managed Server)"); + ignoredResources.add("DataSource (Profile)"); + ignoredResources.add("DataSource (Managed)"); + + ignoredResources.add("Cluster Connection (Profile)"); + ignoredResources.add("Memory Pool"); ignoredResources.add("Periodic Rotating File Handler"); ignoredResources.add("Console Handler"); + // Datasources need a complex workflow, cannot be tested like this + + ignoredResources.add("DataSource (Profile)"); + ignoredResources.add("DataSource (Managed)"); + + // Cannot apply configuration blindly + + ignoredResources.add("Cluster Connection (Profile)"); + Resource platform = this.pluginContainer.getInventoryManager().getPlatform(); Resource server = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE, DomainServerComponentTest.RESOURCE_KEY); commit a00688bddc7cc3eeca7a0a6723363b60a784aa17 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Sep 13 12:12:51 2013 +0200 Minor change: wrap log.debug in isDebugEnabled condition in AutoDiscoveryExecutor diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java index 3e852b3..368e2b3 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java @@ -147,7 +147,9 @@ public class AutoDiscoveryExecutor implements Runnable, Callable<InventoryReport log.debug("Cannot perform process scan - not supported on this platform. (" + systemInfo.getClass() + ")"); } long elapsedTime = System.currentTimeMillis() - startTime; - log.debug("Retrieval of process table took " + elapsedTime + " ms."); + if (log.isDebugEnabled()) { + log.debug("Retrieval of process table took " + elapsedTime + " ms."); + } return processInfos; } commit 798fd4d3ad12395a0e4a4a9d314bc60dd6640ac1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 12 15:24:25 2013 -0400 Bug 806908 - i18n avail type names - Add I18N of availability types in a few GUI places - Some messsage cleanup to remove several redundancies diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java index f4fbcad..f19d77f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java @@ -915,8 +915,7 @@ public class ConditionEditor extends EnhancedVLayout { StaticTextItem helpItem = buildHelpTextItem("availabilityHelp", helpStr, ifFunc); formItems.add(helpItem); - SelectItem selection = new SortedSelectItem(AVAILABILITY_ITEMNAME, - MSG.view_alert_definition_condition_editor_availability_value()); + SelectItem selection = new SortedSelectItem(AVAILABILITY_ITEMNAME, MSG.common_title_availability()); LinkedHashMap<String, String> avails = new LinkedHashMap<String, String>(2); avails.put(AlertConditionOperator.AVAIL_GOES_DOWN.name(), MSG.view_alert_definition_condition_editor_operator_availability_goesDown()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 9737a49..dbfed79 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -24,7 +24,6 @@ import java.util.List; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AvailabilityGraphType; @@ -67,7 +66,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { // loop through the avail intervals for (Availability availability : availabilityList) { sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType() + "\", "); + sb.append(" \"availTypeMessage\":\"" + getAvailabilityTypeMessage(availability) + "\", "); sb.append(" \"availStart\":" + availability.getStartTime() + ", "); // last record will be null long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); @@ -84,13 +83,8 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { } else if (null != groupAvailabilityList) { // loop through the group avail down intervals for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { - // allows substitution for situations like WARN=MIXED for easier terminology - String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType() - .equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) ? MSG - .chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); - sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); + sb.append(" \"availTypeMessage\":\"" + getGroupAvailabilityTypeMessage(groupAvailability) + "\", "); sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); // last record will be null long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) @@ -111,6 +105,37 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { return sb.toString(); } + private String getAvailabilityTypeMessage(Availability availability) { + switch (availability.getAvailabilityType()) { + case UP: + return MSG.common_status_avail_up(); + case DOWN: + return MSG.common_status_avail_down(); + case DISABLED: + return MSG.common_status_avail_disabled(); + case UNKNOWN: + default: + return MSG.common_status_avail_unknown(); + } + } + + private String getGroupAvailabilityTypeMessage(ResourceGroupAvailability groupAvailability) { + switch (groupAvailability.getGroupAvailabilityType()) { + case UP: + return MSG.common_status_avail_up(); + case DISABLED: + return MSG.common_status_avail_disabled(); + case EMPTY: + return MSG.common_status_avail_group_empty(); + case WARN: + // replace with MIXED for better presentation + return MSG.common_status_avail_group_mixed(); + case DOWN: + default: + return MSG.common_status_avail_down(); + } + } + /** * The magic JSNI to draw the charts with d3. */ @@ -365,7 +390,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { } public String getChartHoverAvailabilityLabel() { - return MSG.chart_hover_availability_label(); + return MSG.common_title_availability(); } public String getChartHoverStartLabel() { @@ -373,15 +398,15 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { } public String getAvailChartDownLabel() { - return MSG.avail_chart_down_label(); + return MSG.common_status_avail_down(); } public String getAvailChartUpLabel() { - return MSG.avail_chart_up_label(); + return MSG.common_status_avail_up(); } public String getAvailChartTitleLabel() { - return MSG.avail_chart_title_label(); + return MSG.common_title_availability(); } public String getChartHoverBarLabel() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index a895622..2fd823d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -25,6 +25,7 @@ import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; +import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; @@ -87,27 +88,27 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentField.setColSpan(4); // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); + availField = new StaticTextItem("avail", MSG.common_title_availability()); availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); + prepareTooltip(availField, MSG.view_resource_monitor_availability_tooltip_up()); availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); availTimeField.setWrapTitle(false); prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); + downField = new StaticTextItem("down", MSG.common_status_avail_down_lower()); downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); + prepareTooltip(downField, MSG.view_resource_monitor_availability_tooltip_down()); downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); downTimeField.setWrapTitle(false); prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); + disabledField = new StaticTextItem("disabled", MSG.common_status_avail_disabled_lower()); disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); + prepareTooltip(disabledField, MSG.view_resource_monitor_availability_tooltip_disabled()); disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); disabledTimeField.setWrapTitle(false); @@ -144,8 +145,8 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setShowTitle(false); form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, - disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, - currentTimeField); + disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, + currentTimeField); reloadSummaryData(); @@ -154,50 +155,65 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private void reloadSummaryData() { GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resource.getId(), - new AsyncCallback<ResourceAvailabilitySummary>() { - - @Override - public void onSuccess(ResourceAvailabilitySummary result) { - - currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result - .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); - availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), - MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); - downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), - MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); - disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), - MeasurementUnits.MILLISECONDS, true)); - failureCountField.setValue(result.getFailures()); - disabledCountField.setValue(result.getDisabled()); - mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), - MeasurementUnits.MILLISECONDS, true)); - mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), - MeasurementUnits.MILLISECONDS, true)); - - if (result.getUnknownTime() > 0L) { - unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient - .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); - } else { - unknownField.setValue(""); - } - - currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter - .format(result.getCurrentTime()))); + new AsyncCallback<ResourceAvailabilitySummary>() { + + @Override + public void onSuccess(ResourceAvailabilitySummary result) { + + currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value( + getAvailabilityTypeMessage(result.getCurrent()), + TimestampCellFormatter.format(result.getLastChange().getTime()))); + availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), + MeasurementUnits.PERCENTAGE, true)); + availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), + MeasurementUnits.MILLISECONDS, true)); + downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), + MeasurementUnits.PERCENTAGE, true)); + downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), + MeasurementUnits.MILLISECONDS, true)); + disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), + MeasurementUnits.PERCENTAGE, true)); + disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), + MeasurementUnits.MILLISECONDS, true)); + failureCountField.setValue(result.getFailures()); + disabledCountField.setValue(result.getDisabled()); + mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), + MeasurementUnits.MILLISECONDS, true)); + mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), + MeasurementUnits.MILLISECONDS, true)); + + if (result.getUnknownTime() > 0L) { + unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient + .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); + } else { + unknownField.setValue(""); } - @Override - public void onFailure(Throwable caught) { - currentField.setValue(MSG.common_label_error()); - CoreGUI.getErrorHandler() - .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); - } - }); + currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter + .format(result.getCurrentTime()))); + } + + @Override + public void onFailure(Throwable caught) { + currentField.setValue(MSG.common_label_error()); + CoreGUI.getErrorHandler() + .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); + } + }); + } + + private String getAvailabilityTypeMessage(AvailabilityType availabilityType) { + switch (availabilityType) { + case UP: + return MSG.common_status_avail_up(); + case DOWN: + return MSG.common_status_avail_down(); + case DISABLED: + return MSG.common_status_avail_disabled(); + case UNKNOWN: + default: + return MSG.common_status_avail_unknown(); + } } private void prepareTooltip(FormItem item, String tooltip) { 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 c46f7a5..45de217 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 @@ -6,13 +6,8 @@ # https://docs.jboss.org/author/display/RHQ/Working+with+the+Resource+Bundles # ################################### -avail_chart_down_label = DOWN -avail_chart_title_label = Availability -avail_chart_up_label = UP chart_date_label = Date chart_down_label = Down -chart_hover_availability_label = Availability -chart_hover_availability_type_warn = MIXED chart_hover_bar_label = Duration chart_hover_date_format = %m/%d/%y chart_hover_end_label = End @@ -143,6 +138,15 @@ common_severity_fatal = Fatal common_severity_info = Info common_severity_warn = Warn common_status_attention = Attention +common_status_avail_disabled = DISABLED +common_status_avail_disabled_lower = Disabled +common_status_avail_down = DOWN +common_status_avail_down_lower = Down +common_status_avail_group_empty = EMPTY +common_status_avail_group_mixed = MIXED +common_status_avail_unknown = UNKNOWN +common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = Canceled common_status_deferred = Deferred common_status_failed = Failed @@ -469,10 +473,6 @@ filter_from_date = From filter_to_date = To group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource -pie_chart_availability_summary_disabled = Disabled -pie_chart_availability_summary_down = Down -pie_chart_availability_summary_label = Availability -pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = exception was null util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. @@ -975,7 +975,6 @@ view_alert_definition_condition_editor_availabilityDuration_state = Availability view_alert_definition_condition_editor_availabilityDuration_tooltip = Specify the availability state change and the duration that state must persist in order to trigger the condition. The duration should be long enough (several minutes) to give the agent time to detect another availability state change that may correct the problem. view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = The amount of time the resource must be at the given availability state before the condition is met. view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. -view_alert_definition_condition_editor_availability_value = Availability view_alert_definition_condition_editor_common_avg = Average view_alert_definition_condition_editor_common_baseUnits = Base Units view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: @@ -2045,17 +2044,11 @@ view_resource_inventory_childhistory_deletedChild = Deleted Child view_resource_inventory_childhistory_filterTitle = Past N Days view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact view_resource_inventory_childhistory_status_invalidConfig = Invalid Configuration -view_resource_monitor_availability_availability = Availability -view_resource_monitor_availability_availability_tooltip = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_currentAsOf = This data is current as of {0} view_resource_monitor_availability_currentStatus = Current Status view_resource_monitor_availability_currentStatus_value = This resource has been {0} since {1} -view_resource_monitor_availability_disabled = Disabled view_resource_monitor_availability_disabledTime = Disabled Time view_resource_monitor_availability_disabledTime_tooltip = The cumulative amount of time the resource has been DISABLED -view_resource_monitor_availability_disabled_tooltip = Percentage of time the resource has been DISABLED compared to the times it was up and down -view_resource_monitor_availability_down = Down -view_resource_monitor_availability_down_tooltip = Percentage of time the resource has been DOWN compared to the times it was up and disabled view_resource_monitor_availability_downtime = Downtime view_resource_monitor_availability_downtime_tooltip = The cumulative amount of time the resource has been DOWN view_resource_monitor_availability_loadFailed = Failed to load availability history @@ -2068,6 +2061,9 @@ view_resource_monitor_availability_numDisabled_tooltip = The total number of tim view_resource_monitor_availability_numFailures = Number of Failures view_resource_monitor_availability_numFailures_tooltip = The total number of times this resource has entered the DOWN state view_resource_monitor_availability_summaryError = Failed to load resource availability summary +view_resource_monitor_availability_tooltip_disabled = Percentage of time the resource has been DISABLED compared to the times it was up and down +view_resource_monitor_availability_tooltip_down = Percentage of time the resource has been DOWN compared to the times it was up and disabled +view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_unknown = This resource was in an unknown state for {0} view_resource_monitor_availability_uptime = Uptime view_resource_monitor_availability_uptime_tooltip = The cumulative amount of time the resource has been UP @@ -2139,7 +2135,6 @@ view_table_totalRows = Total Rows: {0} (selected: {1}) view_table_totalRowsUnknown = Total Rows: ? view_tabs_common_activity = Activity view_tabs_common_agent = Agent -view_tabs_common_availability = Availability view_tabs_common_calltime = Calltime view_tabs_common_child_history = Child History view_tabs_common_child_resources = Child Resources diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index eecdba0..2de690f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -166,6 +166,15 @@ common_severity_fatal = FatÃ¡lnÃ common_severity_info = InformaÄnÃ common_severity_warn = VarovÃ¡nÃ ##common_status_attention = ÃspÄch +##common_status_avail_disabled = DISABLED +common_status_avail_disabled_lower = ZneplatnÄnÃœ +##common_status_avail_down = DOWN +common_status_avail_down_lower = NebÄÅŸÃ +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = ZruÅ¡eno common_status_deferred = OdloÅŸeno common_status_failed = Selhalo @@ -488,10 +497,6 @@ filter_from_date = Od filter_to_date = Do group_tree_groupOfResourceType = Skupina: [{0}] group_tree_partialClusterTooltip = {0} z {1} ÄlenÅ¯ skupiny mÃ¡ "{2}" zdroj -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = PÅ¯vod rodiÄe pro: util_errorHandler_nullException = vÃœjimka byla null util_monitoringRequestCallback_error_checkServerStatusFailure = NepodaÅilo se urÄit stav pÅihlaÅ¡ovÃ¡nÃ - zkontrolujte stav serveru. @@ -989,7 +994,6 @@ view_alert_definition_condition_editor_availabilityDuration = Doba dostupnosti ##view_alert_definition_condition_editor_availabilityDuration_tooltip = Specify the availability state change and the duration that state must persist in order to trigger the condition. The duration should be long enough (several minutes) to give the agent time to detect another availability state change that may correct the problem. view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = PoÄet minut po kterÃœch musÃ bÃœt zdroj v danÃ©m stavu dostupnosti, aby byla splnÄna podmÃnka view_alert_definition_condition_editor_availability_tooltip = Specifikujte stav dostupnosti, kterÃœ potÃ© splnÃ podmÃnku. -view_alert_definition_condition_editor_availability_value = Dostupnost view_alert_definition_condition_editor_common_avg = PrÅ¯mÄr view_alert_definition_condition_editor_common_baseUnits = ZÃ¡kladnÃ jednotky view_alert_definition_condition_editor_common_baseUnits_availableUnits = DostupnÃ© jednotky: @@ -2056,17 +2060,11 @@ view_resource_inventory_childhistory_deletedChild = SmazanÃ potomci view_resource_inventory_childhistory_filterTitle = PoslednÃch N dnÅ¯ view_resource_inventory_childhistory_status_invalidArtifact = NeplatnÃœ artefakt view_resource_inventory_childhistory_status_invalidConfig = NeplatnÃ¡ konfigurace -view_resource_monitor_availability_availability = Dostupnost -view_resource_monitor_availability_availability_tooltip = ProcentuÃ¡lnÃ podÃl udÃ¡vajÃcÃ jak dlouho zdroj bÄÅŸÃ v porovnÃ¡nÃ s celkovÃœm Äasem. view_resource_monitor_availability_currentAsOf = Data jsou starÃ¡ {0} view_resource_monitor_availability_currentStatus = AktuÃ¡lnÃ stav view_resource_monitor_availability_currentStatus_value = Zdroj je {0} od {1} -view_resource_monitor_availability_disabled = ZneplatnÄnÃœ view_resource_monitor_availability_disabledTime = Doba zneplatnÄnÃ view_resource_monitor_availability_disabledTime_tooltip = KumulativnÃ veliÄina udÃ¡vajÃcÃ jak dlouho je zdroj zneplatnÄn (stav DISABLED) -view_resource_monitor_availability_disabled_tooltip = ProcentuÃ¡lnÃ podÃl udÃ¡vajÃcÃ jak dlouho je zdroj zneplatnÄn v porovnÃ¡nÃ s celkovÃœm Äasem. -view_resource_monitor_availability_down = NebÄÅŸÃ -view_resource_monitor_availability_down_tooltip = ProcentuÃ¡lnÃ podÃl udÃ¡vajÃcÃ jak dlouho zdroj nebÄÅŸÃ v porovnÃ¡nÃ s celkovÃœm Äasem. view_resource_monitor_availability_downtime = Downtime view_resource_monitor_availability_downtime_tooltip = KumulativnÃ veliÄina udÃ¡vajÃcÃ jak dlouho zdroj nebÄÅŸÃ (stav DOWN) view_resource_monitor_availability_loadFailed = NepodaÅilo se naÄÃst historii dostupnosti @@ -2079,6 +2077,9 @@ view_resource_monitor_availability_numDisabled_tooltip = CelkovÃ© mnoÅŸstvÃ kol view_resource_monitor_availability_numFailures = PoÄet selhÃ¡nÃ view_resource_monitor_availability_numFailures_tooltip = CelkovÃ© mnoÅŸstvÃ kolikrÃ¡t tento zdroj vstoupil do stavu DOWN (spadl) view_resource_monitor_availability_summaryError = Nelze naÄÃst shrnutÃ o dostupnosti zdroje +view_resource_monitor_availability_tooltip_disabled = ProcentuÃ¡lnÃ podÃl udÃ¡vajÃcÃ jak dlouho je zdroj zneplatnÄn v porovnÃ¡nÃ s celkovÃœm Äasem. +view_resource_monitor_availability_tooltip_down = ProcentuÃ¡lnÃ podÃl udÃ¡vajÃcÃ jak dlouho zdroj nebÄÅŸÃ v porovnÃ¡nÃ s celkovÃœm Äasem. +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_unknown = Tento zdroj byl v neznÃ¡mÃ©m stavu {0} view_resource_monitor_availability_uptime = Uptime view_resource_monitor_availability_uptime_tooltip = KumulativnÃ veliÄina udÃ¡vajÃcÃ jak dlouho zdroj bÄÅŸÃ (stav UP) @@ -2150,7 +2151,6 @@ view_table_totalRows = Celkem ÅÃ¡dkÅ¯: {0} (vybrÃ¡no: {1}) view_table_totalRowsUnknown = Celkem ÅÃ¡dkÅ¯: ? view_tabs_common_activity = Aktivita view_tabs_common_agent = Agent -view_tabs_common_availability = Dostupnost view_tabs_common_calltime = Doba volÃ¡nÃ view_tabs_common_child_history = Historie potomkÅ¯ view_tabs_common_child_resources = Potomci zdroje 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 ca016f1..ea31a41 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 @@ -10,12 +10,8 @@ # ################################### ##avail_chart_down_label = DOWN -avail_chart_title_label = VerfÃŒgbarkeit -##avail_chart_up_label = UP chart_date_label = Datum ##chart_down_label = Down -chart_hover_availability_label = VerfÃŒgbarkeit -chart_hover_availability_type_warn = Gemischt chart_hover_bar_label = Dauer chart_hover_date_format = %d.%m.%y chart_hover_end_label = Ende @@ -146,6 +142,15 @@ common_severity_fatal = Fatal common_severity_info = Information common_severity_warn = Warnung common_status_attention = Achtung +common_status_avail_disabled = INAKTIV +common_status_avail_disabled_lower = Inaktiv +common_status_avail_down = UNVERFÃGBAR +common_status_avail_down_lower = UnverfÃŒgbar +##common_status_avail_group_empty = EMPTY +common_status_avail_group_mixed = GEMISCHT +##common_status_avail_unknown = UNKNOWN +common_status_avail_up = VERFÃGBAR +common_status_avail_up_lower = VerfÃŒgbar common_status_canceled = Abgebrochen common_status_deferred = VerzÃ¶gert common_status_failed = Fehlgeschlagen @@ -466,10 +471,6 @@ filter_from_date = Von filter_to_date = Bis group_tree_groupOfResourceType = Gruppe von [{0}] group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource -pie_chart_availability_summary_disabled = Inaktiv -pie_chart_availability_summary_down = UnverfÃŒgbar -pie_chart_availability_summary_label = VerfÃŒgbarkeit -pie_chart_availability_summary_up = VerfÃŒgbar util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin) util_errorHandler_nullException = Exception war null ##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. @@ -905,11 +906,6 @@ view_alert_definition_condition_editor_availabilityDuration = Dauer der VerfÃŒgb view_alert_definition_condition_editor_availabilityDuration_tooltip = Geben Sie die Ãnderung der VerfÃŒgbarkeit und die LÃ€nge der Dauer des Zustandes an damit die Bedingung zutrifft. Die Dauer ist in Minuten und sollte lang genug sein (mehrere Minuten), um dem Agent Zeit zugeben eine potentielle Ãnderung des Zustands zu erkennen. view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = Die Anzahl der Minuten in der die Ressource die gegeben VerfÃŒgbarkeit haben muss, bevor die Bedingung zutrifft. view_alert_definition_condition_editor_availability_tooltip = Geben Sie die Ãnderung des VerfÃŒgbarkeitszustandes an, um die Bedingung auszulÃ¶sen. -view_alert_definition_condition_editor_availability_value = VerfÃŒgbarkeit -view_alert_definition_condition_editor_avilability_option_down = Wird unverfÃŒgbar -view_alert_definition_condition_editor_avilability_option_up = Wird verfÃŒgbar -view_alert_definition_condition_editor_avilability_tooltip = Geben Sie die Ãnderung der VerfÃŒgbarkeit an, die die Bedingung auslÃ¶sen soll. -view_alert_definition_condition_editor_avilability_value = VerfÃŒgbarkeit view_alert_definition_condition_editor_common_avg = Durchschnitt view_alert_definition_condition_editor_common_baseUnits = Basiseinheit view_alert_definition_condition_editor_common_baseUnits_availableUnits = VerfÃŒgbare Einheiten: @@ -1901,17 +1897,11 @@ view_reports_subsystems = Subsysteme ##view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups. ##view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. view_resource_inventory_childhistory_filterTitle = Letzte N Tage -view_resource_monitor_availability_availability = VerfÃŒgbarkeit -view_resource_monitor_availability_availability_tooltip = Prozentsatz der Zeit in der die Ressource verfÃŒgbar war verglichen mit der Zeit in der sie nicht verfÃŒgbar war view_resource_monitor_availability_currentAsOf = Die angezeigten Daten sind Stand {0} view_resource_monitor_availability_currentStatus = Aktueller Stand view_resource_monitor_availability_currentStatus_value = Die Ressource ist seit {1} [{0}] -view_resource_monitor_availability_disabled = Deaktiviert view_resource_monitor_availability_disabledTime = Zeit deaktiviert view_resource_monitor_availability_disabledTime_tooltip = Die aufsummierte Zeit in der die Ressource deaktiviert war -view_resource_monitor_availability_disabled_tooltip = Prozentsatz der Zeit in der die Ressource deaktiviert war verglichen mit der Zeit in der sie verfÃŒgbar oder nicht verfÃŒgbar war -view_resource_monitor_availability_down = Ncht-verfÃŒgbar -view_resource_monitor_availability_down_tooltip = Prozentsatz der Zeit in der die Ressource nicht verfÃŒgbar war verglichen mit der Zeit in der sie verfÃŒgbar oder deaktiviert war view_resource_monitor_availability_downtime = Downtime view_resource_monitor_availability_downtime_tooltip = Die aufsummierte Zeit in der die Ressource nicht verfÃŒgbar war view_resource_monitor_availability_loadFailed = Konnte den Verlauf der VerfÃŒgbarkeit nicht laden @@ -1924,6 +1914,9 @@ view_resource_monitor_availability_numDisabled_tooltip = Summe der Deaktivierune view_resource_monitor_availability_numFailures = Anahl Fehler view_resource_monitor_availability_numFailures_tooltip = Anzahl der ÃbergÃ€ng der Ressource in den Zusatand ''unverfÃŒgbar'' view_resource_monitor_availability_summaryError = Konnte die Zusammenfassung der VerfÃŒgbarkeit nicht laden +view_resource_monitor_availability_tooltip_disabled = Prozentsatz der Zeit in der die Ressource deaktiviert war verglichen mit der Zeit in der sie verfÃŒgbar oder nicht verfÃŒgbar war +view_resource_monitor_availability_tooltip_down = Prozentsatz der Zeit in der die Ressource nicht verfÃŒgbar war verglichen mit der Zeit in der sie verfÃŒgbar oder deaktiviert war +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_unknown = Die VerfÃŒgbarkeit war fÃŒr {0} unbekannt view_resource_monitor_availability_uptime = Uptime view_resource_monitor_availability_uptime_tooltip = Aufsummierte Zeit in der die Ressource verfÃŒgbar war @@ -1994,7 +1987,6 @@ view_table_totalRows = Anzahl EintrÃ€ge: {0} AusgewÃ€hlt: {1} view_table_totalRowsUnknown = Gesamtanzahl Zeilen\: ? view_tabs_common_activity = AktivitÃ€t view_tabs_common_agent = Agent -view_tabs_common_availability = VerfÃŒgbarkeit ##view_tabs_common_calltime = Calltime view_tabs_common_child_history = Verlauf d. Kind-Ressourcen view_tabs_common_child_resources = Kind-Ressourcen 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 56190d2..48ee335 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 @@ -145,6 +145,15 @@ common_severity_fatal = èŽåœç common_severity_info = æå ± common_severity_warn = èŠå ##common_status_attention = æå +##common_status_avail_disabled = DISABLED +common_status_avail_disabled_lower = ç¡å¹å +##common_status_avail_down = DOWN +##common_status_avail_down_lower = Down +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = ãã£ã³ã»ã« common_status_deferred = å»¶æ common_status_failed = å€±æ @@ -464,10 +473,6 @@ filter_from_date = éå§ filter_to_date = çµäº ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã ''{2}'' ãªãœãŒã¹ãæã£ãŠããŸã -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = èŠªã®åç¥ : util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³) util_errorHandler_nullException = äŸå€ã¯ null ã§ãã @@ -963,7 +968,6 @@ view_alert_definition_condition_editor_availabilityDuration = ã¢ãã€ã©ããª view_alert_definition_condition_editor_availabilityDuration_tooltip = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãããªã¬ãŒããããã«ä¿åãããŠããªããã°ãªããªãã¢ãã€ã©ããªãã£ç¶æã®å€åãšééãæå®ããŸãããã®ééã¯ååäœã§æå®ãããŸãããšãŒãžã§ã³ããã¢ãã€ã©ããªãã£ç¶æã®å€æŽãæ€åºããŠåé¡ãä¿®æ£ã§ããããã«ããããã«ã¯ããšãŒãžã§ã³ãã«æå®ããæéãšããŠã¯ãæ°åãšããé·ãã§ååã§ãã view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = ã¢ãã€ã©ããªãã£ã®æ¡ä»¶ãæºããããã«ãªãœãŒã¹ãæå®ãããã¢ãã€ã©ããªãã£ã«ãªãå¿èŠãããæéã®é·ãïŒå)ã§ãã view_alert_definition_condition_editor_availability_tooltip = æ¡ä»¶ã®ããªã¬ãŒãšãªãã¢ãã€ã©ããªãã£ç¶æã®å€åãæå®ããŸã -view_alert_definition_condition_editor_availability_value = ã¢ãã€ã©ããªãã£ view_alert_definition_condition_editor_common_avg = å¹³å ##view_alert_definition_condition_editor_common_baseUnits = Base Units ##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: @@ -2025,17 +2029,11 @@ view_resource_inventory_childhistory_deletedChild = åé€ãããå view_resource_inventory_childhistory_filterTitle = éå» N æ¥ view_resource_inventory_childhistory_status_invalidArtifact = äžæ£ãªçæç© view_resource_inventory_childhistory_status_invalidConfig = äžæ£ãªæ§æ -view_resource_monitor_availability_availability = ã¢ãã€ã©ããªãã£ -view_resource_monitor_availability_availability_tooltip = ãªãœãŒã¹ãèµ·åããŠããæéãåæ¢ãç¡å¹ã®æéãšæ¯èŒããããŒã»ã³ããŒãž view_resource_monitor_availability_currentAsOf = ãã®ããŒã¿ã¯ {0} ã®çŸåšã®ãã®ã§ãã view_resource_monitor_availability_currentStatus = çŸåšã®ã¹ããŒã¿ã¹ view_resource_monitor_availability_currentStatus_value = ãã®ãªãœãŒã¹ã¯ {1} ãã {0} ã®ç¶æã®ãŸãŸã§ã -view_resource_monitor_availability_disabled = ç¡å¹å view_resource_monitor_availability_disabledTime = ç¡å¹åãããæé view_resource_monitor_availability_disabledTime_tooltip = ãªãœãŒã¹ãDISABLEDç¶æã§ããçŽ¯ç©æé -view_resource_monitor_availability_disabled_tooltip = ãªãœãŒã¹ãDISABLEDã§ããæéãèµ·åãåæ¢ã®æéãšæ¯èŒããããŒã»ã³ããŒãž -view_resource_monitor_availability_down = åæ¢ -view_resource_monitor_availability_down_tooltip = ãªãœãŒã¹ãDOWNããŠããæéãèµ·åãç¡å¹åã®æéãšæ¯èŒããããŒã»ã³ããŒãž view_resource_monitor_availability_downtime = åæ¢æé view_resource_monitor_availability_downtime_tooltip = ãªãœãŒã¹ãDOWNç¶æã§ããçŽ¯ç©æé view_resource_monitor_availability_loadFailed = ã¢ãã€ã©ããªãã£å±¥æŽã®ããŒãã«å€±æããŸãã @@ -2048,6 +2046,9 @@ view_resource_monitor_availability_numDisabled_tooltip = ãªãœãŒã¹ãDISABLED view_resource_monitor_availability_numFailures = éå®³æ° view_resource_monitor_availability_numFailures_tooltip = ãªãœãŒã¹ãDOWNç¶æã«å¥ã£ãåæ°ã®åèš view_resource_monitor_availability_summaryError = ãªãœãŒã¹ã¢ãã€ã©ããªãã£ã®ãµããªãããŒãããã®ã«å€±æããŸãã +view_resource_monitor_availability_tooltip_disabled = ãªãœãŒã¹ãDISABLEDã§ããæéãèµ·åãåæ¢ã®æéãšæ¯èŒããããŒã»ã³ããŒãž +view_resource_monitor_availability_tooltip_down = ãªãœãŒã¹ãDOWNããŠããæéãèµ·åãç¡å¹åã®æéãšæ¯èŒããããŒã»ã³ããŒãž +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_unknown = ãã®ãªãœãŒã¹ã¯ {0} ã®éã¯æªç¥ã®ç¶æã§ããã view_resource_monitor_availability_uptime = èµ·åæé view_resource_monitor_availability_uptime_tooltip = ãªãœãŒã¹ãUPç¶æã§ããçŽ¯ç©æé @@ -2119,7 +2120,6 @@ view_table_totalRows = åèšè¡: {0} (éžææžã¿: {1}) view_table_totalRowsUnknown = è¡ã®åèš: ? view_tabs_common_activity = ã¢ã¯ãã£ããã£ view_tabs_common_agent = ãšãŒãžã§ã³ã -view_tabs_common_availability = ã¢ãã€ã©ããªãã£ view_tabs_common_calltime = åŒã³åºãæée view_tabs_common_child_history = åã®å±¥æŽ view_tabs_common_child_resources = åãªãœãŒã¹ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 8b1dba8..b575000 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -138,6 +138,15 @@ common_severity_error = ìë¬ common_severity_info = ì ë³Ž common_severity_warn = ê²œê³ ##common_status_attention = ì±ê³µ +##common_status_avail_disabled = DISABLED +common_status_avail_disabled_lower = ë¹íì±í +##common_status_avail_down = DOWN +common_status_avail_down_lower = ì ì§ +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = ì·šì common_status_deferred = ì°êž° common_status_failed = ì€íš @@ -421,10 +430,6 @@ favorites_resources = ìŠê²šì°Ÿêž° ëŠ¬ìì€ filter_from_date = ìì group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} ì€ {0} ê·žë£¹ ë©€ë²ê° ''{2}'' ììì ê°ì§ê³ ììµëë€. -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = ë¶ëªšì ì¡°ì: util_errorHandler_nullException = ììžë nullìŽììµëë€. util_monitoringRequestCallback_error_checkServerStatusFailure = ë¡ê·žìž ìíë¥Œ íìží ì ììµëë€ - ìë²ì ìíë¥Œ íìžíììì @@ -864,7 +869,6 @@ view_alert_definition_condition_editor_availabilityDuration = ê°ì©ì± ê°ê²© view_alert_definition_condition_editor_availabilityDuration_tooltip = ê°ì©ì± ì¡°ê±Žì ížëŠ¬ê±°íêž° ìíŽ ì ì¥ëìŽ ììŽìŒíë€. ê°ì©ì± ìíì ë³íì ê°ê²©ì ì§ì í©ëë€. ê·ž ê°ê²©ì ë¶ëšìë¡ ì§ì ë©ëë€. ììŽì íž ê°ì©ì± ìíì ë³íë¥Œ ê°ì§íê³ ë¬žì ë¥Œ íŽê²°í ì ìëë¡ íêž° ìíŽìë ììŽì ížì ì§ì íë ìê°ì ëª ë¶ êžžìŽë¡ ì¶©ë¶í©ëë€. view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = ì¡°ê±ŽìŽ ì¶©ì¡±ëêž° ì ì ë¶ì ìë ëŠ¬ìì€ê° ì£ŒìŽì§ ê°ì©ì±ì ììŽìŒí©ëë€. view_alert_definition_condition_editor_availability_tooltip = ì¡°ê±Ž ížëŠ¬ê±°íë ê°ì©ì± ìíì ë³íë¥Œ ì§ì í©ëë€. -view_alert_definition_condition_editor_availability_value = ê°ì©ì± view_alert_definition_condition_editor_common_avg = íê· ##view_alert_definition_condition_editor_common_baseUnits = Base Units ##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: @@ -1726,14 +1730,9 @@ view_resource_inventory_childhistory_deletedChild = ìì ë ì view_resource_inventory_childhistory_filterTitle = ê³Œê±° N ìŒ view_resource_inventory_childhistory_status_invalidArtifact = ìëª»ë ìì±ë¬Œ view_resource_inventory_childhistory_status_invalidConfig = ìëª»ë êµ¬ì± -view_resource_monitor_availability_availability = ê°ì©ì± -view_resource_monitor_availability_availability_tooltip = ìê°ì ë¹ìšì ëŠ¬ìì€ UPê° ëŽë € ìê°ì ë¹íŽ ì¬ì© ì€ì§ëììµëë€ view_resource_monitor_availability_currentStatus = íì¬ ìí -view_resource_monitor_availability_disabled = ë¹íì±í view_resource_monitor_availability_disabledTime = ë¹íì±í ë ìê° view_resource_monitor_availability_disabledTime_tooltip = ëŠ¬ìì€ê° DISABLED ìíë¡ ììë ëì ìê° -view_resource_monitor_availability_down = ì ì§ -view_resource_monitor_availability_down_tooltip = ëŠ¬ìì€ê° DOWNíê³ ìê°ì ììíê±°ë ì€ì§ìí¬ ìê°ê³Œ ë¹êµí ë°±ë¶ìš view_resource_monitor_availability_downtime = ì ì§ìê° view_resource_monitor_availability_downtime_tooltip = ëŠ¬ìì€ê° DOWN ìíë¡ ìë ëì ìê° view_resource_monitor_availability_loadFailed = ê°ì©ì± êž°ë¡ ë¡ëì ì€íšíìµëë€ @@ -1746,6 +1745,9 @@ view_resource_monitor_availability_numDisabled_tooltip = ëŠ¬ìì€ê° DISABLED view_resource_monitor_availability_numFailures = ì¥ì ì view_resource_monitor_availability_numFailures_tooltip = ëŠ¬ìì€ê° DOWN ìíì ë€ìŽê° íì view_resource_monitor_availability_summaryError = ëŠ¬ìì€ ê°ì©ì± ììœì ë¡ëíëë° ì€íšíìµëë€ +##view_resource_monitor_availability_tooltip_disabled = Percentage of time the resource has been DISABLED compared to the times it was up and down +view_resource_monitor_availability_tooltip_down = ëŠ¬ìì€ê° DOWNíê³ ìê°ì ììíê±°ë ì€ì§ìí¬ ìê°ê³Œ ë¹êµí ë°±ë¶ìš +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled view_resource_monitor_availability_unknown = ìŽ ëŠ¬ìì€ë {0} ì¬ìŽë ì ì ìë ìíì ììµëë€ view_resource_monitor_availability_uptime = ìììê° view_resource_monitor_availability_uptime_tooltip = ëŠ¬ìì€ê° UP ìíë¡ ìë ëì ìê° @@ -1809,7 +1811,6 @@ view_table_totalRows = ì ì²Ž í: {0} (ì íëš: {1}) view_table_totalRowsUnknown = ì ì²Ž í: ? view_tabs_common_activity = íë view_tabs_common_agent = ììŽì íž -view_tabs_common_availability = ê°ì©ì± view_tabs_common_calltime = ížì¶ ìê° view_tabs_common_child_history = ìì ëŽì view_tabs_common_child_resources = ìì ëŠ¬ìì€ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 449d904..dbf2c54 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -142,6 +142,15 @@ common_severity_error = Erro ##common_severity_info = Info ##common_severity_warn = Warn ##common_status_attention = Sucesso +##common_status_avail_disabled = DISABLED +##common_status_avail_disabled_lower = Disabled +##common_status_avail_down = DOWN +##common_status_avail_down_lower = Down +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = Cancelado common_status_deferred = Deferido common_status_failed = Falha @@ -470,10 +479,6 @@ favorites_resources = Recursos Favoritos ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Ancestral para: util_errorHandler_nullException = Exce\u00E7\u00E3o nula util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor. @@ -973,7 +978,6 @@ view_alert_common_tab_recovery = Recupera\u00E7\u00E3o ##view_alert_definition_condition_editor_availabilityDuration_tooltip = Specify the availability state change and the duration that state must persist in order to trigger the condition. The duration should be long enough (several minutes) to give the agent time to detect another availability state change that may correct the problem. ##view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = The amount of time the resource must be at the given availability state before the condition is met. view_alert_definition_condition_editor_availability_tooltip = Especifica a mudan\u00E7a de estado na disponibilidade do recurso que ir\u00E1 disparar a condi\u00E7\u00E3o. -view_alert_definition_condition_editor_availability_value = Disponibilidade view_alert_definition_condition_editor_common_avg = M\u00E9dio ##view_alert_definition_condition_editor_common_baseUnits = Base Units ##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: @@ -2138,17 +2142,11 @@ view_resource_inventory_childhistory_deletedChild = Deleted Child view_resource_inventory_childhistory_filterTitle = Past N Days view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact view_resource_inventory_childhistory_status_invalidConfig = Invalid Configuration -##view_resource_monitor_availability_availability = Availability -##view_resource_monitor_availability_availability_tooltip = Percentage of time the resource has been UP compared to the times it was down and disabled ##view_resource_monitor_availability_currentAsOf = This data is current as of {0} ##view_resource_monitor_availability_currentStatus = Current Status ##view_resource_monitor_availability_currentStatus_value = This resource has been {0} since {1} -##view_resource_monitor_availability_disabled = Disabled ##view_resource_monitor_availability_disabledTime = Disabled Time ##view_resource_monitor_availability_disabledTime_tooltip = The cumulative amount of time the resource has been DISABLED -##view_resource_monitor_availability_disabled_tooltip = Percentage of time the resource has been DISABLED compared to the times it was up and down -##view_resource_monitor_availability_down = Down -##view_resource_monitor_availability_down_tooltip = Percentage of time the resource has been DOWN compared to the times it was up and disabled ##view_resource_monitor_availability_downtime = Downtime ##view_resource_monitor_availability_downtime_tooltip = The cumulative amount of time the resource has been DOWN view_resource_monitor_availability_loadFailed = Failed to load availability history @@ -2161,6 +2159,9 @@ view_resource_monitor_availability_loadFailed = Failed to load availability hist ##view_resource_monitor_availability_numFailures = Number of Failures ##view_resource_monitor_availability_numFailures_tooltip = The total number of times this resource has entered the DOWN state ##view_resource_monitor_availability_summaryError = Failed to load resource availability summary +##view_resource_monitor_availability_tooltip_disabled = Percentage of time the resource has been DISABLED compared to the times it was up and down +##view_resource_monitor_availability_tooltip_down = Percentage of time the resource has been DOWN compared to the times it was up and disabled +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled ##view_resource_monitor_availability_unknown = This resource was in an unknown state for {0} ##view_resource_monitor_availability_uptime = Uptime ##view_resource_monitor_availability_uptime_tooltip = The cumulative amount of time the resource has been UP @@ -2232,7 +2233,6 @@ view_table_matchingRows = Matching Rows: {0} (selected: {1}) view_table_totalRows = Total de Linhas: {0} (selecionada: {1}) view_tabs_common_activity = Atividade view_tabs_common_agent = Agente -view_tabs_common_availability = Disponibilidade view_tabs_common_calltime = Calltime view_tabs_common_child_history = Child History view_tabs_common_child_resources = Child Resources diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 642ca03..74af988 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2265,6 +2265,15 @@ common_severity_fatal = Ð€Ð°ÑÐ°Ð»ÑÐœÑÐ¹ common_severity_info = ÐÐœÑÐŸÑÐŒÐ°ÑÐžÑ common_severity_warn = ÐÑÐµÐŽÑÐ¿ÑÐµÐ¶ÐŽÐµÐœÐžÐµ ##common_status_attention = Ð£ÑÐ¿ÐµÑÐœÑÐ¹ +##common_status_avail_disabled = DISABLED +##common_status_avail_disabled_lower = Disabled +##common_status_avail_down = DOWN +##common_status_avail_down_lower = Down +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = ÐÑÐŒÐµÐœÑÐœ common_status_deferred = ÐÑÐ»ÐŸÐ¶ÐµÐœÐœÑÐ¹ common_status_failed = ÐÐµÐ·ÑÑÐ¿ÐµÑÐœÐŸ @@ -2565,10 +2574,6 @@ favorites_resources = ÐÐ·Ð±ÑÐ°ÐœÐœÑÐµ ÑÐµÑÑÑÑÑ filter_from_date = ÐÑ filter_to_date = ÐÐŸ group_tree_partialClusterTooltip = {0} ÐžÐ· {1} ÑÐ»ÐµÐœÐŸÐ² Ð³ÑÑÐ¿Ð¿Ñ ÐžÐŒÐµÑÑ ÑÐµÑÑÑÑ ''{2}'' -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_errorHandler_nullException = ÐÐŸÐ·ÐœÐžÐºÐ»ÐŸ null ÐžÑÐºÐ»ÑÑÐµÐœÐžÐµ util_monitoringRequestCallback_error_checkServerStatusFailure = ÐÐµ ÑÐŽÐ°ÐµÑÑÑ ÐŸÐ¿ÑÐµÐŽÐµÐ»ÐžÑÑ ÑÑÐ°ÑÑÑ Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÐžÐž - Ð¿ÑÐŸÐ²ÐµÑÑÑÐµ ÑÐŸÑÑÐŸÑÐœÐžÐµ ÑÐµÑÐ²ÐµÑÐ°. ##util_userPerm_loadFailBundle = Failed to load your permissions for Bundle with id [{0}] - none granted. @@ -2776,6 +2781,7 @@ view_admin_systemSettings_LDAPBaseDN_name = ÐÐŸÐžÑÐº Ð² Ð±Ð°Ð·Ðµ view_admin_systemSettings_LDAPBindDN_name = ÐÐŒÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ view_admin_systemSettings_LDAPBindPW_name = ÐÐ°ÑÐŸÐ»Ñ ##view_alert_common_tab_conditions_type_metric_trait_matching = with trait value matching +##view_alert_definition_condition_editor_availabilityDuration = Availability Duration ##view_alert_definition_condition_editor_common_regex = Regular Expression ##view_alert_definition_condition_editor_metric_trait_regexTooltip = If specified, this is a regular expression that must match the new trait value in order to trigger the condition. ##view_alert_details_field_resource_ancestry = Resource Ancestry @@ -2868,6 +2874,10 @@ view_group_detail_implicitAvail = Group availability for all members (includes r ##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}]. ##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1} ##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items. +##view_resource_monitor_availability_tooltip_disabled = Percentage of time the resource has been DISABLED compared to the times it was up and down +##view_resource_monitor_availability_tooltip_down = Percentage of time the resource has been DOWN compared to the times it was up and disabled +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled +##view_resource_monitor_availability_unknown = This resource was in an unknown state for {0} ##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box. ##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry. ##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index ba0a488..737e471 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -142,6 +142,15 @@ common_severity_fatal = \u4e25\u91cd common_severity_info = \u4fe1\u606f common_severity_warn = \u8b66\u544a ##common_status_attention = \u6210\u529f +##common_status_avail_disabled = DISABLED +##common_status_avail_disabled_lower = Disabled +##common_status_avail_down = DOWN +##common_status_avail_down_lower = Down +##common_status_avail_group_empty = EMPTY +##common_status_avail_group_mixed = MIXED +##common_status_avail_unknown = UNKNOWN +##common_status_avail_up = UP +common_status_avail_up_lower = Up common_status_canceled = \u53d6\u6d88 common_status_deferred = \u5ef6\u671f common_status_failed = \u5931\u8d25 @@ -459,10 +468,6 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939 ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90 -##pie_chart_availability_summary_disabled = Disabled -##pie_chart_availability_summary_down = Down -##pie_chart_availability_summary_label = Availability -##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = \u5f02\u5e38\u662f null util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001. @@ -959,7 +964,6 @@ view_alert_common_tab_recovery = \u8fd8\u539f ##view_alert_definition_condition_editor_availabilityDuration_tooltip = Specify the availability state change and the duration that state must persist in order to trigger the condition. The duration should be long enough (several minutes) to give the agent time to detect another availability state change that may correct the problem. ##view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = The amount of time the resource must be at the given availability state before the condition is met. view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. -view_alert_definition_condition_editor_availability_value = \u53ef\u7528\u6027 view_alert_definition_condition_editor_common_avg = \u5e73\u5747 ##view_alert_definition_condition_editor_common_baseUnits = Base Units ##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: @@ -2028,17 +2032,11 @@ view_resource_inventory_childhistory_deletedChild = \u5220\u9664\u5b50 view_resource_inventory_childhistory_filterTitle = \u8fc7\u53bbN\u5929 view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact view_resource_inventory_childhistory_status_invalidConfig = \u65e0\u6548\u914d\u7f6e -##view_resource_monitor_availability_availability = Availability -##view_resource_monitor_availability_availability_tooltip = Percentage of time the resource has been UP compared to the times it was down and disabled ##view_resource_monitor_availability_currentAsOf = This data is current as of {0} ##view_resource_monitor_availability_currentStatus = Current Status ##view_resource_monitor_availability_currentStatus_value = This resource has been {0} since {1} -##view_resource_monitor_availability_disabled = Disabled ##view_resource_monitor_availability_disabledTime = Disabled Time ##view_resource_monitor_availability_disabledTime_tooltip = The cumulative amount of time the resource has been DISABLED -##view_resource_monitor_availability_disabled_tooltip = Percentage of time the resource has been DISABLED compared to the times it was up and down -##view_resource_monitor_availability_down = Down -##view_resource_monitor_availability_down_tooltip = Percentage of time the resource has been DOWN compared to the times it was up and disabled ##view_resource_monitor_availability_downtime = Downtime ##view_resource_monitor_availability_downtime_tooltip = The cumulative amount of time the resource has been DOWN view_resource_monitor_availability_loadFailed = \u52a0\u8f7d\u53ef\u7528\u6027\u5386\u53f2\u8bb0\u5f55\u5931\u8d25 @@ -2051,6 +2049,9 @@ view_resource_monitor_availability_loadFailed = \u52a0\u8f7d\u53ef\u7528\u6027\u ##view_resource_monitor_availability_numFailures = Number of Failures ##view_resource_monitor_availability_numFailures_tooltip = The total number of times this resource has entered the DOWN state ##view_resource_monitor_availability_summaryError = Failed to load resource availability summary +##view_resource_monitor_availability_tooltip_disabled = Percentage of time the resource has been DISABLED compared to the times it was up and down +##view_resource_monitor_availability_tooltip_down = Percentage of time the resource has been DOWN compared to the times it was up and disabled +##view_resource_monitor_availability_tooltip_up = Percentage of time the resource has been UP compared to the times it was down and disabled ##view_resource_monitor_availability_unknown = This resource was in an unknown state for {0} ##view_resource_monitor_availability_uptime = Uptime ##view_resource_monitor_availability_uptime_tooltip = The cumulative amount of time the resource has been UP @@ -2121,7 +2122,6 @@ view_table_matchingRows = \u5339\u914d\u7684\u884c: {0} (\u9009\u4e2d: {1}) view_table_totalRows = \u6240\u6709\u7684\u884c: {0} (\u9009\u4e2d: {1}) view_tabs_common_activity = \u6d3b\u52a8 view_tabs_common_agent = \u4ee3\u7406 -view_tabs_common_availability = \u53ef\u7528\u6027 view_tabs_common_calltime = Calltime view_tabs_common_child_history = \u5b50\u5386\u53f2 view_tabs_common_child_resources = \u5b50\u8d44\u6e90 commit 9b524ee940cd047e59b2c58a3c1d35ce78eab700 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 12 14:48:12 2013 -0400 Add a small comment indicating that this may actually be used although it is not packaged in RHQ. diff --git a/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 index 870d8df..bf1c728 100755 --- a/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 +++ b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 @@ -3,6 +3,8 @@ # chkconfig: 2345 93 25 # description: Starts and stops the JBoss ON agent # +# This file is not packaged as part of standard RHQ. It is available for optional EC2 AMI packaging. +# # processname: java # pidfile: /var/run/rhq-agent.pid commit 6295aaf6cd4b808e0224d12458830f0908065a5b Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Sep 12 16:14:59 2013 +0200 Bug 995088 - Discovery on Solaris 11 (64 bit jdk) results causes an java.lang.ArrayIndexOutOfBoundsException: 1 On Solaris with 64 bit VM (-d64), parent process command line may be empty, and we assumed the command line would always hold 1 element at least Fix tested on Solaris 11.1 with agent and EAP6.1 running on 64 bit server JVMs. The discovery process will set up sensible defaults for the resource plugin configurations. I was able to execute a restart operation successfully. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 4476173..9edfec6 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * 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 and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pluginapi.util; @@ -284,7 +280,9 @@ public class ServerStartScriptDiscoveryUtility { // UNIX: "/bin/sh [options] ./standalone.sh --server-config=standalone-full.xml" // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" - if (serverParentProcessCommandLine.length == 1) { + if (serverParentProcessCommandLine.length == 0 // + // Observed on Solaris with 64 bit VM (-d64): parent process command line may be empty + || serverParentProcessCommandLine.length == 1) { // The command line is an executable with no arguments - there's no way it's a script, so return null. return null; } commit d444a32b131d9c46a6e733355ff5d408fa870675 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Sep 12 16:09:14 2013 +0200 Uncomment ResourceUIBean managed bean declaration to make content pages work again diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml index 7a23e56..f4b8995 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml @@ -26,13 +26,11 @@  -  <managed-bean> <managed-bean-name>ResourceOverviewUIBean</managed-bean-name> commit 741da74f13e3b348eb483fc3c9b3641eb14eb494 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Sep 11 16:25:44 2013 -0400 [Bug 1006577 - cannot assign bundles to bundle group] Apply fine-grained permissions to bundle assignment for a bundle group. It was only driving off the global.manage_bundle_groups permission. Add support top to bottom for getting bundle group perms, from authz bean to gui services/permission loader, to bundle selector, to bundle group view. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 2b0269b..1dd005a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -148,6 +148,11 @@ import org.rhq.core.domain.resource.group.ResourceGroup; + "FROM Bundle b, IN (b.bundleGroups) bg, IN (bg.roles) r, IN (r.subjects) s, IN (r.permissions) p " + "WHERE s = :subject AND b.id = :bundleId AND p = :permission"), + @NamedQuery(name = Subject.QUERY_GET_PERMISSIONS_BY_BUNDLE_GROUP_ID, query = "SELECT DISTINCT p " + + "FROM Role r JOIN r.subjects s JOIN r.permissions p " + + "WHERE r in (SELECT r2 from BundleGroup bg JOIN bg.roles r2 WHERE bg.id = :bundleGroupId) " + + " AND s = :subject "), + @NamedQuery(name = Subject.QUERY_HAS_BUNDLE_GROUP_PERMISSION, query = "SELECT count(r) " + "FROM Role r JOIN r.subjects s JOIN r.permissions p " + "WHERE r in (SELECT r2 from BundleGroup bg JOIN bg.roles r2 WHERE bg.id = :bundleGroupId) " @@ -261,6 +266,7 @@ public class Subject implements Serializable { public static final String QUERY_GET_PERMISSIONS_BY_PRIVATE_GROUP_ID = "Subject.getPermissionsByPrivateGroup"; public static final String QUERY_GET_PERMISSIONS_BY_RESOURCE_ID = "Subject.getPermissionsByResource"; public static final String QUERY_GET_PERMISSIONS_BY_BUNDLE_ID = "Subject.getPermissionsByBundle"; + public static final String QUERY_GET_PERMISSIONS_BY_BUNDLE_GROUP_ID = "Subject.getPermissionsByBundleGroup"; public static final String QUERY_ROLES_BY_RESOURCE_IDS = "Subject.getRolesByResources"; public static final String QUERY_HAS_GLOBAL_PERMISSION = "Subject.hasGlobalPermission"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java index 54d8e23..739aee51 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PermissionsLoader.java @@ -116,6 +116,21 @@ public class PermissionsLoader { }); } + public void loadBundleGroupPermissions(final int bundleGroupId, final PermissionsLoadedListener callback) { + GWTServiceLookup.getAuthorizationService().getBundleGroupPermissions(bundleGroupId, + new AsyncCallback<Set<Permission>>() { + + public void onSuccess(Set<Permission> result) { + callback.onPermissionsLoaded(result); + } + + public void onFailure(Throwable caught) { + processFailure(MSG.util_userPerm_loadFailBundle(String.valueOf(bundleGroupId)), caught); + callback.onPermissionsLoaded(null); // indicate an error by passing in null + } + }); + } + protected void processFailure(String msg, Throwable caught) { this.lastError = caught; EnumSet<Option> options = EnumSet.of(Message.Option.BackgroundJobResult); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java index 034d3e0..6adf0f7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java @@ -24,6 +24,7 @@ import java.util.LinkedHashMap; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.TextItem; @@ -46,13 +47,19 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; public class BundleSelector extends AbstractSelector<Bundle, BundleCriteria> { private BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService(); + private boolean canAssign; + private boolean canUnassign; public BundleSelector() { super(); } - public BundleSelector(ListGridRecord[] initiallyAssigned, boolean isReadOnly) { - super(isReadOnly); + public BundleSelector(ListGridRecord[] initiallyAssigned, boolean canAssign, boolean canUnassign) { + super(!(canAssign || canUnassign)); + + this.canAssign = canAssign; + this.canUnassign = canUnassign; + setAssigned(initiallyAssigned); } @@ -111,4 +118,63 @@ public class BundleSelector extends AbstractSelector<Bundle, BundleCriteria> { return result; } } + + // override to make sure the user doesn't unassign bundles from the group if he has no perms to do so + @Override + public void removeSelectedRows() { + if (canUnassign || null == this.initialSelection) { + super.removeSelectedRows(); + return; + } + + // only allow if removing rows not in the initial selection + String selectorKey = getSelectorKey(); + for (ListGridRecord r : this.initialSelection) { + String initialKey = r.getAttribute(selectorKey); + boolean found = false; + for (ListGridRecord selectedAssignedRecord : this.assignedGrid.getSelectedRecords()) { + if (initialKey.equals(selectedAssignedRecord.getAttribute(selectorKey))) { + found = true; + break; + } + } + if (found) { + SC.warn(MSG.view_bundleGroup_unassignFailPerm()); + return; + } + } + + super.removeSelectedRows(); + } + + // override to make sure the user doesn't assign bundles to the group if he has no perms to do so + @Override + public void addSelectedRows() { + if (canAssign) { + super.addSelectedRows(); + return; + } + + // only allow if assigning rows in the initial selection + String selectorKey = getSelectorKey(); + for (ListGridRecord r : this.availableGrid.getSelectedRecords()) { + String selectedAvailableKey = r.getAttribute(selectorKey); + boolean found = false; + if (null != this.initialSelection) { + for (ListGridRecord initialRecord : this.initialSelection) { + if (selectedAvailableKey.equals(initialRecord.getAttribute(selectorKey))) { + found = true; + break; + } + } + } + if (!found) { + SC.warn(MSG.view_bundleGroup_assignFailPerm()); + return; + } + } + + super.addSelectedRows(); + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupEditView.java index c8473a3..9da0e4c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupEditView.java @@ -36,6 +36,8 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.enterprise.gui.coregui.client.IconEnum; import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener; +import org.rhq.enterprise.gui.coregui.client.PermissionsLoader; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.bundle.BundleSelector; import org.rhq.enterprise.gui.coregui.client.components.form.AbstractRecordEditor; @@ -54,6 +56,10 @@ public class BundleGroupEditView extends AbstractRecordEditor<BundleGroupsDataSo private Tab bundlesTab; private BundleSelector bundleSelector; private Set<Permission> globalPermissions; + private int permissionCheckBundleGroupId = 0; + private boolean canManage; + private boolean canAssign; + private boolean canUnassign; public BundleGroupEditView(Set<Permission> globalPermissions, int bundleGroupId) { super(new BundleGroupsDataSource(), bundleGroupId, MSG.common_title_bundleGroups(), HEADER_ICON); @@ -62,10 +68,46 @@ public class BundleGroupEditView extends AbstractRecordEditor<BundleGroupsDataSo } @Override - public void renderView(ViewPath viewPath) { + public void renderView(final ViewPath viewPath) { + final int bundleGroupId = Integer.parseInt(viewPath.getCurrent().getPath()); + + // if we have already determined permissions for this bundle, just proceed + if (permissionCheckBundleGroupId == bundleGroupId) { + authorizedRenderView(bundleGroupId, viewPath); + return; + } + + // check necessary global permissions + canManage = globalPermissions.contains(Permission.MANAGE_BUNDLE_GROUPS); + canAssign = canManage; + canUnassign = canManage; + + // If the user has global perms to manage bundle groups then proceed, otherwise, we + // need to see what bundle group level perms he has. + if (canManage) { + authorizedRenderView(bundleGroupId, viewPath); + + } else { + new PermissionsLoader().loadBundleGroupPermissions(bundleGroupId, new PermissionsLoadedListener() { + @Override + public void onPermissionsLoaded(Set<Permission> bundleGroupPermissions) { + canAssign = bundleGroupPermissions.contains(Permission.CREATE_BUNDLES_IN_GROUP) + || bundleGroupPermissions.contains(Permission.ASSIGN_BUNDLES_TO_GROUP); + canUnassign = bundleGroupPermissions.contains(Permission.DELETE_BUNDLES_FROM_GROUP) + || bundleGroupPermissions.contains(Permission.UNASSIGN_BUNDLES_FROM_GROUP); + + authorizedRenderView(bundleGroupId, viewPath); + } + }); + } + } + + private void authorizedRenderView(final int bundleGroupId, final ViewPath viewPath) { + permissionCheckBundleGroupId = bundleGroupId; + super.renderView(viewPath); - init(!globalPermissions.contains(Permission.MANAGE_BUNDLE_GROUPS)); + init(!(canManage || canAssign || canUnassign)); } @Override @@ -97,6 +139,11 @@ public class BundleGroupEditView extends AbstractRecordEditor<BundleGroupsDataSo return contentPane; } + @Override + protected boolean isFormReadOnly() { + return !canManage; + } + private Tab buildBundlesTab(TabSet tabSet) { Tab tab = new Tab(MSG.common_title_bundles(), ImageManager.getBundleIcon()); // NOTE: We will set the tab content to the bundle selector later, once the Bundle Group has been fetched. @@ -118,8 +165,7 @@ public class BundleGroupEditView extends AbstractRecordEditor<BundleGroupsDataSo Record[] bundleRecords = record.getAttributeAsRecordArray(BundleGroupsDataSource.FIELD_BUNDLES); ListGridRecord[] bundleListGridRecords = toListGridRecordArray(bundleRecords); - this.bundleSelector = new BundleSelector(bundleListGridRecords, - !globalPermissions.contains(Permission.MANAGE_BUNDLE_GROUPS)); + this.bundleSelector = new BundleSelector(bundleListGridRecords, canAssign, canUnassign); this.bundleSelector.addAssignedItemsChangedHandler(new AssignedItemsChangedHandler() { public void onSelectionChanged(AssignedItemsChangedEvent event) { BundleGroupEditView.this.onItemChanged(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java index 3273b3b..ff146f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java @@ -294,7 +294,7 @@ public class BundleView extends EnhancedVLayout implements BookmarkableView { canTag = globalPermissions.contains(Permission.CREATE_BUNDLES); // If the user has global perms to enable/render any of the views then proceed, otherwise, we - // need to see what group level perms he has. + // need to see what bundle level perms he has. if (canDelete && canDeploy && canTag) { authorizedRenderView(bundleId, viewPath); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java index 7b79d23..b175396 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java @@ -96,6 +96,15 @@ public interface AuthorizationGWTService extends RemoteService { Set<Permission> getBundlePermissions(int bundleId) throws RuntimeException; /** + * Gets the set of permissions that the current user explicitly possesses for the specified {@link org.rhq.core.domain.bundle.BundleGroup}. + * + * @param bundleGroupId the id of some BundleGroup to check permissions against + * + * @return the set of permissions that the current user possesses for the specified {@link org.rhq.core.domain.bundle.BundleGroup} - never null + */ + Set<Permission> getBundleGroupPermissions(int bundleGroupId) throws RuntimeException; + + /** * Returns true if the current user possesses either: 1) the specified bundle permission for *all* of the * specified bundles, or 2) is a system superuser which, by definition, gives full access to all bundles * NOTE: The size of the collection must be less than or equal to 1000 (due to an Oracle limitation). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java index 016ca0c..b79b752 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java @@ -125,4 +125,16 @@ public class AuthorizationGWTServiceImpl extends AbstractGWTServiceImpl implemen throw getExceptionToThrowToClient(t); } } + + @Override + public Set<Permission> getBundleGroupPermissions(int bundleGroupId) throws RuntimeException { + try { + return SerialUtility.prepare( + new HashSet<Permission>(authorizationManager.getBundleGroupPermissions(getSessionSubject(), + bundleGroupId)), "AuthorizationManager.getBundleGroupPermissions"); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + } 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 3145280..c46f7a5 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 @@ -1204,9 +1204,11 @@ view_autoDiscoveryQ_unignoreFailure = Failed to unignore Resources view_autoDiscoveryQ_unignoreInProgress = Unignoring the selected Resources... view_autoDiscoveryQ_unignoreSuccessful = You have successfully unignored the selected Resources. view_autoDiscoveryQ_uninventoried = Uninventoried +view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. view_bundleGroup_deletesFailure = Failed to delete the bundle groups view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = Failed to load bundle version data view_bundle_bundleDeployment = Bundle Deployment view_bundle_bundleDeployments = Bundle Deployments @@ -1422,12 +1424,12 @@ view_configEdit_error_2 = Connection settings are not supported by this Resource view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set. view_configEdit_files = Files view_configEdit_hideAll = Hide All +view_configEdit_invalidListSizeMax = The list should contain {0} row(s) at most +view_configEdit_invalidListSizeMin = The list should contain at least {0} row(s) +view_configEdit_invalidListSizeMinMax = The list should contain a minimum of {0} and a maximum of {1} row(s) view_configEdit_jumpToSection = Jump to Section view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0} -view_configEdit_invalidListSizeMin = The list should contain at least {0} row(s) -view_configEdit_invalidListSizeMax = The list should contain {0} row(s) at most -view_configEdit_invalidListSizeMinMax = The list should contain a minimum of {0} and a maximum of {1} row(s) view_configEdit_msg_1 = Added property [{0}] to the set. view_configEdit_msg_2 = Removed properties from the set. view_configEdit_msg_3 = [{0} {1}] deleted from list. @@ -1821,8 +1823,8 @@ view_inventory_resources_unignoreConfirm = Are you sure you want the selected re view_inventory_resources_unignoreFailed = Failed to unignore resources view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan. -view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources +view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed. view_inventory_servers = Servers diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 5785701..eecdba0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1218,9 +1218,11 @@ view_autoDiscoveryQ_unignoreFailure = NepodaÅilo se odignorovat zdroje view_autoDiscoveryQ_unignoreInProgress = OdignorovÃ¡nÃ vybranÃœch zdrojÅ¯ prÃ¡vÄ probÃhÃ¡... view_autoDiscoveryQ_unignoreSuccessful = VybranÃ© zdroje byly ÃºspÄÅ¡nÄ odignorovÃ¡ny. view_autoDiscoveryQ_uninventoried = OdinventarizovanÃœ +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = NepodaÅilo se naÄÃst data verzÃ balÃkÅ¯ view_bundle_bundleDeployment = NasazenÃ balÃku view_bundle_bundleDeployments = NasazovÃ¡nÃ balÃkÅ¯ @@ -1832,8 +1834,8 @@ view_inventory_resources_members = ÄlenskÃ© zdroje ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. view_inventory_resources_uninventoryConfirm = Chcete opravdu odstranit vybranÃ© zdroje z inventÃ¡Åe? Pozn. pokud odstranÄnÃœ zdroj stÃ¡le existuje, bude znovuobjeven v pÅÃÅ¡tÃ fÃ¡zi skenovÃ¡nÃ agentem. -view_inventory_resources_uninventoryStorageConfirm = ChystÃ¡te se odstranit alespoÅ jeden zdroj, kterÃœ mÅ¯ÅŸe pouÅŸÃvat ÃºloÅŸiÅ¡tÄ. Abyste zabrÃ¡nili moÅŸnÃœm chybÃ¡m v budoucnu, je vhodnÃ© nejprve spustit operaci Undeploy na danÃ©m uzlu. Opravdu si pÅejete na vlastnÃ riziko pokraÄovat? view_inventory_resources_uninventoryFailed = NepodaÅilo se odstranit vybranÃœ zdroj z inventÃ¡Åe +view_inventory_resources_uninventoryStorageConfirm = ChystÃ¡te se odstranit alespoÅ jeden zdroj, kterÃœ mÅ¯ÅŸe pouÅŸÃvat ÃºloÅŸiÅ¡tÄ. Abyste zabrÃ¡nili moÅŸnÃœm chybÃ¡m v budoucnu, je vhodnÃ© nejprve spustit operaci Undeploy na danÃ©m uzlu. Opravdu si pÅejete na vlastnÃ riziko pokraÄovat? view_inventory_resources_uninventorySuccessful = ÃspÄÅ¡nÄ jste odstranili z inventÃ¡Åe vybranÃœ zdroj view_inventory_sectionHelp = Z tÃ©to sekce mohou bÃœt zobrazeny a spravovÃ¡ny novÄ objevenÃ© nebo inventorizovane zdroje a skupiny view_inventory_servers = Servery 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 0ac2a40..ca016f1 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 @@ -1121,9 +1121,11 @@ view_autoDiscoveryQ_unignore = Ignorieren aufheben view_autoDiscoveryQ_unignoreFailure = Konnte das Ignorieren fÃŒr die Ressourcen nicht aufheben. view_autoDiscoveryQ_unignoreSuccessful = Sie haben erfolgreich das Ignorieren der ausgewÃ€hlten Ressourcen aufgehoben. view_autoDiscoveryQ_uninventoried = Aus dem Inventory gelÃ¶scht +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. ##view_bundleVersion_loadFailure = Failed to load bundle version data ##view_bundle_bundleDeployment = Bundle Deployment ##view_bundle_bundleDeployments = Bundle Deployments @@ -1637,8 +1639,8 @@ view_inventory_resources_ignoreSuccessful = Sie haben die ausgewÃ€hlten Ressourc ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. ##view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan. -##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? ##view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources +##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? ##view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources view_inventory_sectionHelp = In diesem Abschnitt kÃ¶nnen neu gefundene Ressourcen, sowie Ressourcen und Gruppen im Inventar angesehen und verwaltet werden. view_inventory_servers = Server @@ -1895,10 +1897,10 @@ view_reports_driftCompliance = Drift-Ãbereinstimmung view_reports_inventorySummary_failFetch = Konnte die Inventar-Zusammenfassung nicht laden view_reports_platforms = Cpu- und Speicherauslastung view_reports_subsystems = Subsysteme -view_resource_inventory_childhistory_filterTitle = Letzte N Tage ##view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups. ##view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups. ##view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. +view_resource_inventory_childhistory_filterTitle = Letzte N Tage view_resource_monitor_availability_availability = VerfÃŒgbarkeit view_resource_monitor_availability_availability_tooltip = Prozentsatz der Zeit in der die Ressource verfÃŒgbar war verglichen mit der Zeit in der sie nicht verfÃŒgbar war view_resource_monitor_availability_currentAsOf = Die angezeigten Daten sind Stand {0} 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 d9ba492..56190d2 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 @@ -1193,9 +1193,11 @@ view_autoDiscoveryQ_unignoreFailure = ãªãœãŒã¹ãç¡èŠè§£é€ã®ã«å€±æã view_autoDiscoveryQ_unignoreInProgress = éžæããããªãœãŒã¹ã®ç¡èŠãè§£é€äžã§ã... view_autoDiscoveryQ_unignoreSuccessful = éžæãããªãœãŒã¹ã®ç¡èŠè§£é€ã«æåããŸãã view_autoDiscoveryQ_uninventoried = ã€ã³ãã³ããªç»é²ãããªã +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = ãã³ãã«ããŒãžã§ã³ããŒã¿ãããŒãããã®ã«å€±æããŸãã view_bundle_bundleDeployment = ãã³ãã«ãããã€ã¡ã³ã view_bundle_bundleDeployments = ãã³ãã«ãããã€ã¡ã³ã @@ -1802,8 +1804,8 @@ view_inventory_resources_members = ã¡ã³ããŒãªãœãŒã¹ ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. view_inventory_resources_uninventoryConfirm = éžæãããªãœãŒã¹ãã¢ã³ã€ã³ãã³ããªããŠãããããã§ãã? ããéžæãããªãœãŒã¹ããŸã ååšããŠãããªãããã®ãšãŒãžã§ã³ãã®æ¬¡åã®ãã£ã¹ã«ããªã¹ãã£ã³ã®éã«ããã¯åçºèŠãããŸãã -##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventoryFailed = éžæããããªãœãŒã¹ã®ã¢ã³ã€ã³ãã³ããªã«å€±æããŸãã +##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventorySuccessful = éžæããããªãœãŒã¹ã®ã¢ã³ã€ã³ãã³ããªã«æåããŸãã view_inventory_sectionHelp = ãã®ã»ã¯ã·ã§ã³ã«ãããŠãæ°èŠã«çºèŠããããªãœãŒã¹ãã€ã³ãã³ããªã«ç»é²ããããªãœãŒã¹ãã°ã«ãŒããå¯Ÿè±¡ãšããè¡šç€ºãšç®¡çããããªãããŸãã view_inventory_servers = ãµãŒããŒ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 4f6b144..8b1dba8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -1069,9 +1069,11 @@ view_autoDiscoveryQ_unignoreFailure = ëŠ¬ìì€ë¥Œ ë¬Žì ìíëë° ì€íší view_autoDiscoveryQ_unignoreInProgress = ì íë ëŠ¬ìì€ë¥Œ ë¬Žì ìíëì€... view_autoDiscoveryQ_unignoreSuccessful = ì íë ëŠ¬ìì€ë¥Œ ë¬Žì ìíëë° ì±ê³µíìµëë€. view_autoDiscoveryQ_uninventoried = ìžë²€í ëŠ¬ íŽì +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = ë²ë€ ë²ì ë°ìŽí°ë¥Œ ë¡ëíëë° ì€íšíìµëë€. view_bundle_bundleDeployment = ë²ë€ ë°°í¬ view_bundle_bundleDeployments = ë²ë€ ë°°í¬ @@ -1552,8 +1554,8 @@ view_inventory_resources_members = ë©€ë² ëŠ¬ìì€ ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. view_inventory_resources_uninventoryConfirm = ì íí ëŠ¬ìì€ë¥Œ ìžë²€í ëŠ¬ìì ì ê±°íìê² ìµëê¹? ë§ìœ ì íí ëŠ¬ìì€ê° ì¡Žì¬íê³ ìë€ë©Ž, ê·ž ììŽì ížì ë€ì ëì€ì»€ë²ëŠ¬ ì€ìº ì¬ìŽì ê·žê²ì ì¬ë°ê²¬ë©ëë€. -##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventoryFailed = ì íë ëŠ¬ìì€ ìžë²€í ëŠ¬ ì ê±°ì ì€íšíìµëë€ +##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventorySuccessful = ì íë ëŠ¬ìì€ì ìžë²€í ëŠ¬ ì ê±°ì ì±ê³µíìµëë€ view_inventory_servers = ìë² view_inventory_serversTop = ìë² - ìµìì ê°ì žì€êž° diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 509f789..449d904 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1206,9 +1206,11 @@ view_autoDiscoveryQ_unignoreFailure = Falha ao reimportar os recursos view_autoDiscoveryQ_unignoreInProgress = Removendo status de recurso ignorado... view_autoDiscoveryQ_unignoreSuccessful = Status de recurso ignorado removido com sucesso para os recursos selecionados. view_autoDiscoveryQ_uninventoried = Removido do invent\u00E1rio +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = Falha ao carregar dados da vers\u00E3o do bundle view_bundle_bundleDeployment = Implanta\u00E7\u00E3o do Bundle view_bundle_bundleDeployments = Implanta\u00E7\u00F5es do Bundle @@ -1829,8 +1831,8 @@ view_inventory_resources_ignoreSuccessful = Os recursos selecionados foram ignor ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. ##view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan. -##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? ##view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources +##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? ##view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed. view_inventory_servers = Servers diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 4b5d99a..642ca03 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2782,9 +2782,11 @@ view_admin_systemSettings_LDAPBindPW_name = ÐÐ°ÑÐŸÐ»Ñ ##view_alert_details_field_watched_resource = Watched Resource ##view_autoDiscoveryQ_field_inventoryStatus = Inventory Status ##view_autoDiscoveryQ_ignore = Ignore +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. ##view_bundle_createWizard_bundleDistro = Bundle Distribution ##view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist. ##view_bundle_createWizard_cancelFailurePerm = Failed to fully cancel the creation of bundle [{0}], version = [{1}] because the user has create but not delete permissions. The bundle will likley need to be removed by an administrator. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index db3229f..ba0a488 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1190,9 +1190,11 @@ view_autoDiscoveryQ_unignoreFailure = Failed to unignore resources view_autoDiscoveryQ_unignoreInProgress = Unignoring the selected Resources... view_autoDiscoveryQ_unignoreSuccessful = \u6210\u529f\u4f7f\u9009\u4e2d\u7684\u8d44\u6e90\u751f\u6548. view_autoDiscoveryQ_uninventoried = Uninventoried +##view_bundleGroup_assignFailPerm = You are not authorized to assign bundles to this bundle group. Please check with your administrator. ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundleGroup_unassignFailPerm = You are not authorized to unassign bundles from this bundle group. Please check with your administrator. view_bundleVersion_loadFailure = \u52a0\u8f7dbundle\u7248\u672c\u6570\u636e\u5931\u8d25 view_bundle_bundleDeployment = Bundle\u53d1\u5e03 view_bundle_bundleDeployments = Bundle\u53d1\u5e03 @@ -1805,8 +1807,8 @@ view_inventory_resources_members = \u6210\u5458\u8d44\u6e90 ##view_inventory_resources_unignoreFailed = Failed to unignore resources ##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources. view_inventory_resources_uninventoryConfirm = \u786e\u5b9a\u628a\u9009\u4e2d\u7684\u8d44\u6e90\u4ece\u6e05\u5355\u4e2d\u5220\u9664? \u6ce8\u610f\uff1a\u5982\u679c\u67d0\u4e2a\u9009\u4e2d\u7684\u8d44\u6e90\u4f9d\u7136\u5b58\u5728, \u5219\u7cfb\u7edf\u4f1a\u5728\u6b64\u8d44\u6e90\u7684\u5ba2\u6237\u7aef\u7a0b\u5e8f\u4e0b\u6b21\u63a2\u7d22\u626b\u63cf\u65f6\u91cd\u65b0\u52a0\u8f7d\u6b64\u8d44\u6e90. -##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventoryFailed = \u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90\u5931\u8d25 +##view_inventory_resources_uninventoryStorageConfirm = You are going to uninventory at least one resource that may be used by the storage cluster. To avoid any errors in the future, you should run undeploy the node prior to the this step. Do you really want to continue on your own risk? view_inventory_resources_uninventorySuccessful = \u6210\u529f\u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90 view_inventory_sectionHelp = \u6b64\u6a21\u5757\u53ef\u4ee5\u67e5\u770b\u548c\u7ba1\u7406\u65b0\u53d1\u73b0\u7684\u8d44\u6e90,\u5206\u7c7b\u7684\u8d44\u6e90\u548c\u7ec4. view_inventory_servers = \u670d\u52a1\u5668 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java index 2c44f43..59245de 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java @@ -220,6 +220,21 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { @Override @SuppressWarnings("unchecked") + public Set<Permission> getBundleGroupPermissions(Subject subject, int bundleGroupId) { + Query query = entityManager.createNamedQuery(Subject.QUERY_GET_PERMISSIONS_BY_BUNDLE_GROUP_ID); + query.setParameter("subject", subject); + query.setParameter("bundleGroupId", bundleGroupId); + List<Permission> intermediate = query.getResultList(); + Set<Permission> results = new HashSet<Permission>(); + for (Permission permission : intermediate) { + results.add(permission); + } + + return results; + } + + @Override + @SuppressWarnings("unchecked") public boolean hasBundlePermission(Subject subject, Permission permission, Collection<Integer> bundleIds) { if (isSystemSuperuser(subject)) { return true; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java index 149e1ee..056ee47 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java @@ -26,6 +26,7 @@ import javax.ejb.Local; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.group.Group; @@ -191,6 +192,16 @@ public interface AuthorizationManagerLocal { Set<Permission> getBundlePermissions(Subject subject, int bundleId); /** + * Gets the set of permissions that the current user explicitly possesses for the specified {@link BundleGroup}. + * + * @param subject the current subject or caller + * @param bundleId the id of some BundleGroup to check permissions against + * + * @return the set of permissions that the current user possesses for the specified {@link BundleGroup} - never null + */ + Set<Permission> getBundleGroupPermissions(Subject subject, int bundleGroupId); + + /** * Returns true if the current user possesses the specified bundle permission for the specified bundle group. * * @param subject the current subject or caller commit 945184cbac040e79e9bcdf5044e9b476d46bdfed Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Sep 11 16:20:36 2013 -0400 Add the root cause to this exception. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java index 2f13b24..40812e3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java @@ -199,7 +199,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal { false); } catch (Throwable t) { throw new AlertDefinitionCreationException("Failed to create child AlertDefinition for Resource[id=" - + resourceId + "] with template " + template.toSimpleString()); + + resourceId + "] with template " + template.toSimpleString(), t); } } } commit b710b0bd19e646b453e2bf535cc2315213472300 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Sep 10 13:17:55 2013 -0700 [BZ 818998] Support configurable refresh interval in new chart implementation. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/RefreshIntervalMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/RefreshIntervalMenu.java new file mode 100644 index 0000000..c9b83f1 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/RefreshIntervalMenu.java @@ -0,0 +1,175 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.components.measurement; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.menu.IMenuButton; +import com.smartgwt.client.widgets.menu.Menu; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; + +/** + * Component to handle the Auto-Refresh Interval Menu. + * @author Mike Thompson + */ +public class RefreshIntervalMenu extends IMenuButton { + private static final Messages MSG = CoreGUI.getMessages(); + + private HashMap<Integer, String> refreshMenuMappings; + private MenuItem[] refreshMenuItems; + private int refreshInterval = 0; + + public RefreshIntervalMenu() { + super(); + Menu refreshMenu = new Menu(); + refreshMenu.setShowShadow(true); + refreshMenu.setShadowDepth(10); + refreshMenu.setAutoWidth(); + refreshMenu.setHeight(15); + com.smartgwt.client.widgets.menu.events.ClickHandler menuClick = new com.smartgwt.client.widgets.menu.events.ClickHandler() { + @Override + public void onClick(MenuItemClickEvent event) { + String selection = event.getItem().getTitle(); + refreshInterval = 0; + if (selection != null) { + for (RefreshSelectItemData item : RefreshSelectItemData.values()) { + if (selection.equals(item.getLabel())) { + refreshInterval = item.getTimeSpanInSeconds(); + } + } + UserSessionManager.getUserPreferences().setPageRefreshInterval(refreshInterval, + new RefreshCallback()); + } + } + }; + + refreshMenuMappings = new HashMap<Integer, String>(); + refreshMenuItems = new MenuItem[RefreshSelectItemData.values().length]; + List<MenuItem> menuItemList = new ArrayList<MenuItem>(RefreshSelectItemData.values().length); + int retrievedRefreshInterval = RefreshSelectItemData.refresh1.getTimeSpanInSeconds(); + if (null != UserSessionManager.getUserPreferences()) { + retrievedRefreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); + } + for (RefreshSelectItemData item : RefreshSelectItemData.values()) { + MenuItem menuItem = new MenuItem(item.getLabel(), ""); + menuItem.addClickHandler(menuClick); + refreshMenuMappings.put(item.getTimeSpanInSeconds(), item.getLabel()); + if (retrievedRefreshInterval == item.getTimeSpanInSeconds()) { + menuItem.setIcon(ImageManager.getAvailabilityIcon(true)); + } + menuItemList.add(menuItem); + } + refreshMenuItems = menuItemList.toArray(new MenuItem[menuItemList.size()]); + + refreshMenu.setItems(refreshMenuItems); + setMenu(refreshMenu); + refreshMenu.setAutoHeight(); + setTitle(MSG.common_title_change_refresh_time()); + setWidth(140); + setShowTitle(true); + setTop(0); + setIconOrientation("left"); + } + + private final class RefreshCallback implements AsyncCallback<Subject> { + public void onSuccess(Subject subject) { + String m; + if (refreshInterval > 0) { + m = MSG.view_dashboards_portlets_refresh_success1(); + } else { + m = MSG.view_dashboards_portlets_refresh_success2(); + } + CoreGUI.getMessageCenter().notify(new Message(m, Message.Severity.Info)); + updateRefreshMenu(); + } + + public void onFailure(Throwable throwable) { + String m; + if (refreshInterval > 0) { + m = MSG.view_dashboards_portlets_refresh_fail1(); + } else { + m = MSG.view_dashboards_portlets_refresh_fail2(); + } + CoreGUI.getMessageCenter().notify(new Message(m, Message.Severity.Error)); + // Revert back to our original favorite status, since the server update failed. + updateRefreshMenu(); + } + } + + private void updateRefreshMenu() { + if (refreshMenuItems != null) { + int retrievedRefreshInterval = RefreshSelectItemData.refresh1.getTimeSpanInSeconds(); + if (null != UserSessionManager.getUserPreferences()) { + retrievedRefreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); + } + String currentSelection = refreshMenuMappings.get(retrievedRefreshInterval); + if (currentSelection != null) { + //iterate over menu items and update icon details + for (int i = 0; i < refreshMenuItems.length; i++) { + MenuItem menu = refreshMenuItems[i]; + if (currentSelection.equals(menu.getTitle())) { + menu.setIcon(ImageManager.getAvailabilityIcon(true)); + } else { + menu.setIcon(""); + } + refreshMenuItems[i] = menu; + } + //update the menu + getMenu().setItems(refreshMenuItems); + } + } + markForRedraw(); + } + + private enum RefreshSelectItemData { + + stop(MSG.view_dashboards_portlets_refresh_none(), 0), + refresh1(MSG.view_dashboards_portlets_refresh_one_min(), 60000), + refresh5(MSG.view_dashboards_portlets_refresh_multiple_min(String.valueOf(5)), 5 * 60000), + refresh10(MSG.view_dashboards_portlets_refresh_multiple_min(String.valueOf(10)), 10 * 60000); + + private final String label; + private final Integer timeSpanInSeconds; + + RefreshSelectItemData(String label, Integer timeSpanInSeconds) { + this.label = label; + this.timeSpanInSeconds = timeSpanInSeconds; + } + + private String getLabel() { + return label; + } + + private Integer getTimeSpanInSeconds() { + return timeSpanInSeconds; + } + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 50d752e..9f86c1e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -19,8 +19,10 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph; import java.util.Date; +import java.util.HashMap; import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.FormErrorOrientation; import com.smartgwt.client.types.SelectionType; import com.smartgwt.client.types.VerticalAlignment; @@ -36,11 +38,19 @@ import com.smartgwt.client.widgets.form.fields.DateItem; import com.smartgwt.client.widgets.form.fields.RowSpacerItem; import com.smartgwt.client.widgets.form.fields.TimeItem; import com.smartgwt.client.widgets.layout.HLayout; +import com.smartgwt.client.widgets.menu.IMenuButton; +import com.smartgwt.client.widgets.menu.Menu; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; import com.smartgwt.client.widgets.toolbar.ToolStrip; +import org.rhq.core.domain.auth.Subject; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.RefreshIntervalMenu; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -60,12 +70,12 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { private MeasurementUserPreferences measurementUserPreferences; private Refreshable d3GraphListView; - private static final Messages MSG = CoreGUI.getMessages(); private Label dateRangeLabel; private static final DateTimeFormat fmt = DateTimeFormat.getFormat(MSG.common_buttonbar_datetime_format()); private DateTimeButtonBarClickHandler dateTimeButtonBarClickHandler; private AbstractMeasurementRangeEditor.MetricRangePreferences prefs; final private ButtonBarDateTimeRangeEditor self; + private RefreshIntervalMenu refreshIntervalMenu; public ButtonBarDateTimeRangeEditor(MeasurementUserPreferences measurementUserPrefs, Refreshable d3GraphListView) { @@ -122,10 +132,13 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { toolStrip.addMember(dateRangeLabel); toolStrip.addSpacer(20); + refreshIntervalMenu = new RefreshIntervalMenu(); + toolStrip.addMember(refreshIntervalMenu); addMember(toolStrip); } + public void redrawGraphs() { d3GraphListView.refreshData(); } 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 e94b453..3145280 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 @@ -1481,13 +1481,13 @@ view_dashboard_favorites_error1 = Failed to load favorite Resources. view_dashboardsManager_error1 = Failed to add new dashboard view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>This dashboard can be edited by clicking the (Edit Mode) button above.</p>\n<p>What would you like to do?</p>\n<p>  <a href=\"{1}\">Import newly discovered resources.</a></p>\n<p>  <a href=\"{2}\">Search for resources.</a></p>\n<p>  <a href=\"{3}\">See help and documentation.</a></p> view_dashboards_confirm1 = Are you sure you want to delete -view_dashboards_portlets_refresh_fail1 = Failed to update interval for portlets that auto-refresh -view_dashboards_portlets_refresh_fail2 = Failed to disable reload for portlets that auto-refresh +view_dashboards_portlets_refresh_fail1 = Failed to update auto-refresh interval +view_dashboards_portlets_refresh_fail2 = Failed to disable reload for auto-refresh interval view_dashboards_portlets_refresh_multiple_min = {0} minutes view_dashboards_portlets_refresh_none = No Refresh view_dashboards_portlets_refresh_one_min = 1 minute -view_dashboards_portlets_refresh_success1 = Updated interval for portlets that auto-refresh -view_dashboards_portlets_refresh_success2 = Stopping reload for portlets that auto-refresh +view_dashboards_portlets_refresh_success1 = Updated interval for auto-refresh +view_dashboards_portlets_refresh_success2 = Stopping reload for auto-refresh view_dashboards_title = Dashboard view_drift_button_detectNow = Detect Now view_drift_button_pinToDef = Pin to Definition diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 1d9fd27..5785701 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1494,13 +1494,13 @@ view_dashboard_favorites_error1 = NepodaÅilo se naÄÃst oblÃbenÃ© zdroje. view_dashboardsManager_error1 = NepodaÅilo se pÅidat novÃœ dashboard ##view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>This dashboard can be edited by clicking the (Edit Mode) button above.</p>\n<p>What would you like to do?</p>\n<p>  <a href=\"{1}\">Import newly discovered resources.</a></p>\n<p>  <a href=\"{2}\">Search for resources.</a></p>\n<p>  <a href=\"{3}\">See help and documentation.</a></p> view_dashboards_confirm1 = Jste si jisti, ÅŸe to chcete smazat -view_dashboards_portlets_refresh_fail1 = NepodaÅilo se zmÄnit interval auto aktualizace pro portlety -view_dashboards_portlets_refresh_fail2 = NepodaÅilo se zneplatnit obnovovÃ¡nÃ pro portlety +##view_dashboards_portlets_refresh_fail1 = NepodaÅilo se zmÄnit interval auto aktualizace pro portlety +##view_dashboards_portlets_refresh_fail2 = NepodaÅilo se zneplatnit obnovovÃ¡nÃ pro portlety view_dashboards_portlets_refresh_multiple_min = {0} minut view_dashboards_portlets_refresh_none = Bez obnovy view_dashboards_portlets_refresh_one_min = 1 minuta -view_dashboards_portlets_refresh_success1 = ObnovovacÃ interval pro portlety, kterÃ© se umÃ sami obnovovat -view_dashboards_portlets_refresh_success2 = Zastavuji obnovovÃ¡nÃ pro portlety, kterÃ© se umÃ sami obnovovat +##view_dashboards_portlets_refresh_success1 = ObnovovacÃ interval pro portlety, kterÃ© se umÃ sami obnovovat +##view_dashboards_portlets_refresh_success2 = Zastavuji obnovovÃ¡nÃ pro portlety, kterÃ© se umÃ sami obnovovat view_dashboards_title = Dashboard view_drift_button_detectNow = Detekovat nynÃ view_drift_button_pinToDef = PÅipnout k definici 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 ef538a0..d9ba492 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 @@ -1472,13 +1472,13 @@ view_dashboard_favorites_error1 = å¥œã¿ã®ãªãœãŒã¹ãããŒãããã®ã« view_dashboardsManager_error1 = æ°ããããã·ã¥ããŒããè¿œå ããã®ã«å€±æããŸãã ##view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>This dashboard can be edited by clicking the (Edit Mode) button above.</p>\n<p>What would you like to do?</p>\n<p>  <a href=\"{1}\">Import newly discovered resources.</a></p>\n<p>  <a href=\"{2}\">Search for resources.</a></p>\n<p>  <a href=\"{3}\">See help and documentation.</a></p> view_dashboards_confirm1 = åé€ããŠãããããã§ãã -view_dashboards_portlets_refresh_fail1 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªãã¬ãã·ã¥ééã®æŽæ°ã«å€±æããŸãã -view_dashboards_portlets_refresh_fail2 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªããŒãã®ç¡å¹åã«å€±æããŸãã +##view_dashboards_portlets_refresh_fail1 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªãã¬ãã·ã¥ééã®æŽæ°ã«å€±æããŸãã +##view_dashboards_portlets_refresh_fail2 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªããŒãã®ç¡å¹åã«å€±æããŸãã view_dashboards_portlets_refresh_multiple_min = {0} å view_dashboards_portlets_refresh_none = ãªãã¬ãã·ã¥ãªã view_dashboards_portlets_refresh_one_min = 1 å -view_dashboards_portlets_refresh_success1 = ããŒãã¬ããã®èªåãªãã¬ãã·ã¥ééãæŽæ°ããŸãã -view_dashboards_portlets_refresh_success2 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªããŒããåæ¢ããŠããŸã +##view_dashboards_portlets_refresh_success1 = ããŒãã¬ããã®èªåãªãã¬ãã·ã¥ééãæŽæ°ããŸãã +##view_dashboards_portlets_refresh_success2 = èªåãªãã¬ãã·ã¥ããããŒãã¬ããã®ãªããŒããåæ¢ããŠããŸã view_dashboards_title = ããã·ã¥ããŒã view_drift_button_detectNow = ããã«æ€åº view_drift_button_pinToDef = å®çŸ©ãšããŠãã³çã diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index b39be65..509f789 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1489,13 +1489,13 @@ view_dashboardsManager_message_title = Bem vindo ao RHQ ##view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>This dashboard can be edited by clicking the (Edit Mode) button above.</p>\n<p>What would you like to do?</p>\n<p>  <a href=\"{1}\">Import newly discovered resources.</a></p>\n<p>  <a href=\"{2}\">Search for resources.</a></p>\n<p>  <a href=\"{3}\">See help and documentation.</a></p> view_dashboardsManager_tagcloud_title = Nuvem de Tags view_dashboards_confirm1 = Tem certeza de que deseja excluir? -view_dashboards_portlets_refresh_fail1 = Falha ao alterar o intervalo de atualizaï¿œï¿œo de portlets dinï¿œmicos. -view_dashboards_portlets_refresh_fail2 = Falha ao desabilitar a atualizaï¿œï¿œo de portlets dinï¿œmicos. +##view_dashboards_portlets_refresh_fail1 = Falha ao alterar o intervalo de atualizaï¿œï¿œo de portlets dinï¿œmicos. +##view_dashboards_portlets_refresh_fail2 = Falha ao desabilitar a atualizaï¿œï¿œo de portlets dinï¿œmicos. view_dashboards_portlets_refresh_multiple_min = {0} minutos view_dashboards_portlets_refresh_none = N\u00E3o atualizar view_dashboards_portlets_refresh_one_min = 1 minuto -view_dashboards_portlets_refresh_success1 = Intervalo de atualiza\u00E7\u00E3o dos portlets din\u00E2micos alterado com sucesso -view_dashboards_portlets_refresh_success2 = Parando a atualiza\u00E7\u00E3o autom\u00E1tica dos portlets din\u00E2micos +##view_dashboards_portlets_refresh_success1 = Intervalo de atualiza\u00E7\u00E3o dos portlets din\u00E2micos alterado com sucesso +##view_dashboards_portlets_refresh_success2 = Parando a atualiza\u00E7\u00E3o autom\u00E1tica dos portlets din\u00E2micos view_dashboards_title = Dashboard view_drift_button_detectNow = Detectar agora ##view_drift_button_pinToDef = Pin to Definition diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index e37f80e..db3229f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1467,8 +1467,8 @@ view_dashboard_favorites_error1 = \u52a0\u8f7d\u5e38\u7528\u8d44\u6e90\u5931\u8d view_dashboardsManager_error1 = \u6dfb\u52a0\u65b0\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 ##view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>This dashboard can be edited by clicking the (Edit Mode) button above.</p>\n<p>What would you like to do?</p>\n<p>  <a href=\"{1}\">Import newly discovered resources.</a></p>\n<p>  <a href=\"{2}\">Search for resources.</a></p>\n<p>  <a href=\"{3}\">See help and documentation.</a></p> view_dashboards_confirm1 = \u60a8\u786e\u5b9a\u8981\u5220\u9664\uff1f -view_dashboards_portlets_refresh_fail1 = \u4fee\u6539portlets\u81ea\u52a8\u5237\u65b0\u7684\u95f4\u9694\u65f6\u95f4\u5931\u8d25 -view_dashboards_portlets_refresh_fail2 = \u505c\u7528portlets\u81ea\u52a8\u5237\u65b0\u7684\u91cd\u8f7d\u5931\u8d25 +##view_dashboards_portlets_refresh_fail1 = \u4fee\u6539portlets\u81ea\u52a8\u5237\u65b0\u7684\u95f4\u9694\u65f6\u95f4\u5931\u8d25 +##view_dashboards_portlets_refresh_fail2 = \u505c\u7528portlets\u81ea\u52a8\u5237\u65b0\u7684\u91cd\u8f7d\u5931\u8d25 view_dashboards_portlets_refresh_multiple_min = {0} \u5206\u949f view_dashboards_portlets_refresh_none = \u65e0\u5237\u65b0 view_dashboards_portlets_refresh_one_min = 1 \u5206\u652f commit b30d3fe1ff1b1a6caf86795618892d77c36835f9 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 10 15:34:57 2013 -0400 [BZ 1004050] add more error handling for advanced storage node deployments One of the errors that can be made when deploying multiple storage nodes prior to installing the server is failing to include all of the nodes in the rhq.storage.nodes property in rhq-server.properties. This could have resulted in an IndexOutOfBoundsException that was propagated up the call stack, preventing resources (from the current inventory report) from being imported into inventory. Exception handling has been added along with detailed logging to deal with this scenario. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index 44c0e9d..66ee2fc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -86,18 +86,34 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa if (log.isInfoEnabled()) { log.info("Announcing " + storageNode + " to storage node cluster."); } - List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, - StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL).getResultList(); - List<StorageNode> allNodes = new ArrayList<StorageNode>(clusterNodes); - allNodes.add(storageNode); + try { + storageNode.setOperationMode(StorageNode.OperationMode.ANNOUNCE); + List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, + StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL).getResultList(); + List<StorageNode> allNodes = new ArrayList<StorageNode>(clusterNodes); + allNodes.add(storageNode); + + for (StorageNode clusterNode : clusterNodes) { + clusterNode.setMaintenancePending(true); + } - for (StorageNode clusterNode : clusterNodes) { - clusterNode.setMaintenancePending(true); + announceStorageNode(subject, storageNode, clusterNodes.get(0), createPropertyListOfAddresses("addresses", + allNodes)); + } catch (IndexOutOfBoundsException e) { + String msg = "Aborting storage node deployment due to unexpected error while announcing storage node at " + + storageNode.getAddress(); + log.error(msg, e); + log.error("If this error occurred with a storage node that was deployed prior to installing the server, " + + "then this may indicate that the rhq.storage.nodes property in rhq-server.properties was not set " + + "correctly. All nodes deployed prior to server installation should be listed in the " + + "rhq.storage.nodes property. Please review the deployment documentation for additional details."); + logError(StorageNode.OperationMode.ANNOUNCE, msg, e); + } catch (Exception e) { + String msg = "Aborting storage node deployment due to unexpected error while announcing storage node at " + + storageNode.getAddress(); + log.error(msg, e); + logError(StorageNode.OperationMode.ANNOUNCE, msg, e); } - - announceStorageNode(subject, storageNode, clusterNodes.get(0), createPropertyListOfAddresses("addresses", - allNodes)); - } private void announceStorageNode(Subject subject, StorageNode newStorageNode, StorageNode clusterNode, commit 4bef51991629aa65034b8798cb5eedff0bc8dafd Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Sep 10 11:27:34 2013 -0500 [BZ 1006315] Fixes related to missing dependencies: - added rhq-core-util to the list of module dependencies - removed compression settings since the compression will not be available at all diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index d4b59c2..a2a88c4 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -150,6 +150,11 @@ <version>${project.version}</version> </artifactItem> <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.1</version> diff --git a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java index 80e1129..c064971 100644 --- a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java +++ b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java @@ -90,10 +90,6 @@ public class DataMigratorRunner { .create(); private final Option cassandraPortOption = OptionBuilder.withLongOpt("cassandra-port").hasArg() .withType(Integer.class).withDescription("Cassandra native binary protocol port (default: 9142)").create(); - private final Option cassandraCompressionOption = OptionBuilder.withLongOpt("cassandra-compression") - .hasOptionalArg().withType(Boolean.class) - .withDescription("Enable compression for communication with Cassandra (default: true)") - .create(); //SQL private final Option sqlUserOption = OptionBuilder.withLongOpt("sql-user").hasArg().withType(String.class) @@ -232,7 +228,6 @@ public class DataMigratorRunner { options.addOption(cassandraPasswordOption); options.addOption(cassandraHostsOption); options.addOption(cassandraPortOption); - options.addOption(cassandraCompressionOption); options.addOption(sqlUserOption); options.addOption(sqlPasswordOption); @@ -316,7 +311,6 @@ public class DataMigratorRunner { configuration.put(cassandraPasswordOption, "rhqadmin"); configuration.put(cassandraHostsOption, new String[] { InetAddress.getLocalHost().getHostAddress() }); configuration.put(cassandraPortOption, DEFAULT_CASSANDRA_PORT); - configuration.put(cassandraCompressionOption, true); //default SQL configuration configuration.put(sqlUserOption, "rhqadmin"); @@ -466,11 +460,6 @@ public class DataMigratorRunner { DEFAULT_CASSANDRA_PORT); configuration.put(cassandraPortOption, cassandraPort); } - - if (commandLine.hasOption(cassandraCompressionOption.getLongOpt())) { - boolean value = tryParseBoolean(commandLine.getOptionValue(cassandraCompressionOption.getLongOpt()), true); - configuration.put(cassandraCompressionOption, value); - } } /** @@ -666,16 +655,11 @@ public class DataMigratorRunner { * @throws Exception */ private Session createCassandraSession() throws Exception { - Compression selectedCompression = Compression.NONE; - if ((Boolean) configuration.get(cassandraCompressionOption)) { - selectedCompression = Compression.SNAPPY; - } - Cluster cluster = Cluster .builder() .addContactPoints((String[]) configuration.get(cassandraHostsOption)) .withPort((Integer) configuration.get(cassandraPortOption)) - .withCompression(selectedCompression) + .withCompression(Compression.NONE) .withoutMetrics() .withCredentials((String) configuration.get(cassandraUserOption), (String) configuration.get(cassandraPasswordOption)) diff --git a/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml b/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml index e02679f..3d51cdf 100644 --- a/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml +++ b/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml @@ -5,6 +5,7 @@ <resources> <resource-root path="${project.build.finalName}.jar"/> + <resource-root path="rhq-core-util-${project.version}.jar"/> <resource-root path="rhq-server-metrics-${project.version}.jar"/> <resource-root path="joda-time-${joda-time.version}.jar"/> <resource-root path="hibernate-core-${hibernate.version}.jar"/> commit 0b99feed5411fe1b3437f9e64953c4818a5a4289 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Sep 10 10:15:52 2013 +0200 Bug 955363 - Uploading of file content using remote API/CLI requires many times more heap then file size The CLI uses JBoss Remoting to communicate with the server. JBoss Remoting relies on JDK's HttpUrlConnection when configured for the HTTP transport. But HttpUrlConnection copies the full payload of the HTTP request in memory before sending it to the server. Therefore, when you send a huge file, you can easily reach the maximum heap. Another problem was that the CLI itself was loading the file in memory as well, just to compute the file checksum. Updated ResourceClientProxy to compute checksum on FileInputStream instead of file bytes. Created new methods in ContentManager to upload content in fragments, updated ResourceClientProxy accordingly. diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java index 8b190f4..524245b 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,12 +13,14 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.bindings.client; +import java.io.BufferedInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; @@ -28,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import javassist.ClassPool; import javassist.util.proxy.MethodHandler; @@ -39,7 +40,6 @@ import org.rhq.bindings.util.ClassPoolFactory; import org.rhq.bindings.util.ConfigurationClassBuilder; import org.rhq.bindings.util.LazyLoadScenario; import org.rhq.bindings.util.ResourceTypeFingerprint; -import org.rhq.bindings.util.ScriptUtil; import org.rhq.bindings.util.ShortOutput; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PluginConfigurationUpdate; @@ -69,6 +69,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.core.domain.util.Summary; import org.rhq.core.server.MeasurementConverter; import org.rhq.core.util.MessageDigestGenerator; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementDataManagerRemote; @@ -463,6 +464,7 @@ public class ResourceClientProxy { public static class ClientProxyMethodHandler implements MethodHandler, ContentBackedResource, PluginConfigurable, ResourceConfigurable { + private static final int SIZE_32K = 1024 * 32; ResourceClientProxy resourceClientProxy; RhqFacade remoteClient; @@ -542,10 +544,9 @@ public class ResourceClientProxy { throw new IllegalArgumentException("File expected, found directory: " + file.getAbsolutePath()); } - byte[] fileContents = new ScriptUtil(remoteClient).getFileBytes(filename); String sha = null; try { - sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(fileContents); + sha = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(file); } catch (Exception e) { //do nothing because the sha will remain null. LOG.error("Message digest for the package bits failed.", e); @@ -557,10 +558,29 @@ public class ResourceClientProxy { ContentManagerRemote contentManager = remoteClient.getProxy(ContentManagerRemote.class); + // We will send the file in fragments because sending the whole file at once is memory hungry + // Bug 955363 - Uploading of file content using remote API/CLI requires many times more heap then file size + // https://bugzilla.redhat.com/show_bug.cgi?id=955363 + String temporaryContentHandle = contentManager.createTemporaryContentHandle(); + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(file); + BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream, SIZE_32K); + int len; + byte[] bytes = new byte[SIZE_32K]; + while ((len = bufferedInputStream.read(bytes, 0, bytes.length)) != -1) { + contentManager.uploadContentFragment(temporaryContentHandle, bytes, 0, len); + } + } catch (IOException e) { + throw new RuntimeException("Could not upload content fragment", e); + } finally { + StreamUtil.safeClose(fileInputStream); + } + PackageVersion pv = contentManager.createPackageVersionWithDisplayVersion(remoteClient.getSubject(), oldPackage.getPackageVersion().getGeneralPackage().getName(), oldPackage.getPackageVersion() .getGeneralPackage().getPackageType().getId(), packageVersion, displayVersion, oldPackage - .getPackageVersion().getArchitecture().getId(), fileContents); + .getPackageVersion().getArchitecture().getId(), temporaryContentHandle); contentManager.deployPackagesWithNote(remoteClient.getSubject(), new int[] { resourceClientProxy.getId() }, new int[] { pv.getId() }, "CLI deployment request"); diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml new file mode 100644 index 0000000..40508c6 --- /dev/null +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml @@ -0,0 +1,44 @@ +<?xml version="1.0"?> + + +<differences> + + <difference> + <className>org/rhq/enterprise/server/content/ContentManagerRemote</className> + <differenceType>7012</differenceType>  + <method>java.lang.String createTemporaryContentHandle()</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/content/ContentManagerRemote</className> + <differenceType>7012</differenceType>  + <method>void uploadContentFragment(java.lang.String, byte[], int, int)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/content/ContentManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.content.PackageVersion createPackageVersionWithDisplayVersion(org.rhq.core.domain.auth.Subject, java.lang.String, int, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + +</differences> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index f749c9c..f6021b7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,15 +13,17 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.content; import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -122,6 +124,8 @@ import org.rhq.enterprise.server.util.CriteriaQueryRunner; */ @Stateless public class ContentManagerBean implements ContentManagerLocal, ContentManagerRemote { + private static final Log LOG = LogFactory.getLog(ContentManagerBean.class); + // Constants -------------------------------------------- /** @@ -129,7 +133,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe */ private static final int REQUEST_TIMEOUT = 1000 * 60 * 60; - private final Log log = LogFactory.getLog(this.getClass()); + private static final String TMP_FILE_PREFIX = "rhq-content-"; + + private static final String TMP_FILE_SUFFIX = ".bin"; @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -165,13 +171,15 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe // For performance tracking long start = System.currentTimeMillis(); - log.debug("Merging [" + report.getDeployedPackages().size() + "] packages for Resource with id [" + resourceId - + "]..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Merging [" + report.getDeployedPackages().size() + "] packages for Resource with id [" + + resourceId + "]..."); + } // Load the resource and its installed packages Resource resource = entityManager.find(Resource.class, resourceId); if (resource == null) { - log.error("Invalid resource ID specified for merge. Resource ID: " + resourceId); + LOG.error("Invalid resource ID specified for merge. Resource ID: " + resourceId); return; } @@ -247,7 +255,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { packageArchitecture = (Architecture) architectureQuery.getSingleResult(); } catch (Exception e) { - log.warn("Could not load architecture for architecture name [" + LOG.warn("Could not load architecture for architecture name [" + discoveredPackage.getArchitectureName() + "] for package [" + discoveredPackage.getName() + "]. Cause: " + ThrowableUtil.getAllMessages(e)); continue; @@ -282,8 +290,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe List<InstalledPackage> installedPackageList = installedPackageQuery.getResultList(); if (installedPackageList.size() > 0) { - if (log.isDebugEnabled()) { - log.debug("Discovered package is already known to the inventory " + if (LOG.isDebugEnabled()) { + LOG.debug("Discovered package is already known to the inventory " + installedPackageList.iterator().next()); } @@ -344,8 +352,10 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } } - log.debug("Finished merging [" + report.getDeployedPackages().size() + "] packages in " - + (System.currentTimeMillis() - start) + "ms"); + if (LOG.isDebugEnabled()) { + LOG.debug("Finished merging [" + report.getDeployedPackages().size() + "] packages in " + + (System.currentTimeMillis() - start) + "ms"); + } } public void deployPackages(Subject user, int[] resourceIds, int[] packageVersionIds) { @@ -375,7 +385,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe throw new IllegalArgumentException("packages cannot be null"); } - log.info("Deploying " + packages.size() + " packages on resource ID [" + resourceId + "]"); + LOG.info("Deploying " + packages.size() + " packages on resource ID [" + resourceId + "]"); if (packages.size() == 0) { return; @@ -406,7 +416,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ContentAgentService agentService = agentClient.getContentAgentService(); agentService.deployPackages(transferRequest); } catch (RuntimeException e) { - log.error("Error while sending deploy request to agent", e); + LOG.error("Error while sending deploy request to agent", e); // Update the request with the failure contentManager.failRequest(persistedRequest.getId(), e); @@ -460,7 +470,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe @SuppressWarnings("unchecked") public void completeDeployPackageRequest(DeployPackagesResponse response) { - log.info("Completing deploy package response: " + response); + LOG.info("Completing deploy package response: " + response); // Load persisted request Query query = entityManager.createNamedQuery(ContentServiceRequest.QUERY_FIND_BY_ID); @@ -590,7 +600,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe throw new IllegalArgumentException("installedPackages cannot be null"); } - log.info("Deleting " + installedPackageIds.length + " from resource ID [" + resourceId + "]"); + LOG.info("Deleting " + installedPackageIds.length + " from resource ID [" + resourceId + "]"); if (installedPackageIds.length == 0) { return; @@ -632,7 +642,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ContentAgentService agentService = agentClient.getContentAgentService(); agentService.deletePackages(transferRequest); } catch (RuntimeException e) { - log.error("Error while sending deploy request to agent", e); + LOG.error("Error while sending deploy request to agent", e); // Update the request with the failure contentManager.failRequest(persistedRequest.getId(), e); @@ -683,7 +693,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } public void completeDeletePackageRequest(RemovePackagesResponse response) { - log.info("Completing delete package response: " + response); + LOG.info("Completing delete package response: " + response); // Load persisted request Query query = entityManager.createNamedQuery(ContentServiceRequest.QUERY_FIND_BY_ID); @@ -779,7 +789,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } public void retrieveBitsFromResource(Subject user, int resourceId, int installedPackageId) { - log.info("Retrieving bits for package [" + installedPackageId + "] on resource ID [" + resourceId + "]"); + LOG.info("Retrieving bits for package [" + installedPackageId + "] on resource ID [" + resourceId + "]"); // Check permissions first if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { @@ -807,7 +817,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ContentAgentService agentService = agentClient.getContentAgentService(); agentService.retrievePackageBits(transferRequest); } catch (RuntimeException e) { - log.error("Error while sending deploy request to agent", e); + LOG.error("Error while sending deploy request to agent", e); // Update the request with the failure contentManager.failRequest(persistedRequest.getId(), e); @@ -860,7 +870,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe public List<DeployPackageStep> translateInstallationSteps(int resourceId, ResourcePackageDetails packageDetails) throws Exception { - log.info("Retrieving installation steps for package [" + packageDetails + "]"); + LOG.info("Retrieving installation steps for package [" + packageDetails + "]"); Resource resource = entityManager.find(Resource.class, resourceId); Agent agent = resource.getAgent(); @@ -872,7 +882,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ContentAgentService agentService = agentClient.getContentAgentService(); packageStepList = agentService.translateInstallationSteps(resourceId, packageDetails); } catch (PluginContainerException e) { - log.error("Error while sending deploy request to agent", e); + LOG.error("Error while sending deploy request to agent", e); // Throw so caller knows an error happened throw e; @@ -913,7 +923,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe @TransactionTimeout(45 * 60) @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void completeRetrievePackageBitsRequest(ContentServiceResponse response, InputStream bitStream) { - log.info("Completing retrieve package bits response: " + response); + LOG.info("Completing retrieve package bits response: " + response); // Load persisted request ContentServiceRequest persistedRequest = entityManager.find(ContentServiceRequest.class, response @@ -921,7 +931,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe // There is some inconsistency if we're completing a request that was not in the database if (persistedRequest == null) { - log + LOG .error("Attempting to complete a request that was not found in the database: " + response.getRequestId()); return; @@ -934,7 +944,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe if (response.getStatus() == ContentRequestStatus.SUCCESS) { // Read the stream from the agent and store in the package version try { - log.debug("Saving content for response: " + response); + if (LOG.isDebugEnabled()) { + LOG.debug("Saving content for response: " + response); + } PackageBits packageBits = initializePackageBits(null); @@ -970,7 +982,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { ps.close(); } catch (Exception e) { - log.warn("Failed to close prepared statement for package version [" + packageVersion + "]"); + LOG.warn("Failed to close prepared statement for package version [" + packageVersion + "]"); } } @@ -978,13 +990,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { conn.close(); } catch (Exception e) { - log.warn("Failed to close connection for package version [" + packageVersion + "]"); + LOG.warn("Failed to close connection for package version [" + packageVersion + "]"); } } } } catch (Exception e) { - log.error("Error while reading content from agent stream", e); + LOG.error("Error while reading content from agent stream", e); // TODO: don't want to throw exception here? does the tx rollback automatically anyway? } } @@ -1018,7 +1030,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe // There is some inconsistency if the request is not in the database if (persistedRequest == null) { - log.error("Could not find request with ID: " + requestId); + LOG.error("Could not find request with ID: " + requestId); return dependencies; } @@ -1045,7 +1057,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } if (persistedPackageList.size() != 1) { - log.error("Multiple packages found. Found: " + persistedPackageList.size() + " for key: " + key); + LOG.error("Multiple packages found. Found: " + persistedPackageList.size() + " for key: " + key); } // Convert to transfer object to be sent to the agent @@ -1149,7 +1161,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe return results.get(0); } else { String message = "2 or more package types with name '" + packageTypeName + "' found on the resource type with id " + resourceTypeId + ". This is a bug in the database."; - log.error(message); + LOG.error(message); throw new IllegalStateException(message); } } @@ -1168,7 +1180,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } } catch (Exception e) { //well, this shouldn't happen but is not crucial in this case - log.info("Failed to obtain the behavior of package type '" + packageTypeName + "'.", e); + LOG.info("Failed to obtain the behavior of package type '" + packageTypeName + "'.", e); } return new PackageTypeAndVersionFormatComposite(type, format); @@ -1177,8 +1189,10 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe @SuppressWarnings("unchecked") public void checkForTimedOutRequests(Subject subject) { if (!authorizationManager.isOverlord(subject)) { - log.debug("Unauthorized user " + subject + " tried to execute checkForTimedOutRequests; " - + "only the overlord may execute this system operation"); + if (LOG.isDebugEnabled()) { + LOG.debug("Unauthorized user " + subject + " tried to execute checkForTimedOutRequests; " + + "only the overlord may execute this system operation"); + } return; } @@ -1198,7 +1212,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe // If the duration exceeds the timeout threshold, mark it as timed out if (duration > REQUEST_TIMEOUT) { - log.debug("Timing out request after duration: " + duration + " Request: " + request); + if (LOG.isDebugEnabled()) { + LOG.debug("Timing out request after duration: " + duration + " Request: " + request); + } request.setErrorMessage("Request with duration " + duration + " exceeded the timeout threshold of " + REQUEST_TIMEOUT); @@ -1229,7 +1245,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe break; default: - log.warn("Found a history entry on the request with an unexpected status. Id: " + LOG.warn("Found a history entry on the request with an unexpected status. Id: " + history.getId() + ", Status: " + packageStatus); break; @@ -1238,7 +1254,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } } } catch (Throwable e) { - log.error("Error while processing timed out requests", e); + LOG.error("Error while processing timed out requests", e); } } @@ -1303,7 +1319,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } catch (PackageDetailsValidationException e) { throw e; } catch (Exception e) { - log.error("Failed to get the package type plugin container. This is a bug.", e); + LOG.error("Failed to get the package type plugin container. This is a bug.", e); throw new IllegalStateException("Failed to get the package type plugin container.", e); } @@ -1403,7 +1419,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe persisted = entityManager.merge(pv); if (error != null) { - log.warn("There was probably a very big and ugly EJB/hibernate error just above this log message - " + LOG.warn("There was probably a very big and ugly EJB/hibernate error just above this log message - " + "you can normally ignore that. We detected that a package version was already created when we" + " tried to do it also - we will ignore this and just use the new package version that was " + "created in the other thread", new Throwable("Stack Trace:")); @@ -1462,7 +1478,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe persisted = entityManager.merge(pkg); if (error != null) { - log.warn("There was probably a very big and ugly EJB/hibernate error just above this log message - " + LOG.warn("There was probably a very big and ugly EJB/hibernate error just above this log message - " + "you can normally ignore that. We detected that a package was already created when we" + " tried to do it also - we will ignore this and just use the new package that was " + "created in the other thread"); @@ -1718,7 +1734,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } catch (PackageDetailsValidationException e) { throw e; } catch (Exception e) { - log.error("Failed to get the package type plugin container. This is a bug.", e); + LOG.error("Failed to get the package type plugin container. This is a bug.", e); throw new IllegalStateException("Failed to get the package type plugin container.", e); } @@ -1971,7 +1987,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ps.close(); conn.close(); } catch (Exception e) { - log.error("An error occurred while updating Blob with stream for PackageBits[" + bits.getId() + "], " + LOG.error("An error occurred while updating Blob with stream for PackageBits[" + bits.getId() + "], " + e.getMessage()); e.printStackTrace(); } finally { @@ -1979,7 +1995,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { ps.close(); } catch (Exception e) { - log.warn("Failed to close prepared statement for package bits [" + bits.getId() + "]"); + LOG.warn("Failed to close prepared statement for package bits [" + bits.getId() + "]"); } } @@ -1987,7 +2003,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { ps2.close(); } catch (Exception e) { - log.warn("Failed to close prepared statement for package bits [" + bits.getId() + "]"); + LOG.warn("Failed to close prepared statement for package bits [" + bits.getId() + "]"); } } @@ -1995,14 +2011,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { conn.close(); } catch (Exception e) { - log.warn("Failed to close connection for package bits [" + bits.getId() + "]"); + LOG.warn("Failed to close connection for package bits [" + bits.getId() + "]"); } } if (stream != null) { try { stream.close(); } catch (Exception e) { - log.warn("Failed to close stream to package bits located at [" + +bits.getId() + "]"); + LOG.warn("Failed to close stream to package bits located at [" + +bits.getId() + "]"); } } } @@ -2056,13 +2072,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { output.close(); } catch (IOException ioe2) { - log.warn("Streams could not be closed", ioe2); + LOG.warn("Streams could not be closed", ioe2); } try { input.close(); } catch (IOException ioe2) { - log.warn("Streams could not be closed", ioe2); + LOG.warn("Streams could not be closed", ioe2); } } } @@ -2083,7 +2099,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } if ((bits == null) || (bits.getId() <= 0)) { //then PackageBits instance passed in is insufficiently initialized. - log.warn("PackageBits insufficiently initialized. No data to write out."); + LOG.warn("PackageBits insufficiently initialized. No data to write out."); return; } try { @@ -2109,8 +2125,66 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe ps.close(); } } catch (Exception ex) { - log.error("An error occurred while writing Blob contents out to stream :" + ex.getMessage()); + LOG.error("An error occurred while writing Blob contents out to stream :" + ex.getMessage()); ex.printStackTrace(); } } -} \ No newline at end of file + + @Override + public String createTemporaryContentHandle() { + try { + return File.createTempFile(TMP_FILE_PREFIX, TMP_FILE_SUFFIX, getTempDirectory()).getName(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private File getTempDirectory() { + String tempDirectoryPath = System.getProperty("java.io.tmpdir"); + return new File(tempDirectoryPath); + } + + @Override + public void uploadContentFragment(String temporaryContentHandle, byte[] fragment, int off, int len) { + File temporaryContentFile = getTemporaryContentFile(temporaryContentHandle); + ByteArrayInputStream inputStream = new ByteArrayInputStream(fragment, off, len); + FileOutputStream fileOutputStream = null; + try { + fileOutputStream = new FileOutputStream(temporaryContentFile, true); // append == true + StreamUtil.copy(inputStream, new BufferedOutputStream(fileOutputStream, 1024 * 32)); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } finally { + StreamUtil.safeClose(fileOutputStream); + } + } + + @Override + public PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName, + int packageTypeId, String version, String displayVersion, Integer architectureId, String temporaryContentHandle) { + // Check permissions first + if (!authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_CONTENT)) { + throw new PermissionException("User [" + subject.getName() + + "] does not have permission to create package versions"); + } + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(getTemporaryContentFile(temporaryContentHandle)); + return createPackageVersionWithDisplayVersion(subject, packageName, packageTypeId, version, displayVersion, + (null == architectureId) ? getNoArchitecture().getId() : architectureId, fileInputStream); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } finally { + StreamUtil.safeClose(fileInputStream); + } + } + + private File getTemporaryContentFile(String handle) { + File tempDirectory = getTempDirectory(); + File file = new File(tempDirectory, handle); + if (!file.isFile()) { + throw new RuntimeException("handle [" + handle + "] does not denote a file"); + } + return file; + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java index abc8ba5..8799ee8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.content; @@ -55,7 +55,7 @@ import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException; * @author Jason Dobies */ @Local -public interface ContentManagerLocal { +public interface ContentManagerLocal extends ContentManagerRemote { // Use case logic -------------------------------------------- @@ -443,4 +443,4 @@ public interface ContentManagerLocal { void updateBlobStream(InputStream stream, PackageBits bits, Map<String, String> contentDetails); -} \ No newline at end of file +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java index 5e55090..262c30e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.content; @@ -63,7 +63,11 @@ public interface ContentManagerRemote { /** * Creates a new package version in the system. If the parent package (identified by the packageName parameter) does * not exist, it will be created. If a package version exists with the specified version ID, a new one will not be - * created and the existing package version instance will be returned. + * created and the existing package version instance will be returned.<br> + * <br> + * <strong>Use this method with caution:</strong> passing a content file as a byte array is memory hungry. Consider + * calling {@link #createPackageVersionWithDisplayVersion(org.rhq.core.domain.auth.Subject, String, int, String, String, Integer, String)} + * instead. * * @param subject The logged in subject * @param packageName parent package name; uniquely identifies the package under which this version goes @@ -227,4 +231,42 @@ public interface ContentManagerRemote { * @return the package bytes */ byte[] getPackageBytes(Subject subject, int resourceId, int installedPackageId); -} \ No newline at end of file + + /** + * Creates a temporary file for fragmented content upload. + * + * @return a temporary file handle + */ + String createTemporaryContentHandle(); + + /** + * Saves the fragment in the temporary file denoted by <code>temporaryContentHandle</code>. + * + * The <code>fragment</code> bytes will be copied starting from the <code>off</code> index up to the minimum of + * <code>off+len</code> and <code>fragment.length</code>. + * + * @param temporaryContentHandle temporary file handle + * @param fragment fragment bytes + */ + void uploadContentFragment(String temporaryContentHandle, byte[] fragment, int off, int len); + + /** + * Creates a new package version in the system with content denoted by the <code>temporaryContentHandle</code>. + * + * Use this method instead of {@link #createPackageVersionWithDisplayVersion(org.rhq.core.domain.auth.Subject, String, int, String, String, Integer, byte[])} + * to avoid passing content files as byte array paramaters.<br> + * <br> + * Sample code:<br> + * <pre> + * String temporaryContentHandle = contentManager.createTemporaryContentHandle(); + * while (... more bytes to send) { + * contentManager.uploadContentFragment(temporaryContentHandle, ...); + * } + * PackageVersion pv = contentManager.createPackageVersionWithDisplayVersion(..., temporaryContentHandle); + * </pre> + * + * @see ContentManagerRemote#createPackageVersionWithDisplayVersion(org.rhq.core.domain.auth.Subject, String, int, String, String, Integer, byte[]) + */ + PackageVersion createPackageVersionWithDisplayVersion(Subject subject, String packageName, int packageTypeId, + String version, String displayVersion, Integer architectureId, String temporaryContentHandle); +} commit 822e5583f684523c7db4cc54108840102291e2ac Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Sep 6 17:12:56 2013 +0200 Bug 999976 - [JBossAS7] - editing XA datasource configuration fails diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index 30609969..9e7dc28 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -256,6 +256,22 @@ public class DatasourceComponent extends BaseComponent<BaseComponent<?>> impleme @Override public void updateResourceConfiguration(final ConfigurationUpdateReport configurationUpdateReport) { + ReadAttribute readEnabledAttributeOperation = new ReadAttribute(address, ENABLED_ATTRIBUTE); + Result readEnabledAttributeResult = getASConnection().execute(readEnabledAttributeOperation); + if (!readEnabledAttributeResult.isSuccess()) { + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); + configurationUpdateReport.setErrorMessage("Could not determine if the datasource is currently enabled: " + + readEnabledAttributeResult.getFailureDescription()); + return; + } + Boolean datasourceEnabled = (Boolean) readEnabledAttributeResult.getResult(); + if (datasourceEnabled == Boolean.TRUE) { + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); + configurationUpdateReport.setErrorMessage("You must disable the datasource " + + "before editing its configuration"); + return; + } + Configuration config = configurationUpdateReport.getConfiguration(); ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); commit 9fab69c730cb014e6c3f758072d91e86d6028e44 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Sep 9 14:48:27 2013 -0400 fix a comment in the generated rhq-server.properties file diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index c17d2d3..25fc6ee 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -721,7 +721,7 @@ rhq.storage.password=${rhq.storage.password} # installation will have no effect. rhq.storage.nodes= -# The list of ports used by storages nodes to communiticate with each other +# The ports used by storage nodes to communicate with each other # and used by the RHQ server(s) to communicate with the cluster. # Both properties are required. # commit 5d3dbb06b6744ecbe37674f90caea464b7101799 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Mon Sep 9 18:09:29 2013 -0400 development RHQ_4.10.0-SNAPSHOT diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index e5ddfb6..1a8284f 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index afda1c8..e7923a3 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.9.0-SNAPSHOT</version> + <version>4.10.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 ef86f5e..720bfc8 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index c53c752..c02b137 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 76ff6e6..512c30c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 24af794..975c94e 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 3c059a3..bb6f37e 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index fec66dc..4a350fa 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 174357f..efca5b9 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 8f67575..46d2035 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 077cdb9..a5d8cba 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 25ad9f1..e6474b1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index b1347ab..bc27f0a 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.9.0-SNAPSHOT</version> + <version>4.10.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 8e60b26..e625006 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index 775c91f..c09393a 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 16dd176..617b3f9 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index f957b0e..6f5e532 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index dc0b2a1..ffb3f31 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index aecbc2c..c094eb6 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 8baccf3..2f35c76 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index a73f1a5..0d6f795 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 624b493..7d0b522 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index de8cbbb..95c0b9f 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 ae09153..e8f0283 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 7a33a06..086f15e 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index f85f34b..b791f76 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 12388f1..912e115 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.9.0-SNAPSHOT</version> + <version>4.10.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 d655f76..1732edf 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.9.0-SNAPSHOT</version> + <version>4.10.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 2ff1853..4d17615 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 292fb51..fcf7cb6 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 093f176..f2e6732 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 0d0932a..6c89eae 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index ab07c70..ad3872c 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index bf520fd..0f64c06 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 76a07bf..355a1d4 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0b6d5a8..d68e830 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2b4d557..ae264f9 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 136cbb8..d0fef55 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 5b73003..e2c2d85 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 1d1d4cc..2884b6c 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 9352da0..f0f91bf 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.9.0-SNAPSHOT</version> + <version>4.10.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 61b45b7..a1583ca 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.9.0-SNAPSHOT</version> + <version>4.10.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 a227ed4..dfea554 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 5d0961d..648d913 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.9.0-SNAPSHOT</version> + <version>4.10.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 b2dd375..7ed5063 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 6e35fe1..eb0f5cb 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 5cdfe4a..76f6289 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 9f21f48..a707865 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 73352f5..0105ca8 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.9.0-SNAPSHOT</version> + <version>4.10.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 95f24cf..7515110 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.9.0-SNAPSHOT</version> + <version>4.10.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 06242ef..fb84763 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.9.0-SNAPSHOT</version> + <version>4.10.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 e3d2f1c..43c3715 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 452b356..d1e38e3 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 468acb4..6d83c83 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index adfd66e..e717bfb 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index cd09594..1bcfe6e 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index d0fa818..74c89c6 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index f1a4c7b..4063181 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 f6e7bba..7f583c5 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 5672238..d4b59c2 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 e2a4cdb..68d4ffe 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 36e54c1..b91bad6 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 43afd79..7812f45 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 b06acb7..c1559a7 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 2abc387..d980eb1 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 5dec7c5..8a3e836 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 73937a7..2ce635e 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 6a69499..2a99065 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 81355a3..fa9b113 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 8fe8a04..5eba78d 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 7788e36..f651099 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 13a3542..0ddb077 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 8b0964a..d6bee28 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 4041b26..00137eb 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 1c573d3..080f1f2 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 3c6447c..756065c 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.9.0-SNAPSHOT</version> + <version>4.10.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 3083250..fec823d 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 b3cdad6..0e57cbd 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.9.0-SNAPSHOT</version> + <version>4.10.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 ea01d96..0f01ac9 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.9.0-SNAPSHOT</version> + <version>4.10.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 88eb12b..d0dd9be 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index adee0c3..2de9e86 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.9.0-SNAPSHOT</version> + <version>4.10.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 8c5f434..a3b6153 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 0058f24..be5b3a9 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 3d0ae5f..5e250e5 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.9.0-SNAPSHOT</version> + <version>4.10.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 15fe691..a9c2542 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.9.0-SNAPSHOT</version> + <version>4.10.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 bef9d81..c8ee9f0 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index eb26cac..c820eb4 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.9.0-SNAPSHOT</version> + <version>4.10.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 e8ba3af..94cd5ae 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index b8b6a91..9f53404 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index b741785..16eacd7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index e69df2e..131c470 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 a3e2318..2a75c27 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index e298b17..cb8b21b 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 6e2c6df..6b06712 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 0a06610..3281f90 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 1ea35be..26ca127 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 900adbd..4642ba1 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index c672abf..ac587f1 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 0214f69..08f3004 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index d83bd43..4725468 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index f500c91..de0ce85 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 7e965a7..3f5d3a9 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 8a08b92..f0cfdaa 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index ae13e95..d1c1be1 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index eecb5e9..eb9e366 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 72bf856..7075ec3 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index fbab0ed..fe89a45 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.9.0-SNAPSHOT</version> + <version>4.10.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 31de62c..02f76b1 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 92ff649..c416175 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index b361319..da5429b 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 316353a..38cf3fb 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 0369c90..b391ff5 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 675fd2f..2749a8e 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0d8f8bf..c34d1c2 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index e954e99..7ede2af 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.9.0-SNAPSHOT</version> + <version>4.10.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 69597f2..1df9119 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 89bad43..37cf180 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index dc18257..f74ea37 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 96f8101..2436798 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 8ec3fd1..164aaf0 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index fa5c216..fc03161 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 7b78f3c..2695daf 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index a97c390..22d2789 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.9.0-SNAPSHOT</version> + <version>4.10.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 bdc0575..637cfec 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.9.0-SNAPSHOT</version> + <version>4.10.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 c81debb..8b5ff0d 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.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 4b866de..817563e 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.9.0-SNAPSHOT</version> + <version>4.10.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 a4028f5..6bf163d 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.9.0-SNAPSHOT</version> + <version>4.10.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 65c873b..861d169 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index a7baca1..4ffb32f 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index f441356..7ca1b7a 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.9.0-SNAPSHOT</version> + <version>4.10.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 d4ea1d2..9a03e04 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 706ab6a..48a788f 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 8832af8..1d1edde 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 6fa0acd..39497f0 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index a17bca2..904bec7 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.9.0-SNAPSHOT</version> + <version>4.10.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 75e40d1..05c4c3d 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index bca7d07..c07beea 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index e1ffee8..628c46e 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index d4061b2..aa91586 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2558e97..c5bf422 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index cb2a67f..5a41c81 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.9.0-SNAPSHOT</version> + <version>4.10.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 8dcf493..5ec0606 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.9.0-SNAPSHOT</version> + <version>4.10.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 2e41dc5..1613f24 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 344afee..bf3eabd 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index b52e515..e4d7ce0 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index f63b96b..758fb3b 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 9786a81..f02b873 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 5a12593..6910176 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index b78fbb0..edbd8fe 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index cf7962d..1f86b9a 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 77f8c8e..090632d 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 732624d..2942971 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 83e1180..de0ec13 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.9.0-SNAPSHOT</version> + <version>4.10.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 1546555..37a8d5b 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index e2c9b97..cffe023 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 3ccab4d..580d59c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 632ccbf..70207d9 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.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 0505929..7380d63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>4.10.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

10 years, 8 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - code-coverage/pom.xml modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

code-coverage/pom.xml | 2 +- modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/cassandra-auth/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml | 2 +- modules/common/cassandra-ccm/pom.xml | 2 +- modules/common/cassandra-installer/pom.xml | 2 +- modules/common/cassandra-schema/pom.xml | 2 +- modules/common/cassandra-util/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as-dmr-client/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/arquillian-integration/suite-extension/pom.xml | 2 +- modules/core/arquillian-integration/test-agent-plugin/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/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/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/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/remoting-war/pom.xml | 2 +- modules/enterprise/gui/rest-examples-war/pom.xml | 2 +- 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/scripting/api/pom.xml | 4 ++-- modules/enterprise/scripting/javascript/pom.xml | 4 ++-- modules/enterprise/scripting/pom.xml | 4 ++-- modules/enterprise/scripting/python/pom.xml | 4 ++-- modules/enterprise/server/appserver/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/data-migration/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/installer/pom.xml | 2 +- modules/enterprise/server/itests-2/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 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/alertdef-rhq/pom.xml | 2 +- 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/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/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/server-control/pom.xml | 2 +- modules/enterprise/server/server-metrics/pom.xml | 2 +- modules/enterprise/server/startup-subsystem/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/metrics-simulator/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rest-docs-generator/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/integration-tests/rest-api/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/cassandra/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/noop/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 | 2 +- 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/rhq-storage/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/sonarqube/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 | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 158 files changed, 179 insertions(+), 179 deletions(-) New commits: commit cdd8be9e0d4ab83cc9c39ce32ea06c503a2825c7 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Wed Sep 25 07:37:59 2013 -0400 tag RHQ_4_7_0_JONCI diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 9783c17..4aae357 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index df3c6b7..434edad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index e27e9ae..86baa5a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index ad356e9..5195e6e 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 1ee2365..dc9fcac 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 86298a7..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 4b78cec..8640d5b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index 7a5bf61..b817c60 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 44e3f9e..1b8bc61 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 0c341cd..fac3833 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 1a4e928..c62a28f 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 18d2ef8..800f5d1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a97a3f1..d3baf3b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index a22d463..93f3805 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index cf49eb0..ef791fb 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index bff6e36..866f669 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 8a4966b..d31a6ad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index fefcf36..f4b2afa 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 832fdd3..33e48b1 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index f6638aa..66df7dd 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index fd8e278..bbe0954 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 474988c..b560968 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index cdb3121..a06011c 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b3bcfd0..ff8a21b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index ce66cca..83c9dac 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ab06e9e..b59e15e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e25a193..710a585 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d076cd9..86a3e7e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fdf355f..adf5bd4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 8cb5215..2ed4c26 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 57987fd..e03ac78 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index a619439..97ed3ab 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 143ce73..b2c1184 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 72e7d1b..0820f4b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 24a00ee..ecdde93 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index dcbfd30..9765a55 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 4935618a..2d97b0b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index fcd9b26..c832b41 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 20854c9..c0554c6 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 8cd2d97..4d3b17e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 0a1e19b..f3e07b4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e3de1bc..1ea7d61 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 908c109..d418db5 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 578f0ed..57c01e8 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 cf9088d..b418671 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 4e7d74c..53a1556 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index b946b2b..0ab8d0e 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 b6a7a04..22ee22b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 1eac425..300e679 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d8527f8..427c5fb 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 ed18648..49e0186 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 982d3d3..a087cb1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d445ed7..bbd87da 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 575a004..4b4ba59 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index f469ca5..aac6e73 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 50ab4c3..4c47992 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 7ef3212..1e36d6c 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 83d7b23..61830f3 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 91a653b..12215be 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 58a16f2..1af4fa8 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6a4b21c..f35a0a4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 04dc335..c9c0a03 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index f9f2e6a..7af6f9d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 3f7c17a..4d8a07d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 44d1b10..abc220d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 dc9d767..20c07de 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e81935a..471003a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 a1a6f8b..2457b0d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 d32dddd..d620c92 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 eb14068..7e3cbe7 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 3e00528..54dcd5b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 39b5ca5..317e61b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 12758b4..36e246a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 6aab82f..5551c92 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 56ad7b6..6f7ac53 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 1ef821f..8edfd9b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 21145a5..32acda7 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 82c6669..02fd80d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 7259db3..8689924 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 e497a9c..5833fee 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index c7caff8..7211f4c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 93fe1f4..13b66fe 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 7d1797b..c86f705 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 117271d..6b28aa9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 2449ed8..32d9a39 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 fd56fff..a6cdea1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 1e9b481..bca927d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 9c2ccf4..bb51ace 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 0c9d27c..713b1b4 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 7d57760..0d39f8e 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 03c2ce5..fc766fe 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 6350464..edf7c87 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 768ec0a..e63e38e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index dd97e8f..a7ed4cc 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 26c709d..545b5db 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 36e76d8..718c14c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</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 d5bd8e7..fa787c5 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9630bc8..84ef130 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index c31b804..0567602 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 63f1e62..df8b7ef 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 77ed069..ca3d81f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0a616d3..0b0c363 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 4510e72..5e1f84c 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 8038922..777f236 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index da1ad51..ac50627 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 556c1e4..7c5748d 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 523406f..a7b8e47 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 167ab67..7c2d095 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a89a568..0c23814 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f96b173..71c5eca 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 679f9b3..56452fb 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index e16b1fd..6d5887e 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index bc7bca1..ddc9e9e 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0edf971..5f332a0 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9446a83..2f42e79 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 92dace7..dd1d4a3 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index ebdb5c0..d252d6c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a3f17f4..a10b0f8 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 44ac23f..0d0eefa 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index a9e7295..e0e3cdc 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 092ac13..b31fd66 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 6853c1a..aaa9aa2 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index b32ee81..a35e582 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 dc08424..725187f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 f4a7a88..00d0bda 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 993a215..1c8fe0f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 44e9ce9..513f5b4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index a8e46d8..69b26bf 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 18e79f9..6e2414b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index c3c0db9..ac3304d 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 206f2d7..bab062b 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index c1a9f61..21102b3 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9678528..c45ff85 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 06b5a80..a7df5f9 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index cd0c446..6f8216c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 2160f12..6ac7fb2 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 1b10af4..766df02 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 4e18f5f..930f335 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 51af020..ba2069c 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index feb87c4..bf6fe94 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index bb904517..0cc62a9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 414a2c4..4989446 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index f373663..a579f86 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 942836c..834091d 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 9269350..b3fce75 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c018eed..1f52ac4 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index b2c4587..539f1b9 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 404f7d6..ee7b2fd 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index fb12b85..834b985 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9f53f6f..b9f2b39 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 764fe67..beb0dd1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f043ba1..f9bd9b1 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 67c4519..45d589a 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.9.0.JON320ER2</version> + <version>4.7.0.JON</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 01d0d24..f46c475 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 7fbac03..678e67f 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 41280b9..70e298a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3d4ed73..3407cad 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.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index c305a40..b3d1503 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>pom</packaging> <name>RHQ</name>

10 years, 8 months

1
0
0 / 0

[rhq] Changes to 'jswWin64'

by Thomas Segismont

New branch 'jswWin64' available with the following commits: commit 55d1b57776455acfe6bdb1b2fa986a0c2c16c10e Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Sep 25 11:46:07 2013 +0200 Support for JSW 64 bits on Windows

10 years, 8 months

1
0
0 / 0

[rhq] modules/enterprise

by Heiko W. Rupp

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2c186bc8b4b0e35200bab2ab60183df148ad8828 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Sep 24 21:56:52 2013 +0200 BZ 1002233 "on the null" -> "on the platform" if the propertyName is null. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java index aaf99da..023d6c4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java @@ -109,7 +109,7 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { }); } } - + ListGrid listGrid = getListGrid(); listGrid.setAutoSaveEdits(false); listGrid.setFields(fields.toArray(new ListGridField[fields.size()])); @@ -197,8 +197,8 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { protected Canvas getExpansionComponent(final ListGridRecord record) { if (record.getAttribute(FIELD_RESOURCE_ID.propertyName()) == null) { // no resource set - return new HTMLFlow("There is no load data available for this node. Is the agent running on the " - + record.getAttributeAsString(FIELD_ADDRESS.propertyName() + "?")); + return new HTMLFlow("There is no load data available for this node. Is the agent running on the " + + "platform?"); } int id = record.getAttributeAsInt(FIELD_ID); return new StorageNodeLoadComponent(id, null);

10 years, 8 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - modules/core

by Simeon Pinder

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6cf86130802caa5430cf0153c772f6b2a0fc76e4 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 24 15:10:40 2013 -0400 fix an issue causing a server itest failure. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 671853f..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> </table>

10 years, 8 months

1
0
0 / 0

[rhq] 2 commits - modules/common modules/core

by Jay Shaughnessy

modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java | 4 +++- modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 231750d9a3f4a1e4216bdc74ee8acd3b8b2bd768 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 24 15:10:40 2013 -0400 fix an issue causing a server itest failure. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 671853f..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> </table> commit 3adffa913e73cd163bc54513cd2f4711bd06a449 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 24 15:10:01 2013 -0400 fix an issue using -Ditest.use-external-storage-node with server itests. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java index d051d9d..50aaab1 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java @@ -152,7 +152,9 @@ public class CCMSuiteDeploymentExtension implements LoadableExtension { String cqlPortString = System.getProperty("rhq.storage.cql-port", "9042"); cqlPort = Integer.parseInt(cqlPortString); - //jmxPorts = parseNodeJmxPorts(seed); + String jmxPortString = System.getProperty("rhq.storage.jmx-port", "7299"); + jmxPorts = new int[] { Integer.parseInt(jmxPortString) }; + schemaManager = new SchemaManager("rhqadmin", "1eeb2f255e832171df8592078de921bc", nodes, cqlPort); } catch (Exception e) {

10 years, 8 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - modules/enterprise

by Simeon Pinder

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 04ea628989b39bac142f65833bf2c0f9d0cb8e90 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Sep 24 12:02:13 2013 -0400 Modifying LdapManagerBeanTest to use original settings since the right fix affects other tests as well. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java index 7452247..6c0fd5e 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java @@ -29,7 +29,6 @@ import org.testng.annotations.Test; import org.rhq.core.domain.common.SystemConfiguration; import org.rhq.core.domain.common.composite.SystemSetting; -import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.resource.group.LdapGroupManagerBean; import org.rhq.enterprise.server.resource.group.LdapGroupManagerLocal; @@ -440,10 +439,9 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test { * Helper methods ---------------*/ private void setSystemConfigProperty(final String name, final String value) throws Exception { - SystemSettings sysConfig = systemManager.getSystemSettings(LookupUtil.getSubjectManager().getOverlord()); - SystemSetting retrievedKey = SystemSetting.valueOf(name); - sysConfig.put(retrievedKey, value); - systemManager.setSystemSettings(LookupUtil.getSubjectManager().getOverlord(), sysConfig); + Properties sysConfig = systemManager.getSystemConfiguration(LookupUtil.getSubjectManager().getOverlord()); + sysConfig.setProperty(name, value); + systemManager.setSystemConfiguration(LookupUtil.getSubjectManager().getOverlord(), sysConfig, true); } private void setLdapGroupFilter(String filter) throws Exception {

10 years, 8 months

1
0
0 / 0

[rhq] modules/enterprise

by Simeon Pinder

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 9d5d89cf8c6385028e939ccb76174058cc008d26 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Sep 24 12:02:13 2013 -0400 Modifying LdapManagerBeanTest to use original settings since the right fix affects other tests as well. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java index 7452247..6c0fd5e 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java @@ -29,7 +29,6 @@ import org.testng.annotations.Test; import org.rhq.core.domain.common.SystemConfiguration; import org.rhq.core.domain.common.composite.SystemSetting; -import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.resource.group.LdapGroupManagerBean; import org.rhq.enterprise.server.resource.group.LdapGroupManagerLocal; @@ -440,10 +439,9 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test { * Helper methods ---------------*/ private void setSystemConfigProperty(final String name, final String value) throws Exception { - SystemSettings sysConfig = systemManager.getSystemSettings(LookupUtil.getSubjectManager().getOverlord()); - SystemSetting retrievedKey = SystemSetting.valueOf(name); - sysConfig.put(retrievedKey, value); - systemManager.setSystemSettings(LookupUtil.getSubjectManager().getOverlord(), sysConfig); + Properties sysConfig = systemManager.getSystemConfiguration(LookupUtil.getSubjectManager().getOverlord()); + sysConfig.setProperty(name, value); + systemManager.setSystemConfiguration(LookupUtil.getSubjectManager().getOverlord(), sysConfig, true); } private void setLdapGroupFilter(String filter) throws Exception {

10 years, 8 months

1
0
0 / 0

[rhq] modules/enterprise

by John Sanda

modules/enterprise/server/appserver/pom.xml | 17 ++++++++++ modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 2 - 2 files changed, 18 insertions(+), 1 deletion(-) New commits: commit 110e9a621fdbbef84ba9d7f4d3a3c9532291f700 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 24 11:51:45 2013 -0400 add back plugin config for groovy script to generate additional storage nodes diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 0bd95ff..be8c43c 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -319,6 +319,23 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.0-SNAPSHOT</version> + <executions> + <execution> + <id>storage-setup</id> + <phase>package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${project.basedir}/src/main/scripts/storage_setup.groovy</source> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> diff --git a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy index 857c268..c20e0ed 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy +++ b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy @@ -23,7 +23,7 @@ * You can also run the setup for additional storage nodes after you have already built * your dev-container by executing * - * $ mvn -o groovy:execute -Pdev -Dsource=src/main/script/storage_setup.groovy -Drhq.storage.num-nodes=4 + * $ mvn -o groovy:execute -Pdev -Dsource=src/main/scripts/storage_setup.groovy -Drhq.storage.num-nodes=4 * * The script will detect that you already have rhq-server-2 and rhq-server-3 setup; so, it * will only set up rhq-server-4.

10 years, 8 months

1
0
0 / 0

[rhq] Branch 'bug/960166' - modules/enterprise

by Heiko W. Rupp

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResGroupSelector.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResGroupSelector.java | 79 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java | 79 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResGroupSelector.java | 67 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResourceGroupSelector.java | 67 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasRangeEditor.java | 380 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 380 ------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasRangeEditor.java | 197 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java | 197 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasRangeEditor.java | 67 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java | 67 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigUpdatesPortlet.java | 493 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 493 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 401 -------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOpsHistoryPortlet.java | 401 ++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OpsHistoryPortlet.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigUpdatesPortlet.java | 302 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 302 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java | 144 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOpsHistoryDataSource.java | 144 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDS.java | 272 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java | 272 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 66 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigDS.java | 106 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationDataSource.java | 106 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistGrpResConfMembers.java | 312 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 312 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistGrpPluginConfigMembers.java | 311 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 311 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResGroupResourceSelector.java | 144 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java | 144 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java | 89 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOpsHistoryDataSource.java | 89 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDS.java | 160 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java | 160 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryDS.java | 348 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryListView.java | 200 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 348 ------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java | 200 ---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryDS.java | 178 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryListView.java | 109 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java | 179 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java | 109 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryDS.java | 176 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryListView.java | 103 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 177 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java | 103 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 171 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOpsHistoryDataSource.java | 171 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDS.java | 119 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java | 119 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 472 --------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OpsHistoryDS.java | 472 +++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigHistoryListView.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 5 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java | 50 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResConfigHistoryDetailsUIBean.java | 99 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigHistoryUIBean.java | 89 + modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryDetailsUIBean.java | 99 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryUIBean.java | 89 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropDetailsUIBean.java | 104 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyDetailsUIBean.java | 104 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyHistoryUIBean.java | 108 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropsHistUIBean.java | 108 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigUpdateUIBean.java | 128 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigurationUpdateUIBean.java | 128 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasScheduleUIBean.java | 110 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasurementScheduleUIBean.java | 110 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResGroupMeasScheduleUIBean.java | 108 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResourceGroupMeasurementScheduleUIBean.java | 108 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasScheduleUIBean.java | 104 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasurementScheduleUIBean.java | 104 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java | 123 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationHistoryDetailsUIBean.java | 97 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java | 144 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsCompletedHistoryUIBean.java | 123 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsHistoryDetailsUIBean.java | 97 + modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsPendingHistoryUIBean.java | 144 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationCompletedHistoryUIBean.java | 139 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationPendingHistoryUIBean.java | 133 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsCompletedHistUIBean.java | 139 ++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsPendingHistUIBean.java | 133 ++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/measurement-beans.xml | 6 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/configuration-beans.xml | 9 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml | 13 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/measurement-beans.xml | 10 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml | 12 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml | 8 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml | 12 131 files changed, 7290 insertions(+), 7293 deletions(-) New commits: commit b74398921e3d981411dbc7ca66b318953f2cf8af Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Sep 24 17:33:39 2013 +0200 BZ 960166 those files somehow were forgotten on the previous commit diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java index a582de3..e794e42 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java @@ -50,7 +50,7 @@ import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration.BundleDestinat import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection.SingleCompatibleResourceGroupSelector; +import org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection.SingleCompatibleResGroupSelector; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -73,7 +73,7 @@ public class GetDestinationStep extends AbstractWizardStep { private final BundleDeployWizard wizard; private VLayout form; DynamicForm valForm = new DynamicForm(); - private SingleCompatibleResourceGroupSelector selector; + private SingleCompatibleResGroupSelector selector; private BundleDestination destination = new BundleDestination(); private boolean createInProgress = false; private RadioGroupItem destBaseDirItem; @@ -152,7 +152,7 @@ public class GetDestinationStep extends AbstractWizardStep { } }); - this.selector = new SingleCompatibleResourceGroupSelector("group", MSG.common_title_resource_group()); + this.selector = new SingleCompatibleResGroupSelector("group", MSG.common_title_resource_group()); this.selector.setWidth(300); this.selector.setRequired(true); Validator validator = new IsIntegerValidator(); @@ -219,7 +219,7 @@ public class GetDestinationStep extends AbstractWizardStep { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deployWizard_error_9(), caught); - // try anyway and potentially fail again from there + // try anyway and potentially fail again from there createDestination(); } }); @@ -230,7 +230,7 @@ public class GetDestinationStep extends AbstractWizardStep { return false; } - // this will advance or decrement the step depending on creation success or failure + // this will advance or decrement the step depending on creation success or failure private void createDestination() { int selectedGroup = (Integer) this.valForm.getValue("group"); @@ -264,7 +264,7 @@ public class GetDestinationStep extends AbstractWizardStep { destBaseDirItem.clearValue(); destBaseDirItem.setValueMap((String[]) null); - // this will be null if there is no true group actually selected (e.g. user is typing a partial name to search) + // this will be null if there is no true group actually selected (e.g. user is typing a partial name to search) if (selectedGroupId != null) { bundleServer.getResourceTypeBundleConfiguration(selectedGroupId.intValue(), new AsyncCallback<ResourceTypeBundleConfiguration>() { @@ -309,10 +309,10 @@ public class GetDestinationStep extends AbstractWizardStep { } private class QuickGroupCreateWizard extends AbstractGroupCreateWizard { - private SingleCompatibleResourceGroupSelector groupSelector; + private SingleCompatibleResGroupSelector groupSelector; private HandlerRegistration handlerRegistrar; - public QuickGroupCreateWizard(SingleCompatibleResourceGroupSelector theSelector) { + public QuickGroupCreateWizard(SingleCompatibleResGroupSelector theSelector) { super(); this.groupSelector = theSelector; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResGroupSelector.java new file mode 100644 index 0000000..307e57c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResGroupSelector.java @@ -0,0 +1,30 @@ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; + +import com.smartgwt.client.data.DSRequest; + +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceGroupSelector; + +public class PlatformResGroupSelector extends ResourceGroupSelector { + + public PlatformResGroupSelector() { + super(); + } + + @Override + protected SelectedPlatformResGroupsDataSource getDataSource() { + return new SelectedPlatformResGroupsDataSource(); + } + + protected class SelectedPlatformResGroupsDataSource extends SelectedResourceGroupsDataSource { + + @Override + protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { + ResourceGroupCriteria result = super.getFetchCriteria(request); + result.addFilterExplicitResourceCategory(ResourceCategory.PLATFORM); + return result; + } + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java deleted file mode 100644 index 3a6c4c1..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; - -import com.smartgwt.client.data.DSRequest; - -import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.resource.ResourceCategory; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceGroupSelector; - -public class PlatformResourceGroupSelector extends ResourceGroupSelector { - - public PlatformResourceGroupSelector() { - super(); - } - - @Override - protected SelectedPlatformResourceGroupsDataSource getDataSource() { - return new SelectedPlatformResourceGroupsDataSource(); - } - - protected class SelectedPlatformResourceGroupsDataSource extends SelectedResourceGroupsDataSource { - - @Override - protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { - ResourceGroupCriteria result = super.getFetchCriteria(request); - result.addFilterExplicitResourceCategory(ResourceCategory.PLATFORM); - return result; - } - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResGroupSelector.java new file mode 100644 index 0000000..2769478 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResGroupSelector.java @@ -0,0 +1,79 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; + +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.types.TextMatchStyle; +import com.smartgwt.client.widgets.form.fields.ComboBoxItem; +import com.smartgwt.client.widgets.grid.ListGridField; + +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; + +@Deprecated +// could use SingleResourceGroupSelectorItem seeded with addFilterBundleTargetableOnly(true); +public class SingleCompatibleResGroupSelector extends ComboBoxItem { + + public SingleCompatibleResGroupSelector(String name, String title) { + super(name, title); + + ListGridField nameField = new ListGridField("name"); + ListGridField descriptionField = new ListGridField("description"); + + setOptionDataSource(new CompatibleResourceGroupsDS()); + + setWidth(240); + setTitle(CoreGUI.getMessages().common_title_resource_group()); + + setValueField("id"); + setDisplayField("name"); + setPickListWidth(450); + setPickListFields(nameField, descriptionField); + setTextMatchStyle(TextMatchStyle.SUBSTRING); + } + + protected class CompatibleResourceGroupsDS extends ResourceGroupsDataSource { + + @Override + protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { + // We don't want to use the superclass's getFetchCriteria because our selected value + // is either a Integer (when a real group has been selected) or a String (when a partial search string is selected). + // So, here we create our own criteria. See BZ 802528. + ResourceGroupCriteria result = new ResourceGroupCriteria(); + String filterString = getFilter(request, "id", String.class); + if (filterString != null) { + try { + Integer id = new Integer(filterString); + result.addFilterId(id); + } catch (Exception e) { + result.addFilterName(filterString); + } + } + + // we only want to show those groups that can have bundles deployed to them + result.addFilterBundleTargetableOnly(true); + return result; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java deleted file mode 100644 index 7e31550..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; - -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.types.TextMatchStyle; -import com.smartgwt.client.widgets.form.fields.ComboBoxItem; -import com.smartgwt.client.widgets.grid.ListGridField; - -import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; - -@Deprecated -// could use SingleResourceGroupSelectorItem seeded with addFilterBundleTargetableOnly(true); -public class SingleCompatibleResourceGroupSelector extends ComboBoxItem { - - public SingleCompatibleResourceGroupSelector(String name, String title) { - super(name, title); - - ListGridField nameField = new ListGridField("name"); - ListGridField descriptionField = new ListGridField("description"); - - setOptionDataSource(new CompatibleResourceGroupsDataSource()); - - setWidth(240); - setTitle(CoreGUI.getMessages().common_title_resource_group()); - - setValueField("id"); - setDisplayField("name"); - setPickListWidth(450); - setPickListFields(nameField, descriptionField); - setTextMatchStyle(TextMatchStyle.SUBSTRING); - } - - protected class CompatibleResourceGroupsDataSource extends ResourceGroupsDataSource { - - @Override - protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { - // We don't want to use the superclass's getFetchCriteria because our selected value - // is either a Integer (when a real group has been selected) or a String (when a partial search string is selected). - // So, here we create our own criteria. See BZ 802528. - ResourceGroupCriteria result = new ResourceGroupCriteria(); - String filterString = getFilter(request, "id", String.class); - if (filterString != null) { - try { - Integer id = new Integer(filterString); - result.addFilterId(id); - } catch (Exception e) { - result.addFilterName(filterString); - } - } - - // we only want to show those groups that can have bundles deployed to them - result.addFilterBundleTargetableOnly(true); - return result; - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResGroupSelector.java new file mode 100644 index 0000000..c5ff305 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResGroupSelector.java @@ -0,0 +1,67 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; + +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.types.TextMatchStyle; +import com.smartgwt.client.widgets.form.fields.ComboBoxItem; +import com.smartgwt.client.widgets.grid.ListGridField; + +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; + +/** + * @author Greg Hinkle + */ +public class SinglePlatformResGroupSelector extends ComboBoxItem { + + public SinglePlatformResGroupSelector(String name, String title) { + super(name, title); + + ListGridField nameField = new ListGridField("name"); + ListGridField descriptionField = new ListGridField("description"); + + setOptionDataSource(new PlatformResourceGroupsDS()); + + setWidth(240); + setTitle(CoreGUI.getMessages().common_title_resource_group()); + + setValueField("id"); + setDisplayField("name"); + setPickListWidth(450); + setPickListFields(nameField, descriptionField); + setTextMatchStyle(TextMatchStyle.SUBSTRING); + } + + protected class PlatformResourceGroupsDS extends ResourceGroupsDataSource { + + @Override + protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { + ResourceGroupCriteria result = super.getFetchCriteria(request); + result.addFilterExplicitResourceCategory(ResourceCategory.PLATFORM); + return result; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResourceGroupSelector.java deleted file mode 100644 index cfc8d77..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResourceGroupSelector.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.enterprise.gui.coregui.client.bundle.deploy.selection; - -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.types.TextMatchStyle; -import com.smartgwt.client.widgets.form.fields.ComboBoxItem; -import com.smartgwt.client.widgets.grid.ListGridField; - -import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.resource.ResourceCategory; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; - -/** - * @author Greg Hinkle - */ -public class SinglePlatformResourceGroupSelector extends ComboBoxItem { - - public SinglePlatformResourceGroupSelector(String name, String title) { - super(name, title); - - ListGridField nameField = new ListGridField("name"); - ListGridField descriptionField = new ListGridField("description"); - - setOptionDataSource(new PlatformResourceGroupsDataSource()); - - setWidth(240); - setTitle(CoreGUI.getMessages().common_title_resource_group()); - - setValueField("id"); - setDisplayField("name"); - setPickListWidth(450); - setPickListFields(nameField, descriptionField); - setTextMatchStyle(TextMatchStyle.SUBSTRING); - } - - protected class PlatformResourceGroupsDataSource extends ResourceGroupsDataSource { - - @Override - protected ResourceGroupCriteria getFetchCriteria(final DSRequest request) { - ResourceGroupCriteria result = super.getFetchCriteria(request); - result.addFilterExplicitResourceCategory(ResourceCategory.PLATFORM); - return result; - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasRangeEditor.java new file mode 100644 index 0000000..20ee406 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasRangeEditor.java @@ -0,0 +1,380 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.components.measurement; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.DateDisplayFormat; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.ButtonItem; +import com.smartgwt.client.widgets.form.fields.CheckboxItem; +import com.smartgwt.client.widgets.form.fields.DateTimeItem; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.SpacerItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; +import com.smartgwt.client.widgets.form.fields.events.ClickEvent; +import com.smartgwt.client.widgets.form.fields.events.ClickHandler; +import com.smartgwt.client.widgets.form.validator.CustomValidator; +import com.smartgwt.client.widgets.grid.ListGrid; + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +/** + * @author Simeon Pinder + * @author Greg Hinkle + */ +public abstract class AbstractMeasRangeEditor extends DynamicForm implements TableWidget { + + protected static final Messages MSG = CoreGUI.getMessages(); + + //keyed map of translated date units Ex. minutes,hours,days + protected static LinkedHashMap<String, String> lastUnits; + //array of values available for displaying/selecting 'last N hours|minutes|days'. + protected static final String[] lastValues; + + protected boolean advanced; + private ButtonItem advancedSimpleButton; + protected SelectItem simpleLastValuesItem; + protected SelectItem simpleLastUnitsItem; + protected DateTimeItem advancedStartItem; + protected DateTimeItem advancedEndItem; + private boolean displaySetButton = true; + private boolean displayEnableButton = false; + private boolean displayRangeItemGrouping = false; + protected CheckboxItem enableRangeItem; + private SpacerItem space; + + private ButtonItem setButton; + public static final String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM"; + public static final String ADVANCED_BUTTON_ITEM = "advanced"; + public static final String SIMPLE_VALUE_ITEM = "lastValues"; + public static final String SIMPLE_UNIT_ITEM = "lastUnits"; + public static final String ADVANCED_START_ITEM = "start"; + public static final String ADVANCED_END_ITEM = "end"; + public static final String SET_ITEM = "set"; + + static { + Messages MSG = CoreGUI.getMessages(); + + lastUnits = new LinkedHashMap<String, String>(3); + lastUnits.put(String.valueOf(MeasurementUtility.UNIT_MINUTES), MSG.common_unit_minutes()); + lastUnits.put(String.valueOf(MeasurementUtility.UNIT_HOURS), MSG.common_unit_hours()); + lastUnits.put(String.valueOf(MeasurementUtility.UNIT_DAYS), MSG.common_unit_days()); + + lastValues = new String[] { "4", "8", "12", "24", "30", "36", "48", "60", "90", "120" }; + } + + public AbstractMeasRangeEditor() { + super(); + setNumCols(10); + setWrapItemTitles(false); + setAlign(Alignment.LEFT); + } + + /** + * Returns the current range that is persisted. Note this may NOT be the begin and end times + * as shown in the UI if the user changed the values but did not hit the set button. + * @return begin/end epoch times in a list + */ + public abstract List<Long> getBeginEndTimes(); + + public abstract MetricRangePreferences getMetricRangePreferences(); + + public abstract void setMetricRangeProperties(MetricRangePreferences prefs); + + @Override + protected void onInit() { + super.onInit(); + if (isDisplayRangeItemGrouping()) { + setIsGroup(true); + setGroupTitle("Filter by: Time"); + } + enableRangeItem = new CheckboxItem(ENABLE_RANGE_ITEM, ""); + enableRangeItem.setShowTitle(false); + enableRangeItem.setShowLabel(false); + enableRangeItem.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent event) { + boolean enableRange = Boolean.valueOf(event.getItem().getValue() + ""); + enableMeasurementRange(enableRange); + } + }); + + //combobox of last items + simpleLastValuesItem = new SelectItem(SIMPLE_VALUE_ITEM, MSG.view_measureRange_last()); + simpleLastValuesItem.setValueMap(lastValues); + simpleLastValuesItem.setTitleAlign(Alignment.LEFT); + + //combobox of units of time + simpleLastUnitsItem = new SelectItem(SIMPLE_UNIT_ITEM); + simpleLastUnitsItem.setValueMap(lastUnits); + simpleLastUnitsItem.setShowTitle(false); + + //time range start from + advancedStartItem = new DateTimeItem(ADVANCED_START_ITEM, MSG.view_measureRange_start()); + advancedStartItem.setTitleAlign(Alignment.LEFT); + advancedStartItem.setUseMask(true); + advancedStartItem.setDisplayFormat(DateDisplayFormat.TOUSSHORTDATE); + + //time range end + advancedEndItem = new DateTimeItem(ADVANCED_END_ITEM, MSG.common_title_end()); + advancedEndItem.setUseMask(true); + advancedEndItem.setDisplayFormat(DateDisplayFormat.TOUSSHORTDATE); + + //time validator, start should be before end + CustomValidator timeValidator = new CustomValidator() { + protected boolean condition(Object value) { + return advancedEndItem.getValueAsDate().after(advancedStartItem.getValueAsDate()); + } + }; + timeValidator.setErrorMessage(MSG.view_measureTable_startBeforeEnd()); + advancedStartItem.setValidators(timeValidator); + + setButton = new ButtonItem(SET_ITEM, MSG.common_button_set()); + setButton.setStartRow(false); + setButton.setEndRow(false); + setButton.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + MetricRangePreferences prefs = new MetricRangePreferences(); + prefs.explicitBeginEnd = advanced; + if (advanced) { + try { + if (validate()) { + prefs.begin = advancedStartItem.getValueAsDate().getTime(); + prefs.end = advancedEndItem.getValueAsDate().getTime(); + if (null != prefs.begin && null != prefs.end && prefs.begin > prefs.end) { + CoreGUI.getMessageCenter().notify(new Message(MSG.view_measureTable_startBeforeEnd())); + } else { + setMetricRangeProperties(prefs); + } + } + } catch (Exception ex) { + // some of the digits are not filled correctly + Map<String, String> errors = new HashMap<String, String>(); + errors.put(ADVANCED_END_ITEM, "MM/DD/YYYY HH:MM"); + errors.put(ADVANCED_START_ITEM, "MM/DD/YYYY HH:MM"); + setErrors(errors, true); + } + } else { + prefs.lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString()); + prefs.unit = Integer.valueOf(simpleLastUnitsItem.getValueAsString()); + setMetricRangeProperties(prefs); + } + } + + }); + + advancedSimpleButton = new ButtonItem(ADVANCED_BUTTON_ITEM, MSG.common_button_advanced()); + advancedSimpleButton.setStartRow(false); + advancedSimpleButton.setEndRow(false); + advancedSimpleButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + advanced = !advanced; + update(); + } + }); + + space = new SpacerItem(); + space.setWidth(300); + + MetricRangePreferences metricRangePrefs = getMetricRangePreferences(); + if (metricRangePrefs != null) { + advanced = (metricRangePrefs.explicitBeginEnd); + } + + if (displaySetButton) { + setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, setButton, + advancedSimpleButton, space); + } else {//not displaying Set button + if (displayEnableButton) { + setItems(enableRangeItem, simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, + advancedEndItem, advancedSimpleButton, space); + } else { + setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, + advancedSimpleButton, space); + } + } + update(); + } + + private void assignDefaultsToAdvancedItems() { + advancedStartItem.setValue(new Date(System.currentTimeMillis() - (1000L * 60 * 60 * 8))); + advancedEndItem.setValue(new Date()); + } + + private void assignDefaultsToSimpleItems() { + simpleLastValuesItem.setValue("8"); + simpleLastUnitsItem.setValue(String.valueOf(MeasurementUtility.UNIT_HOURS)); + } + + protected void enableMeasurementRange(boolean enableRange) { + if (enableRange) { + simpleLastValuesItem.disable(); + simpleLastUnitsItem.disable(); + advancedStartItem.disable(); + advancedEndItem.disable(); + advancedSimpleButton.disable(); + } else { + simpleLastValuesItem.enable(); + simpleLastUnitsItem.enable(); + advancedStartItem.enable(); + advancedEndItem.enable(); + advancedSimpleButton.enable(); + markForRedraw(); + } + } + + protected void update() { + if (advanced) { + advancedSimpleButton.setTitle(MSG.view_measureRange_simple()); + showItem(ADVANCED_START_ITEM); + showItem(ADVANCED_END_ITEM); + hideItem(SIMPLE_VALUE_ITEM); + hideItem(SIMPLE_UNIT_ITEM); + } else { + advancedSimpleButton.setTitle(MSG.common_button_advanced()); + hideItem(ADVANCED_START_ITEM); + hideItem(ADVANCED_END_ITEM); + showItem(SIMPLE_VALUE_ITEM); + showItem(SIMPLE_UNIT_ITEM); + } + + // populate the fields - first with defaults in case we have no prefs, then with the appropriate prefs + assignDefaultsToSimpleItems(); + assignDefaultsToAdvancedItems(); + + try { + MetricRangePreferences metricRangePrefs = getMetricRangePreferences(); + if (metricRangePrefs.explicitBeginEnd) { + if (metricRangePrefs.begin != null && metricRangePrefs.end != null) { + advancedStartItem.setValue(new Date(metricRangePrefs.begin.longValue())); + advancedEndItem.setValue(new Date(metricRangePrefs.end.longValue())); + } + } else { + if (lastUnits.containsKey(String.valueOf(metricRangePrefs.unit))) { + simpleLastUnitsItem.setValue(String.valueOf(metricRangePrefs.unit)); + } + if (Arrays.asList(lastValues).contains(String.valueOf(metricRangePrefs.lastN))) { + simpleLastValuesItem.setValue(String.valueOf(metricRangePrefs.lastN)); + } + } + } catch (Exception e) { + // in case any odd errors occur (like bad format of preference strings), just fill in some defaults + CoreGUI.getMessageCenter().notify( + new Message("Failed to get range user preferences, using defaults", e, Severity.Warning)); + assignDefaultsToSimpleItems(); + assignDefaultsToAdvancedItems(); + } + + markForRedraw(); + } + + @Override + public void refresh(ListGrid listGrid) { + update(); + } + + public static class MetricRangePreferences { + // if readOnly is true, then the beginning and ending range dates are specified with explicit dates + // if readOnly is false, then the time is relative to NOW and is specified as <lastN> units of <unit> time + public boolean explicitBeginEnd; + + // simple, when readOnly is false + public int lastN; + public int unit; // see MeasurementUtility.UNIT_xxx + + // advanced, when readOnly is true + public Long begin; + public Long end; + + /** + * Returns a two element <code>List</code> of <code>Long</code> objects representing the begin and end times (in + * milliseconds since the epoch) of the time frame. + **/ + public ArrayList<Long> getBeginEndTimes() { + if (explicitBeginEnd) { + ArrayList<Long> times = new ArrayList<Long>(2); + times.add(begin); + times.add(end); + return times; + } else { + return MeasurementUtility.calculateTimeFrame(lastN, unit); + } + } + + public String toString() { + return (explicitBeginEnd) ? "[begin=" + begin + end + ",end=" + end + "]" : "[lastN=" + lastN + ",unit=" + + unit + "]"; + } + } + + /** + * Returns the SetButton so you can set a click handler from a dialog box + * @return ButtonItem setButton + */ + public ButtonItem getSetButton() { + return setButton; + } + + public boolean isDisplaySetButton() { + return displaySetButton; + } + + public void setDisplaySetButton(boolean displaySetButton) { + this.displaySetButton = displaySetButton; + } + + public boolean isDisplayEnableButton() { + return displayEnableButton; + } + + public void setDisplayEnableButton(boolean displayEnableButton) { + this.displayEnableButton = displayEnableButton; + } + + public boolean isAdvanced() { + return advanced; + } + + public void setAdvanced(boolean advanced) { + this.advanced = advanced; + } + + public boolean isDisplayRangeItemGrouping() { + return displayRangeItemGrouping; + } + + public void setDisplayRangeItemGrouping(boolean displayRangeItemGrouping) { + this.displayRangeItemGrouping = displayRangeItemGrouping; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java deleted file mode 100644 index b4abddc..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java +++ /dev/null @@ -1,380 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.components.measurement; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.DateDisplayFormat; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.ButtonItem; -import com.smartgwt.client.widgets.form.fields.CheckboxItem; -import com.smartgwt.client.widgets.form.fields.DateTimeItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.SpacerItem; -import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; -import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; -import com.smartgwt.client.widgets.form.fields.events.ClickEvent; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; -import com.smartgwt.client.widgets.form.validator.CustomValidator; -import com.smartgwt.client.widgets.grid.ListGrid; - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; - -/** - * @author Simeon Pinder - * @author Greg Hinkle - */ -public abstract class AbstractMeasurementRangeEditor extends DynamicForm implements TableWidget { - - protected static final Messages MSG = CoreGUI.getMessages(); - - //keyed map of translated date units Ex. minutes,hours,days - protected static LinkedHashMap<String, String> lastUnits; - //array of values available for displaying/selecting 'last N hours|minutes|days'. - protected static final String[] lastValues; - - protected boolean advanced; - private ButtonItem advancedSimpleButton; - protected SelectItem simpleLastValuesItem; - protected SelectItem simpleLastUnitsItem; - protected DateTimeItem advancedStartItem; - protected DateTimeItem advancedEndItem; - private boolean displaySetButton = true; - private boolean displayEnableButton = false; - private boolean displayRangeItemGrouping = false; - protected CheckboxItem enableRangeItem; - private SpacerItem space; - - private ButtonItem setButton; - public static final String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM"; - public static final String ADVANCED_BUTTON_ITEM = "advanced"; - public static final String SIMPLE_VALUE_ITEM = "lastValues"; - public static final String SIMPLE_UNIT_ITEM = "lastUnits"; - public static final String ADVANCED_START_ITEM = "start"; - public static final String ADVANCED_END_ITEM = "end"; - public static final String SET_ITEM = "set"; - - static { - Messages MSG = CoreGUI.getMessages(); - - lastUnits = new LinkedHashMap<String, String>(3); - lastUnits.put(String.valueOf(MeasurementUtility.UNIT_MINUTES), MSG.common_unit_minutes()); - lastUnits.put(String.valueOf(MeasurementUtility.UNIT_HOURS), MSG.common_unit_hours()); - lastUnits.put(String.valueOf(MeasurementUtility.UNIT_DAYS), MSG.common_unit_days()); - - lastValues = new String[] { "4", "8", "12", "24", "30", "36", "48", "60", "90", "120" }; - } - - public AbstractMeasurementRangeEditor() { - super(); - setNumCols(10); - setWrapItemTitles(false); - setAlign(Alignment.LEFT); - } - - /** - * Returns the current range that is persisted. Note this may NOT be the begin and end times - * as shown in the UI if the user changed the values but did not hit the set button. - * @return begin/end epoch times in a list - */ - public abstract List<Long> getBeginEndTimes(); - - public abstract MetricRangePreferences getMetricRangePreferences(); - - public abstract void setMetricRangeProperties(MetricRangePreferences prefs); - - @Override - protected void onInit() { - super.onInit(); - if (isDisplayRangeItemGrouping()) { - setIsGroup(true); - setGroupTitle("Filter by: Time"); - } - enableRangeItem = new CheckboxItem(ENABLE_RANGE_ITEM, ""); - enableRangeItem.setShowTitle(false); - enableRangeItem.setShowLabel(false); - enableRangeItem.addChangeHandler(new ChangeHandler() { - @Override - public void onChange(ChangeEvent event) { - boolean enableRange = Boolean.valueOf(event.getItem().getValue() + ""); - enableMeasurementRange(enableRange); - } - }); - - //combobox of last items - simpleLastValuesItem = new SelectItem(SIMPLE_VALUE_ITEM, MSG.view_measureRange_last()); - simpleLastValuesItem.setValueMap(lastValues); - simpleLastValuesItem.setTitleAlign(Alignment.LEFT); - - //combobox of units of time - simpleLastUnitsItem = new SelectItem(SIMPLE_UNIT_ITEM); - simpleLastUnitsItem.setValueMap(lastUnits); - simpleLastUnitsItem.setShowTitle(false); - - //time range start from - advancedStartItem = new DateTimeItem(ADVANCED_START_ITEM, MSG.view_measureRange_start()); - advancedStartItem.setTitleAlign(Alignment.LEFT); - advancedStartItem.setUseMask(true); - advancedStartItem.setDisplayFormat(DateDisplayFormat.TOUSSHORTDATE); - - //time range end - advancedEndItem = new DateTimeItem(ADVANCED_END_ITEM, MSG.common_title_end()); - advancedEndItem.setUseMask(true); - advancedEndItem.setDisplayFormat(DateDisplayFormat.TOUSSHORTDATE); - - //time validator, start should be before end - CustomValidator timeValidator = new CustomValidator() { - protected boolean condition(Object value) { - return advancedEndItem.getValueAsDate().after(advancedStartItem.getValueAsDate()); - } - }; - timeValidator.setErrorMessage(MSG.view_measureTable_startBeforeEnd()); - advancedStartItem.setValidators(timeValidator); - - setButton = new ButtonItem(SET_ITEM, MSG.common_button_set()); - setButton.setStartRow(false); - setButton.setEndRow(false); - setButton.addClickHandler(new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - MetricRangePreferences prefs = new MetricRangePreferences(); - prefs.explicitBeginEnd = advanced; - if (advanced) { - try { - if (validate()) { - prefs.begin = advancedStartItem.getValueAsDate().getTime(); - prefs.end = advancedEndItem.getValueAsDate().getTime(); - if (null != prefs.begin && null != prefs.end && prefs.begin > prefs.end) { - CoreGUI.getMessageCenter().notify(new Message(MSG.view_measureTable_startBeforeEnd())); - } else { - setMetricRangeProperties(prefs); - } - } - } catch (Exception ex) { - // some of the digits are not filled correctly - Map<String, String> errors = new HashMap<String, String>(); - errors.put(ADVANCED_END_ITEM, "MM/DD/YYYY HH:MM"); - errors.put(ADVANCED_START_ITEM, "MM/DD/YYYY HH:MM"); - setErrors(errors, true); - } - } else { - prefs.lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString()); - prefs.unit = Integer.valueOf(simpleLastUnitsItem.getValueAsString()); - setMetricRangeProperties(prefs); - } - } - - }); - - advancedSimpleButton = new ButtonItem(ADVANCED_BUTTON_ITEM, MSG.common_button_advanced()); - advancedSimpleButton.setStartRow(false); - advancedSimpleButton.setEndRow(false); - advancedSimpleButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent clickEvent) { - advanced = !advanced; - update(); - } - }); - - space = new SpacerItem(); - space.setWidth(300); - - MetricRangePreferences metricRangePrefs = getMetricRangePreferences(); - if (metricRangePrefs != null) { - advanced = (metricRangePrefs.explicitBeginEnd); - } - - if (displaySetButton) { - setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, setButton, - advancedSimpleButton, space); - } else {//not displaying Set button - if (displayEnableButton) { - setItems(enableRangeItem, simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, - advancedEndItem, advancedSimpleButton, space); - } else { - setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, - advancedSimpleButton, space); - } - } - update(); - } - - private void assignDefaultsToAdvancedItems() { - advancedStartItem.setValue(new Date(System.currentTimeMillis() - (1000L * 60 * 60 * 8))); - advancedEndItem.setValue(new Date()); - } - - private void assignDefaultsToSimpleItems() { - simpleLastValuesItem.setValue("8"); - simpleLastUnitsItem.setValue(String.valueOf(MeasurementUtility.UNIT_HOURS)); - } - - protected void enableMeasurementRange(boolean enableRange) { - if (enableRange) { - simpleLastValuesItem.disable(); - simpleLastUnitsItem.disable(); - advancedStartItem.disable(); - advancedEndItem.disable(); - advancedSimpleButton.disable(); - } else { - simpleLastValuesItem.enable(); - simpleLastUnitsItem.enable(); - advancedStartItem.enable(); - advancedEndItem.enable(); - advancedSimpleButton.enable(); - markForRedraw(); - } - } - - protected void update() { - if (advanced) { - advancedSimpleButton.setTitle(MSG.view_measureRange_simple()); - showItem(ADVANCED_START_ITEM); - showItem(ADVANCED_END_ITEM); - hideItem(SIMPLE_VALUE_ITEM); - hideItem(SIMPLE_UNIT_ITEM); - } else { - advancedSimpleButton.setTitle(MSG.common_button_advanced()); - hideItem(ADVANCED_START_ITEM); - hideItem(ADVANCED_END_ITEM); - showItem(SIMPLE_VALUE_ITEM); - showItem(SIMPLE_UNIT_ITEM); - } - - // populate the fields - first with defaults in case we have no prefs, then with the appropriate prefs - assignDefaultsToSimpleItems(); - assignDefaultsToAdvancedItems(); - - try { - MetricRangePreferences metricRangePrefs = getMetricRangePreferences(); - if (metricRangePrefs.explicitBeginEnd) { - if (metricRangePrefs.begin != null && metricRangePrefs.end != null) { - advancedStartItem.setValue(new Date(metricRangePrefs.begin.longValue())); - advancedEndItem.setValue(new Date(metricRangePrefs.end.longValue())); - } - } else { - if (lastUnits.containsKey(String.valueOf(metricRangePrefs.unit))) { - simpleLastUnitsItem.setValue(String.valueOf(metricRangePrefs.unit)); - } - if (Arrays.asList(lastValues).contains(String.valueOf(metricRangePrefs.lastN))) { - simpleLastValuesItem.setValue(String.valueOf(metricRangePrefs.lastN)); - } - } - } catch (Exception e) { - // in case any odd errors occur (like bad format of preference strings), just fill in some defaults - CoreGUI.getMessageCenter().notify( - new Message("Failed to get range user preferences, using defaults", e, Severity.Warning)); - assignDefaultsToSimpleItems(); - assignDefaultsToAdvancedItems(); - } - - markForRedraw(); - } - - @Override - public void refresh(ListGrid listGrid) { - update(); - } - - public static class MetricRangePreferences { - // if readOnly is true, then the beginning and ending range dates are specified with explicit dates - // if readOnly is false, then the time is relative to NOW and is specified as <lastN> units of <unit> time - public boolean explicitBeginEnd; - - // simple, when readOnly is false - public int lastN; - public int unit; // see MeasurementUtility.UNIT_xxx - - // advanced, when readOnly is true - public Long begin; - public Long end; - - /** - * Returns a two element <code>List</code> of <code>Long</code> objects representing the begin and end times (in - * milliseconds since the epoch) of the time frame. - **/ - public ArrayList<Long> getBeginEndTimes() { - if (explicitBeginEnd) { - ArrayList<Long> times = new ArrayList<Long>(2); - times.add(begin); - times.add(end); - return times; - } else { - return MeasurementUtility.calculateTimeFrame(lastN, unit); - } - } - - public String toString() { - return (explicitBeginEnd) ? "[begin=" + begin + end + ",end=" + end + "]" : "[lastN=" + lastN + ",unit=" - + unit + "]"; - } - } - - /** - * Returns the SetButton so you can set a click handler from a dialog box - * @return ButtonItem setButton - */ - public ButtonItem getSetButton() { - return setButton; - } - - public boolean isDisplaySetButton() { - return displaySetButton; - } - - public void setDisplaySetButton(boolean displaySetButton) { - this.displaySetButton = displaySetButton; - } - - public boolean isDisplayEnableButton() { - return displayEnableButton; - } - - public void setDisplayEnableButton(boolean displayEnableButton) { - this.displayEnableButton = displayEnableButton; - } - - public boolean isAdvanced() { - return advanced; - } - - public void setAdvanced(boolean advanced) { - this.advanced = advanced; - } - - public boolean isDisplayRangeItemGrouping() { - return displayRangeItemGrouping; - } - - public void setDisplayRangeItemGrouping(boolean displayRangeItemGrouping) { - this.displayRangeItemGrouping = displayRangeItemGrouping; - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasRangeEditor.java new file mode 100644 index 0000000..df49f33 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasRangeEditor.java @@ -0,0 +1,197 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.components.measurement; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; + +public class CustomConfigMeasRangeEditor extends AbstractMeasRangeEditor { + + public static final String PREF_METRIC_RANGE = Constant.METRIC_RANGE; + public static final String PREF_METRIC_RANGE_LASTN = Constant.METRIC_RANGE_LASTN; + public static final String PREF_METRIC_RANGE_UNIT = Constant.METRIC_RANGE_UNIT; + public static final String PREF_METRIC_RANGE_BEGIN_END_FLAG = Constant.METRIC_RANGE_BEGIN_END_FLAG; + public static final String ALERT_METRIC_RANGE_ENABLE = Constant.METRIC_RANGE_ENABLE; + + public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString(); + public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(Constant.METRIC_RANGE_LASTN_DEFAULT); + public static final Integer DEFAULT_VALUE_RANGE_UNIT = Integer.valueOf(Constant.METRIC_RANGE_UNIT_DEFAULT); + + private ConfigurationMeasurementPreferences measurementPrefs; + + public CustomConfigMeasRangeEditor(Configuration config) { + super(); + measurementPrefs = new ConfigurationMeasurementPreferences(config); + setDisplaySetButton(false); + setDisplayEnableButton(true); + setDisplayRangeItemGrouping(true); + setWidth(650); + } + + @Override + public List<Long> getBeginEndTimes() { + List<Long> beginEndTimes = new ArrayList<Long>(); + if (advanced) { + beginEndTimes.add(advancedStartItem.getValueAsDate().getTime()); + beginEndTimes.add(advancedEndItem.getValueAsDate().getTime()); + return beginEndTimes; + } else { + int lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString()); + String unit = simpleLastUnitsItem.getValueAsString(); + measurementPrefs.metricRangePreferences.lastN = lastN; + measurementPrefs.metricRangePreferences.unit = Integer.valueOf(unit); + return MeasurementUtility.calculateTimeFrame(lastN, Integer.valueOf(unit)); + } + } + + @Override + public MetricRangePreferences getMetricRangePreferences() { + return measurementPrefs.getMetricRangePreferences(); + } + + @Override + public void setMetricRangeProperties(MetricRangePreferences prefs) { + measurementPrefs.setMetricRangePreferences(prefs); + } + + public String getSimpleProperty(String propertyKey) { + String propertyValue = ""; + if ((propertyKey != null) && (propertyKey.trim().length() > 0)) { + if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) { + PropertySimple property = measurementPrefs.configuration.getSimple(propertyKey); + if (property != null) { + propertyValue = property.getStringValue(); + } + } + } + return propertyValue; + } + + public void setSimpleProperty(String propertyKey, String value) { + if ((propertyKey != null) && (propertyKey.trim().length() > 0) && (value != null) && (!value.trim().isEmpty())) { + if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) { + measurementPrefs.configuration.put(new PropertySimple(propertyKey, value)); + } + } + } + + class ConfigurationMeasurementPreferences { + + private MetricRangePreferences metricRangePreferences; + private Configuration configuration; + + public ConfigurationMeasurementPreferences(Configuration config) { + if (metricRangePreferences == null) { + metricRangePreferences = new MetricRangePreferences(); + } + //parse config and lazily init timing elements + metricRangePreferences.explicitBeginEnd = Boolean.valueOf( + config.getSimple(PREF_METRIC_RANGE_BEGIN_END_FLAG).getStringValue()).booleanValue(); + //check to display advanced settings widget components + if (metricRangePreferences.explicitBeginEnd == false) { + //retrieve lastN + metricRangePreferences.lastN = config.getSimple(PREF_METRIC_RANGE_LASTN).getIntegerValue(); + //retrieve lastN units + metricRangePreferences.unit = config.getSimple(PREF_METRIC_RANGE_UNIT).getIntegerValue(); + + List<Long> range = MeasurementUtility.calculateTimeFrame(metricRangePreferences.lastN, + metricRangePreferences.unit); + metricRangePreferences.begin = range.get(0); + metricRangePreferences.end = range.get(1); + } else {//in advanced view + try { + String rangeString = config.getSimpleValue(PREF_METRIC_RANGE, ""); + if (rangeString != null && rangeString.trim().length() > 0) { + if (rangeString.contains(",")) { // legacy support: old prefs used to use commas + rangeString = rangeString.replace(",", "|"); + //userPrefs.setPreference(PREF_METRIC_RANGE, rangeString); // TODO set only if we don't support JSF anymore + } + String[] beginEnd = rangeString.split("\\|"); + metricRangePreferences.begin = Long.parseLong(beginEnd[0]); + metricRangePreferences.end = Long.parseLong(beginEnd[1]); + } + } catch (IllegalArgumentException iae) { + // that's OK, range will remain null and we might use the lastN / unit + List<Long> range = MeasurementUtility.calculateTimeFrame(DEFAULT_VALUE_RANGE_LASTN, + DEFAULT_VALUE_RANGE_UNIT); + metricRangePreferences.begin = range.get(0); + metricRangePreferences.end = range.get(1); + } + } + // update configuration + this.configuration = config; + } + + public void setMetricRangePreferences(MetricRangePreferences metricRangePreferences) { + this.metricRangePreferences = metricRangePreferences; + } + + public MetricRangePreferences getMetricRangePreferences() { + return metricRangePreferences; + } + } + + @Override + protected void onInit() { + super.onInit(); + //turn on date entry validation + enableRangeItem.setWidth(30); + // advancedStartItem.setEnforceDate(true); + // advancedEndItem.setEnforceDate(true); + //disable text field view to prevent bad data entry. Use widget or dropdowns. + //TODO: spinder 3/9/11: this should be renabled to allow minute/second tuning here too, but need to handle validation. + advancedStartItem.setUseTextField(false); + advancedEndItem.setUseTextField(false); + advancedStartItem.setType("selection"); + simpleLastValuesItem.setWidth(50); + simpleLastUnitsItem.setWidth(70); + + //set fields to previously populated values + PropertySimple cp = measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE); + if (Boolean.valueOf(measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE).getStringValue())) { + enableRangeItem.setValue(true); + enableMeasurementRange(false); + } else { + enableRangeItem.setValue(false); + enableMeasurementRange(true); + } + //is advanced + boolean advanced = measurementPrefs.metricRangePreferences.explicitBeginEnd; + if (advanced) { + ArrayList<Long> beginEnd = measurementPrefs.metricRangePreferences.getBeginEndTimes(); + if ((beginEnd != null) && (!beginEnd.isEmpty())) { + advancedStartItem.setValue(beginEnd.get(0)); + advancedEndItem.setValue(beginEnd.get(1)); + } + } else {//simple: set LastN and Units + if (lastUnits.containsKey(String.valueOf(measurementPrefs.metricRangePreferences.unit))) { + simpleLastUnitsItem.setValue(String.valueOf(measurementPrefs.metricRangePreferences.unit)); + } + if (Arrays.asList(lastValues).contains(String.valueOf(measurementPrefs.metricRangePreferences.lastN))) { + simpleLastValuesItem.setValue(String.valueOf(measurementPrefs.metricRangePreferences.lastN)); + } + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java deleted file mode 100644 index a6cadd8..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java +++ /dev/null @@ -1,197 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.components.measurement; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; - -public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRangeEditor { - - public static final String PREF_METRIC_RANGE = Constant.METRIC_RANGE; - public static final String PREF_METRIC_RANGE_LASTN = Constant.METRIC_RANGE_LASTN; - public static final String PREF_METRIC_RANGE_UNIT = Constant.METRIC_RANGE_UNIT; - public static final String PREF_METRIC_RANGE_BEGIN_END_FLAG = Constant.METRIC_RANGE_BEGIN_END_FLAG; - public static final String ALERT_METRIC_RANGE_ENABLE = Constant.METRIC_RANGE_ENABLE; - - public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString(); - public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(Constant.METRIC_RANGE_LASTN_DEFAULT); - public static final Integer DEFAULT_VALUE_RANGE_UNIT = Integer.valueOf(Constant.METRIC_RANGE_UNIT_DEFAULT); - - private ConfigurationMeasurementPreferences measurementPrefs; - - public CustomConfigMeasurementRangeEditor(Configuration config) { - super(); - measurementPrefs = new ConfigurationMeasurementPreferences(config); - setDisplaySetButton(false); - setDisplayEnableButton(true); - setDisplayRangeItemGrouping(true); - setWidth(650); - } - - @Override - public List<Long> getBeginEndTimes() { - List<Long> beginEndTimes = new ArrayList<Long>(); - if (advanced) { - beginEndTimes.add(advancedStartItem.getValueAsDate().getTime()); - beginEndTimes.add(advancedEndItem.getValueAsDate().getTime()); - return beginEndTimes; - } else { - int lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString()); - String unit = simpleLastUnitsItem.getValueAsString(); - measurementPrefs.metricRangePreferences.lastN = lastN; - measurementPrefs.metricRangePreferences.unit = Integer.valueOf(unit); - return MeasurementUtility.calculateTimeFrame(lastN, Integer.valueOf(unit)); - } - } - - @Override - public MetricRangePreferences getMetricRangePreferences() { - return measurementPrefs.getMetricRangePreferences(); - } - - @Override - public void setMetricRangeProperties(MetricRangePreferences prefs) { - measurementPrefs.setMetricRangePreferences(prefs); - } - - public String getSimpleProperty(String propertyKey) { - String propertyValue = ""; - if ((propertyKey != null) && (propertyKey.trim().length() > 0)) { - if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) { - PropertySimple property = measurementPrefs.configuration.getSimple(propertyKey); - if (property != null) { - propertyValue = property.getStringValue(); - } - } - } - return propertyValue; - } - - public void setSimpleProperty(String propertyKey, String value) { - if ((propertyKey != null) && (propertyKey.trim().length() > 0) && (value != null) && (!value.trim().isEmpty())) { - if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) { - measurementPrefs.configuration.put(new PropertySimple(propertyKey, value)); - } - } - } - - class ConfigurationMeasurementPreferences { - - private MetricRangePreferences metricRangePreferences; - private Configuration configuration; - - public ConfigurationMeasurementPreferences(Configuration config) { - if (metricRangePreferences == null) { - metricRangePreferences = new MetricRangePreferences(); - } - //parse config and lazily init timing elements - metricRangePreferences.explicitBeginEnd = Boolean.valueOf( - config.getSimple(PREF_METRIC_RANGE_BEGIN_END_FLAG).getStringValue()).booleanValue(); - //check to display advanced settings widget components - if (metricRangePreferences.explicitBeginEnd == false) { - //retrieve lastN - metricRangePreferences.lastN = config.getSimple(PREF_METRIC_RANGE_LASTN).getIntegerValue(); - //retrieve lastN units - metricRangePreferences.unit = config.getSimple(PREF_METRIC_RANGE_UNIT).getIntegerValue(); - - List<Long> range = MeasurementUtility.calculateTimeFrame(metricRangePreferences.lastN, - metricRangePreferences.unit); - metricRangePreferences.begin = range.get(0); - metricRangePreferences.end = range.get(1); - } else {//in advanced view - try { - String rangeString = config.getSimpleValue(PREF_METRIC_RANGE, ""); - if (rangeString != null && rangeString.trim().length() > 0) { - if (rangeString.contains(",")) { // legacy support: old prefs used to use commas - rangeString = rangeString.replace(",", "|"); - //userPrefs.setPreference(PREF_METRIC_RANGE, rangeString); // TODO set only if we don't support JSF anymore - } - String[] beginEnd = rangeString.split("\\|"); - metricRangePreferences.begin = Long.parseLong(beginEnd[0]); - metricRangePreferences.end = Long.parseLong(beginEnd[1]); - } - } catch (IllegalArgumentException iae) { - // that's OK, range will remain null and we might use the lastN / unit - List<Long> range = MeasurementUtility.calculateTimeFrame(DEFAULT_VALUE_RANGE_LASTN, - DEFAULT_VALUE_RANGE_UNIT); - metricRangePreferences.begin = range.get(0); - metricRangePreferences.end = range.get(1); - } - } - // update configuration - this.configuration = config; - } - - public void setMetricRangePreferences(MetricRangePreferences metricRangePreferences) { - this.metricRangePreferences = metricRangePreferences; - } - - public MetricRangePreferences getMetricRangePreferences() { - return metricRangePreferences; - } - } - - @Override - protected void onInit() { - super.onInit(); - //turn on date entry validation - enableRangeItem.setWidth(30); - // advancedStartItem.setEnforceDate(true); - // advancedEndItem.setEnforceDate(true); - //disable text field view to prevent bad data entry. Use widget or dropdowns. - //TODO: spinder 3/9/11: this should be renabled to allow minute/second tuning here too, but need to handle validation. - advancedStartItem.setUseTextField(false); - advancedEndItem.setUseTextField(false); - advancedStartItem.setType("selection"); - simpleLastValuesItem.setWidth(50); - simpleLastUnitsItem.setWidth(70); - - //set fields to previously populated values - PropertySimple cp = measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE); - if (Boolean.valueOf(measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE).getStringValue())) { - enableRangeItem.setValue(true); - enableMeasurementRange(false); - } else { - enableRangeItem.setValue(false); - enableMeasurementRange(true); - } - //is advanced - boolean advanced = measurementPrefs.metricRangePreferences.explicitBeginEnd; - if (advanced) { - ArrayList<Long> beginEnd = measurementPrefs.metricRangePreferences.getBeginEndTimes(); - if ((beginEnd != null) && (!beginEnd.isEmpty())) { - advancedStartItem.setValue(beginEnd.get(0)); - advancedEndItem.setValue(beginEnd.get(1)); - } - } else {//simple: set LastN and Units - if (lastUnits.containsKey(String.valueOf(measurementPrefs.metricRangePreferences.unit))) { - simpleLastUnitsItem.setValue(String.valueOf(measurementPrefs.metricRangePreferences.unit)); - } - if (Arrays.asList(lastValues).contains(String.valueOf(measurementPrefs.metricRangePreferences.lastN))) { - simpleLastValuesItem.setValue(String.valueOf(measurementPrefs.metricRangePreferences.lastN)); - } - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasRangeEditor.java new file mode 100644 index 0000000..aba357f --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasRangeEditor.java @@ -0,0 +1,67 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.components.measurement; + +import java.util.List; + +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +public class UserPreferencesMeasRangeEditor extends AbstractMeasRangeEditor { + private static final int START_TIME_INDEX = 0; + private static final int END_TIME_INDEX = 1; + + private MeasurementUserPreferences measurementUserPrefs; + public UserPreferencesMeasRangeEditor() { + super(); + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + } + + /** + * Returns the current range that is persisted. Note this may NOT be the begin and end times + * as shown in the UI if the user changed the values but did not hit the set button. + * @return begin/end epoch times in a list + */ + @Override + public List<Long> getBeginEndTimes() { + return measurementUserPrefs.getMetricRangePreferences().getBeginEndTimes(); + } + + @Override + public MetricRangePreferences getMetricRangePreferences() { + return measurementUserPrefs.getMetricRangePreferences(); + } + + @Override + public void setMetricRangeProperties(MetricRangePreferences prefs) { + measurementUserPrefs.setMetricRangePreferences(prefs); + } + + public Long getStartTime(){ + List<Long> beginEndTimes = getBeginEndTimes(); + return beginEndTimes.get(START_TIME_INDEX); + + } + public Long getEndTime(){ + List<Long> beginEndTimes = getBeginEndTimes(); + return beginEndTimes.get(END_TIME_INDEX); + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java deleted file mode 100644 index 66bfd57..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.components.measurement; - -import java.util.List; - -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; - -public class UserPreferencesMeasurementRangeEditor extends AbstractMeasurementRangeEditor { - private static final int START_TIME_INDEX = 0; - private static final int END_TIME_INDEX = 1; - - private MeasurementUserPreferences measurementUserPrefs; - public UserPreferencesMeasurementRangeEditor() { - super(); - measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - } - - /** - * Returns the current range that is persisted. Note this may NOT be the begin and end times - * as shown in the UI if the user changed the values but did not hit the set button. - * @return begin/end epoch times in a list - */ - @Override - public List<Long> getBeginEndTimes() { - return measurementUserPrefs.getMetricRangePreferences().getBeginEndTimes(); - } - - @Override - public MetricRangePreferences getMetricRangePreferences() { - return measurementUserPrefs.getMetricRangePreferences(); - } - - @Override - public void setMetricRangeProperties(MetricRangePreferences prefs) { - measurementUserPrefs.setMetricRangePreferences(prefs); - } - - public Long getStartTime(){ - List<Long> beginEndTimes = getBeginEndTimes(); - return beginEndTimes.get(START_TIME_INDEX); - - } - public Long getEndTime(){ - List<Long> beginEndTimes = getBeginEndTimes(); - return beginEndTimes.get(END_TIME_INDEX); - - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java index 9c310ca..4acc479 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java @@ -63,13 +63,13 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.form.ColorButtonItem; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBundleDeploymentsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOobsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOperationsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupPkgHistoryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceBundleDeploymentsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceEventsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceOperationsPortlet; @@ -122,7 +122,7 @@ public class DashboardView extends EnhancedVLayout { /** * Convenience constructor for subsystem context. - * + * * @param dashboardContainer * @param storedDashboard */ @@ -475,7 +475,7 @@ public class DashboardView extends EnhancedVLayout { } // Configuration related portlets if (!facets.contains(ResourceTypeFacet.CONFIGURATION)) { - resourceMenuMap.remove(ResourceConfigurationUpdatesPortlet.KEY); + resourceMenuMap.remove(ResourceConfigUpdatesPortlet.KEY); } // Bundle related portlets if (!facets.contains(ResourceTypeFacet.BUNDLE)) { @@ -506,7 +506,7 @@ public class DashboardView extends EnhancedVLayout { groupMenuMap.remove(GroupMetricsPortlet.KEY); groupMenuMap.remove(GroupOobsPortlet.KEY); groupMenuMap.remove(GroupPkgHistoryPortlet.KEY); - groupMenuMap.remove(GroupConfigurationUpdatesPortlet.KEY); + groupMenuMap.remove(GroupConfigUpdatesPortlet.KEY); groupMenuMap.remove(GroupBundleDeploymentsPortlet.KEY); } else { @@ -527,7 +527,7 @@ public class DashboardView extends EnhancedVLayout { } // CONFIGURATION related portlets(CONFIGURATION) if (!facets.contains(ResourceTypeFacet.CONFIGURATION)) { - groupMenuMap.remove(GroupConfigurationUpdatesPortlet.KEY); + groupMenuMap.remove(GroupConfigUpdatesPortlet.KEY); } // BUNDLE related portlets(BUNDLE) if (!facets.contains(ResourceTypeFacet.BUNDLE)) { @@ -695,13 +695,13 @@ public class DashboardView extends EnhancedVLayout { * a portlet may have been associated with its window prior to being persisted. In this case we can consider * it equal if it is associated with the same dashboard(1) and has the same positioning. Note that key-name pairing * can not be used for equality as a dashboard is allowed to have the same portlet multiple times, with a default - * name. But they can not hold the same position. + * name. But they can not hold the same position. * <pre> * (1) Even the dashboard comparison has been made flexible. To allow for lazy persist of the dashboard (to * allow for the default group or resource dashboard to not be persisted) we allow the dash comparison * to be done by name if an entity id is 0. This should be safe as dashboard names are set prior to - * persist, and should be unique for the session user. - * + * persist, and should be unique for the session user. + * * @param storedPortlet * @param updatedPortlet * @return diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java index 9ea5507..fa2f43b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java @@ -64,7 +64,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTab; import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTabSet; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.RecentAlertsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationHistoryPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OpsHistoryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.problems.ProblemResourcesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.summary.InventorySummaryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MashupPortlet; @@ -228,7 +228,7 @@ public class DashboardsView extends EnhancedVLayout implements DashboardContaine // If re-selecting a Dashboard, make sure it, and its portlets, are up to date if (selectedDashboardView.isDrawn()) { - // I think this should work with markForRedraw but for some reason it does not + // I think this should work with markForRedraw but for some reason it does not selectedDashboardView.redraw(); } } @@ -280,7 +280,7 @@ public class DashboardsView extends EnhancedVLayout implements DashboardContaine dashboard.setName(MSG.common_title_default()); dashboard.setCategory(DashboardCategory.INVENTORY); dashboard.setColumns(2); - // only leftmost column width is currently settable, the rest are equally divided + // only leftmost column width is currently settable, the rest are equally divided dashboard.setColumnWidths("32%"); dashboard.getConfiguration().put(new PropertySimple(Dashboard.CFG_BACKGROUND, "#F1F2F3")); @@ -328,7 +328,7 @@ public class DashboardsView extends EnhancedVLayout implements DashboardContaine ProblemResourcesPortlet.defaultShowHours)); dashboard.addPortlet(problemResources, columnIndex, rowIndex++); - DashboardPortlet operations = new DashboardPortlet(OperationHistoryPortlet.NAME, OperationHistoryPortlet.KEY, + DashboardPortlet operations = new DashboardPortlet(OpsHistoryPortlet.NAME, OpsHistoryPortlet.KEY, 200); dashboard.addPortlet(operations, columnIndex, rowIndex++); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java index f7dd822..8501238 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java @@ -32,7 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.FavoriteGroupsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBundleDeploymentsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupEventsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOobsPortlet; @@ -45,12 +45,12 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resour import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.platform.PlatformSummaryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.RecentAlertsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.imported.RecentlyAddedResourcesPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationHistoryPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OpsHistoryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationSchedulePortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.problems.ProblemResourcesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceAlertsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceBundleDeploymentsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceEventsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceOobsPortlet; @@ -71,10 +71,10 @@ public class PortletFactory { private static final HashMap<String, PortletViewFactory> globalPortletFactoryMap; // although portlet names are I18N, they are assumed to be unique. This maps portlet names to portlet keys, - // and the keyset is sorted for convenient display. + // and the keyset is sorted for convenient display. private static final TreeMap<String, String> globalPortletNameMap; // although portlet names are I18N, they are assumed to be unique. This maps portlet keys to portlet names, - // and is suitable for a sorted Menu value map. + // and is suitable for a sorted Menu value map. private static final LinkedHashMap<String, String> globalPortletMenuMap; //Group portlet registrations, diff from default portlets as only applicable for specific group @@ -109,7 +109,7 @@ public class PortletFactory { globalPortletFactoryMap.put(MashupPortlet.KEY, MashupPortlet.Factory.INSTANCE); globalPortletFactoryMap.put(MessagePortlet.KEY, MessagePortlet.Factory.INSTANCE); globalPortletFactoryMap.put(ProblemResourcesPortlet.KEY, ProblemResourcesPortlet.Factory.INSTANCE); - globalPortletFactoryMap.put(OperationHistoryPortlet.KEY, OperationHistoryPortlet.Factory.INSTANCE); + globalPortletFactoryMap.put(OpsHistoryPortlet.KEY, OpsHistoryPortlet.Factory.INSTANCE); globalPortletFactoryMap.put(OperationSchedulePortlet.KEY, OperationSchedulePortlet.Factory.INSTANCE); // sorted map of portlet names to portlet keys @@ -130,7 +130,7 @@ public class PortletFactory { globalPortletNameMap.put(MashupPortlet.NAME, MashupPortlet.KEY); globalPortletNameMap.put(MessagePortlet.NAME, MessagePortlet.KEY); globalPortletNameMap.put(ProblemResourcesPortlet.NAME, ProblemResourcesPortlet.KEY); - globalPortletNameMap.put(OperationHistoryPortlet.NAME, OperationHistoryPortlet.KEY); + globalPortletNameMap.put(OpsHistoryPortlet.NAME, OpsHistoryPortlet.KEY); globalPortletNameMap.put(OperationSchedulePortlet.NAME, OperationSchedulePortlet.KEY); globalPortletMenuMap = new LinkedHashMap<String, String>(globalPortletNameMap.size()); @@ -140,7 +140,7 @@ public class PortletFactory { // GROUP Portlets - // Map portlet keys to portlet factories + // Map portlet keys to portlet factories groupPortletFactoryMap = new HashMap<String, PortletViewFactory>(); groupPortletFactoryMap.put(GroupAlertsPortlet.KEY, GroupAlertsPortlet.Factory.INSTANCE); groupPortletFactoryMap.put(GroupMetricsPortlet.KEY, GroupMetricsPortlet.Factory.INSTANCE); @@ -149,8 +149,8 @@ public class PortletFactory { groupPortletFactoryMap.put(GroupOperationsPortlet.KEY, GroupOperationsPortlet.Factory.INSTANCE); groupPortletFactoryMap.put(GroupPkgHistoryPortlet.KEY, GroupPkgHistoryPortlet.Factory.INSTANCE); groupPortletFactoryMap.put(GroupBundleDeploymentsPortlet.KEY, GroupBundleDeploymentsPortlet.Factory.INSTANCE); - groupPortletFactoryMap.put(GroupConfigurationUpdatesPortlet.KEY, - GroupConfigurationUpdatesPortlet.Factory.INSTANCE); + groupPortletFactoryMap.put(GroupConfigUpdatesPortlet.KEY, + GroupConfigUpdatesPortlet.Factory.INSTANCE); // sorted map of portlet names to portlet keys groupPortletNameMap = new TreeMap<String, String>(); @@ -161,7 +161,7 @@ public class PortletFactory { groupPortletNameMap.put(GroupOperationsPortlet.NAME, GroupOperationsPortlet.KEY); groupPortletNameMap.put(GroupPkgHistoryPortlet.NAME, GroupPkgHistoryPortlet.KEY); groupPortletNameMap.put(GroupBundleDeploymentsPortlet.NAME, GroupBundleDeploymentsPortlet.KEY); - groupPortletNameMap.put(GroupConfigurationUpdatesPortlet.NAME, GroupConfigurationUpdatesPortlet.KEY); + groupPortletNameMap.put(GroupConfigUpdatesPortlet.NAME, GroupConfigUpdatesPortlet.KEY); groupPortletMenuMap = new LinkedHashMap<String, String>(groupPortletNameMap.size()); for (String portletName : groupPortletNameMap.keySet()) { @@ -170,7 +170,7 @@ public class PortletFactory { // Resource Portlets - // Map portlet keys to portlet factories + // Map portlet keys to portlet factories resourcePortletFactoryMap = new HashMap<String, PortletViewFactory>(); resourcePortletFactoryMap.put(ResourceMetricsPortlet.KEY, ResourceMetricsPortlet.Factory.INSTANCE); resourcePortletFactoryMap.put(ResourceEventsPortlet.KEY, ResourceEventsPortlet.Factory.INSTANCE); @@ -180,8 +180,8 @@ public class PortletFactory { resourcePortletFactoryMap.put(ResourcePkgHistoryPortlet.KEY, ResourcePkgHistoryPortlet.Factory.INSTANCE); resourcePortletFactoryMap.put(ResourceBundleDeploymentsPortlet.KEY, ResourceBundleDeploymentsPortlet.Factory.INSTANCE); - resourcePortletFactoryMap.put(ResourceConfigurationUpdatesPortlet.KEY, - ResourceConfigurationUpdatesPortlet.Factory.INSTANCE); + resourcePortletFactoryMap.put(ResourceConfigUpdatesPortlet.KEY, + ResourceConfigUpdatesPortlet.Factory.INSTANCE); // sorted map of portlet names to portlet keys resourcePortletNameMap = new TreeMap<String, String>(); @@ -192,7 +192,7 @@ public class PortletFactory { resourcePortletNameMap.put(ResourcePkgHistoryPortlet.NAME, ResourcePkgHistoryPortlet.KEY); resourcePortletNameMap.put(ResourceAlertsPortlet.NAME, ResourceAlertsPortlet.KEY); resourcePortletNameMap.put(ResourceBundleDeploymentsPortlet.NAME, ResourceBundleDeploymentsPortlet.KEY); - resourcePortletNameMap.put(ResourceConfigurationUpdatesPortlet.NAME, ResourceConfigurationUpdatesPortlet.KEY); + resourcePortletNameMap.put(ResourceConfigUpdatesPortlet.NAME, ResourceConfigUpdatesPortlet.KEY); resourcePortletMenuMap = new LinkedHashMap<String, String>(resourcePortletNameMap.size()); for (String portletName : resourcePortletNameMap.keySet()) { @@ -216,8 +216,8 @@ public class PortletFactory { portletIconMap.put(ResourcePkgHistoryPortlet.KEY, ImageManager.getActivityPackageIcon()); portletIconMap.put(GroupBundleDeploymentsPortlet.KEY, ImageManager.getBundleIcon()); portletIconMap.put(ResourceBundleDeploymentsPortlet.KEY, ImageManager.getBundleIcon()); - portletIconMap.put(GroupConfigurationUpdatesPortlet.KEY, ImageManager.getConfigureIcon()); - portletIconMap.put(ResourceConfigurationUpdatesPortlet.KEY, ImageManager.getConfigureIcon()); + portletIconMap.put(GroupConfigUpdatesPortlet.KEY, ImageManager.getConfigureIcon()); + portletIconMap.put(ResourceConfigUpdatesPortlet.KEY, ImageManager.getConfigureIcon()); } private PortletFactory() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java index 1301923..4aabe97 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; /** Shared portlet configuration component where initial configuration settings @@ -212,8 +212,8 @@ public class PortletConfigurationEditorComponent { * @param portletConfig * @return */ - public static CustomConfigMeasurementRangeEditor getMeasurementRangeEditor(Configuration portletConfig) { - return new CustomConfigMeasurementRangeEditor(portletConfig); + public static CustomConfigMeasRangeEditor getMeasurementRangeEditor(Configuration portletConfig) { + return new CustomConfigMeasRangeEditor(portletConfig); } public static SelectItem getOperationStatusEditor(Configuration portletConfig) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigUpdatesPortlet.java new file mode 100644 index 0000000..fe36ab7 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigUpdatesPortlet.java @@ -0,0 +1,493 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.events.SubmitValuesEvent; +import com.smartgwt.client.widgets.form.events.SubmitValuesHandler; +import com.smartgwt.client.widgets.form.fields.SelectItem; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; +import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.GroupResourceConfigDS; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.HistoryGroupResourceConfigurationTable; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * @author Simeon Pinder + */ +public class GroupConfigUpdatesPortlet extends EnhancedVLayout implements CustomSettingsPortlet, + AutoRefreshPortlet { + + // A non-displayed, persisted identifier for the portlet + public static final String KEY = "GroupConfigurationUpdates"; + // A default displayed, persisted name for the portlet + public static final String NAME = MSG.view_portlet_defaultName_group_config_updates(); + + // context provides whether this is a standard group, autocluster or autogroup + private EntityContext context; + + protected Canvas recentConfigurationContent = new Canvas(); + + public static final String ID = "id"; + + //defines the list of configuration elements to load/persist for this portlet + protected static List<String> CONFIG_INCLUDE = new ArrayList<String>(); + static { + CONFIG_INCLUDE.add(Constant.METRIC_RANGE); + CONFIG_INCLUDE.add(Constant.METRIC_RANGE_BEGIN_END_FLAG); + CONFIG_INCLUDE.add(Constant.METRIC_RANGE_ENABLE); + CONFIG_INCLUDE.add(Constant.METRIC_RANGE_LASTN); + CONFIG_INCLUDE.add(Constant.METRIC_RANGE_UNIT); + CONFIG_INCLUDE.add(Constant.RESULT_COUNT); + CONFIG_INCLUDE.add(Constant.CONFIG_UPDATE_STATUS); + // CONFIG_INCLUDE.add(Constant.RESULT_SORT_ORDER); + } + + // set on initial configuration, the window for this portlet view. + protected PortletWindow portletWindow; + + //instance ui widgets + protected Canvas containerCanvas; + + protected Timer refreshTimer; + private ResourceGroupComposite groupComposite; + protected boolean portletConfigInitialized = false; + protected boolean currentlyLoading = false; + private GroupConfigurationHistoryCriteriaTable groupHistoryTable; + + protected static HashMap<String, String> updatedMapping = new HashMap<String, String>(); + static { + updatedMapping.putAll(PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION); + } + + public GroupConfigUpdatesPortlet(EntityContext context) { + super(); + this.context = context; + } + + /**Defines layout for the portlet page. + */ + protected void initializeUi() { + setHeight("*"); + setWidth100(); + + //tell canvas to fill it's component + recentConfigurationContent.setHeight100(); + addMember(recentConfigurationContent); + markForRedraw(); + } + + /** Responsible for initialization and lazy configuration of the portlet values + */ + public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) { + //populate portlet configuration details + if (null == this.portletWindow && null != portletWindow) { + this.portletWindow = portletWindow; + } + + if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) { + return; + } + + Configuration portletConfig = storedPortlet.getConfiguration(); + + //lazy init any elements not yet configured. + for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) { + if ((portletConfig.getSimple(key) == null) && CONFIG_INCLUDE.contains(key)) { + portletConfig.put(new PropertySimple(key, + PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.get(key))); + } + } + } + + public Canvas getHelpCanvas() { + return new HTMLFlow(MSG.view_portlet_help_config_updates()); + } + + @Override + public DynamicForm getCustomSettingsForm() { + final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); + final Configuration portletConfig = storedPortlet.getConfiguration(); + DynamicForm customSettings = new DynamicForm(); + EnhancedVLayout page = new EnhancedVLayout(); + //build editor form container + final DynamicForm form = new DynamicForm(); + form.setMargin(5); + + //add sort priority selector + // final SelectItem resultSortSelector = PortletConfigurationEditorComponent + // .getResulSortOrderEditor(portletConfig); + //add result status selector + final SelectItem resultStatusSelector = PortletConfigurationEditorComponent + .getConfigurationUpdateStatusEditor(portletConfig); + + //add result count selector + final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); + + //add range selector + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + .getMeasurementRangeEditor(portletConfig); + + // form.setItems(alertPrioritySelector, resultCountSelector); + form.setItems(resultStatusSelector, resultCountSelector); + + //submit handler + customSettings.addSubmitValuesHandler(new SubmitValuesHandler() { + + @Override + public void onSubmitValues(SubmitValuesEvent event) { + // //result sort order + // selectedValue = resultSortSelector.getValue().toString(); + // if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc + // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC)); + // } else { + // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC)); + // } + //config status + Configuration updatedConfig = AbstractActivityView.saveConfigUpdateStatusSelectorSettings( + resultStatusSelector, portletConfig); + + //result count + updatedConfig = AbstractActivityView.saveResultCounterSettings(resultCountSelector, updatedConfig); + + //time range settings + updatedConfig = AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor, + updatedConfig); + + //persist and reload portlet + storedPortlet.setConfiguration(updatedConfig); + configure(portletWindow, storedPortlet); + refresh(); + } + }); + form.markForRedraw(); + page.addMember(measurementRangeEditor); + page.addMember(form); + customSettings.addChild(page); + return customSettings; + } + + public static final class Factory implements PortletViewFactory { + public static final PortletViewFactory INSTANCE = new Factory(); + + public final Portlet getInstance(EntityContext context) { + + if (EntityContext.Type.ResourceGroup != context.getType()) { + throw new IllegalArgumentException("Context [" + context + "] not supported by portlet"); + } + + return new GroupConfigUpdatesPortlet(context); + } + } + + @Override + public void startRefreshCycle() { + refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); + } + + @Override + protected void onDestroy() { + AutoRefreshUtil.onDestroy(refreshTimer); + + super.onDestroy(); + } + + @Override + protected void onInit() { + //disable the refresh timer for this run + currentlyLoading = true; + initializeUi(); + loadData(); + } + + @Override + public boolean isRefreshing() { + return this.currentlyLoading; + } + + protected void setRefreshing(boolean currentlyRefreshing) { + this.currentlyLoading = currentlyRefreshing; + } + + @Override + public void refresh() { + if (!isRefreshing()) { + loadData(); + } + } + + protected void loadData() { + final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); + final Configuration portletConfig = storedPortlet.getConfiguration(); + + //populate composite data + //locate resourceGroupRef + ResourceGroupCriteria criteria = new ResourceGroupCriteria(); + criteria.addFilterId(context.getGroupId()); + criteria.fetchConfigurationUpdates(false); + criteria.fetchExplicitResources(false); + criteria.fetchGroupDefinition(false); + criteria.fetchOperationHistories(false); + + // for autoclusters and autogroups we need to add more criteria + if (context.isAutoCluster()) { + criteria.addFilterVisible(false); + } else if (context.isAutoGroup()) { + criteria.addFilterVisible(false); + criteria.addFilterPrivate(true); + } + + //locate the resource group + GWTServiceLookup.getResourceGroupService().findResourceGroupCompositesByCriteria(criteria, + new AsyncCallback<PageList<ResourceGroupComposite>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving resource group composite for group [" + context.getGroupId() + "]:" + + caught.getMessage()); + currentlyLoading = false; + } + + @Override + public void onSuccess(PageList<ResourceGroupComposite> results) { + if (!results.isEmpty()) { + groupComposite = results.get(0); + //instantiate view + + PageControl lastFive = new PageControl(0, 5); + GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); + criteria.setPageControl(lastFive); + //TODO: spinder: move this up into the pageControl. + criteria.addSortStatus(PageOrdering.DESC); + List<Integer> filterResourceGroupIds = new ArrayList<Integer>(); + filterResourceGroupIds.add(context.getGroupId()); + criteria.addFilterResourceGroupIds(filterResourceGroupIds); + + groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); + } else { + ResourceGroup emptyGroup = new ResourceGroup(""); + emptyGroup.setId(-1); + Long zero = new Long(0); + groupComposite = new ResourceGroupComposite(zero, zero, zero, zero, zero, zero, zero, zero, + emptyGroup); + groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); + } + + //update table for portlet display. + groupHistoryTable.setDataSource(new GroupConfigDS(portletConfig, + context.getGroupId())); + groupHistoryTable.setShowHeader(false); + groupHistoryTable.setShowFooterRefresh(false); + + //cleanup + for (Canvas child : recentConfigurationContent.getChildren()) { + child.destroy(); + } + recentConfigurationContent.addChild(groupHistoryTable); + recentConfigurationContent.markForRedraw(); + currentlyLoading = false; + } + }); + } + + class GroupConfigurationHistoryCriteriaTable extends HistoryGroupResourceConfigurationTable { + + public GroupConfigurationHistoryCriteriaTable(ResourceGroupComposite groupComposite) { + super(groupComposite); + } + + @Override + public void refreshTableInfo() { + super.refreshTableInfo(); + if (getTableInfo() != null) { + int count = getListGrid().getSelectedRecords().length; + getTableInfo().setContents( + MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); + } + } + + @Override + protected void onInit() { + super.onInit(); + getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); + } + + } + + class GroupConfigDS extends GroupResourceConfigDS { + + public GroupConfigDS(Configuration portletConfig, int groupId) { + super(groupId); + this.portletConfig = portletConfig; + this.groupId = groupId; + } + + private int groupId; + private Configuration portletConfig; + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final GroupResourceConfigurationUpdateCriteria criteria) { + ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); + + configurationService.findGroupResourceConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<GroupResourceConfigurationUpdate>>() { + + @Override + public void onSuccess(PageList<GroupResourceConfigurationUpdate> result) { + response.setData(buildRecords(result)); + //adjust for portlets that restrict result size + response.setTotalRows(result.size()); + processResponse(request.getRequestId(), response); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected GroupResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + //initialize criteria + GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); + + criteria.addFilterResourceGroupIds(Arrays.asList(groupId)); + + PageControl pageControl = new PageControl(0, Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); + + //customize query with latest configuration selections + + //retrieve previous settings from portlet config + if (portletConfig != null) { + // //result sort order + // PropertySimple property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER); + // if (property != null) { + // String currentSetting = property.getStringValue(); + // if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) { + // criteria.addSortStatus(PageOrdering.DESC); + // } else { + // criteria.addSortStatus(PageOrdering.ASC); + // } + // } + //result timeframe if enabled + PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE); + if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting + + boolean isAdvanced = Boolean.valueOf(portletConfig.getSimpleValue( + Constant.METRIC_RANGE_BEGIN_END_FLAG, Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); + if (isAdvanced) { + //Advanced time settings + String currentSetting = portletConfig.getSimpleValue(Constant.METRIC_RANGE, + Constant.METRIC_RANGE_DEFAULT); + String[] range = currentSetting.split(","); + if (range.length == 2) { + criteria.addFilterStartTime(Long.valueOf(range[0])); + criteria.addFilterEndTime(Long.valueOf(range[1])); + } + } else { + //Simple time settings + property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN); + if (property != null) { + int lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN, + Constant.METRIC_RANGE_LASTN_DEFAULT)); + int units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT, + Constant.METRIC_RANGE_UNIT_DEFAULT)); + ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); + criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); + criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); + } + } + } + + //result count + String currentSetting = portletConfig.getSimpleValue(Constant.RESULT_COUNT, + Constant.RESULT_COUNT_DEFAULT); + if (currentSetting.trim().isEmpty()) { + pageControl.setPageSize(Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); + } else { + pageControl.setPageSize(Integer.valueOf(currentSetting)); + } + + criteria.setPageControl(pageControl); + + //detect operation status filter + property = portletConfig.getSimple(Constant.CONFIG_UPDATE_STATUS); + if (property != null) { + currentSetting = portletConfig.getSimpleValue(Constant.CONFIG_UPDATE_STATUS, + Constant.CONFIG_UPDATE_STATUS_DEFAULT); + String[] parsedValues = currentSetting.trim().split(","); + if (currentSetting.trim().isEmpty() + || parsedValues.length == ConfigurationUpdateStatus.values().length) { + //all operation stati assumed + } else { + ConfigurationUpdateStatus[] updateStatus = new ConfigurationUpdateStatus[parsedValues.length]; + int indx = 0; + for (String priority : parsedValues) { + ConfigurationUpdateStatus s = ConfigurationUpdateStatus.valueOf(priority); + updateStatus[indx++] = s; + } + criteria.addFilterStatuses(updateStatus); + } + } + } + return criteria; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java deleted file mode 100644 index e03002a..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ /dev/null @@ -1,493 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.HTMLFlow; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.events.SubmitValuesEvent; -import com.smartgwt.client.widgets.form.events.SubmitValuesHandler; -import com.smartgwt.client.widgets.form.fields.SelectItem; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; -import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; -import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.GroupResourceConfigurationDataSource; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.HistoryGroupResourceConfigurationTable; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * @author Simeon Pinder - */ -public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements CustomSettingsPortlet, - AutoRefreshPortlet { - - // A non-displayed, persisted identifier for the portlet - public static final String KEY = "GroupConfigurationUpdates"; - // A default displayed, persisted name for the portlet - public static final String NAME = MSG.view_portlet_defaultName_group_config_updates(); - - // context provides whether this is a standard group, autocluster or autogroup - private EntityContext context; - - protected Canvas recentConfigurationContent = new Canvas(); - - public static final String ID = "id"; - - //defines the list of configuration elements to load/persist for this portlet - protected static List<String> CONFIG_INCLUDE = new ArrayList<String>(); - static { - CONFIG_INCLUDE.add(Constant.METRIC_RANGE); - CONFIG_INCLUDE.add(Constant.METRIC_RANGE_BEGIN_END_FLAG); - CONFIG_INCLUDE.add(Constant.METRIC_RANGE_ENABLE); - CONFIG_INCLUDE.add(Constant.METRIC_RANGE_LASTN); - CONFIG_INCLUDE.add(Constant.METRIC_RANGE_UNIT); - CONFIG_INCLUDE.add(Constant.RESULT_COUNT); - CONFIG_INCLUDE.add(Constant.CONFIG_UPDATE_STATUS); - // CONFIG_INCLUDE.add(Constant.RESULT_SORT_ORDER); - } - - // set on initial configuration, the window for this portlet view. - protected PortletWindow portletWindow; - - //instance ui widgets - protected Canvas containerCanvas; - - protected Timer refreshTimer; - private ResourceGroupComposite groupComposite; - protected boolean portletConfigInitialized = false; - protected boolean currentlyLoading = false; - private GroupConfigurationHistoryCriteriaTable groupHistoryTable; - - protected static HashMap<String, String> updatedMapping = new HashMap<String, String>(); - static { - updatedMapping.putAll(PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION); - } - - public GroupConfigurationUpdatesPortlet(EntityContext context) { - super(); - this.context = context; - } - - /**Defines layout for the portlet page. - */ - protected void initializeUi() { - setHeight("*"); - setWidth100(); - - //tell canvas to fill it's component - recentConfigurationContent.setHeight100(); - addMember(recentConfigurationContent); - markForRedraw(); - } - - /** Responsible for initialization and lazy configuration of the portlet values - */ - public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) { - //populate portlet configuration details - if (null == this.portletWindow && null != portletWindow) { - this.portletWindow = portletWindow; - } - - if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) { - return; - } - - Configuration portletConfig = storedPortlet.getConfiguration(); - - //lazy init any elements not yet configured. - for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) { - if ((portletConfig.getSimple(key) == null) && CONFIG_INCLUDE.contains(key)) { - portletConfig.put(new PropertySimple(key, - PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.get(key))); - } - } - } - - public Canvas getHelpCanvas() { - return new HTMLFlow(MSG.view_portlet_help_config_updates()); - } - - @Override - public DynamicForm getCustomSettingsForm() { - final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); - final Configuration portletConfig = storedPortlet.getConfiguration(); - DynamicForm customSettings = new DynamicForm(); - EnhancedVLayout page = new EnhancedVLayout(); - //build editor form container - final DynamicForm form = new DynamicForm(); - form.setMargin(5); - - //add sort priority selector - // final SelectItem resultSortSelector = PortletConfigurationEditorComponent - // .getResulSortOrderEditor(portletConfig); - //add result status selector - final SelectItem resultStatusSelector = PortletConfigurationEditorComponent - .getConfigurationUpdateStatusEditor(portletConfig); - - //add result count selector - final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); - - //add range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent - .getMeasurementRangeEditor(portletConfig); - - // form.setItems(alertPrioritySelector, resultCountSelector); - form.setItems(resultStatusSelector, resultCountSelector); - - //submit handler - customSettings.addSubmitValuesHandler(new SubmitValuesHandler() { - - @Override - public void onSubmitValues(SubmitValuesEvent event) { - // //result sort order - // selectedValue = resultSortSelector.getValue().toString(); - // if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc - // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC)); - // } else { - // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC)); - // } - //config status - Configuration updatedConfig = AbstractActivityView.saveConfigUpdateStatusSelectorSettings( - resultStatusSelector, portletConfig); - - //result count - updatedConfig = AbstractActivityView.saveResultCounterSettings(resultCountSelector, updatedConfig); - - //time range settings - updatedConfig = AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor, - updatedConfig); - - //persist and reload portlet - storedPortlet.setConfiguration(updatedConfig); - configure(portletWindow, storedPortlet); - refresh(); - } - }); - form.markForRedraw(); - page.addMember(measurementRangeEditor); - page.addMember(form); - customSettings.addChild(page); - return customSettings; - } - - public static final class Factory implements PortletViewFactory { - public static final PortletViewFactory INSTANCE = new Factory(); - - public final Portlet getInstance(EntityContext context) { - - if (EntityContext.Type.ResourceGroup != context.getType()) { - throw new IllegalArgumentException("Context [" + context + "] not supported by portlet"); - } - - return new GroupConfigurationUpdatesPortlet(context); - } - } - - @Override - public void startRefreshCycle() { - refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); - } - - @Override - protected void onDestroy() { - AutoRefreshUtil.onDestroy(refreshTimer); - - super.onDestroy(); - } - - @Override - protected void onInit() { - //disable the refresh timer for this run - currentlyLoading = true; - initializeUi(); - loadData(); - } - - @Override - public boolean isRefreshing() { - return this.currentlyLoading; - } - - protected void setRefreshing(boolean currentlyRefreshing) { - this.currentlyLoading = currentlyRefreshing; - } - - @Override - public void refresh() { - if (!isRefreshing()) { - loadData(); - } - } - - protected void loadData() { - final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); - final Configuration portletConfig = storedPortlet.getConfiguration(); - - //populate composite data - //locate resourceGroupRef - ResourceGroupCriteria criteria = new ResourceGroupCriteria(); - criteria.addFilterId(context.getGroupId()); - criteria.fetchConfigurationUpdates(false); - criteria.fetchExplicitResources(false); - criteria.fetchGroupDefinition(false); - criteria.fetchOperationHistories(false); - - // for autoclusters and autogroups we need to add more criteria - if (context.isAutoCluster()) { - criteria.addFilterVisible(false); - } else if (context.isAutoGroup()) { - criteria.addFilterVisible(false); - criteria.addFilterPrivate(true); - } - - //locate the resource group - GWTServiceLookup.getResourceGroupService().findResourceGroupCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceGroupComposite>>() { - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving resource group composite for group [" + context.getGroupId() + "]:" - + caught.getMessage()); - currentlyLoading = false; - } - - @Override - public void onSuccess(PageList<ResourceGroupComposite> results) { - if (!results.isEmpty()) { - groupComposite = results.get(0); - //instantiate view - - PageControl lastFive = new PageControl(0, 5); - GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); - criteria.setPageControl(lastFive); - //TODO: spinder: move this up into the pageControl. - criteria.addSortStatus(PageOrdering.DESC); - List<Integer> filterResourceGroupIds = new ArrayList<Integer>(); - filterResourceGroupIds.add(context.getGroupId()); - criteria.addFilterResourceGroupIds(filterResourceGroupIds); - - groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); - } else { - ResourceGroup emptyGroup = new ResourceGroup(""); - emptyGroup.setId(-1); - Long zero = new Long(0); - groupComposite = new ResourceGroupComposite(zero, zero, zero, zero, zero, zero, zero, zero, - emptyGroup); - groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); - } - - //update table for portlet display. - groupHistoryTable.setDataSource(new GroupConfigurationUdpatesCriteriaDataSource(portletConfig, - context.getGroupId())); - groupHistoryTable.setShowHeader(false); - groupHistoryTable.setShowFooterRefresh(false); - - //cleanup - for (Canvas child : recentConfigurationContent.getChildren()) { - child.destroy(); - } - recentConfigurationContent.addChild(groupHistoryTable); - recentConfigurationContent.markForRedraw(); - currentlyLoading = false; - } - }); - } - - class GroupConfigurationHistoryCriteriaTable extends HistoryGroupResourceConfigurationTable { - - public GroupConfigurationHistoryCriteriaTable(ResourceGroupComposite groupComposite) { - super(groupComposite); - } - - @Override - public void refreshTableInfo() { - super.refreshTableInfo(); - if (getTableInfo() != null) { - int count = getListGrid().getSelectedRecords().length; - getTableInfo().setContents( - MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); - } - } - - @Override - protected void onInit() { - super.onInit(); - getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); - } - - } - - class GroupConfigurationUdpatesCriteriaDataSource extends GroupResourceConfigurationDataSource { - - public GroupConfigurationUdpatesCriteriaDataSource(Configuration portletConfig, int groupId) { - super(groupId); - this.portletConfig = portletConfig; - this.groupId = groupId; - } - - private int groupId; - private Configuration portletConfig; - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final GroupResourceConfigurationUpdateCriteria criteria) { - ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); - - configurationService.findGroupResourceConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<GroupResourceConfigurationUpdate>>() { - - @Override - public void onSuccess(PageList<GroupResourceConfigurationUpdate> result) { - response.setData(buildRecords(result)); - //adjust for portlets that restrict result size - response.setTotalRows(result.size()); - processResponse(request.getRequestId(), response); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected GroupResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - //initialize criteria - GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); - - criteria.addFilterResourceGroupIds(Arrays.asList(groupId)); - - PageControl pageControl = new PageControl(0, Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); - - //customize query with latest configuration selections - - //retrieve previous settings from portlet config - if (portletConfig != null) { - // //result sort order - // PropertySimple property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER); - // if (property != null) { - // String currentSetting = property.getStringValue(); - // if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) { - // criteria.addSortStatus(PageOrdering.DESC); - // } else { - // criteria.addSortStatus(PageOrdering.ASC); - // } - // } - //result timeframe if enabled - PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE); - if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting - - boolean isAdvanced = Boolean.valueOf(portletConfig.getSimpleValue( - Constant.METRIC_RANGE_BEGIN_END_FLAG, Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); - if (isAdvanced) { - //Advanced time settings - String currentSetting = portletConfig.getSimpleValue(Constant.METRIC_RANGE, - Constant.METRIC_RANGE_DEFAULT); - String[] range = currentSetting.split(","); - if (range.length == 2) { - criteria.addFilterStartTime(Long.valueOf(range[0])); - criteria.addFilterEndTime(Long.valueOf(range[1])); - } - } else { - //Simple time settings - property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN); - if (property != null) { - int lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN, - Constant.METRIC_RANGE_LASTN_DEFAULT)); - int units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT, - Constant.METRIC_RANGE_UNIT_DEFAULT)); - ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); - criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); - criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); - } - } - } - - //result count - String currentSetting = portletConfig.getSimpleValue(Constant.RESULT_COUNT, - Constant.RESULT_COUNT_DEFAULT); - if (currentSetting.trim().isEmpty()) { - pageControl.setPageSize(Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); - } else { - pageControl.setPageSize(Integer.valueOf(currentSetting)); - } - - criteria.setPageControl(pageControl); - - //detect operation status filter - property = portletConfig.getSimple(Constant.CONFIG_UPDATE_STATUS); - if (property != null) { - currentSetting = portletConfig.getSimpleValue(Constant.CONFIG_UPDATE_STATUS, - Constant.CONFIG_UPDATE_STATUS_DEFAULT); - String[] parsedValues = currentSetting.trim().split(","); - if (currentSetting.trim().isEmpty() - || parsedValues.length == ConfigurationUpdateStatus.values().length) { - //all operation stati assumed - } else { - ConfigurationUpdateStatus[] updateStatus = new ConfigurationUpdateStatus[parsedValues.length]; - int indx = 0; - for (String priority : parsedValues) { - ConfigurationUpdateStatus s = ConfigurationUpdateStatus.valueOf(priority); - updateStatus[indx++] = s; - } - criteria.addFilterStatuses(updateStatus); - } - } - } - return criteria; - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java index f2269f0..8fd3112 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.event.EventSeverity; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; @@ -163,7 +163,7 @@ public class GroupEventsPortlet extends EnhancedVLayout implements CustomSetting final Configuration portletConfig = storedPortlet.getConfiguration(); //add range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent .getMeasurementRangeEditor(portletConfig); //submit handler diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index 303a3b2..fdbc77c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -56,7 +56,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; @@ -189,7 +189,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin EnhancedVLayout page = new EnhancedVLayout(); final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); final Configuration portletConfig = storedPortlet.getConfiguration(); - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent .getMeasurementRangeEditor(portletConfig); //submit handler diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java index 71c065f..76e18c4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java @@ -47,7 +47,7 @@ import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOpsHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; @@ -164,7 +164,7 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet groupComposite = results.get(0); //instantiate view //populated GWT criteria objects - Criteria criteria = new Criteria(GroupOperationHistoryDataSource.CriteriaField.GROUP_ID, String + Criteria criteria = new Criteria(GroupOpsHistoryDataSource.CriteriaField.GROUP_ID, String .valueOf(groupComposite.getResourceGroup().getId())); groupOperations = new GroupOperationsCriteriaHistoryListView( @@ -254,7 +254,7 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); //add range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent .getMeasurementRangeEditor(portletConfig); form.setItems(operationStatusSelector, resultCountSelector); @@ -393,7 +393,7 @@ class GroupOperationsCriteriaHistoryListView extends GroupOperationHistoryListVi * * @author spinder */ -class GroupOperationsCriteriaDataSource extends GroupOperationHistoryDataSource { +class GroupOperationsCriteriaDataSource extends GroupOpsHistoryDataSource { private Configuration portletConfig; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index b037e0a..9c409bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -36,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.alert.AlertDataSource; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; @@ -177,7 +177,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); // range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent .getMeasurementRangeEditor(portletConfig); filterForm.setItems(alertPrioritySelector, resultCountSelector); @@ -228,12 +228,12 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple * @param measurementRangeEditor metric range editor widget * @param portletConfig - the config to be updated */ - private void saveMeasurementRangeEditorSettings(final CustomConfigMeasurementRangeEditor measurementRangeEditor, + private void saveMeasurementRangeEditorSettings(final CustomConfigMeasRangeEditor measurementRangeEditor, Configuration portletConfig) { String selectedValue; if ((measurementRangeEditor != null) && (portletConfig != null)) { //time range filter. Check for enabled and then persist property. Dealing with compound widget. - FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM); + FormItem item = measurementRangeEditor.getItem(CustomConfigMeasRangeEditor.ENABLE_RANGE_ITEM); CheckboxItem itemC = (CheckboxItem) item; boolean persistTimeRangeSettings = itemC.getValueAsBoolean(); if (persistTimeRangeSettings) {//retrieve values and persist diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index 4bc0289..2184bde 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -32,7 +32,7 @@ import org.rhq.core.domain.util.OrderingField; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; @@ -47,8 +47,8 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; /** * A base class for deriving recent drift portlets for different entity contexts. In this way the * basic plumbing is shared, giving a consistent behavior and configuration for the concrete portlets. - * - * @author Jay Shaughnessy + * + * @author Jay Shaughnessy */ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView implements CustomSettingsPortlet, AutoRefreshPortlet { @@ -56,7 +56,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple private static final String DRIFT_CATEGORY = "DRIFT_CATEGORY"; private static final String DRIFT_CATEGORY_DEFAULT = ""; // all categories - // set on initial configuration, the window for this portlet view. + // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; private DriftsPortletDataSource dataSource; @@ -185,7 +185,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); // range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent .getMeasurementRangeEditor(portletConfig); filterForm.setItems(driftCategorySelector, resultCountSelector); @@ -229,19 +229,19 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple return customSettingsForm; } - /** + /** * Takes the current value of the widget and persists it into the configuration object passed in. * * @param measurementRangeEditor * @param portletConfig * returns populated configuration object. */ - private void saveMeasurementRangeEditorSettings(final CustomConfigMeasurementRangeEditor measurementRangeEditor, + private void saveMeasurementRangeEditorSettings(final CustomConfigMeasRangeEditor measurementRangeEditor, Configuration portletConfig) { String selectedValue = null; if ((measurementRangeEditor != null) && (portletConfig != null)) { //time range filter. Check for enabled and then persist property. Dealing with compound widget. - FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM); + FormItem item = measurementRangeEditor.getItem(CustomConfigMeasRangeEditor.ENABLE_RANGE_ITEM); CheckboxItem itemC = (CheckboxItem) item; boolean persistTimeRangeSettings = itemC.getValueAsBoolean(); if (persistTimeRangeSettings) {//retrieve values and persist diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java deleted file mode 100644 index 45a2f81..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ /dev/null @@ -1,401 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import com.google.gwt.user.client.Timer; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.HTMLFlow; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.events.SubmitValuesEvent; -import com.smartgwt.client.widgets.form.events.SubmitValuesHandler; -import com.smartgwt.client.widgets.form.fields.CheckboxItem; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; - -import org.rhq.core.domain.authz.Permission; -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.operation.OperationRequestStatus; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.composite.ResourcePermission; -import org.rhq.core.domain.util.OrderingField; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; -import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; -import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource; -import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * A base class for deriving recent resource operations portlets for different entity contexts. In this way the - * basic plumbing is shared, giving a consistent behavior and configuration for the concrete portlets. - * - * @author Jay Shaughnessy - * @author Simeon Pinder - */ -public abstract class AbstractOperationHistoryPortlet extends OperationHistoryView implements CustomSettingsPortlet, - AutoRefreshPortlet { - - // set on initial configuration, the window for this portlet view. - private PortletWindow portletWindow; - private OperationHistoryPortletDataSource dataSource; - private Boolean hasControlPermission; - - // autorefresh timer - private Timer refreshTimer; - - private String baseViewPath; - - public AbstractOperationHistoryPortlet(EntityContext entityContext) { - super(null, entityContext); - - this.baseViewPath = LinkManager.getEntityTabLink(getContext(), "Operations", "History"); - - setShowFilterForm(false); //disable filter form for portlet - setOverflow(Overflow.VISIBLE); - setShowFooterRefresh(false); //disable footer refresh button as redundant for portlets - setShowHeader(false);//disable header for portlets - } - - public Timer getRefreshTimer() { - return refreshTimer; - } - - public void setRefreshTimer(Timer refreshTimer) { - this.refreshTimer = refreshTimer; - } - - public PortletWindow getPortletWindow() { - return portletWindow; - } - - @Override - public OperationHistoryPortletDataSource getDataSource() { - if (null == this.dataSource) { - this.dataSource = new OperationHistoryPortletDataSource(getContext()); - } - return this.dataSource; - } - - @Override - protected String getBasePath() { - return this.baseViewPath; - } - - @Override - public Canvas getHelpCanvas() { - return new HTMLFlow(MSG.view_portlet_help_operations_criteria()); - } - - @Override - public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) { - - // the portletWindow does not change, so we can hold onto it locally - if (null == this.portletWindow && null != portletWindow) { - this.portletWindow = portletWindow; - } - - // if there is no configuration there is nothing to set - if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) { - return; - } - - Configuration config = storedPortlet.getConfiguration(); - - // not sure I love the fact that this common portlet config assigns some irrelevant/unused config props, - // may be better to prune the common set and add the specific properties locally in this method - for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) { - if (config.getSimple(key) == null) { - config.put(new PropertySimple(key, PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION - .get(key))); - } - } - - getDataSource().setConfiguration(config); - } - - @Override - public DynamicForm getCustomSettingsForm() { - - DynamicForm customSettingsForm = new DynamicForm(); - EnhancedVLayout page = new EnhancedVLayout(); - DynamicForm filterForm = new DynamicForm(); - filterForm.setMargin(5); - - final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); - final Configuration portletConfig = storedPortlet.getConfiguration(); - - // operation history status selector - final SelectItem operationStatusSelector = PortletConfigurationEditorComponent - .getOperationStatusEditor(portletConfig); - - // result count selector - final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); - - // range selector - final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent - .getMeasurementRangeEditor(portletConfig); - - filterForm.setItems(operationStatusSelector, resultCountSelector); - - //submit handler - customSettingsForm.addSubmitValuesHandler(new SubmitValuesHandler() { - - @Override - public void onSubmitValues(SubmitValuesEvent event) { - // operation status - String selectedValue = (null == operationStatusSelector.getValue()) ? "" : operationStatusSelector - .getValue().toString(); - if ((selectedValue.trim().isEmpty()) - || (selectedValue.split(",").length == OperationRequestStatus.values().length)) { - selectedValue = Constant.OPERATION_STATUS_DEFAULT; - } - portletConfig.put(new PropertySimple(Constant.OPERATION_STATUS, selectedValue)); - - // result count - selectedValue = resultCountSelector.getValue().toString(); - if (selectedValue.trim().isEmpty()) { - selectedValue = Constant.RESULT_COUNT_DEFAULT; - } - portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, selectedValue)); - - // time range settings - saveMeasurementRangeEditorSettings(measurementRangeEditor, portletConfig); - - // persist and reload portlet - storedPortlet.setConfiguration(portletConfig); - configure(portletWindow, storedPortlet); - //apply latest settings to the visible result set - refresh(); - } - }); - - page.addMember(measurementRangeEditor); - page.addMember(filterForm); - customSettingsForm.addChild(page); - - return customSettingsForm; - } - - /** - * Takes the current value of the widget and persists it into the configuration object passed in. - * - * @param measurementRangeEditor - * @param portletConfig - * returns populated configuration object. - */ - private void saveMeasurementRangeEditorSettings(final CustomConfigMeasurementRangeEditor measurementRangeEditor, - Configuration portletConfig) { - String selectedValue = null; - if ((measurementRangeEditor != null) && (portletConfig != null)) { - //time range filter. Check for enabled and then persist property. Dealing with compound widget. - FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM); - CheckboxItem itemC = (CheckboxItem) item; - boolean persistTimeRangeSettings = itemC.getValueAsBoolean(); - if (persistTimeRangeSettings) {//retrieve values and persist - selectedValue = String.valueOf(itemC.getValueAsBoolean()); - if (!selectedValue.trim().isEmpty()) {//then call - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, selectedValue)); - } - - //time advanced time filter enabled. - boolean isAdvanceTimeSetting = false; - selectedValue = String.valueOf(measurementRangeEditor.isAdvanced()); - if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) { - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, selectedValue)); - isAdvanceTimeSetting = Boolean.valueOf(selectedValue); - } - - //time frame - List<Long> begEnd = measurementRangeEditor.getBeginEndTimes(); - if (isAdvanceTimeSetting) {//advanced settings - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, (begEnd.get(0) + "," + begEnd.get(1)))); - } else { - //save not advanced time range - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_LASTN, measurementRangeEditor - .getMetricRangePreferences().lastN)); - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_UNIT, measurementRangeEditor - .getMetricRangePreferences().unit)); - } - } else {//if disabled, reset time defaults - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, false)); - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, false)); - List<Long> rangeArray = MeasurementUtility.calculateTimeFrame( - Integer.valueOf(Constant.METRIC_RANGE_LASTN_DEFAULT), - Integer.valueOf(Constant.METRIC_RANGE_UNIT_DEFAULT)); - // String[] range = {String.valueOf(rangeArray.get(0)),String.valueOf(rangeArray.get(1))}; - portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, - (String.valueOf(rangeArray.get(0)) + "," + String.valueOf(rangeArray.get(1))))); - } - } - } - - protected boolean hasControlPermission() { - if (null == this.hasControlPermission) { - Set<Permission> globalPerm = this.getPortletWindow().getGlobalPermissions(); - ResourcePermission resPerm = this.getPortletWindow().getResourcePermissions(); - - this.hasControlPermission = (globalPerm.contains(Permission.MANAGE_INVENTORY) || (null != resPerm && resPerm - .isControl())); - } - - return this.hasControlPermission; - } - - @Override - public void refreshTableInfo() { - super.refreshTableInfo(); - if (getTableInfo() != null) { - int count = getListGrid().getSelectedRecords().length; - getTableInfo().setContents( - MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); - } - } - - public void startRefreshCycle() { - refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); - } - - public boolean isRefreshing() { - return false; - } - - @Override - public void refresh() { - if (!isRefreshing()) { - super.refresh(); - } - } - - @Override - protected void onDestroy() { - AutoRefreshUtil.onDestroy(refreshTimer); - - super.onDestroy(); - } - - static public class OperationHistoryPortletDataSource extends OperationHistoryDataSource { - private Configuration configuration; - - public OperationHistoryPortletDataSource(EntityContext entityContext) { - this(entityContext, null); - } - - public OperationHistoryPortletDataSource(EntityContext entityContext, Configuration configuration) { - super(entityContext); - this.configuration = configuration; - } - - public Configuration getConfiguration() { - return configuration; - } - - public void setConfiguration(Configuration configuration) { - this.configuration = configuration; - } - - /* (non-Javadoc) - * This override allows us to set the total rows to the number of recent op history configured for - * the portlet. This sets the counter appropriately and stops further queries to the server. - * - * @see org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource#getTotalRows(org.rhq.core.domain.util.PageList, com.smartgwt.client.data.DSResponse, com.smartgwt.client.data.DSRequest) - */ - @Override - protected int getTotalRows(final PageList<ResourceOperationHistory> result, final DSResponse response, - final DSRequest request) { - - return result.size(); - } - - @Override - protected ResourceOperationHistoryCriteria getFetchCriteria(DSRequest request) { - ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); - - // result count - String currentSetting = this.configuration.getSimpleValue(Constant.RESULT_COUNT, - Constant.RESULT_COUNT_DEFAULT); - - // We have to set a PageControl override here, or RPCDataSource will apply default paging based on the - // request. But, once setting a paging override the CriteriaQueryGenerator will use it for - // paging *and* sorting, so we need to also ensure our desired sorting is included in the override. So, - // to get the most recent op histories, apply a descending ordering on create time. - int pageNumber = 0; - int pageSize = Integer.valueOf(currentSetting); - OrderingField orderingField = new OrderingField(OperationHistoryDataSource.Field.CREATED_TIME, - PageOrdering.DESC); - criteria.setPageControl(new PageControl(pageNumber, pageSize, orderingField)); - - // status - currentSetting = this.configuration.getSimpleValue(Constant.OPERATION_STATUS, - Constant.OPERATION_STATUS_DEFAULT); - String[] parsedValues = currentSetting.trim().split(","); - if (!(currentSetting.trim().isEmpty() || parsedValues.length == OperationRequestStatus.values().length)) { - OperationRequestStatus[] operationStatuses = new OperationRequestStatus[parsedValues.length]; - int indx = 0; - for (String priority : parsedValues) { - OperationRequestStatus s = OperationRequestStatus.valueOf(priority); - operationStatuses[indx++] = s; - } - criteria.addFilterStatuses(operationStatuses); - } - - //result timeframe if enabled - PropertySimple property = configuration.getSimple(Constant.METRIC_RANGE_ENABLE); - if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting - - boolean isAdvanced = Boolean.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_BEGIN_END_FLAG, - Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); - if (isAdvanced) { - //Advanced time settings - currentSetting = configuration.getSimpleValue(Constant.METRIC_RANGE, Constant.METRIC_RANGE_DEFAULT); - String[] range = currentSetting.split(","); - if (range.length == 2) { - criteria.addFilterStartTime(Long.valueOf(range[0])); - criteria.addFilterEndTime(Long.valueOf(range[1])); - } - } else { - //Simple time settings - property = configuration.getSimple(Constant.METRIC_RANGE_LASTN); - if (property != null) { - Integer lastN = Integer.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_LASTN, - Constant.METRIC_RANGE_LASTN_DEFAULT)); - Integer units = Integer.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_UNIT, - Constant.METRIC_RANGE_UNIT_DEFAULT)); - ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); - criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); - criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); - } - } - } - - // add any context related filters - switch (getEntityContext().type) { - case Resource: - criteria.addFilterResourceIds(getEntityContext().getResourceId()); - break; - - case ResourceGroup: - criteria.addFilterGroupOperationHistoryId(getEntityContext().getGroupId()); - } - - return criteria; - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOpsHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOpsHistoryPortlet.java new file mode 100644 index 0000000..e4a6b76 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOpsHistoryPortlet.java @@ -0,0 +1,401 @@ +package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import com.google.gwt.user.client.Timer; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.events.SubmitValuesEvent; +import com.smartgwt.client.widgets.form.events.SubmitValuesHandler; +import com.smartgwt.client.widgets.form.fields.CheckboxItem; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.SelectItem; + +import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.composite.ResourcePermission; +import org.rhq.core.domain.util.OrderingField; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasRangeEditor; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; +import org.rhq.enterprise.gui.coregui.client.operation.OpsHistoryDS; +import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * A base class for deriving recent resource operations portlets for different entity contexts. In this way the + * basic plumbing is shared, giving a consistent behavior and configuration for the concrete portlets. + * + * @author Jay Shaughnessy + * @author Simeon Pinder + */ +public abstract class AbstractOpsHistoryPortlet extends OperationHistoryView implements CustomSettingsPortlet, + AutoRefreshPortlet { + + // set on initial configuration, the window for this portlet view. + private PortletWindow portletWindow; + private OpsHistoryPortletDS dataSource; + private Boolean hasControlPermission; + + // autorefresh timer + private Timer refreshTimer; + + private String baseViewPath; + + public AbstractOpsHistoryPortlet(EntityContext entityContext) { + super(null, entityContext); + + this.baseViewPath = LinkManager.getEntityTabLink(getContext(), "Operations", "History"); + + setShowFilterForm(false); //disable filter form for portlet + setOverflow(Overflow.VISIBLE); + setShowFooterRefresh(false); //disable footer refresh button as redundant for portlets + setShowHeader(false);//disable header for portlets + } + + public Timer getRefreshTimer() { + return refreshTimer; + } + + public void setRefreshTimer(Timer refreshTimer) { + this.refreshTimer = refreshTimer; + } + + public PortletWindow getPortletWindow() { + return portletWindow; + } + + @Override + public OpsHistoryPortletDS getDataSource() { + if (null == this.dataSource) { + this.dataSource = new OpsHistoryPortletDS(getContext()); + } + return this.dataSource; + } + + @Override + protected String getBasePath() { + return this.baseViewPath; + } + + @Override + public Canvas getHelpCanvas() { + return new HTMLFlow(MSG.view_portlet_help_operations_criteria()); + } + + @Override + public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) { + + // the portletWindow does not change, so we can hold onto it locally + if (null == this.portletWindow && null != portletWindow) { + this.portletWindow = portletWindow; + } + + // if there is no configuration there is nothing to set + if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) { + return; + } + + Configuration config = storedPortlet.getConfiguration(); + + // not sure I love the fact that this common portlet config assigns some irrelevant/unused config props, + // may be better to prune the common set and add the specific properties locally in this method + for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) { + if (config.getSimple(key) == null) { + config.put(new PropertySimple(key, PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION + .get(key))); + } + } + + getDataSource().setConfiguration(config); + } + + @Override + public DynamicForm getCustomSettingsForm() { + + DynamicForm customSettingsForm = new DynamicForm(); + EnhancedVLayout page = new EnhancedVLayout(); + DynamicForm filterForm = new DynamicForm(); + filterForm.setMargin(5); + + final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); + final Configuration portletConfig = storedPortlet.getConfiguration(); + + // operation history status selector + final SelectItem operationStatusSelector = PortletConfigurationEditorComponent + .getOperationStatusEditor(portletConfig); + + // result count selector + final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig); + + // range selector + final CustomConfigMeasRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent + .getMeasurementRangeEditor(portletConfig); + + filterForm.setItems(operationStatusSelector, resultCountSelector); + + //submit handler + customSettingsForm.addSubmitValuesHandler(new SubmitValuesHandler() { + + @Override + public void onSubmitValues(SubmitValuesEvent event) { + // operation status + String selectedValue = (null == operationStatusSelector.getValue()) ? "" : operationStatusSelector + .getValue().toString(); + if ((selectedValue.trim().isEmpty()) + || (selectedValue.split(",").length == OperationRequestStatus.values().length)) { + selectedValue = Constant.OPERATION_STATUS_DEFAULT; + } + portletConfig.put(new PropertySimple(Constant.OPERATION_STATUS, selectedValue)); + + // result count + selectedValue = resultCountSelector.getValue().toString(); + if (selectedValue.trim().isEmpty()) { + selectedValue = Constant.RESULT_COUNT_DEFAULT; + } + portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, selectedValue)); + + // time range settings + saveMeasurementRangeEditorSettings(measurementRangeEditor, portletConfig); + + // persist and reload portlet + storedPortlet.setConfiguration(portletConfig); + configure(portletWindow, storedPortlet); + //apply latest settings to the visible result set + refresh(); + } + }); + + page.addMember(measurementRangeEditor); + page.addMember(filterForm); + customSettingsForm.addChild(page); + + return customSettingsForm; + } + + /** + * Takes the current value of the widget and persists it into the configuration object passed in. + * + * @param measurementRangeEditor + * @param portletConfig + * returns populated configuration object. + */ + private void saveMeasurementRangeEditorSettings(final CustomConfigMeasRangeEditor measurementRangeEditor, + Configuration portletConfig) { + String selectedValue = null; + if ((measurementRangeEditor != null) && (portletConfig != null)) { + //time range filter. Check for enabled and then persist property. Dealing with compound widget. + FormItem item = measurementRangeEditor.getItem(CustomConfigMeasRangeEditor.ENABLE_RANGE_ITEM); + CheckboxItem itemC = (CheckboxItem) item; + boolean persistTimeRangeSettings = itemC.getValueAsBoolean(); + if (persistTimeRangeSettings) {//retrieve values and persist + selectedValue = String.valueOf(itemC.getValueAsBoolean()); + if (!selectedValue.trim().isEmpty()) {//then call + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, selectedValue)); + } + + //time advanced time filter enabled. + boolean isAdvanceTimeSetting = false; + selectedValue = String.valueOf(measurementRangeEditor.isAdvanced()); + if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) { + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, selectedValue)); + isAdvanceTimeSetting = Boolean.valueOf(selectedValue); + } + + //time frame + List<Long> begEnd = measurementRangeEditor.getBeginEndTimes(); + if (isAdvanceTimeSetting) {//advanced settings + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, (begEnd.get(0) + "," + begEnd.get(1)))); + } else { + //save not advanced time range + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_LASTN, measurementRangeEditor + .getMetricRangePreferences().lastN)); + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_UNIT, measurementRangeEditor + .getMetricRangePreferences().unit)); + } + } else {//if disabled, reset time defaults + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, false)); + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, false)); + List<Long> rangeArray = MeasurementUtility.calculateTimeFrame( + Integer.valueOf(Constant.METRIC_RANGE_LASTN_DEFAULT), + Integer.valueOf(Constant.METRIC_RANGE_UNIT_DEFAULT)); + // String[] range = {String.valueOf(rangeArray.get(0)),String.valueOf(rangeArray.get(1))}; + portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, + (String.valueOf(rangeArray.get(0)) + "," + String.valueOf(rangeArray.get(1))))); + } + } + } + + protected boolean hasControlPermission() { + if (null == this.hasControlPermission) { + Set<Permission> globalPerm = this.getPortletWindow().getGlobalPermissions(); + ResourcePermission resPerm = this.getPortletWindow().getResourcePermissions(); + + this.hasControlPermission = (globalPerm.contains(Permission.MANAGE_INVENTORY) || (null != resPerm && resPerm + .isControl())); + } + + return this.hasControlPermission; + } + + @Override + public void refreshTableInfo() { + super.refreshTableInfo(); + if (getTableInfo() != null) { + int count = getListGrid().getSelectedRecords().length; + getTableInfo().setContents( + MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); + } + } + + public void startRefreshCycle() { + refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer); + } + + public boolean isRefreshing() { + return false; + } + + @Override + public void refresh() { + if (!isRefreshing()) { + super.refresh(); + } + } + + @Override + protected void onDestroy() { + AutoRefreshUtil.onDestroy(refreshTimer); + + super.onDestroy(); + } + + static public class OpsHistoryPortletDS extends OpsHistoryDS { + private Configuration configuration; + + public OpsHistoryPortletDS(EntityContext entityContext) { + this(entityContext, null); + } + + public OpsHistoryPortletDS(EntityContext entityContext, Configuration configuration) { + super(entityContext); + this.configuration = configuration; + } + + public Configuration getConfiguration() { + return configuration; + } + + public void setConfiguration(Configuration configuration) { + this.configuration = configuration; + } + + /* (non-Javadoc) + * This override allows us to set the total rows to the number of recent op history configured for + * the portlet. This sets the counter appropriately and stops further queries to the server. + * + * @see org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource#getTotalRows(org.rhq.core.domain.util.PageList, com.smartgwt.client.data.DSResponse, com.smartgwt.client.data.DSRequest) + */ + @Override + protected int getTotalRows(final PageList<ResourceOperationHistory> result, final DSResponse response, + final DSRequest request) { + + return result.size(); + } + + @Override + protected ResourceOperationHistoryCriteria getFetchCriteria(DSRequest request) { + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + + // result count + String currentSetting = this.configuration.getSimpleValue(Constant.RESULT_COUNT, + Constant.RESULT_COUNT_DEFAULT); + + // We have to set a PageControl override here, or RPCDataSource will apply default paging based on the + // request. But, once setting a paging override the CriteriaQueryGenerator will use it for + // paging *and* sorting, so we need to also ensure our desired sorting is included in the override. So, + // to get the most recent op histories, apply a descending ordering on create time. + int pageNumber = 0; + int pageSize = Integer.valueOf(currentSetting); + OrderingField orderingField = new OrderingField(OpsHistoryDS.Field.CREATED_TIME, + PageOrdering.DESC); + criteria.setPageControl(new PageControl(pageNumber, pageSize, orderingField)); + + // status + currentSetting = this.configuration.getSimpleValue(Constant.OPERATION_STATUS, + Constant.OPERATION_STATUS_DEFAULT); + String[] parsedValues = currentSetting.trim().split(","); + if (!(currentSetting.trim().isEmpty() || parsedValues.length == OperationRequestStatus.values().length)) { + OperationRequestStatus[] operationStatuses = new OperationRequestStatus[parsedValues.length]; + int indx = 0; + for (String priority : parsedValues) { + OperationRequestStatus s = OperationRequestStatus.valueOf(priority); + operationStatuses[indx++] = s; + } + criteria.addFilterStatuses(operationStatuses); + } + + //result timeframe if enabled + PropertySimple property = configuration.getSimple(Constant.METRIC_RANGE_ENABLE); + if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting + + boolean isAdvanced = Boolean.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_BEGIN_END_FLAG, + Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); + if (isAdvanced) { + //Advanced time settings + currentSetting = configuration.getSimpleValue(Constant.METRIC_RANGE, Constant.METRIC_RANGE_DEFAULT); + String[] range = currentSetting.split(","); + if (range.length == 2) { + criteria.addFilterStartTime(Long.valueOf(range[0])); + criteria.addFilterEndTime(Long.valueOf(range[1])); + } + } else { + //Simple time settings + property = configuration.getSimple(Constant.METRIC_RANGE_LASTN); + if (property != null) { + Integer lastN = Integer.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_LASTN, + Constant.METRIC_RANGE_LASTN_DEFAULT)); + Integer units = Integer.valueOf(configuration.getSimpleValue(Constant.METRIC_RANGE_UNIT, + Constant.METRIC_RANGE_UNIT_DEFAULT)); + ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); + criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); + criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); + } + } + } + + // add any context related filters + switch (getEntityContext().type) { + case Resource: + criteria.addFilterResourceIds(getEntityContext().getResourceId()); + break; + + case ResourceGroup: + criteria.addFilterGroupOperationHistoryId(getEntityContext().getGroupId()); + } + + return criteria; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java deleted file mode 100644 index 497c2c8..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations; - -/* - * RHQ Management Platform - * Copyright (C) 2010 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. - */ - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; - -/** - * @author Jay Shaughnessy - */ -public class OperationHistoryPortlet extends AbstractOperationHistoryPortlet { - - // A non-displayed, persisted identifier for the portlet - public static final String KEY = "Operations"; - // A default displayed, persisted name for the portlet - public static final String NAME = MSG.view_portlet_defaultName_operations(); - - public OperationHistoryPortlet() { - super(EntityContext.forSubsystemView()); - } - - public static final class Factory implements PortletViewFactory { - public static final PortletViewFactory INSTANCE = new Factory(); - - public final Portlet getInstance(EntityContext context) { - - return new OperationHistoryPortlet(); - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OpsHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OpsHistoryPortlet.java new file mode 100644 index 0000000..7ffdd15 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OpsHistoryPortlet.java @@ -0,0 +1,48 @@ +package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations; + +/* + * RHQ Management Platform + * Copyright (C) 2010 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. + */ + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; + +/** + * @author Jay Shaughnessy + */ +public class OpsHistoryPortlet extends AbstractOpsHistoryPortlet { + + // A non-displayed, persisted identifier for the portlet + public static final String KEY = "Operations"; + // A default displayed, persisted name for the portlet + public static final String NAME = MSG.view_portlet_defaultName_operations(); + + public OpsHistoryPortlet() { + super(EntityContext.forSubsystemView()); + } + + public static final class Factory implements PortletViewFactory { + public static final PortletViewFactory INSTANCE = new Factory(); + + public final Portlet getInstance(EntityContext context) { + + return new OpsHistoryPortlet(); + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigUpdatesPortlet.java new file mode 100644 index 0000000..a55f346 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigUpdatesPortlet.java @@ -0,0 +1,302 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource; + +import java.util.ArrayList; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigHistoryDS; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigHistoryListView; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; + +/**This portlet allows the end user to customize the Package History display + * + * @author Simeon Pinder + */ +public class ResourceConfigUpdatesPortlet extends GroupConfigUpdatesPortlet { + + // A non-displayed, persisted identifier for the portlet + public static final String KEY = "ResourceConfigurationUpdates"; + // A default displayed, persisted name for the portlet + public static final String NAME = MSG.view_portlet_defaultName_resource_config_updates(); + + private int resourceId = -1; + private ResourceComposite resourceComposite; + + private ResourceConfigHistCriteriaView resourceHistoryTable; + + public ResourceConfigUpdatesPortlet(int resourceId) { + super(null); + this.resourceId = resourceId; + } + + public static final class Factory implements PortletViewFactory { + public static final PortletViewFactory INSTANCE = new Factory(); + + public final Portlet getInstance(EntityContext context) { + + if (EntityContext.Type.Resource != context.getType()) { + throw new IllegalArgumentException("Context [" + context + "] not supported by portlet"); + } + + return new ResourceConfigUpdatesPortlet(context.getResourceId()); + } + } + + @Override + protected void loadData() { + final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); + final Configuration portletConfig = storedPortlet.getConfiguration(); + //populate composite data + //locate resourceRef + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(this.resourceId); + criteria.fetchResourceConfigurationUpdates(false); + criteria.fetchOperationHistories(false); + + //locate the resource + GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, + new AsyncCallback<PageList<ResourceComposite>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving resource composite for resource [" + resourceId + "]:" + + caught.getMessage()); + currentlyLoading = false; + } + + @Override + public void onSuccess(PageList<ResourceComposite> results) { + if (!results.isEmpty()) { + resourceComposite = results.get(0); + //instantiate view + + PageControl lastFive = new PageControl(0, 5); + ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); + criteria.setPageControl(lastFive); + //TODO: spinder: move this up into the pageControl. + criteria.addSortStatus(PageOrdering.DESC); + criteria.addFilterResourceIds(resourceId); + + resourceHistoryTable = new ResourceConfigHistCriteriaView(resourceComposite + .getResourcePermission().isConfigureWrite(), resourceId); + } else { + resourceHistoryTable = new ResourceConfigHistCriteriaView(resourceComposite + .getResourcePermission().isConfigureWrite(), -1); + } + resourceHistoryTable.setDataSource(new ConfigUdpatesCriteriaDS(portletConfig)); + resourceHistoryTable.setShowHeader(false); + resourceHistoryTable.setShowFooterRefresh(false); + + //cleanup + for (Canvas child : recentConfigurationContent.getChildren()) { + child.destroy(); + } + recentConfigurationContent.addChild(resourceHistoryTable); + recentConfigurationContent.markForRedraw(); + currentlyLoading = false; + } + }); + } + + class ResourceConfigHistCriteriaView extends ResourceConfigHistoryListView { + + public ResourceConfigHistCriteriaView(boolean hasWritePerm, int resourceId) { + super(hasWritePerm, resourceId); + } + + @Override + public void refreshTableInfo() { + super.refreshTableInfo(); + if (getTableInfo() != null) { + int count = getListGrid().getSelectedRecords().length; + getTableInfo().setContents( + MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); + } + } + + /** + * Override if you don't want the detailsLinkColumn to have the default link wrapper. + * @return the desired CellFormatter. + */ + protected CellFormatter getDetailsLinkColumnCellFormatter() { + return new CellFormatter() { + public String format(Object value, ListGridRecord record, int i, int i1) { + Integer recordId = getId(record); + String detailsUrl = "#" + getBasePath() + "/" + recordId; + return LinkManager.getHref(detailsUrl, value.toString()); + } + }; + } + + @Override + protected String getBasePath() { + return "Resource/" + resourceComposite.getResource().getId() + "/Configuration/History"; + } + + @Override + protected void onInit() { + super.onInit(); + getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); + } + } + + class ConfigUdpatesCriteriaDS extends ResourceConfigHistoryDS { + + public ConfigUdpatesCriteriaDS(Configuration portletConfig) { + super(); + this.portletConfig = portletConfig; + } + + private Configuration portletConfig; + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final ResourceConfigurationUpdateCriteria criteria) { + ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); + configurationService.findResourceConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { + + @Override + public void onSuccess(PageList<ResourceConfigurationUpdate> result) { + response.setData(buildRecords(result)); + //adjust for portlets that restrict result size + response.setTotalRows(result.size()); + processResponse(request.getRequestId(), response); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + //initialize criteria + ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); + criteria.addFilterResourceIds(resourceId); + + //initialize to only five for quick queries. + PageControl pageControl = new PageControl(0, Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); + //customize query with latest configuration selections + + //retrieve previous settings from portlet config + if (portletConfig != null) { + // //result sort order + // PropertySimple property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER); + // if (property != null) { + // String currentSetting = property.getStringValue(); + // if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) { + // criteria.addSortStatus(PageOrdering.DESC); + // } else { + // criteria.addSortStatus(PageOrdering.ASC); + // } + // } + //result timeframe if enabled + PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE); + if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting + + //detect type of widget[Simple|Advanced] + boolean isAdvanced = Boolean.valueOf(portletConfig.getSimpleValue( + Constant.METRIC_RANGE_BEGIN_END_FLAG, Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); + if (isAdvanced) { + //Advanced time settings + String currentSetting = portletConfig.getSimpleValue(Constant.METRIC_RANGE, + Constant.METRIC_RANGE_DEFAULT); + String[] range = currentSetting.split(","); + if (range.length == 2) { + criteria.addFilterStartTime(Long.valueOf(range[0])); + criteria.addFilterEndTime(Long.valueOf(range[1])); + } + } else { + //Simple time settings + property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN); + if (property != null) { + Integer lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN, + Constant.METRIC_RANGE_LASTN_DEFAULT)); + Integer units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT, + Constant.METRIC_RANGE_UNIT_DEFAULT)); + ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); + criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); + criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); + } + } + } + + //result count + String currentSetting = portletConfig.getSimpleValue(Constant.RESULT_COUNT, + Constant.RESULT_COUNT_DEFAULT); + if (currentSetting.trim().isEmpty()) { + pageControl.setPageSize(Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); + } else { + pageControl.setPageSize(Integer.valueOf(currentSetting)); + } + criteria.setPageControl(pageControl); + + //detect operation status filter + String configUpdateStatus = portletConfig.getSimpleValue(Constant.CONFIG_UPDATE_STATUS, + Constant.CONFIG_UPDATE_STATUS_DEFAULT); + String[] parsedValues = configUpdateStatus.trim().split(","); + if (configUpdateStatus.trim().isEmpty() + || parsedValues.length == ConfigurationUpdateStatus.values().length) { + //all operation stati assumed + } else { + ConfigurationUpdateStatus[] updateStatus = new ConfigurationUpdateStatus[parsedValues.length]; + int indx = 0; + for (String priority : parsedValues) { + ConfigurationUpdateStatus s = ConfigurationUpdateStatus.valueOf(priority); + updateStatus[indx++] = s; + } + criteria.addFilterStatuses(updateStatus); + } + } + return criteria; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java deleted file mode 100644 index f895fed..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource; - -import java.util.ArrayList; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryDataSource; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; - -/**This portlet allows the end user to customize the Package History display - * - * @author Simeon Pinder - */ -public class ResourceConfigurationUpdatesPortlet extends GroupConfigurationUpdatesPortlet { - - // A non-displayed, persisted identifier for the portlet - public static final String KEY = "ResourceConfigurationUpdates"; - // A default displayed, persisted name for the portlet - public static final String NAME = MSG.view_portlet_defaultName_resource_config_updates(); - - private int resourceId = -1; - private ResourceComposite resourceComposite; - - private ResourceConfigurationHistoryCriteriaView resourceHistoryTable; - - public ResourceConfigurationUpdatesPortlet(int resourceId) { - super(null); - this.resourceId = resourceId; - } - - public static final class Factory implements PortletViewFactory { - public static final PortletViewFactory INSTANCE = new Factory(); - - public final Portlet getInstance(EntityContext context) { - - if (EntityContext.Type.Resource != context.getType()) { - throw new IllegalArgumentException("Context [" + context + "] not supported by portlet"); - } - - return new ResourceConfigurationUpdatesPortlet(context.getResourceId()); - } - } - - @Override - protected void loadData() { - final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); - final Configuration portletConfig = storedPortlet.getConfiguration(); - //populate composite data - //locate resourceRef - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(this.resourceId); - criteria.fetchResourceConfigurationUpdates(false); - criteria.fetchOperationHistories(false); - - //locate the resource - GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving resource composite for resource [" + resourceId + "]:" - + caught.getMessage()); - currentlyLoading = false; - } - - @Override - public void onSuccess(PageList<ResourceComposite> results) { - if (!results.isEmpty()) { - resourceComposite = results.get(0); - //instantiate view - - PageControl lastFive = new PageControl(0, 5); - ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); - criteria.setPageControl(lastFive); - //TODO: spinder: move this up into the pageControl. - criteria.addSortStatus(PageOrdering.DESC); - criteria.addFilterResourceIds(resourceId); - - resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(resourceComposite - .getResourcePermission().isConfigureWrite(), resourceId); - } else { - resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(resourceComposite - .getResourcePermission().isConfigureWrite(), -1); - } - resourceHistoryTable.setDataSource(new ConfigurationUdpatesCriteriaDataSource(portletConfig)); - resourceHistoryTable.setShowHeader(false); - resourceHistoryTable.setShowFooterRefresh(false); - - //cleanup - for (Canvas child : recentConfigurationContent.getChildren()) { - child.destroy(); - } - recentConfigurationContent.addChild(resourceHistoryTable); - recentConfigurationContent.markForRedraw(); - currentlyLoading = false; - } - }); - } - - class ResourceConfigurationHistoryCriteriaView extends ResourceConfigurationHistoryListView { - - public ResourceConfigurationHistoryCriteriaView(boolean hasWritePerm, int resourceId) { - super(hasWritePerm, resourceId); - } - - @Override - public void refreshTableInfo() { - super.refreshTableInfo(); - if (getTableInfo() != null) { - int count = getListGrid().getSelectedRecords().length; - getTableInfo().setContents( - MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); - } - } - - /** - * Override if you don't want the detailsLinkColumn to have the default link wrapper. - * @return the desired CellFormatter. - */ - protected CellFormatter getDetailsLinkColumnCellFormatter() { - return new CellFormatter() { - public String format(Object value, ListGridRecord record, int i, int i1) { - Integer recordId = getId(record); - String detailsUrl = "#" + getBasePath() + "/" + recordId; - return LinkManager.getHref(detailsUrl, value.toString()); - } - }; - } - - @Override - protected String getBasePath() { - return "Resource/" + resourceComposite.getResource().getId() + "/Configuration/History"; - } - - @Override - protected void onInit() { - super.onInit(); - getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); - } - } - - class ConfigurationUdpatesCriteriaDataSource extends ResourceConfigurationHistoryDataSource { - - public ConfigurationUdpatesCriteriaDataSource(Configuration portletConfig) { - super(); - this.portletConfig = portletConfig; - } - - private Configuration portletConfig; - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final ResourceConfigurationUpdateCriteria criteria) { - ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); - configurationService.findResourceConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { - - @Override - public void onSuccess(PageList<ResourceConfigurationUpdate> result) { - response.setData(buildRecords(result)); - //adjust for portlets that restrict result size - response.setTotalRows(result.size()); - processResponse(request.getRequestId(), response); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - //initialize criteria - ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); - criteria.addFilterResourceIds(resourceId); - - //initialize to only five for quick queries. - PageControl pageControl = new PageControl(0, Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); - //customize query with latest configuration selections - - //retrieve previous settings from portlet config - if (portletConfig != null) { - // //result sort order - // PropertySimple property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER); - // if (property != null) { - // String currentSetting = property.getStringValue(); - // if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) { - // criteria.addSortStatus(PageOrdering.DESC); - // } else { - // criteria.addSortStatus(PageOrdering.ASC); - // } - // } - //result timeframe if enabled - PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE); - if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting - - //detect type of widget[Simple|Advanced] - boolean isAdvanced = Boolean.valueOf(portletConfig.getSimpleValue( - Constant.METRIC_RANGE_BEGIN_END_FLAG, Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); - if (isAdvanced) { - //Advanced time settings - String currentSetting = portletConfig.getSimpleValue(Constant.METRIC_RANGE, - Constant.METRIC_RANGE_DEFAULT); - String[] range = currentSetting.split(","); - if (range.length == 2) { - criteria.addFilterStartTime(Long.valueOf(range[0])); - criteria.addFilterEndTime(Long.valueOf(range[1])); - } - } else { - //Simple time settings - property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN); - if (property != null) { - Integer lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN, - Constant.METRIC_RANGE_LASTN_DEFAULT)); - Integer units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT, - Constant.METRIC_RANGE_UNIT_DEFAULT)); - ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units); - criteria.addFilterStartTime(Long.valueOf(beginEnd.get(0))); - criteria.addFilterEndTime(Long.valueOf(beginEnd.get(1))); - } - } - } - - //result count - String currentSetting = portletConfig.getSimpleValue(Constant.RESULT_COUNT, - Constant.RESULT_COUNT_DEFAULT); - if (currentSetting.trim().isEmpty()) { - pageControl.setPageSize(Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); - } else { - pageControl.setPageSize(Integer.valueOf(currentSetting)); - } - criteria.setPageControl(pageControl); - - //detect operation status filter - String configUpdateStatus = portletConfig.getSimpleValue(Constant.CONFIG_UPDATE_STATUS, - Constant.CONFIG_UPDATE_STATUS_DEFAULT); - String[] parsedValues = configUpdateStatus.trim().split(","); - if (configUpdateStatus.trim().isEmpty() - || parsedValues.length == ConfigurationUpdateStatus.values().length) { - //all operation stati assumed - } else { - ConfigurationUpdateStatus[] updateStatus = new ConfigurationUpdateStatus[parsedValues.length]; - int indx = 0; - for (String priority : parsedValues) { - ConfigurationUpdateStatus s = ConfigurationUpdateStatus.valueOf(priority); - updateStatus[indx++] = s; - } - criteria.addFilterStatuses(updateStatus); - } - } - return criteria; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java index 017a8de..a6cb9b8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java @@ -21,13 +21,13 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource; import org.rhq.core.domain.common.EntityContext; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.AbstractOperationHistoryPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.AbstractOpsHistoryPortlet; /** * @author Simeon Pinder - * @author Jay Shaughnessy + * @author Jay Shaughnessy */ -public class ResourceOperationsPortlet extends AbstractOperationHistoryPortlet { +public class ResourceOperationsPortlet extends AbstractOpsHistoryPortlet { // A non-displayed, persisted identifier for the portlet public static final String KEY = "ResourceOperations"; @@ -55,4 +55,4 @@ public class ResourceOperationsPortlet extends AbstractOperationHistoryPortlet { } } -} \ No newline at end of file +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index 451659b..48b81ff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -28,7 +28,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor; @@ -100,7 +100,7 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements protected void updateTimeRangeToNow() { Date now = new Date(); - AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs + AbstractMeasRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs .getMetricRangePreferences(); long timeRange = metricRangePreferences.end - metricRangePreferences.begin; Date newStartDate = new Date(now.getTime() - timeRange); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java deleted file mode 100644 index 26a99ca..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.inventory.common.detail.operation.history; - -import java.util.List; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.fields.DataSourceDateTimeField; -import com.smartgwt.client.data.fields.DataSourceIntegerField; -import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.OperationHistoryCriteria; -import org.rhq.core.domain.operation.OperationHistory; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; - -/** - * @author Greg Hinkle - * @author Ian Springer - */ -public abstract class AbstractOperationHistoryDataSource<T extends OperationHistory, C extends OperationHistoryCriteria> - extends RPCDataSource<T, C> { - - public static abstract class Field { - public static final String ID = "id"; - public static final String OPERATION_NAME = "operationName"; - public static final String STATUS = "status"; - public static final String STARTED_TIME = "startedTime"; - public static final String CREATED_TIME = "createdTime"; - public static final String DURATION = "duration"; - public static final String SUBJECT = "subjectName"; - public static final String OPERATION_DEFINITION = "operationDefinition"; - public static final String ERROR_MESSAGE = "errorMessage"; - public static final String PARAMETERS = "parameters"; - } - - public static abstract class RequestAttribute { - public static final String FORCE = "force"; - } - - protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); - - public AbstractOperationHistoryDataSource() { - List<DataSourceField> fields = addDataSourceFields(); - addFields(fields); - } - - @Override - protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { - final T operationHistoryToRemove = copyValues(recordToRemove); - Boolean forceValue = request.getAttributeAsBoolean(RequestAttribute.FORCE); - boolean force = ((forceValue != null) && forceValue); - operationService.deleteOperationHistory(operationHistoryToRemove.getId(), force, new AsyncCallback<Void>() { - public void onSuccess(Void result) { - sendSuccessResponse(request, response, operationHistoryToRemove, new Message("success")); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to delete " + operationHistoryToRemove + ".", caught); - } - }); - } - - @Override - protected List<DataSourceField> addDataSourceFields() { - List<DataSourceField> fields = super.addDataSourceFields(); - - DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG.common_title_id()); - idField.setPrimaryKey(true); - fields.add(idField); - - DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME, MSG - .dataSource_operationHistory_field_operationName()); - fields.add(nameField); - - DataSourceTextField statusField = new DataSourceTextField(Field.STATUS, MSG.common_title_status()); - fields.add(statusField); - - DataSourceDateTimeField createdTimeField = new DataSourceDateTimeField(Field.CREATED_TIME, MSG - .dataSource_operationHistory_field_createdTime()); - fields.add(createdTimeField); - - DataSourceDateTimeField startedTimeField = new DataSourceDateTimeField(Field.STARTED_TIME, MSG - .dataSource_operationHistory_field_startedTime()); - fields.add(startedTimeField); - - DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT, MSG - .dataSource_operationHistory_field_subject()); - fields.add(subjectField); - - return fields; - } - - @Override - public T copyValues(Record from) { - T operationHistory = createOperationHistory(); - operationHistory.setId(from.getAttributeAsInt(Field.ID)); - return operationHistory; - } - - protected abstract T createOperationHistory(); - - @Override - public ListGridRecord copyValues(T from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.CREATED_TIME, convertTimestampToDate(from.getCreatedTime())); - record.setAttribute(Field.STARTED_TIME, convertTimestampToDate(from.getStartedTime())); - record.setAttribute(Field.DURATION, from.getDuration()); - record.setAttribute(Field.SUBJECT, from.getSubjectName()); - record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); - record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); - record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); - record.setAttribute(Field.STATUS, from.getStatus().name()); - record.setAttribute(Field.PARAMETERS, from.getParameters()); - - return record; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java index 54fe9a6..df0f10e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java @@ -140,17 +140,17 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis OperationRequestStatus status = operationHistory.getStatus(); - StaticTextItem idItem = new StaticTextItem(AbstractOperationHistoryDataSource.Field.ID, "Execution ID"); + StaticTextItem idItem = new StaticTextItem(AbstractOpsHistoryDataSource.Field.ID, "Execution ID"); idItem.setValue(operationHistory.getId()); items.add(idItem); - StaticTextItem operationItem = new StaticTextItem(AbstractOperationHistoryDataSource.Field.OPERATION_NAME, + StaticTextItem operationItem = new StaticTextItem(AbstractOpsHistoryDataSource.Field.OPERATION_NAME, MSG.view_operationHistoryDetails_operation()); OperationDefinition operationDefinition = operationHistory.getOperationDefinition(); operationItem.setValue(operationDefinition.getDisplayName()); items.add(operationItem); - StaticTextItem submittedItem = new StaticTextItem(AbstractOperationHistoryDataSource.Field.STARTED_TIME, + StaticTextItem submittedItem = new StaticTextItem(AbstractOpsHistoryDataSource.Field.STARTED_TIME, MSG.view_operationHistoryDetails_dateSubmitted()); if (operationHistory.getStartedTime() == 0) { // must have executed serially, halt-on-error was true and a previous resource op failed, thus this never even got submitted to the agent for invocation @@ -171,14 +171,14 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis } items.add(completedItem); - StaticTextItem requesterItem = new StaticTextItem(AbstractOperationHistoryDataSource.Field.SUBJECT, + StaticTextItem requesterItem = new StaticTextItem(AbstractOpsHistoryDataSource.Field.SUBJECT, MSG.view_operationHistoryDetails_requestor()); requesterItem.setEscapeHTML(true); requesterItem.setValue(operationHistory.getSubjectName()); items.add(requesterItem); - StaticTextItem statusItem = new StaticTextItem(AbstractOperationHistoryDataSource.Field.STATUS, + StaticTextItem statusItem = new StaticTextItem(AbstractOpsHistoryDataSource.Field.STATUS, MSG.view_operationHistoryDetails_status()); String icon = ImageManager.getFullImagePath(ImageManager.getOperationResultsIcon(status)); statusItem.setValue("<img src='" + icon + "'/>"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java index d71988b..153c3b3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java @@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource; +import org.rhq.enterprise.gui.coregui.client.operation.OpsHistoryDS; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Option; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; @@ -63,7 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; * @author John Mazzitelli * @author Ian Springer */ -public abstract class AbstractOperationHistoryListView<T extends AbstractOperationHistoryDataSource> extends +public abstract class AbstractOperationHistoryListView<T extends AbstractOpsHistoryDataSource> extends TableSection<T> { private static final String HEADER_ICON = "subsystems/control/Operation_24.png"; @@ -87,7 +87,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati setListGridFields(fields.toArray(new ListGridField[fields.size()])); // explicitly sort on started time so the user can see the last operation at the top and is sorted descendingly - SortSpecifier sortSpec = new SortSpecifier(AbstractOperationHistoryDataSource.Field.STARTED_TIME, + SortSpecifier sortSpec = new SortSpecifier(AbstractOpsHistoryDataSource.Field.STARTED_TIME, SortDirection.DESCENDING); getListGrid().setSort(new SortSpecifier[] { sortSpec }); @@ -101,7 +101,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati int count = selection.length; for (ListGridRecord item : selection) { if (!OperationRequestStatus.INPROGRESS.name().equals( - item.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS))) { + item.getAttribute(AbstractOpsHistoryDataSource.Field.STATUS))) { count--; // one selected item was not in-progress, it doesn't count } } @@ -114,9 +114,9 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati for (ListGridRecord toBeCanceled : selection) { // only cancel those selected operations that are currently in progress if (OperationRequestStatus.INPROGRESS.name().equals( - toBeCanceled.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS))) { + toBeCanceled.getAttribute(AbstractOpsHistoryDataSource.Field.STATUS))) { numCancelRequestsSubmitted++; - final int historyId = toBeCanceled.getAttributeAsInt(OperationHistoryDataSource.Field.ID); + final int historyId = toBeCanceled.getAttributeAsInt(OpsHistoryDS.Field.ID); opService.cancelOperationHistory(historyId, false, new AsyncCallback<Void>() { public void onSuccess(Void result) { Message msg = new Message(MSG.view_operationHistoryList_cancelSuccess(String @@ -171,15 +171,15 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati protected List<ListGridField> createFields() { List<ListGridField> fields = new ArrayList<ListGridField>(); - ListGridField idField = new ListGridField(AbstractOperationHistoryDataSource.Field.ID); + ListGridField idField = new ListGridField(AbstractOpsHistoryDataSource.Field.ID); idField.setWidth(38); fields.add(idField); - ListGridField opNameField = new ListGridField(AbstractOperationHistoryDataSource.Field.OPERATION_NAME); + ListGridField opNameField = new ListGridField(AbstractOpsHistoryDataSource.Field.OPERATION_NAME); opNameField.setWidth("34%"); fields.add(opNameField); - ListGridField subjectField = new ListGridField(AbstractOperationHistoryDataSource.Field.SUBJECT); + ListGridField subjectField = new ListGridField(AbstractOpsHistoryDataSource.Field.SUBJECT); subjectField.setWidth("33%"); fields.add(subjectField); @@ -194,7 +194,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati } protected ListGridField createStartedTimeField() { - ListGridField startedTimeField = new ListGridField(AbstractOperationHistoryDataSource.Field.STARTED_TIME); + ListGridField startedTimeField = new ListGridField(AbstractOpsHistoryDataSource.Field.STARTED_TIME); startedTimeField.setAlign(Alignment.LEFT); startedTimeField.setCellAlign(Alignment.LEFT); startedTimeField.setCellFormatter(new TimestampCellFormatter() { @@ -208,20 +208,20 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati }); startedTimeField.setShowHover(true); startedTimeField.setHoverCustomizer(TimestampCellFormatter - .getHoverCustomizer(AbstractOperationHistoryDataSource.Field.STARTED_TIME)); + .getHoverCustomizer(AbstractOpsHistoryDataSource.Field.STARTED_TIME)); return startedTimeField; } protected ListGridField createStatusField() { - ListGridField statusField = new ListGridField(AbstractOperationHistoryDataSource.Field.STATUS); + ListGridField statusField = new ListGridField(AbstractOpsHistoryDataSource.Field.STATUS); statusField.setAlign(Alignment.CENTER); statusField.setCellAlign(Alignment.CENTER); statusField.setShowHover(true); statusField.setHoverCustomizer(new HoverCustomizer() { @Override public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - String statusStr = record.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS); + String statusStr = record.getAttribute(AbstractOpsHistoryDataSource.Field.STATUS); OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); switch (status) { case SUCCESS: { @@ -252,7 +252,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati @Override public void onRecordClick(RecordClickEvent event) { Record record = event.getRecord(); - String statusStr = record.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS); + String statusStr = record.getAttribute(AbstractOpsHistoryDataSource.Field.STATUS); OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); if (status == OperationRequestStatus.FAILURE) { final Window winModal = new Window(); @@ -278,7 +278,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati htmlPane.setMargin(10); htmlPane.setDefaultWidth(500); htmlPane.setDefaultHeight(400); - String errorMsg = record.getAttribute(AbstractOperationHistoryDataSource.Field.ERROR_MESSAGE); + String errorMsg = record.getAttribute(AbstractOpsHistoryDataSource.Field.ERROR_MESSAGE); if (errorMsg == null) { errorMsg = MSG.common_status_failed(); } @@ -324,7 +324,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati final ListGridRecord[] recordsToBeDeleted = getListGrid().getSelectedRecords(); final int numberOfRecordsToBeDeleted = recordsToBeDeleted.length; Boolean forceValue = (requestProperties != null && requestProperties - .getAttributeAsBoolean(AbstractOperationHistoryDataSource.RequestAttribute.FORCE)); + .getAttributeAsBoolean(AbstractOpsHistoryDataSource.RequestAttribute.FORCE)); boolean force = ((forceValue != null) && forceValue); final List<Integer> successIds = new ArrayList<Integer>(); final List<Integer> failureIds = new ArrayList<Integer>(); @@ -366,7 +366,7 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati @Override protected String getDetailsLinkColumnName() { - return AbstractOperationHistoryDataSource.Field.OPERATION_NAME; + return AbstractOpsHistoryDataSource.Field.OPERATION_NAME; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOpsHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOpsHistoryDataSource.java new file mode 100644 index 0000000..f31c496 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOpsHistoryDataSource.java @@ -0,0 +1,144 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.inventory.common.detail.operation.history; + +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceDateTimeField; +import com.smartgwt.client.data.fields.DataSourceIntegerField; +import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.OperationHistoryCriteria; +import org.rhq.core.domain.operation.OperationHistory; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; + +/** + * @author Greg Hinkle + * @author Ian Springer + */ +public abstract class AbstractOpsHistoryDataSource<T extends OperationHistory, C extends OperationHistoryCriteria> + extends RPCDataSource<T, C> { + + public static abstract class Field { + public static final String ID = "id"; + public static final String OPERATION_NAME = "operationName"; + public static final String STATUS = "status"; + public static final String STARTED_TIME = "startedTime"; + public static final String CREATED_TIME = "createdTime"; + public static final String DURATION = "duration"; + public static final String SUBJECT = "subjectName"; + public static final String OPERATION_DEFINITION = "operationDefinition"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String PARAMETERS = "parameters"; + } + + public static abstract class RequestAttribute { + public static final String FORCE = "force"; + } + + protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); + + public AbstractOpsHistoryDataSource() { + List<DataSourceField> fields = addDataSourceFields(); + addFields(fields); + } + + @Override + protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { + final T operationHistoryToRemove = copyValues(recordToRemove); + Boolean forceValue = request.getAttributeAsBoolean(RequestAttribute.FORCE); + boolean force = ((forceValue != null) && forceValue); + operationService.deleteOperationHistory(operationHistoryToRemove.getId(), force, new AsyncCallback<Void>() { + public void onSuccess(Void result) { + sendSuccessResponse(request, response, operationHistoryToRemove, new Message("success")); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to delete " + operationHistoryToRemove + ".", caught); + } + }); + } + + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG.common_title_id()); + idField.setPrimaryKey(true); + fields.add(idField); + + DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME, MSG + .dataSource_operationHistory_field_operationName()); + fields.add(nameField); + + DataSourceTextField statusField = new DataSourceTextField(Field.STATUS, MSG.common_title_status()); + fields.add(statusField); + + DataSourceDateTimeField createdTimeField = new DataSourceDateTimeField(Field.CREATED_TIME, MSG + .dataSource_operationHistory_field_createdTime()); + fields.add(createdTimeField); + + DataSourceDateTimeField startedTimeField = new DataSourceDateTimeField(Field.STARTED_TIME, MSG + .dataSource_operationHistory_field_startedTime()); + fields.add(startedTimeField); + + DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT, MSG + .dataSource_operationHistory_field_subject()); + fields.add(subjectField); + + return fields; + } + + @Override + public T copyValues(Record from) { + T operationHistory = createOperationHistory(); + operationHistory.setId(from.getAttributeAsInt(Field.ID)); + return operationHistory; + } + + protected abstract T createOperationHistory(); + + @Override + public ListGridRecord copyValues(T from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.CREATED_TIME, convertTimestampToDate(from.getCreatedTime())); + record.setAttribute(Field.STARTED_TIME, convertTimestampToDate(from.getStartedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); + record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.PARAMETERS, from.getParameters()); + + return record; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDS.java new file mode 100644 index 0000000..ab38d2f --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDS.java @@ -0,0 +1,272 @@ +/* + * RHQ Management Platform + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule; + +import java.util.Comparator; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.TreeSet; + +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceDateTimeField; +import com.smartgwt.client.data.fields.DataSourceIntegerField; +import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.types.FieldType; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.common.JobTrigger; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.operation.bean.OperationSchedule; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule.GroupOperationScheduleDS; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.RecordUtility; + +/** + * @author Ian Springer + */ +public abstract class AbstractOperationScheduleDS<T extends OperationSchedule> extends + RPCDataSource<T, Criteria> { + + public static abstract class Field { + public static final String ID = "id"; + public static final String JOB_NAME = "jobName"; + public static final String JOB_GROUP = "jobGroup"; + public static final String OPERATION_NAME = "operationName"; + public static final String OPERATION_DISPLAY_NAME = "operationDisplayName"; + public static final String PARAMETERS = "parameters"; + public static final String SUBJECT = "subject"; + public static final String SUBJECT_ID = "subjectId"; + public static final String DESCRIPTION = "description"; + public static final String NEXT_FIRE_TIME = "nextFireTime"; + public static final String TIMEOUT = "timeout"; + public static final String JOB_TRIGGER = "jobTrigger"; + + // job trigger fields + public static final String START_TIME = "startTime"; + public static final String REPEAT_INTERVAL = "repeatInterval"; + public static final String REPEAT_COUNT = "repeatCount"; + public static final String END_TIME = "endTime"; + public static final String CRON_EXPRESSION = "cronExpression"; + } + + public static abstract class RequestProperty { + public static final String PARAMETERS = "parameters"; + } + + protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); + + private ResourceType resourceType; + + public AbstractOperationScheduleDS(ResourceType resourceType) { + super(); + this.resourceType = resourceType; + List<DataSourceField> fields = addDataSourceFields(); + addFields(fields); + } + + // TODO: i18n + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG + .dataSource_operationSchedule_field_id()); + idField.setPrimaryKey(true); + idField.setCanEdit(false); + fields.add(idField); + + DataSourceTextField operationNameField = createTextField(Field.OPERATION_NAME, MSG + .dataSource_operationSchedule_field_operationName(), null, 100, true); + // sort the op def names in the drop down + TreeSet<OperationDefinition> operationDefinitions = new TreeSet<OperationDefinition>( + new Comparator<OperationDefinition>() { + public int compare(OperationDefinition o1, OperationDefinition o2) { + return o1.getDisplayName().compareTo(o2.getDisplayName()); + } + }); + operationDefinitions.addAll(this.resourceType.getOperationDefinitions()); + LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); + for (OperationDefinition operationDefinition : operationDefinitions) { + valueMap.put(operationDefinition.getName(), operationDefinition.getDisplayName()); + } + operationNameField.setValueMap(valueMap); + fields.add(operationNameField); + + DataSourceTextField operationDisplayNameField = createTextField(Field.OPERATION_DISPLAY_NAME, MSG + .dataSource_operationSchedule_field_operationDisplayName(), null, 100, true); + fields.add(operationDisplayNameField); + + DataSourceField subjectField = new DataSourceField(Field.SUBJECT, FieldType.ANY, MSG + .dataSource_operationSchedule_field_subject()); + subjectField.setCanEdit(false); + fields.add(subjectField); + + DataSourceTextField descriptionField = createTextField(Field.DESCRIPTION, MSG + .dataSource_operationSchedule_field_description(), null, 100, false); + fields.add(descriptionField); + + DataSourceDateTimeField nextFireTimeField = new DataSourceDateTimeField(Field.NEXT_FIRE_TIME, MSG + .dataSource_operationSchedule_field_nextFireTime()); + nextFireTimeField.setCanEdit(false); + fields.add(nextFireTimeField); + + DataSourceIntegerField timeoutField = createIntegerField(Field.TIMEOUT, MSG + .dataSource_operationSchedule_field_timeout(), 30, null, false); + fields.add(timeoutField); + + return fields; + } + + protected abstract T createOperationSchedule(); + + @Override + public T copyValues(Record from) { + T to = createOperationSchedule(); + + to.setId(from.getAttributeAsInt(Field.ID)); + to.setJobName(from.getAttribute(Field.JOB_NAME)); + to.setJobGroup(from.getAttribute(Field.JOB_GROUP)); + Subject subject = new Subject(); + subject.setName(from.getAttribute(Field.SUBJECT)); + subject.setId(from.getAttributeAsInt(Field.SUBJECT_ID)); + to.setSubject(subject); + Configuration parameters = (Configuration) from.getAttributeAsObject(Field.PARAMETERS); + Integer timeout = RecordUtility.getAttributeAsInteger(from, Field.TIMEOUT); + if (timeout != null) { + if (parameters == null) { + parameters = new Configuration(); + } + parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, timeout)); + } + to.setParameters(parameters); + to.setOperationName(from.getAttribute(Field.OPERATION_NAME)); + to.setOperationDisplayName(from.getAttribute(Field.OPERATION_DISPLAY_NAME)); + to.setDescription(from.getAttribute(Field.DESCRIPTION)); + to.setNextFireTime(from.getAttributeAsDate(Field.NEXT_FIRE_TIME)); + to.setJobTrigger(createJobTrigger(from.getAttributeAsRecord("jobTrigger"))); + + return to; + } + + @Override + public ListGridRecord copyValues(T from) { + ListGridRecord to = new ListGridRecord(); + + to.setAttribute(Field.ID, from.getId()); + to.setAttribute(Field.JOB_NAME, from.getJobName()); + to.setAttribute(Field.JOB_GROUP, from.getJobGroup()); + to.setAttribute(Field.SUBJECT, from.getSubject().getName()); + to.setAttribute(Field.SUBJECT_ID, from.getSubject().getId()); + Configuration parameters = from.getParameters(); + to.setAttribute(Field.PARAMETERS, parameters); + to.setAttribute(Field.OPERATION_NAME, from.getOperationName()); + to.setAttribute(Field.OPERATION_DISPLAY_NAME, from.getOperationDisplayName()); + to.setAttribute(Field.DESCRIPTION, from.getDescription()); + to.setAttribute(Field.NEXT_FIRE_TIME, from.getNextFireTime()); + to.setAttribute(Field.TIMEOUT, (parameters != null) ? parameters.getSimpleValue( + OperationDefinition.TIMEOUT_PARAM_NAME, null) : null); + + JobTrigger jobTrigger = from.getJobTrigger(); + Record jobTriggerRecord = new ListGridRecord(); + jobTriggerRecord.setAttribute(Field.START_TIME, jobTrigger.getStartDate()); + jobTriggerRecord.setAttribute(Field.REPEAT_INTERVAL, jobTrigger.getRepeatInterval()); + jobTriggerRecord.setAttribute(Field.REPEAT_COUNT, jobTrigger.getRepeatCount()); + jobTriggerRecord.setAttribute(Field.END_TIME, jobTrigger.getEndDate()); + jobTriggerRecord.setAttribute(Field.CRON_EXPRESSION, jobTrigger.getCronExpression()); + to.setAttribute("jobTrigger", jobTriggerRecord); + + return to; + } + + public JobTrigger createJobTrigger(Record jobTriggerRecord) { + JobTrigger jobTrigger; + + String cronExpression = jobTriggerRecord.getAttribute(Field.CRON_EXPRESSION); + if (cronExpression != null) { + jobTrigger = JobTrigger.createCronTrigger(cronExpression); + } else { + // calendar mode + Date startTime = jobTriggerRecord.getAttributeAsDate(Field.START_TIME); + Long repeatInterval = jobTriggerRecord.getAttributeAsLong(Field.REPEAT_INTERVAL); + Integer repeatCount = jobTriggerRecord.getAttributeAsInt(Field.REPEAT_COUNT); + Date endTime = jobTriggerRecord.getAttributeAsDate(Field.END_TIME); + + if (startTime != null) { + // LATER + + if (repeatInterval != null) { + // LATER AND REPEAT + + if (repeatCount != null) { + jobTrigger = JobTrigger.createLaterAndRepeatTrigger(startTime, repeatInterval, repeatCount); + } else { + jobTrigger = JobTrigger.createLaterAndRepeatTrigger(startTime, repeatInterval, endTime); + } + } else { + // LATER ONCE + + jobTrigger = JobTrigger.createLaterTrigger(startTime); + } + } else { + // NOW + if (repeatInterval != null) { + // NOW AND REPEAT + + if (repeatCount != null) { + jobTrigger = JobTrigger.createNowAndRepeatTrigger(repeatInterval, repeatCount); + } else { + jobTrigger = JobTrigger.createNowAndRepeatTrigger(repeatInterval, endTime); + } + } else { + // NOW ONCE + + jobTrigger = JobTrigger.createNowTrigger(); + } + } + } + + return jobTrigger; + } + + protected void addRequestPropertiesToRecord(DSRequest request, Record record) { + Configuration parameters = (Configuration) request + .getAttributeAsObject(GroupOperationScheduleDS.RequestProperty.PARAMETERS); + record.setAttribute(GroupOperationScheduleDS.Field.PARAMETERS, parameters); + } + + /** + * All data sources extending this type do not use the normal criteria object to query. + * So this just returns null. + */ + @Override + protected Criteria getFetchCriteria(DSRequest request) { + return null; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java deleted file mode 100644 index d4663a6..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java +++ /dev/null @@ -1,272 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule; - -import java.util.Comparator; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.TreeSet; - -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.fields.DataSourceDateTimeField; -import com.smartgwt.client.data.fields.DataSourceIntegerField; -import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.types.FieldType; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.common.JobTrigger; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.criteria.Criteria; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.operation.bean.OperationSchedule; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule.GroupOperationScheduleDataSource; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.RecordUtility; - -/** - * @author Ian Springer - */ -public abstract class AbstractOperationScheduleDataSource<T extends OperationSchedule> extends - RPCDataSource<T, Criteria> { - - public static abstract class Field { - public static final String ID = "id"; - public static final String JOB_NAME = "jobName"; - public static final String JOB_GROUP = "jobGroup"; - public static final String OPERATION_NAME = "operationName"; - public static final String OPERATION_DISPLAY_NAME = "operationDisplayName"; - public static final String PARAMETERS = "parameters"; - public static final String SUBJECT = "subject"; - public static final String SUBJECT_ID = "subjectId"; - public static final String DESCRIPTION = "description"; - public static final String NEXT_FIRE_TIME = "nextFireTime"; - public static final String TIMEOUT = "timeout"; - public static final String JOB_TRIGGER = "jobTrigger"; - - // job trigger fields - public static final String START_TIME = "startTime"; - public static final String REPEAT_INTERVAL = "repeatInterval"; - public static final String REPEAT_COUNT = "repeatCount"; - public static final String END_TIME = "endTime"; - public static final String CRON_EXPRESSION = "cronExpression"; - } - - public static abstract class RequestProperty { - public static final String PARAMETERS = "parameters"; - } - - protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); - - private ResourceType resourceType; - - public AbstractOperationScheduleDataSource(ResourceType resourceType) { - super(); - this.resourceType = resourceType; - List<DataSourceField> fields = addDataSourceFields(); - addFields(fields); - } - - // TODO: i18n - @Override - protected List<DataSourceField> addDataSourceFields() { - List<DataSourceField> fields = super.addDataSourceFields(); - - DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG - .dataSource_operationSchedule_field_id()); - idField.setPrimaryKey(true); - idField.setCanEdit(false); - fields.add(idField); - - DataSourceTextField operationNameField = createTextField(Field.OPERATION_NAME, MSG - .dataSource_operationSchedule_field_operationName(), null, 100, true); - // sort the op def names in the drop down - TreeSet<OperationDefinition> operationDefinitions = new TreeSet<OperationDefinition>( - new Comparator<OperationDefinition>() { - public int compare(OperationDefinition o1, OperationDefinition o2) { - return o1.getDisplayName().compareTo(o2.getDisplayName()); - } - }); - operationDefinitions.addAll(this.resourceType.getOperationDefinitions()); - LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - for (OperationDefinition operationDefinition : operationDefinitions) { - valueMap.put(operationDefinition.getName(), operationDefinition.getDisplayName()); - } - operationNameField.setValueMap(valueMap); - fields.add(operationNameField); - - DataSourceTextField operationDisplayNameField = createTextField(Field.OPERATION_DISPLAY_NAME, MSG - .dataSource_operationSchedule_field_operationDisplayName(), null, 100, true); - fields.add(operationDisplayNameField); - - DataSourceField subjectField = new DataSourceField(Field.SUBJECT, FieldType.ANY, MSG - .dataSource_operationSchedule_field_subject()); - subjectField.setCanEdit(false); - fields.add(subjectField); - - DataSourceTextField descriptionField = createTextField(Field.DESCRIPTION, MSG - .dataSource_operationSchedule_field_description(), null, 100, false); - fields.add(descriptionField); - - DataSourceDateTimeField nextFireTimeField = new DataSourceDateTimeField(Field.NEXT_FIRE_TIME, MSG - .dataSource_operationSchedule_field_nextFireTime()); - nextFireTimeField.setCanEdit(false); - fields.add(nextFireTimeField); - - DataSourceIntegerField timeoutField = createIntegerField(Field.TIMEOUT, MSG - .dataSource_operationSchedule_field_timeout(), 30, null, false); - fields.add(timeoutField); - - return fields; - } - - protected abstract T createOperationSchedule(); - - @Override - public T copyValues(Record from) { - T to = createOperationSchedule(); - - to.setId(from.getAttributeAsInt(Field.ID)); - to.setJobName(from.getAttribute(Field.JOB_NAME)); - to.setJobGroup(from.getAttribute(Field.JOB_GROUP)); - Subject subject = new Subject(); - subject.setName(from.getAttribute(Field.SUBJECT)); - subject.setId(from.getAttributeAsInt(Field.SUBJECT_ID)); - to.setSubject(subject); - Configuration parameters = (Configuration) from.getAttributeAsObject(Field.PARAMETERS); - Integer timeout = RecordUtility.getAttributeAsInteger(from, Field.TIMEOUT); - if (timeout != null) { - if (parameters == null) { - parameters = new Configuration(); - } - parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, timeout)); - } - to.setParameters(parameters); - to.setOperationName(from.getAttribute(Field.OPERATION_NAME)); - to.setOperationDisplayName(from.getAttribute(Field.OPERATION_DISPLAY_NAME)); - to.setDescription(from.getAttribute(Field.DESCRIPTION)); - to.setNextFireTime(from.getAttributeAsDate(Field.NEXT_FIRE_TIME)); - to.setJobTrigger(createJobTrigger(from.getAttributeAsRecord("jobTrigger"))); - - return to; - } - - @Override - public ListGridRecord copyValues(T from) { - ListGridRecord to = new ListGridRecord(); - - to.setAttribute(Field.ID, from.getId()); - to.setAttribute(Field.JOB_NAME, from.getJobName()); - to.setAttribute(Field.JOB_GROUP, from.getJobGroup()); - to.setAttribute(Field.SUBJECT, from.getSubject().getName()); - to.setAttribute(Field.SUBJECT_ID, from.getSubject().getId()); - Configuration parameters = from.getParameters(); - to.setAttribute(Field.PARAMETERS, parameters); - to.setAttribute(Field.OPERATION_NAME, from.getOperationName()); - to.setAttribute(Field.OPERATION_DISPLAY_NAME, from.getOperationDisplayName()); - to.setAttribute(Field.DESCRIPTION, from.getDescription()); - to.setAttribute(Field.NEXT_FIRE_TIME, from.getNextFireTime()); - to.setAttribute(Field.TIMEOUT, (parameters != null) ? parameters.getSimpleValue( - OperationDefinition.TIMEOUT_PARAM_NAME, null) : null); - - JobTrigger jobTrigger = from.getJobTrigger(); - Record jobTriggerRecord = new ListGridRecord(); - jobTriggerRecord.setAttribute(Field.START_TIME, jobTrigger.getStartDate()); - jobTriggerRecord.setAttribute(Field.REPEAT_INTERVAL, jobTrigger.getRepeatInterval()); - jobTriggerRecord.setAttribute(Field.REPEAT_COUNT, jobTrigger.getRepeatCount()); - jobTriggerRecord.setAttribute(Field.END_TIME, jobTrigger.getEndDate()); - jobTriggerRecord.setAttribute(Field.CRON_EXPRESSION, jobTrigger.getCronExpression()); - to.setAttribute("jobTrigger", jobTriggerRecord); - - return to; - } - - public JobTrigger createJobTrigger(Record jobTriggerRecord) { - JobTrigger jobTrigger; - - String cronExpression = jobTriggerRecord.getAttribute(Field.CRON_EXPRESSION); - if (cronExpression != null) { - jobTrigger = JobTrigger.createCronTrigger(cronExpression); - } else { - // calendar mode - Date startTime = jobTriggerRecord.getAttributeAsDate(Field.START_TIME); - Long repeatInterval = jobTriggerRecord.getAttributeAsLong(Field.REPEAT_INTERVAL); - Integer repeatCount = jobTriggerRecord.getAttributeAsInt(Field.REPEAT_COUNT); - Date endTime = jobTriggerRecord.getAttributeAsDate(Field.END_TIME); - - if (startTime != null) { - // LATER - - if (repeatInterval != null) { - // LATER AND REPEAT - - if (repeatCount != null) { - jobTrigger = JobTrigger.createLaterAndRepeatTrigger(startTime, repeatInterval, repeatCount); - } else { - jobTrigger = JobTrigger.createLaterAndRepeatTrigger(startTime, repeatInterval, endTime); - } - } else { - // LATER ONCE - - jobTrigger = JobTrigger.createLaterTrigger(startTime); - } - } else { - // NOW - if (repeatInterval != null) { - // NOW AND REPEAT - - if (repeatCount != null) { - jobTrigger = JobTrigger.createNowAndRepeatTrigger(repeatInterval, repeatCount); - } else { - jobTrigger = JobTrigger.createNowAndRepeatTrigger(repeatInterval, endTime); - } - } else { - // NOW ONCE - - jobTrigger = JobTrigger.createNowTrigger(); - } - } - } - - return jobTrigger; - } - - protected void addRequestPropertiesToRecord(DSRequest request, Record record) { - Configuration parameters = (Configuration) request - .getAttributeAsObject(GroupOperationScheduleDataSource.RequestProperty.PARAMETERS); - record.setAttribute(GroupOperationScheduleDataSource.Field.PARAMETERS, parameters); - } - - /** - * All data sources extending this type do not use the normal criteria object to query. - * So this just returns null. - */ - @Override - protected Criteria getFetchCriteria(DSRequest request) { - return null; - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java index 983a8dd..0202aa8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java @@ -67,7 +67,7 @@ import org.rhq.enterprise.gui.coregui.client.components.trigger.JobTriggerEditor import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDS; import org.rhq.enterprise.gui.coregui.client.util.FormUtility; import org.rhq.enterprise.gui.coregui.client.util.TypeConversionUtility; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; @@ -80,7 +80,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; * @author Ian Springer */ public abstract class AbstractOperationScheduleDetailsView extends - AbstractRecordEditor<AbstractOperationScheduleDataSource<? extends OperationSchedule>> { + AbstractRecordEditor<AbstractOperationScheduleDS<? extends OperationSchedule>> { private static final String FIELD_OPERATION_DESCRIPTION = "operationDescription"; private static final String FIELD_OPERATION_PARAMETERS = "operationParameters"; @@ -101,7 +101,7 @@ public abstract class AbstractOperationScheduleDetailsView extends private ViewPath viewPath; private boolean isImmediateExecution; - public AbstractOperationScheduleDetailsView(AbstractOperationScheduleDataSource<? extends OperationSchedule> dataSource, + public AbstractOperationScheduleDetailsView(AbstractOperationScheduleDS<? extends OperationSchedule> dataSource, ResourceType resourceType, int scheduleId) { super(dataSource, scheduleId, MSG.view_operationScheduleDetails_operationSchedule(), null); @@ -168,7 +168,7 @@ public abstract class AbstractOperationScheduleDetailsView extends // If the operationDefId has been seeded then treat it as a user-initiated change to // update associated widgets and button enablement. if (this.operationDefinitionId != null) { - FormItem nameField = this.getForm().getField(AbstractOperationScheduleDataSource.Field.OPERATION_NAME); + FormItem nameField = this.getForm().getField(AbstractOperationScheduleDS.Field.OPERATION_NAME); nameField.setValue(this.operationIdToNameMap.get(this.operationDefinitionId)); handleOperationNameChange(); getForm().rememberValues(); @@ -190,11 +190,11 @@ public abstract class AbstractOperationScheduleDetailsView extends List<FormItem> items = new ArrayList<FormItem>(); if (!isNewRecord()) { - StaticTextItem idItem = new StaticTextItem(AbstractOperationScheduleDataSource.Field.ID); + StaticTextItem idItem = new StaticTextItem(AbstractOperationScheduleDS.Field.ID); items.add(idItem); } - SelectItem operationNameItem = new SortedSelectItem(AbstractOperationScheduleDataSource.Field.OPERATION_NAME); + SelectItem operationNameItem = new SortedSelectItem(AbstractOperationScheduleDS.Field.OPERATION_NAME); operationNameItem.setShowTitle(true); items.add(operationNameItem); operationNameItem.addChangedHandler(new ChangedHandler() { @@ -267,7 +267,7 @@ public abstract class AbstractOperationScheduleDetailsView extends supportedUnits.add(TimeUnit.SECONDS); supportedUnits.add(TimeUnit.MINUTES); supportedUnits.add(TimeUnit.HOURS); - DurationItem timeoutItem = new DurationItem(AbstractOperationScheduleDataSource.Field.TIMEOUT, + DurationItem timeoutItem = new DurationItem(AbstractOperationScheduleDS.Field.TIMEOUT, MSG.view_operationScheduleDetails_field_timeout(), supportedUnits, false, isReadOnly()); ProductInfo productInfo = CoreGUI.get().getProductInfo(); timeoutItem.setContextualHelp(MSG.view_operationScheduleDetails_fieldHelp_timeout(productInfo.getShortName())); @@ -275,12 +275,12 @@ public abstract class AbstractOperationScheduleDetailsView extends if (!isNewRecord()) { StaticTextItem nextFireTimeItem = new StaticTextItem( - AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME, + AbstractOperationScheduleDS.Field.NEXT_FIRE_TIME, MSG.dataSource_operationSchedule_field_nextFireTime()); notesFields.add(nextFireTimeItem); } - TextAreaItem notesItem = new TextAreaItem(ResourceOperationScheduleDataSource.Field.DESCRIPTION, + TextAreaItem notesItem = new TextAreaItem(ResourceOperationScheduleDS.Field.DESCRIPTION, MSG.dataSource_operationSchedule_field_description()); notesItem.setWidth(450); notesItem.setHeight(60); @@ -308,7 +308,7 @@ public abstract class AbstractOperationScheduleDetailsView extends @Override protected String getTitleFieldName() { - return ResourceOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME; + return ResourceOperationScheduleDS.Field.OPERATION_DISPLAY_NAME; } @Override @@ -316,8 +316,8 @@ public abstract class AbstractOperationScheduleDetailsView extends Record record = super.createNewRecord(); Subject sessionSubject = UserSessionManager.getSessionSubject(); - record.setAttribute(ResourceOperationScheduleDataSource.Field.SUBJECT, sessionSubject.getName()); - record.setAttribute(ResourceOperationScheduleDataSource.Field.SUBJECT_ID, sessionSubject.getId()); + record.setAttribute(ResourceOperationScheduleDS.Field.SUBJECT, sessionSubject.getName()); + record.setAttribute(ResourceOperationScheduleDS.Field.SUBJECT_ID, sessionSubject.getId()); return record; } @@ -333,32 +333,32 @@ public abstract class AbstractOperationScheduleDetailsView extends @Override protected void editExistingRecord(Record record) { JavaScriptObject jobTriggerJavaScriptObject = (JavaScriptObject) getForm().getValue( - AbstractOperationScheduleDataSource.Field.JOB_TRIGGER); + AbstractOperationScheduleDS.Field.JOB_TRIGGER); Record jobTriggerRecord = new ListGridRecord(jobTriggerJavaScriptObject); JobTrigger jobTrigger = getDataSource().createJobTrigger(jobTriggerRecord); this.triggerEditor.setJobTrigger(jobTrigger); - FormItem nextFireTimeItem = this.notesForm.getField(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME); - nextFireTimeItem.setValue(getForm().getValue(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME)); + FormItem nextFireTimeItem = this.notesForm.getField(AbstractOperationScheduleDS.Field.NEXT_FIRE_TIME); + nextFireTimeItem.setValue(getForm().getValue(AbstractOperationScheduleDS.Field.NEXT_FIRE_TIME)); DurationItem timeoutItem = (DurationItem) this.notesForm - .getField(AbstractOperationScheduleDataSource.Field.TIMEOUT); - Object value = getForm().getValue(AbstractOperationScheduleDataSource.Field.TIMEOUT); + .getField(AbstractOperationScheduleDS.Field.TIMEOUT); + Object value = getForm().getValue(AbstractOperationScheduleDS.Field.TIMEOUT); Integer integerValue = TypeConversionUtility.toInteger(value); timeoutItem.setValue(integerValue, UnitType.TIME); StaticTextItem notesItem = (StaticTextItem) this.notesForm - .getField(AbstractOperationScheduleDataSource.Field.DESCRIPTION); + .getField(AbstractOperationScheduleDS.Field.DESCRIPTION); // Notes field is user-editable, so escape HTML to prevent an XSS attack. Unless empty, then don't to prevent // displaying   as the value. - String notesValue = getForm().getValueAsString(AbstractOperationScheduleDataSource.Field.DESCRIPTION); + String notesValue = getForm().getValueAsString(AbstractOperationScheduleDS.Field.DESCRIPTION); if (null != notesValue && !notesValue.isEmpty()) { notesItem.setEscapeHTML(true); } notesItem.setValue(notesValue); this.operationParameters = (Configuration) record - .getAttributeAsObject(AbstractOperationScheduleDataSource.Field.PARAMETERS); + .getAttributeAsObject(AbstractOperationScheduleDS.Field.PARAMETERS); super.editExistingRecord(record); } @@ -375,7 +375,7 @@ public abstract class AbstractOperationScheduleDetailsView extends } } - requestProperties.setAttribute(AbstractOperationScheduleDataSource.RequestProperty.PARAMETERS, + requestProperties.setAttribute(AbstractOperationScheduleDS.RequestProperty.PARAMETERS, this.operationParameters); EnhancedDynamicForm form = getForm(); @@ -384,33 +384,33 @@ public abstract class AbstractOperationScheduleDetailsView extends Date startTime = this.triggerEditor.getStartTime(); isImmediateExecution = startTime == null; - jobTriggerRecord.setAttribute(AbstractOperationScheduleDataSource.Field.START_TIME, startTime); + jobTriggerRecord.setAttribute(AbstractOperationScheduleDS.Field.START_TIME, startTime); Date endTime = this.triggerEditor.getEndTime(); - jobTriggerRecord.setAttribute(AbstractOperationScheduleDataSource.Field.END_TIME, endTime); + jobTriggerRecord.setAttribute(AbstractOperationScheduleDS.Field.END_TIME, endTime); Integer repeatCount = this.triggerEditor.getRepeatCount(); - jobTriggerRecord.setAttribute(AbstractOperationScheduleDataSource.Field.REPEAT_COUNT, repeatCount); + jobTriggerRecord.setAttribute(AbstractOperationScheduleDS.Field.REPEAT_COUNT, repeatCount); Long repeatInterval = this.triggerEditor.getRepeatInterval(); - jobTriggerRecord.setAttribute(AbstractOperationScheduleDataSource.Field.REPEAT_INTERVAL, repeatInterval); + jobTriggerRecord.setAttribute(AbstractOperationScheduleDS.Field.REPEAT_INTERVAL, repeatInterval); String cronExpression = this.triggerEditor.getCronExpression(); - jobTriggerRecord.setAttribute(AbstractOperationScheduleDataSource.Field.CRON_EXPRESSION, cronExpression); + jobTriggerRecord.setAttribute(AbstractOperationScheduleDS.Field.CRON_EXPRESSION, cronExpression); - form.setValue(AbstractOperationScheduleDataSource.Field.JOB_TRIGGER, jobTriggerRecord); + form.setValue(AbstractOperationScheduleDS.Field.JOB_TRIGGER, jobTriggerRecord); DurationItem timeoutItem = (DurationItem) this.notesForm - .getItem(AbstractOperationScheduleDataSource.Field.TIMEOUT); + .getItem(AbstractOperationScheduleDS.Field.TIMEOUT); Long timeout = timeoutItem.getValueAsLong(); if (timeout != null) { - form.setValue(AbstractOperationScheduleDataSource.Field.TIMEOUT, timeout); + form.setValue(AbstractOperationScheduleDS.Field.TIMEOUT, timeout); } else { - form.setValue(AbstractOperationScheduleDataSource.Field.TIMEOUT, (String) null); + form.setValue(AbstractOperationScheduleDS.Field.TIMEOUT, (String) null); } - FormItem notesItem = this.notesForm.getField(AbstractOperationScheduleDataSource.Field.DESCRIPTION); - form.setValue(AbstractOperationScheduleDataSource.Field.DESCRIPTION, (String) notesItem.getValue()); + FormItem notesItem = this.notesForm.getField(AbstractOperationScheduleDS.Field.DESCRIPTION); + form.setValue(AbstractOperationScheduleDS.Field.DESCRIPTION, (String) notesItem.getValue()); super.save(requestProperties); } @@ -491,7 +491,7 @@ public abstract class AbstractOperationScheduleDetailsView extends } private String getSelectedOperationName() { - FormItem operationNameItem = getForm().getField(AbstractOperationScheduleDataSource.Field.OPERATION_NAME); + FormItem operationNameItem = getForm().getField(AbstractOperationScheduleDS.Field.OPERATION_NAME); return (String) operationNameItem.getValue(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java index 2aea953..7da70cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java @@ -30,9 +30,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma /** * @author Ian Springer */ -public abstract class AbstractOperationScheduleListView extends TableSection<AbstractOperationScheduleDataSource> { +public abstract class AbstractOperationScheduleListView extends TableSection<AbstractOperationScheduleDS> { - public AbstractOperationScheduleListView(AbstractOperationScheduleDataSource dataSource, String title) { + public AbstractOperationScheduleListView(AbstractOperationScheduleDS dataSource, String title) { super(title); setDataSource(dataSource); @@ -42,18 +42,18 @@ public abstract class AbstractOperationScheduleListView extends TableSection<Abs @Override protected void configureTable() { - ListGridField idField = new ListGridField(AbstractOperationScheduleDataSource.Field.ID, 70); + ListGridField idField = new ListGridField(AbstractOperationScheduleDS.Field.ID, 70); ListGridField operationField = new ListGridField( - AbstractOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME, 180); + AbstractOperationScheduleDS.Field.OPERATION_DISPLAY_NAME, 180); - ListGridField subjectField = new ListGridField(AbstractOperationScheduleDataSource.Field.SUBJECT, 110); + ListGridField subjectField = new ListGridField(AbstractOperationScheduleDS.Field.SUBJECT, 110); - ListGridField nextFireTimeField = new ListGridField(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME, + ListGridField nextFireTimeField = new ListGridField(AbstractOperationScheduleDS.Field.NEXT_FIRE_TIME, 190); TimestampCellFormatter.prepareDateField(nextFireTimeField); - ListGridField descriptionField = new ListGridField(AbstractOperationScheduleDataSource.Field.DESCRIPTION); + ListGridField descriptionField = new ListGridField(AbstractOperationScheduleDS.Field.DESCRIPTION); descriptionField.setCellFormatter(new EscapedHtmlCellFormatter()); setListGridFields(true, idField, operationField, subjectField, nextFireTimeField, descriptionField); @@ -84,7 +84,7 @@ public abstract class AbstractOperationScheduleListView extends TableSection<Abs @Override protected String getDetailsLinkColumnName() { - return AbstractOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME; + return AbstractOperationScheduleDS.Field.OPERATION_DISPLAY_NAME; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index 2ff0003..cfe33dd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -27,7 +27,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -222,7 +222,7 @@ public abstract class AbstractMetricGraph extends VLayout implements HasD3Metric Log.debug("Saving Date range: "+new Date((long)startTime) + " - "+ new Date((long)endTime)); final boolean advanced = true; - AbstractMeasurementRangeEditor.MetricRangePreferences prefs = measurementUserPrefs.getMetricRangePreferences(); + AbstractMeasRangeEditor.MetricRangePreferences prefs = measurementUserPrefs.getMetricRangePreferences(); prefs.explicitBeginEnd = advanced; prefs.begin = (long) startTime; prefs.end = (long) endTime; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 5a81ab3..1b65585 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -39,7 +39,7 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.measurement.RefreshIntervalMenu; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -64,7 +64,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { private Label dateRangeLabel; private static final DateTimeFormat fmt = DateTimeFormat.getFormat(MSG.common_buttonbar_datetime_format()); private DateTimeButtonBarClickHandler dateTimeButtonBarClickHandler; - private AbstractMeasurementRangeEditor.MetricRangePreferences prefs; + private AbstractMeasRangeEditor.MetricRangePreferences prefs; final private ButtonBarDateTimeRangeEditor self; private RefreshIntervalMenu refreshIntervalMenu; private boolean allowPreferenceUpdateRefresh; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigDS.java new file mode 100644 index 0000000..ada423a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigDS.java @@ -0,0 +1,106 @@ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration; + +import java.util.ArrayList; +import java.util.Date; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * DataSource implementation for HistoryGroupResourceConfigurationTable. + * + * @author John Mazzitelli + * @author Simeon Pinder + */ +public class GroupResourceConfigDS extends + RPCDataSource<GroupResourceConfigurationUpdate, GroupResourceConfigurationUpdateCriteria> { + + private int groupId; + + public class Field { + public static final String ID = "id"; + public static final String DATECREATED = "createdTime"; + public static final String LASTUPDATED = "modifiedTime"; + public static final String STATUS = "status"; + public static final String USER = "subjectName"; + public static final String OBJECT = "object"; + } + + public GroupResourceConfigDS(int groupId) { + super(); + this.groupId = groupId; + } + + @Override + public GroupResourceConfigurationUpdate copyValues(Record from) { + return (GroupResourceConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); + } + + @Override + public ListGridRecord copyValues(GroupResourceConfigurationUpdate from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); + record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.USER, from.getSubjectName()); + + record.setAttribute(Field.OBJECT, from); + + return record; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final GroupResourceConfigurationUpdateCriteria criteria) { + ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); + + configurationService.findGroupResourceConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<GroupResourceConfigurationUpdate>>() { + + @Override + public void onSuccess(PageList<GroupResourceConfigurationUpdate> result) { + response.setData(buildRecords(result)); + response.setTotalRows(result.getTotalSize()); + processResponse(request.getRequestId(), response); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected GroupResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); + + ArrayList<Integer> groupIds = new ArrayList<Integer>(1); + groupIds.add(this.groupId); + criteria.addFilterResourceGroupIds(groupIds); + + PageControl pageControl = getPageControl(request); + pageControl.addDefaultOrderingField(Field.ID, PageOrdering.DESC); + criteria.setPageControl(pageControl); + + return criteria; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationDataSource.java deleted file mode 100644 index ab8b819..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationDataSource.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration; - -import java.util.ArrayList; -import java.util.Date; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; - -/** - * DataSource implementation for HistoryGroupResourceConfigurationTable. - * - * @author John Mazzitelli - * @author Simeon Pinder - */ -public class GroupResourceConfigurationDataSource extends - RPCDataSource<GroupResourceConfigurationUpdate, GroupResourceConfigurationUpdateCriteria> { - - private int groupId; - - public class Field { - public static final String ID = "id"; - public static final String DATECREATED = "createdTime"; - public static final String LASTUPDATED = "modifiedTime"; - public static final String STATUS = "status"; - public static final String USER = "subjectName"; - public static final String OBJECT = "object"; - } - - public GroupResourceConfigurationDataSource(int groupId) { - super(); - this.groupId = groupId; - } - - @Override - public GroupResourceConfigurationUpdate copyValues(Record from) { - return (GroupResourceConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); - } - - @Override - public ListGridRecord copyValues(GroupResourceConfigurationUpdate from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); - record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); - record.setAttribute(Field.STATUS, from.getStatus().name()); - record.setAttribute(Field.USER, from.getSubjectName()); - - record.setAttribute(Field.OBJECT, from); - - return record; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final GroupResourceConfigurationUpdateCriteria criteria) { - ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); - - configurationService.findGroupResourceConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<GroupResourceConfigurationUpdate>>() { - - @Override - public void onSuccess(PageList<GroupResourceConfigurationUpdate> result) { - response.setData(buildRecords(result)); - response.setTotalRows(result.getTotalSize()); - processResponse(request.getRequestId(), response); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_group_resConfig_table_failFetch(), caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected GroupResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - GroupResourceConfigurationUpdateCriteria criteria = new GroupResourceConfigurationUpdateCriteria(); - - ArrayList<Integer> groupIds = new ArrayList<Integer>(1); - groupIds.add(this.groupId); - criteria.addFilterResourceGroupIds(groupIds); - - PageControl pageControl = getPageControl(request); - pageControl.addDefaultOrderingField(Field.ID, PageOrdering.DESC); - criteria.setPageControl(pageControl); - - return criteria; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistGrpResConfMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistGrpResConfMembers.java new file mode 100644 index 0000000..f8af9ac --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistGrpResConfMembers.java @@ -0,0 +1,312 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration; + +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.types.ListGridFieldType; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordClickEvent; +import com.smartgwt.client.widgets.grid.events.RecordClickHandler; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.composite.ResourcePermission; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * Shows a table of individual resource members that belonged to the group when the group configuration was updated. + * + * @author John Mazzitelli + */ +public class HistGrpResConfMembers extends EnhancedVLayout { + private final ResourceGroup group; + @SuppressWarnings("unused") + private final ResourcePermission groupPerms; + private final int groupUpdateId; + + public HistGrpResConfMembers(ResourceGroupComposite groupComposite, int updateId) { + super(); + this.group = groupComposite.getResourceGroup(); + this.groupPerms = groupComposite.getResourcePermission(); + this.groupUpdateId = updateId; + + setMargin(5); + setMembersMargin(5); + String backPath = LinkManager.getGroupResourceConfigurationUpdateHistoryLink( + EntityContext.forGroup(this.group), null); + BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath); + addMember(backButton); + + MembersTable table = new MembersTable(); + addMember(table); + } + + @Override + protected void onDraw() { + super.onDraw(); + } + + private class MembersTable extends Table<MembersTable.DataSource> { + public MembersTable() { + super(MSG.view_group_resConfig_members_title()); + setDataSource(new DataSource()); + } + + @Override + protected void configureTable() { + ListGridField fieldResource = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); + fieldResource.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); + return LinkManager.getHref(url, o.toString()); + } + }); + fieldResource.setShowHover(true); + fieldResource.setHoverCustomizer(new HoverCustomizer() { + + public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { + return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); + } + }); + + ListGridField fieldAncestry = AncestryUtil.setupAncestryListGridField(); + ListGridField fieldDateCreated = new ListGridField(DataSource.Field.DATECREATED, + MSG.common_title_dateCreated()); + TimestampCellFormatter.prepareDateField(fieldDateCreated); + ListGridField fieldLastUpdated = new ListGridField(DataSource.Field.LASTUPDATED, + MSG.common_title_lastUpdated()); + TimestampCellFormatter.prepareDateField(fieldLastUpdated); + ListGridField fieldStatus = new ListGridField(DataSource.Field.STATUS, MSG.common_title_status()); + ListGridField fieldUser = new ListGridField(DataSource.Field.USER, MSG.common_title_user()); + + fieldResource.setWidth("30%"); + fieldAncestry.setWidth("*"); + fieldDateCreated.setWidth(150); + fieldLastUpdated.setWidth(150); + fieldStatus.setWidth("10%"); + fieldUser.setWidth("10%"); + + fieldResource.setType(ListGridFieldType.LINK); + fieldResource.setTarget("_self"); + + fieldStatus.setType(ListGridFieldType.ICON); + HashMap<String, String> statusIcons = new HashMap<String, String>(4); + statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), + ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.SUCCESS)); + statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), + ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.FAILURE)); + statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), + ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS)); + statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), + ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE)); + fieldStatus.setValueIcons(statusIcons); + fieldStatus.addRecordClickHandler(new RecordClickHandler() { + @Override + public void onRecordClick(RecordClickEvent event) { + new ErrorMessageWindow(MSG.view_group_resConfig_members_statusDetails(), "<pre>" + + getStatusHtmlString(event.getRecord()) + "</pre>").show(); + } + }); + fieldStatus.setShowHover(true); + fieldStatus.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String html = getStatusHtmlString(record); + if (html.length() > 80) { + // this was probably an error stack trace, snip it so the tooltip isn't too big + html = "<pre>" + html.substring(0, 80) + "...</pre><p>" + + MSG.view_group_resConfig_table_clickStatusIcon() + "</p>"; + } + return html; + } + }); + + ListGrid listGrid = getListGrid(); + listGrid + .setFields(fieldResource, fieldAncestry, fieldDateCreated, fieldLastUpdated, fieldStatus, fieldUser); + } + + private String getStatusHtmlString(Record record) { + String html = null; + AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record + .getAttributeAsObject(DataSource.Field.OBJECT); + switch (obj.getStatus()) { + case SUCCESS: { + html = MSG.view_group_resConfig_members_statusSuccess(); + break; + } + case INPROGRESS: { + html = MSG.view_group_resConfig_members_statusInprogress(); + break; + } + case NOCHANGE: { + html = MSG.view_group_resConfig_members_statusNochange(); + break; + } + case FAILURE: { + html = obj.getErrorMessage(); + if (html == null) { + html = MSG.view_group_resConfig_members_statusFailure(); + } + break; + } + } + return html; + } + + private class DataSource extends + RPCDataSource<ResourceConfigurationUpdate, ResourceConfigurationUpdateCriteria> { + + public class Field { + public static final String ID = "id"; + public static final String DATECREATED = "dateCreated"; + public static final String LASTUPDATED = "lastUpdated"; + public static final String STATUS = "status"; + public static final String USER = "user"; + public static final String OBJECT = "object"; + } + + @Override + public ResourceConfigurationUpdate copyValues(Record from) { + return (ResourceConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); + } + + @Override + public ListGridRecord copyValues(ResourceConfigurationUpdate from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); + record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); + record.setAttribute(Field.USER, from.getSubjectName()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + + // for ancestry handling + Resource resource = from.getResource(); + record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); + record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); + record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + + record.setAttribute(Field.OBJECT, from); + + return record; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final ResourceConfigurationUpdateCriteria criteria) { + ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); + + configurationService.findResourceConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { + + @Override + public void onSuccess(final PageList<ResourceConfigurationUpdate> result) { + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (ResourceConfigurationUpdate update : result) { + Resource resource = update.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), + new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, + AncestryUtil.getAncestryValue(record)); + } + response.setData(records); + response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_group_resConfig_members_fetchFailure(String + .valueOf(HistGrpResConfMembers.this.groupUpdateId)), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); + criteria + .addFilterGroupConfigurationUpdateId(HistGrpResConfMembers.this.groupUpdateId); + criteria.fetchResource(true); + return criteria; + } + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java deleted file mode 100644 index e337e71..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration; - -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.HoverCustomizer; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.grid.events.RecordClickEvent; -import com.smartgwt.client.widgets.grid.events.RecordClickHandler; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.composite.ResourcePermission; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * Shows a table of individual resource members that belonged to the group when the group configuration was updated. - * - * @author John Mazzitelli - */ -public class HistoryGroupResourceConfigurationMembers extends EnhancedVLayout { - private final ResourceGroup group; - @SuppressWarnings("unused") - private final ResourcePermission groupPerms; - private final int groupUpdateId; - - public HistoryGroupResourceConfigurationMembers(ResourceGroupComposite groupComposite, int updateId) { - super(); - this.group = groupComposite.getResourceGroup(); - this.groupPerms = groupComposite.getResourcePermission(); - this.groupUpdateId = updateId; - - setMargin(5); - setMembersMargin(5); - String backPath = LinkManager.getGroupResourceConfigurationUpdateHistoryLink( - EntityContext.forGroup(this.group), null); - BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath); - addMember(backButton); - - MembersTable table = new MembersTable(); - addMember(table); - } - - @Override - protected void onDraw() { - super.onDraw(); - } - - private class MembersTable extends Table<MembersTable.DataSource> { - public MembersTable() { - super(MSG.view_group_resConfig_members_title()); - setDataSource(new DataSource()); - } - - @Override - protected void configureTable() { - ListGridField fieldResource = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); - fieldResource.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); - return LinkManager.getHref(url, o.toString()); - } - }); - fieldResource.setShowHover(true); - fieldResource.setHoverCustomizer(new HoverCustomizer() { - - public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { - return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); - } - }); - - ListGridField fieldAncestry = AncestryUtil.setupAncestryListGridField(); - ListGridField fieldDateCreated = new ListGridField(DataSource.Field.DATECREATED, - MSG.common_title_dateCreated()); - TimestampCellFormatter.prepareDateField(fieldDateCreated); - ListGridField fieldLastUpdated = new ListGridField(DataSource.Field.LASTUPDATED, - MSG.common_title_lastUpdated()); - TimestampCellFormatter.prepareDateField(fieldLastUpdated); - ListGridField fieldStatus = new ListGridField(DataSource.Field.STATUS, MSG.common_title_status()); - ListGridField fieldUser = new ListGridField(DataSource.Field.USER, MSG.common_title_user()); - - fieldResource.setWidth("30%"); - fieldAncestry.setWidth("*"); - fieldDateCreated.setWidth(150); - fieldLastUpdated.setWidth(150); - fieldStatus.setWidth("10%"); - fieldUser.setWidth("10%"); - - fieldResource.setType(ListGridFieldType.LINK); - fieldResource.setTarget("_self"); - - fieldStatus.setType(ListGridFieldType.ICON); - HashMap<String, String> statusIcons = new HashMap<String, String>(4); - statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), - ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.SUCCESS)); - statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), - ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.FAILURE)); - statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), - ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS)); - statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), - ImageManager.getResourceConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE)); - fieldStatus.setValueIcons(statusIcons); - fieldStatus.addRecordClickHandler(new RecordClickHandler() { - @Override - public void onRecordClick(RecordClickEvent event) { - new ErrorMessageWindow(MSG.view_group_resConfig_members_statusDetails(), "<pre>" - + getStatusHtmlString(event.getRecord()) + "</pre>").show(); - } - }); - fieldStatus.setShowHover(true); - fieldStatus.setHoverCustomizer(new HoverCustomizer() { - @Override - public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - String html = getStatusHtmlString(record); - if (html.length() > 80) { - // this was probably an error stack trace, snip it so the tooltip isn't too big - html = "<pre>" + html.substring(0, 80) + "...</pre><p>" - + MSG.view_group_resConfig_table_clickStatusIcon() + "</p>"; - } - return html; - } - }); - - ListGrid listGrid = getListGrid(); - listGrid - .setFields(fieldResource, fieldAncestry, fieldDateCreated, fieldLastUpdated, fieldStatus, fieldUser); - } - - private String getStatusHtmlString(Record record) { - String html = null; - AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record - .getAttributeAsObject(DataSource.Field.OBJECT); - switch (obj.getStatus()) { - case SUCCESS: { - html = MSG.view_group_resConfig_members_statusSuccess(); - break; - } - case INPROGRESS: { - html = MSG.view_group_resConfig_members_statusInprogress(); - break; - } - case NOCHANGE: { - html = MSG.view_group_resConfig_members_statusNochange(); - break; - } - case FAILURE: { - html = obj.getErrorMessage(); - if (html == null) { - html = MSG.view_group_resConfig_members_statusFailure(); - } - break; - } - } - return html; - } - - private class DataSource extends - RPCDataSource<ResourceConfigurationUpdate, ResourceConfigurationUpdateCriteria> { - - public class Field { - public static final String ID = "id"; - public static final String DATECREATED = "dateCreated"; - public static final String LASTUPDATED = "lastUpdated"; - public static final String STATUS = "status"; - public static final String USER = "user"; - public static final String OBJECT = "object"; - } - - @Override - public ResourceConfigurationUpdate copyValues(Record from) { - return (ResourceConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); - } - - @Override - public ListGridRecord copyValues(ResourceConfigurationUpdate from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); - record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); - record.setAttribute(Field.USER, from.getSubjectName()); - record.setAttribute(Field.STATUS, from.getStatus().name()); - - // for ancestry handling - Resource resource = from.getResource(); - record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); - record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); - record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); - - record.setAttribute(Field.OBJECT, from); - - return record; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final ResourceConfigurationUpdateCriteria criteria) { - ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); - - configurationService.findResourceConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { - - @Override - public void onSuccess(final PageList<ResourceConfigurationUpdate> result) { - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (ResourceConfigurationUpdate update : result) { - Resource resource = update.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), - new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, - AncestryUtil.getAncestryValue(record)); - } - response.setData(records); - response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_group_resConfig_members_fetchFailure(String - .valueOf(HistoryGroupResourceConfigurationMembers.this.groupUpdateId)), caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria(); - criteria - .addFilterGroupConfigurationUpdateId(HistoryGroupResourceConfigurationMembers.this.groupUpdateId); - criteria.fetchResource(true); - return criteria; - } - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java index 091ef6d..570bf7d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java @@ -54,7 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; * * @author John Mazzitelli */ -public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceConfigurationDataSource> { +public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceConfigDS> { private final ResourceGroup group; private final ResourcePermission groupPerms; @@ -63,20 +63,20 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission(); - setDataSource(new GroupResourceConfigurationDataSource(this.group.getId())); + setDataSource(new GroupResourceConfigDS(this.group.getId())); } @Override protected void configureTable() { - ListGridField fieldId = new ListGridField(GroupResourceConfigurationDataSource.Field.ID, + ListGridField fieldId = new ListGridField(GroupResourceConfigDS.Field.ID, MSG.common_title_version()); - ListGridField fieldDateCreated = new ListGridField(GroupResourceConfigurationDataSource.Field.DATECREATED, + ListGridField fieldDateCreated = new ListGridField(GroupResourceConfigDS.Field.DATECREATED, MSG.common_title_dateCreated()); - ListGridField fieldLastUpdated = new ListGridField(GroupResourceConfigurationDataSource.Field.LASTUPDATED, + ListGridField fieldLastUpdated = new ListGridField(GroupResourceConfigDS.Field.LASTUPDATED, MSG.common_title_lastUpdated()); - ListGridField fieldStatus = new ListGridField(GroupResourceConfigurationDataSource.Field.STATUS, + ListGridField fieldStatus = new ListGridField(GroupResourceConfigDS.Field.STATUS, MSG.common_title_status()); - ListGridField fieldUser = new ListGridField(GroupResourceConfigurationDataSource.Field.USER, + ListGridField fieldUser = new ListGridField(GroupResourceConfigDS.Field.USER, MSG.common_title_user()); TimestampCellFormatter.prepareDateField(fieldDateCreated); @@ -132,7 +132,7 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC Integer[] updateIds = new Integer[selection.length]; int i = 0; for (ListGridRecord record : selection) { - updateIds[i++] = record.getAttributeAsInt(GroupResourceConfigurationDataSource.Field.ID); + updateIds[i++] = record.getAttributeAsInt(GroupResourceConfigDS.Field.ID); } service.deleteGroupResourceConfigurationUpdate(groupId, updateIds, new AsyncCallback<Void>() { @@ -161,7 +161,7 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC public void executeAction(ListGridRecord[] selection, Object actionValue) { CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink( EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null) - + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Settings"); + + "/" + selection[0].getAttribute(GroupResourceConfigDS.Field.ID) + "/Settings"); refreshTableInfo(); } }); @@ -172,7 +172,7 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC public void executeAction(ListGridRecord[] selection, Object actionValue) { CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink( EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null) - + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Members"); + + "/" + selection[0].getAttribute(GroupResourceConfigDS.Field.ID) + "/Members"); refreshTableInfo(); } }); @@ -182,7 +182,7 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC private String getStatusHtmlString(Record record) { String html = null; AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record - .getAttributeAsObject(GroupResourceConfigurationDataSource.Field.OBJECT); + .getAttributeAsObject(GroupResourceConfigDS.Field.OBJECT); switch (obj.getStatus()) { case SUCCESS: { html = MSG.view_group_resConfig_table_statusSuccess(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java index 63e937e..ba9cc1c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java @@ -75,7 +75,7 @@ public class HistoryGroupResourceConfigurationView extends EnhancedVLayout imple if (configView) { detailsCanvas = new HistoryGroupResourceConfigurationSettings(this.groupComposite, groupHistoryId); } else { - detailsCanvas = new HistoryGroupResourceConfigurationMembers(this.groupComposite, groupHistoryId); + detailsCanvas = new HistGrpResConfMembers(this.groupComposite, groupHistoryId); } addMember(detailsCanvas); setVisibleMember(detailsCanvas); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistGrpPluginConfigMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistGrpPluginConfigMembers.java new file mode 100644 index 0000000..2f13b11 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistGrpPluginConfigMembers.java @@ -0,0 +1,311 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory; + +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.types.ListGridFieldType; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordClickEvent; +import com.smartgwt.client.widgets.grid.events.RecordClickHandler; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PluginConfigurationUpdate; +import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.composite.ResourcePermission; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * Shows a table of individual resource members that belonged to the group when the group configuration was updated. + * + * @author John Mazzitelli + */ +public class HistGrpPluginConfigMembers extends EnhancedVLayout { + private final ResourceGroup group; + @SuppressWarnings("unused") + private final ResourcePermission groupPerms; + private final int groupUpdateId; + + public HistGrpPluginConfigMembers(ResourceGroupComposite groupComposite, int updateId) { + super(); + this.group = groupComposite.getResourceGroup(); + this.groupPerms = groupComposite.getResourcePermission(); + this.groupUpdateId = updateId; + + setMargin(5); + setMembersMargin(5); + String backPath = LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(this.group), + null); + BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath); + addMember(backButton); + + MembersTable table = new MembersTable(); + addMember(table); + } + + @Override + protected void onDraw() { + super.onDraw(); + } + + private class MembersTable extends Table<MembersTable.DataSource> { + public MembersTable() { + super(MSG.view_group_pluginConfig_members_title()); + setDataSource(new DataSource()); + } + + @Override + protected void configureTable() { + ListGridField fieldResource = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); + fieldResource.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); + return LinkManager.getHref(url, o.toString()); + } + }); + fieldResource.setShowHover(true); + fieldResource.setHoverCustomizer(new HoverCustomizer() { + + public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { + return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); + } + }); + + ListGridField fieldAncestry = AncestryUtil.setupAncestryListGridField(); + ListGridField fieldDateCreated = new ListGridField(DataSource.Field.DATECREATED, + MSG.common_title_dateCreated()); + TimestampCellFormatter.prepareDateField(fieldDateCreated); + ListGridField fieldLastUpdated = new ListGridField(DataSource.Field.LASTUPDATED, + MSG.common_title_lastUpdated()); + TimestampCellFormatter.prepareDateField(fieldLastUpdated); + ListGridField fieldStatus = new ListGridField(DataSource.Field.STATUS, MSG.common_title_status()); + ListGridField fieldUser = new ListGridField(DataSource.Field.USER, MSG.common_title_user()); + + fieldResource.setWidth("30%"); + fieldAncestry.setWidth("*"); + fieldDateCreated.setWidth(150); + fieldLastUpdated.setWidth(150); + fieldStatus.setWidth("10%"); + fieldUser.setWidth("10%"); + + fieldResource.setType(ListGridFieldType.LINK); + fieldResource.setTarget("_self"); + + fieldStatus.setType(ListGridFieldType.ICON); + HashMap<String, String> statusIcons = new HashMap<String, String>(4); + statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), + ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS)); + statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), + ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE)); + statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), + ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS)); + statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), + ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE)); + fieldStatus.setValueIcons(statusIcons); + fieldStatus.addRecordClickHandler(new RecordClickHandler() { + @Override + public void onRecordClick(RecordClickEvent event) { + new ErrorMessageWindow(MSG.view_group_pluginConfig_members_statusDetails(), "<pre>" + + getStatusHtmlString(event.getRecord()) + "</pre>").show(); + } + }); + fieldStatus.setShowHover(true); + fieldStatus.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String html = getStatusHtmlString(record); + if (html.length() > 80) { + // this was probably an error stack trace, snip it so the tooltip isn't too big + html = "<pre>" + html.substring(0, 80) + "...</pre><p>" + + MSG.view_group_pluginConfig_table_clickStatusIcon() + "</p>"; + } + return html; + } + }); + + ListGrid listGrid = getListGrid(); + listGrid + .setFields(fieldResource, fieldAncestry, fieldDateCreated, fieldLastUpdated, fieldStatus, fieldUser); + } + + private String getStatusHtmlString(Record record) { + String html = null; + AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record + .getAttributeAsObject(DataSource.Field.OBJECT); + switch (obj.getStatus()) { + case SUCCESS: { + html = MSG.view_group_pluginConfig_members_statusSuccess(); + break; + } + case INPROGRESS: { + html = MSG.view_group_pluginConfig_members_statusInprogress(); + break; + } + case NOCHANGE: { + html = MSG.view_group_pluginConfig_members_statusNochange(); + break; + } + case FAILURE: { + html = obj.getErrorMessage(); + if (html == null) { + html = MSG.view_group_pluginConfig_members_statusFailure(); + } + break; + } + } + return html; + } + + private class DataSource extends RPCDataSource<PluginConfigurationUpdate, PluginConfigurationUpdateCriteria> { + + public class Field { + public static final String ID = "id"; + public static final String DATECREATED = "dateCreated"; + public static final String LASTUPDATED = "lastUpdated"; + public static final String STATUS = "status"; + public static final String USER = "user"; + public static final String OBJECT = "object"; + } + + @Override + public PluginConfigurationUpdate copyValues(Record from) { + return (PluginConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); + } + + @Override + public ListGridRecord copyValues(PluginConfigurationUpdate from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); + record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); + record.setAttribute(Field.USER, from.getSubjectName()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + + // for ancestry handling + Resource resource = from.getResource(); + record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); + record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); + record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + + record.setAttribute(Field.OBJECT, from); + + return record; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final PluginConfigurationUpdateCriteria criteria) { + + ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); + + configurationService.findPluginConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<PluginConfigurationUpdate>>() { + + @Override + public void onSuccess(final PageList<PluginConfigurationUpdate> result) { + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (PluginConfigurationUpdate update : result) { + Resource resource = update.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), + new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, + AncestryUtil.getAncestryValue(record)); + } + response.setData(records); + response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_group_pluginConfig_members_fetchFailure(String + .valueOf(HistGrpPluginConfigMembers.this.groupUpdateId)), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected PluginConfigurationUpdateCriteria getFetchCriteria(DSRequest request) { + PluginConfigurationUpdateCriteria criteria = new PluginConfigurationUpdateCriteria(); + criteria.addFilterGroupConfigurationUpdateId(HistGrpPluginConfigMembers.this.groupUpdateId); + criteria.fetchResource(true); + return criteria; + } + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java deleted file mode 100644 index e8ecf7d..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory; - -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.HoverCustomizer; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.grid.events.RecordClickEvent; -import com.smartgwt.client.widgets.grid.events.RecordClickHandler; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.PluginConfigurationUpdate; -import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.composite.ResourcePermission; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * Shows a table of individual resource members that belonged to the group when the group configuration was updated. - * - * @author John Mazzitelli - */ -public class HistoryGroupPluginConfigurationMembers extends EnhancedVLayout { - private final ResourceGroup group; - @SuppressWarnings("unused") - private final ResourcePermission groupPerms; - private final int groupUpdateId; - - public HistoryGroupPluginConfigurationMembers(ResourceGroupComposite groupComposite, int updateId) { - super(); - this.group = groupComposite.getResourceGroup(); - this.groupPerms = groupComposite.getResourcePermission(); - this.groupUpdateId = updateId; - - setMargin(5); - setMembersMargin(5); - String backPath = LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(this.group), - null); - BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath); - addMember(backButton); - - MembersTable table = new MembersTable(); - addMember(table); - } - - @Override - protected void onDraw() { - super.onDraw(); - } - - private class MembersTable extends Table<MembersTable.DataSource> { - public MembersTable() { - super(MSG.view_group_pluginConfig_members_title()); - setDataSource(new DataSource()); - } - - @Override - protected void configureTable() { - ListGridField fieldResource = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); - fieldResource.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); - return LinkManager.getHref(url, o.toString()); - } - }); - fieldResource.setShowHover(true); - fieldResource.setHoverCustomizer(new HoverCustomizer() { - - public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { - return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); - } - }); - - ListGridField fieldAncestry = AncestryUtil.setupAncestryListGridField(); - ListGridField fieldDateCreated = new ListGridField(DataSource.Field.DATECREATED, - MSG.common_title_dateCreated()); - TimestampCellFormatter.prepareDateField(fieldDateCreated); - ListGridField fieldLastUpdated = new ListGridField(DataSource.Field.LASTUPDATED, - MSG.common_title_lastUpdated()); - TimestampCellFormatter.prepareDateField(fieldLastUpdated); - ListGridField fieldStatus = new ListGridField(DataSource.Field.STATUS, MSG.common_title_status()); - ListGridField fieldUser = new ListGridField(DataSource.Field.USER, MSG.common_title_user()); - - fieldResource.setWidth("30%"); - fieldAncestry.setWidth("*"); - fieldDateCreated.setWidth(150); - fieldLastUpdated.setWidth(150); - fieldStatus.setWidth("10%"); - fieldUser.setWidth("10%"); - - fieldResource.setType(ListGridFieldType.LINK); - fieldResource.setTarget("_self"); - - fieldStatus.setType(ListGridFieldType.ICON); - HashMap<String, String> statusIcons = new HashMap<String, String>(4); - statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), - ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS)); - statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), - ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE)); - statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), - ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS)); - statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), - ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE)); - fieldStatus.setValueIcons(statusIcons); - fieldStatus.addRecordClickHandler(new RecordClickHandler() { - @Override - public void onRecordClick(RecordClickEvent event) { - new ErrorMessageWindow(MSG.view_group_pluginConfig_members_statusDetails(), "<pre>" - + getStatusHtmlString(event.getRecord()) + "</pre>").show(); - } - }); - fieldStatus.setShowHover(true); - fieldStatus.setHoverCustomizer(new HoverCustomizer() { - @Override - public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - String html = getStatusHtmlString(record); - if (html.length() > 80) { - // this was probably an error stack trace, snip it so the tooltip isn't too big - html = "<pre>" + html.substring(0, 80) + "...</pre><p>" - + MSG.view_group_pluginConfig_table_clickStatusIcon() + "</p>"; - } - return html; - } - }); - - ListGrid listGrid = getListGrid(); - listGrid - .setFields(fieldResource, fieldAncestry, fieldDateCreated, fieldLastUpdated, fieldStatus, fieldUser); - } - - private String getStatusHtmlString(Record record) { - String html = null; - AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record - .getAttributeAsObject(DataSource.Field.OBJECT); - switch (obj.getStatus()) { - case SUCCESS: { - html = MSG.view_group_pluginConfig_members_statusSuccess(); - break; - } - case INPROGRESS: { - html = MSG.view_group_pluginConfig_members_statusInprogress(); - break; - } - case NOCHANGE: { - html = MSG.view_group_pluginConfig_members_statusNochange(); - break; - } - case FAILURE: { - html = obj.getErrorMessage(); - if (html == null) { - html = MSG.view_group_pluginConfig_members_statusFailure(); - } - break; - } - } - return html; - } - - private class DataSource extends RPCDataSource<PluginConfigurationUpdate, PluginConfigurationUpdateCriteria> { - - public class Field { - public static final String ID = "id"; - public static final String DATECREATED = "dateCreated"; - public static final String LASTUPDATED = "lastUpdated"; - public static final String STATUS = "status"; - public static final String USER = "user"; - public static final String OBJECT = "object"; - } - - @Override - public PluginConfigurationUpdate copyValues(Record from) { - return (PluginConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT); - } - - @Override - public ListGridRecord copyValues(PluginConfigurationUpdate from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.DATECREATED, new Date(from.getCreatedTime())); - record.setAttribute(Field.LASTUPDATED, new Date(from.getModifiedTime())); - record.setAttribute(Field.USER, from.getSubjectName()); - record.setAttribute(Field.STATUS, from.getStatus().name()); - - // for ancestry handling - Resource resource = from.getResource(); - record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); - record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); - record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); - - record.setAttribute(Field.OBJECT, from); - - return record; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final PluginConfigurationUpdateCriteria criteria) { - - ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); - - configurationService.findPluginConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<PluginConfigurationUpdate>>() { - - @Override - public void onSuccess(final PageList<PluginConfigurationUpdate> result) { - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (PluginConfigurationUpdate update : result) { - Resource resource = update.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), - new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, - AncestryUtil.getAncestryValue(record)); - } - response.setData(records); - response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_group_pluginConfig_members_fetchFailure(String - .valueOf(HistoryGroupPluginConfigurationMembers.this.groupUpdateId)), caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected PluginConfigurationUpdateCriteria getFetchCriteria(DSRequest request) { - PluginConfigurationUpdateCriteria criteria = new PluginConfigurationUpdateCriteria(); - criteria.addFilterGroupConfigurationUpdateId(HistoryGroupPluginConfigurationMembers.this.groupUpdateId); - criteria.fetchResource(true); - return criteria; - } - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java index 2b0e1c4..0fee99b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java @@ -75,7 +75,7 @@ public class HistoryGroupPluginConfigurationView extends EnhancedVLayout impleme if (configView) { detailsCanvas = new HistoryGroupPluginConfigurationSettings(this.groupComposite, groupHistoryId); } else { - detailsCanvas = new HistoryGroupPluginConfigurationMembers(this.groupComposite, groupHistoryId); + detailsCanvas = new HistGrpPluginConfigMembers(this.groupComposite, groupHistoryId); } addMember(detailsCanvas); setVisibleMember(detailsCanvas); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResGroupResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResGroupResourceSelector.java new file mode 100644 index 0000000..bf76676 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResGroupResourceSelector.java @@ -0,0 +1,144 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.rpc.RPCResponse; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * @author Jay Shaughnessy + */ +public class ResGroupResourceSelector extends ResourceSelector { + private static final int MAX_AVAILABLE_RECORDS = 300; + + private Collection<Resource> resources; + + public ResGroupResourceSelector(Collection<Resource> resources, ResourceType resourceTypeFilter, + boolean forceResourceTypeFilter) { + + super(resourceTypeFilter, forceResourceTypeFilter); + + this.resources = resources; + + this.setOverflow(Overflow.AUTO); + } + + @Override + protected void onInit() { + + if (null != this.resources) { + // to properly handle ancestry we need to provide the LGRecords with necessary ResourceType info for + // the initially assigned resources + + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (Resource resource : this.resources) { + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + ListGridRecord[] records = (new ResourceDatasource()).buildRecords(resources); + + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + } + + setAssigned(records); + ResGroupResourceSelector.super.onInit(); + } + }); + } else { + super.onInit(); + } + } + + @Override + protected int getMaxAvailableRecords() { + return MAX_AVAILABLE_RECORDS; + } + + @Override + protected RPCDataSource<Resource, ResourceCriteria> getDataSource() { + return new SelectedResourcesAwareDS(); + } + + private class SelectedResourcesAwareDS extends SelectedResourceDataSource { + + @Override + public void executeFetch(final DSRequest request, final DSResponse response, final ResourceCriteria criteria) { + getResourceService().findGroupMemberCandidateResources(criteria, getSelectedResourceIds(), + new AsyncCallback<PageList<Resource>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); + response.setStatus(RPCResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + @Override + public void onSuccess(PageList<Resource> result) { + dataRetrieved(result, response, request); + } + }); + } + + private int[] getSelectedResourceIds() { + ListGridRecord[] assignedRecords = assignedGrid.getRecords(); + int[] selectedResourceIds = new int[assignedRecords.length]; + for (int i = 0; i < assignedRecords.length; i++) { + ListGridRecord assignedRecord = assignedRecords[i]; + selectedResourceIds[i] = assignedRecord.getAttributeAsInt(getSelectorKey()); + } + return selectedResourceIds; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java index e4d1327..de40c8b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java @@ -44,7 +44,7 @@ public class ResourceGroupMembershipView extends EnhancedVLayout { private int resourceGroupId; private ResourceGroup resourceGroup; - private ResourceGroupResourceSelector selector; + private ResGroupResourceSelector selector; private ClickHandler saveButtonHandler; private ClickHandler cancelButtonHandler; @@ -58,7 +58,7 @@ public class ResourceGroupMembershipView extends EnhancedVLayout { * Allows an external component to hook into the save button. The given * handler will be invoked when the save button is pressed. If <code>null</code> * is given, then no external handler will be called. - * + * * @param saveButtonHandler */ public void setSaveButtonHandler(ClickHandler saveButtonHandler) { @@ -69,7 +69,7 @@ public class ResourceGroupMembershipView extends EnhancedVLayout { * Allows an external component to hook into the cancel button. The given * handler will be invoked when the cancel button is pressed. If <code>null</code> * is given, then no external handler will be called. - * + * * @param cancelButtonHandler */ public void setCancelButtonHandler(ClickHandler cancelButtonHandler) { @@ -127,7 +127,7 @@ public class ResourceGroupMembershipView extends EnhancedVLayout { public void onSuccess(PageList<ResourceGroup> result) { ResourceGroup group = result.get(0); ResourceGroupMembershipView.this.resourceGroup = group; - ResourceGroupMembershipView.this.selector = new ResourceGroupResourceSelector( + ResourceGroupMembershipView.this.selector = new ResGroupResourceSelector( group.getExplicitResources(), (GroupCategory.COMPATIBLE == ResourceGroupMembershipView.this.resourceGroup.getGroupCategory()) ? group .getResourceType() : null, false); @@ -174,4 +174,4 @@ public class ResourceGroupMembershipView extends EnhancedVLayout { return selection; } -} \ No newline at end of file +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java deleted file mode 100644 index 2bf0883..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2013 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; - -/** - * @author Jay Shaughnessy - */ -public class ResourceGroupResourceSelector extends ResourceSelector { - private static final int MAX_AVAILABLE_RECORDS = 300; - - private Collection<Resource> resources; - - public ResourceGroupResourceSelector(Collection<Resource> resources, ResourceType resourceTypeFilter, - boolean forceResourceTypeFilter) { - - super(resourceTypeFilter, forceResourceTypeFilter); - - this.resources = resources; - - this.setOverflow(Overflow.AUTO); - } - - @Override - protected void onInit() { - - if (null != this.resources) { - // to properly handle ancestry we need to provide the LGRecords with necessary ResourceType info for - // the initially assigned resources - - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (Resource resource : this.resources) { - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - ListGridRecord[] records = (new ResourceDatasource()).buildRecords(resources); - - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - } - - setAssigned(records); - ResourceGroupResourceSelector.super.onInit(); - } - }); - } else { - super.onInit(); - } - } - - @Override - protected int getMaxAvailableRecords() { - return MAX_AVAILABLE_RECORDS; - } - - @Override - protected RPCDataSource<Resource, ResourceCriteria> getDataSource() { - return new SelectedResourcesAwareDataSource(); - } - - private class SelectedResourcesAwareDataSource extends SelectedResourceDataSource { - - @Override - public void executeFetch(final DSRequest request, final DSResponse response, final ResourceCriteria criteria) { - getResourceService().findGroupMemberCandidateResources(criteria, getSelectedResourceIds(), - new AsyncCallback<PageList<Resource>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); - response.setStatus(RPCResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - @Override - public void onSuccess(PageList<Resource> result) { - dataRetrieved(result, response, request); - } - }); - } - - private int[] getSelectedResourceIds() { - ListGridRecord[] assignedRecords = assignedGrid.getRecords(); - int[] selectedResourceIds = new int[assignedRecords.length]; - for (int i = 0; i < assignedRecords.length; i++) { - ListGridRecord assignedRecord = assignedRecords[i]; - selectedResourceIds[i] = assignedRecord.getAttributeAsInt(getSelectorKey()); - } - return selectedResourceIds; - } - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java index b29e59a..8d5b188 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java @@ -30,7 +30,7 @@ import com.smartgwt.client.widgets.grid.events.CellClickHandler; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; @@ -94,7 +94,7 @@ public class GroupMeasurementTableView extends Table<GroupMetricsTableDataSource public void refresh() { if (isVisible() && !isRefreshing()) { Date now = new Date(); - AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs.getMetricRangePreferences(); + AbstractMeasRangeEditor.MetricRangePreferences metricRangePreferences = measurementUserPrefs.getMetricRangePreferences(); long timeRange = metricRangePreferences.end - metricRangePreferences.begin; Date newStartDate = new Date(now.getTime() - timeRange); buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java index bedfdaf..feec64e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java @@ -13,24 +13,24 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOpsHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOpsHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDetailsView; /** * @author Ian Springer */ public class GroupMemberResourceOperationHistoryListView extends - AbstractOperationHistoryListView<ResourceOperationHistoryDataSource> { + AbstractOperationHistoryListView<ResourceOpsHistoryDataSource> { private ResourceGroupComposite groupComposite; public GroupMemberResourceOperationHistoryListView(ResourceGroupComposite groupComposite, int groupOperationHistoryId) { - super(new ResourceOperationHistoryDataSource(), null, new Criteria( - ResourceOperationHistoryDataSource.CriteriaField.GROUP_OPERATION_HISTORY_ID, + super(new ResourceOpsHistoryDataSource(), null, new Criteria( + ResourceOpsHistoryDataSource.CriteriaField.GROUP_OPERATION_HISTORY_ID, String.valueOf(groupOperationHistoryId))); this.groupComposite = groupComposite; } @@ -39,7 +39,7 @@ public class GroupMemberResourceOperationHistoryListView extends protected List<ListGridField> createFields() { List<ListGridField> fields = new ArrayList<ListGridField>(); - ListGridField idField = new ListGridField(AbstractOperationHistoryDataSource.Field.ID); + ListGridField idField = new ListGridField(AbstractOpsHistoryDataSource.Field.ID); idField.setWidth(38); fields.add(idField); @@ -90,7 +90,7 @@ public class GroupMemberResourceOperationHistoryListView extends } int resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); - int opHistoryId = record.getAttributeAsInt(ResourceOperationHistoryDataSource.Field.ID); + int opHistoryId = record.getAttributeAsInt(ResourceOpsHistoryDataSource.Field.ID); if (resourceId > 0 && opHistoryId > 0) { CoreGUI.goToView(LinkManager.getSubsystemResourceOperationHistoryLink(resourceId, opHistoryId)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java deleted file mode 100644 index de6eb52..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history; - -import java.util.Arrays; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria; -import org.rhq.core.domain.operation.GroupOperationHistory; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDataSource; - -/** - * @author Ian Springer - */ -public class GroupOperationHistoryDataSource extends - AbstractOperationHistoryDataSource<GroupOperationHistory, GroupOperationHistoryCriteria> { - - public static abstract class Field extends AbstractOperationHistoryDataSource.Field { - public static final String GROUP = "group"; - } - - public static abstract class CriteriaField { - public static final String GROUP_ID = "groupId"; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final GroupOperationHistoryCriteria criteria) { - operationService.findGroupOperationHistoriesByCriteria(criteria, - new AsyncCallback<PageList<GroupOperationHistory>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), caught); - } - - public void onSuccess(PageList<GroupOperationHistory> result) { - response.setData(buildRecords(result)); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected GroupOperationHistoryCriteria getFetchCriteria(final DSRequest request) { - GroupOperationHistoryCriteria criteria = new GroupOperationHistoryCriteria(); - - if (request.getCriteria().getValues().containsKey(CriteriaField.GROUP_ID)) { - int groupId = Integer.parseInt((String) request.getCriteria().getValues().get(CriteriaField.GROUP_ID)); - criteria.addFilterResourceGroupIds(Arrays.asList(groupId)); - } - - return criteria; - } - - @Override - protected GroupOperationHistory createOperationHistory() { - return new GroupOperationHistory(null, null, null, null, null, null); - } - - @Override - public ListGridRecord copyValues(GroupOperationHistory from) { - ListGridRecord record = super.copyValues(from); - record.setAttribute(Field.GROUP, from.getGroup()); - return record; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java index 99b9439..43fb5b2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java @@ -28,13 +28,13 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.h /** * @author Ian Springer */ -public class GroupOperationHistoryListView extends AbstractOperationHistoryListView<GroupOperationHistoryDataSource> { +public class GroupOperationHistoryListView extends AbstractOperationHistoryListView<GroupOpsHistoryDataSource> { private ResourceGroupComposite groupComposite; public GroupOperationHistoryListView(ResourceGroupComposite groupComposite) { - super(new GroupOperationHistoryDataSource(), null, new Criteria( - GroupOperationHistoryDataSource.CriteriaField.GROUP_ID, String.valueOf(groupComposite.getResourceGroup() + super(new GroupOpsHistoryDataSource(), null, new Criteria( + GroupOpsHistoryDataSource.CriteriaField.GROUP_ID, String.valueOf(groupComposite.getResourceGroup() .getId()))); this.groupComposite = groupComposite; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOpsHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOpsHistoryDataSource.java new file mode 100644 index 0000000..2776abc --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOpsHistoryDataSource.java @@ -0,0 +1,89 @@ +/* + * RHQ Management Platform + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history; + +import java.util.Arrays; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOpsHistoryDataSource; + +/** + * @author Ian Springer + */ +public class GroupOpsHistoryDataSource extends + AbstractOpsHistoryDataSource<GroupOperationHistory, GroupOperationHistoryCriteria> { + + public static abstract class Field extends AbstractOpsHistoryDataSource.Field { + public static final String GROUP = "group"; + } + + public static abstract class CriteriaField { + public static final String GROUP_ID = "groupId"; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final GroupOperationHistoryCriteria criteria) { + operationService.findGroupOperationHistoriesByCriteria(criteria, + new AsyncCallback<PageList<GroupOperationHistory>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), caught); + } + + public void onSuccess(PageList<GroupOperationHistory> result) { + response.setData(buildRecords(result)); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected GroupOperationHistoryCriteria getFetchCriteria(final DSRequest request) { + GroupOperationHistoryCriteria criteria = new GroupOperationHistoryCriteria(); + + if (request.getCriteria().getValues().containsKey(CriteriaField.GROUP_ID)) { + int groupId = Integer.parseInt((String) request.getCriteria().getValues().get(CriteriaField.GROUP_ID)); + criteria.addFilterResourceGroupIds(Arrays.asList(groupId)); + } + + return criteria; + } + + @Override + protected GroupOperationHistory createOperationHistory() { + return new GroupOperationHistory(null, null, null, null, null, null); + } + + @Override + public ListGridRecord copyValues(GroupOperationHistory from) { + ListGridRecord record = super.copyValues(from); + record.setAttribute(Field.GROUP, from.getGroup()); + return record; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDS.java new file mode 100644 index 0000000..b16eee3 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDS.java @@ -0,0 +1,160 @@ +/* + * RHQ Management Platform + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule; + +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.operation.bean.GroupOperationSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDS; + +/** + * A DataSource for {@link org.rhq.core.domain.operation.bean.GroupOperationSchedule}s for a given + * {@link org.rhq.core.domain.resource.group.ResourceGroup}. + * + * @author Ian Springer + */ +public class GroupOperationScheduleDS extends AbstractOperationScheduleDS<GroupOperationSchedule> { + + public static abstract class Field extends AbstractOperationScheduleDS.Field { + public static final String HALT_ON_FAILURE = "haltOnFailure"; + public static final String EXECUTION_ORDER = "executionOrder"; + } + + public static abstract class RequestProperty extends AbstractOperationScheduleDS.RequestProperty { + public static final String EXECUTION_ORDER = "executionOrder"; + } + + private ResourceGroupComposite groupComposite; + + public GroupOperationScheduleDS(ResourceGroupComposite groupComposite) { + super(groupComposite.getResourceGroup().getResourceType()); + this.groupComposite = groupComposite; + } + + @Override + protected GroupOperationSchedule createOperationSchedule() { + GroupOperationSchedule groupOperationSchedule = new GroupOperationSchedule(); + groupOperationSchedule.setGroup(this.groupComposite.getResourceGroup()); + return groupOperationSchedule; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { + final Integer scheduleId = request.getCriteria().getAttributeAsInt(Field.ID); + if (scheduleId != null) { + operationService.getGroupOperationSchedule(scheduleId, new AsyncCallback<GroupOperationSchedule>() { + public void onSuccess(GroupOperationSchedule result) { + sendSuccessResponse(request, response, result); + } + + public void onFailure(Throwable caught) { + sendFailureResponse(request, response, "Failed to fetch GroupOperationSchedule with id " + + scheduleId + ".", caught); + } + }); + } else { + operationService.findScheduledGroupOperations(this.groupComposite.getResourceGroup().getId(), + new AsyncCallback<List<GroupOperationSchedule>>() { + public void onSuccess(List<GroupOperationSchedule> result) { + Record[] records = buildRecords(result); + response.setData(records); + processResponse(request.getRequestId(), response); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to find scheduled operations for " + + groupComposite.getResourceGroup() + ".", caught); + } + }); + } + } + + @Override + protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) { + addRequestPropertiesToRecord(request, recordToAdd); + + final GroupOperationSchedule scheduleToAdd = copyValues(recordToAdd); + + operationService.scheduleGroupOperation(scheduleToAdd, new AsyncCallback<Integer>() { + public void onSuccess(Integer scheduleId) { + scheduleToAdd.setId(scheduleId); + sendSuccessResponse(request, response, scheduleToAdd); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to add " + scheduleToAdd, caught); + } + }); + } + + @Override + protected void addRequestPropertiesToRecord(DSRequest request, Record record) { + super.addRequestPropertiesToRecord(request, record); + + List<Resource> executionOrder = (List<Resource>) request.getAttributeAsObject(RequestProperty.EXECUTION_ORDER); + record.setAttribute(Field.EXECUTION_ORDER, executionOrder); + } + + @Override + protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { + final GroupOperationSchedule scheduleToRemove = copyValues(recordToRemove); + + operationService.unscheduleGroupOperation(scheduleToRemove, new AsyncCallback<Void>() { + public void onSuccess(Void result) { + sendSuccessResponse(request, response, scheduleToRemove); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to remove " + scheduleToRemove, caught); + } + }); + } + + @Override + public ListGridRecord copyValues(GroupOperationSchedule from) { + ListGridRecord record = super.copyValues(from); + + record.setAttribute(Field.EXECUTION_ORDER, from.getExecutionOrder()); + record.setAttribute(Field.HALT_ON_FAILURE, from.getHaltOnFailure()); + + return record; + } + + @Override + public GroupOperationSchedule copyValues(Record from) { + GroupOperationSchedule groupOperationSchedule = super.copyValues(from); + + List<Resource> executionOrder = (List<Resource>) from.getAttributeAsObject(Field.EXECUTION_ORDER); + groupOperationSchedule.setExecutionOrder(executionOrder); + groupOperationSchedule.setHaltOnFailure(from.getAttributeAsBoolean(Field.HALT_ON_FAILURE)); + + return groupOperationSchedule; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java deleted file mode 100644 index 56ba89e..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule; - -import java.util.List; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.Criteria; -import org.rhq.core.domain.operation.bean.GroupOperationSchedule; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDataSource; - -/** - * A DataSource for {@link org.rhq.core.domain.operation.bean.GroupOperationSchedule}s for a given - * {@link org.rhq.core.domain.resource.group.ResourceGroup}. - * - * @author Ian Springer - */ -public class GroupOperationScheduleDataSource extends AbstractOperationScheduleDataSource<GroupOperationSchedule> { - - public static abstract class Field extends AbstractOperationScheduleDataSource.Field { - public static final String HALT_ON_FAILURE = "haltOnFailure"; - public static final String EXECUTION_ORDER = "executionOrder"; - } - - public static abstract class RequestProperty extends AbstractOperationScheduleDataSource.RequestProperty { - public static final String EXECUTION_ORDER = "executionOrder"; - } - - private ResourceGroupComposite groupComposite; - - public GroupOperationScheduleDataSource(ResourceGroupComposite groupComposite) { - super(groupComposite.getResourceGroup().getResourceType()); - this.groupComposite = groupComposite; - } - - @Override - protected GroupOperationSchedule createOperationSchedule() { - GroupOperationSchedule groupOperationSchedule = new GroupOperationSchedule(); - groupOperationSchedule.setGroup(this.groupComposite.getResourceGroup()); - return groupOperationSchedule; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - final Integer scheduleId = request.getCriteria().getAttributeAsInt(Field.ID); - if (scheduleId != null) { - operationService.getGroupOperationSchedule(scheduleId, new AsyncCallback<GroupOperationSchedule>() { - public void onSuccess(GroupOperationSchedule result) { - sendSuccessResponse(request, response, result); - } - - public void onFailure(Throwable caught) { - sendFailureResponse(request, response, "Failed to fetch GroupOperationSchedule with id " - + scheduleId + ".", caught); - } - }); - } else { - operationService.findScheduledGroupOperations(this.groupComposite.getResourceGroup().getId(), - new AsyncCallback<List<GroupOperationSchedule>>() { - public void onSuccess(List<GroupOperationSchedule> result) { - Record[] records = buildRecords(result); - response.setData(records); - processResponse(request.getRequestId(), response); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to find scheduled operations for " - + groupComposite.getResourceGroup() + ".", caught); - } - }); - } - } - - @Override - protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) { - addRequestPropertiesToRecord(request, recordToAdd); - - final GroupOperationSchedule scheduleToAdd = copyValues(recordToAdd); - - operationService.scheduleGroupOperation(scheduleToAdd, new AsyncCallback<Integer>() { - public void onSuccess(Integer scheduleId) { - scheduleToAdd.setId(scheduleId); - sendSuccessResponse(request, response, scheduleToAdd); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to add " + scheduleToAdd, caught); - } - }); - } - - @Override - protected void addRequestPropertiesToRecord(DSRequest request, Record record) { - super.addRequestPropertiesToRecord(request, record); - - List<Resource> executionOrder = (List<Resource>) request.getAttributeAsObject(RequestProperty.EXECUTION_ORDER); - record.setAttribute(Field.EXECUTION_ORDER, executionOrder); - } - - @Override - protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { - final GroupOperationSchedule scheduleToRemove = copyValues(recordToRemove); - - operationService.unscheduleGroupOperation(scheduleToRemove, new AsyncCallback<Void>() { - public void onSuccess(Void result) { - sendSuccessResponse(request, response, scheduleToRemove); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to remove " + scheduleToRemove, caught); - } - }); - } - - @Override - public ListGridRecord copyValues(GroupOperationSchedule from) { - ListGridRecord record = super.copyValues(from); - - record.setAttribute(Field.EXECUTION_ORDER, from.getExecutionOrder()); - record.setAttribute(Field.HALT_ON_FAILURE, from.getHaltOnFailure()); - - return record; - } - - @Override - public GroupOperationSchedule copyValues(Record from) { - GroupOperationSchedule groupOperationSchedule = super.copyValues(from); - - List<Resource> executionOrder = (List<Resource>) from.getAttributeAsObject(Field.EXECUTION_ORDER); - groupOperationSchedule.setExecutionOrder(executionOrder); - groupOperationSchedule.setHaltOnFailure(from.getAttributeAsBoolean(Field.HALT_ON_FAILURE)); - - return groupOperationSchedule; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java index 62d86d7..2f56e82 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java @@ -50,7 +50,7 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule private ReorderableList memberExecutionOrderer; public GroupOperationScheduleDetailsView(ResourceGroupComposite groupComposite, int scheduleId) { - super(new GroupOperationScheduleDataSource(groupComposite), + super(new GroupOperationScheduleDS(groupComposite), groupComposite.getResourceGroup().getResourceType(), scheduleId); this.groupComposite = groupComposite; } @@ -111,7 +111,7 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule executionModeItem.setDefaultValue(EXECUTION_ORDER_PARALLEL); executionModeItem.setShowTitle(true); - final CheckboxItem haltOnFailureItem = new CheckboxItem(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE, + final CheckboxItem haltOnFailureItem = new CheckboxItem(GroupOperationScheduleDS.Field.HALT_ON_FAILURE, MSG.view_group_operationScheduleDetails_field_haltOnFailure()); haltOnFailureItem.setDefaultValue(false); haltOnFailureItem.setVisible(false); @@ -159,7 +159,7 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule @Override protected void editExistingRecord(final Record record) { List<Resource> executionOrder = (List<Resource>) record - .getAttributeAsObject(GroupOperationScheduleDataSource.Field.EXECUTION_ORDER); + .getAttributeAsObject(GroupOperationScheduleDS.Field.EXECUTION_ORDER); if (executionOrder != null) { Integer[] resourceIds = new Integer[executionOrder.size()]; @@ -188,8 +188,8 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule memberExecutionOrderer.show(); FormItem haltOnFailureItem = executionModeForm - .getField(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE); - Object haltOnFailure = getForm().getValue(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE); + .getField(GroupOperationScheduleDS.Field.HALT_ON_FAILURE); + Object haltOnFailure = getForm().getValue(GroupOperationScheduleDS.Field.HALT_ON_FAILURE); haltOnFailureItem.setValue(haltOnFailure); haltOnFailureItem.show(); @@ -199,9 +199,9 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule } else { this.executionModeForm.setValue(FIELD_EXECUTION_MODE, EXECUTION_ORDER_PARALLEL); - Object haltOnFailure = getForm().getValue(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE); + Object haltOnFailure = getForm().getValue(GroupOperationScheduleDS.Field.HALT_ON_FAILURE); FormItem haltOnFailureItem = this.executionModeForm - .getField(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE); + .getField(GroupOperationScheduleDS.Field.HALT_ON_FAILURE); haltOnFailureItem.setValue(haltOnFailure); super.editExistingRecord(record); @@ -222,11 +222,11 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule executionOrder = null; } requestProperties - .setAttribute(GroupOperationScheduleDataSource.RequestProperty.EXECUTION_ORDER, executionOrder); + .setAttribute(GroupOperationScheduleDS.RequestProperty.EXECUTION_ORDER, executionOrder); Boolean haltOnFailure = (Boolean) this.executionModeForm - .getValue(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE); - getForm().setValue(GroupOperationScheduleDataSource.Field.HALT_ON_FAILURE, haltOnFailure); + .getValue(GroupOperationScheduleDS.Field.HALT_ON_FAILURE); + getForm().setValue(GroupOperationScheduleDS.Field.HALT_ON_FAILURE, haltOnFailure); super.save(requestProperties); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java index 985d5fd..d08540a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java @@ -36,7 +36,7 @@ public class GroupOperationScheduleListView extends AbstractOperationScheduleLis private ResourceGroupComposite groupComposite; public GroupOperationScheduleListView(ResourceGroupComposite groupComposite) { - super(new GroupOperationScheduleDataSource(groupComposite), TITLE); + super(new GroupOperationScheduleDS(groupComposite), TITLE); this.groupComposite = groupComposite; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java index 53a2471..e06bfdd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java @@ -48,7 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardContainer; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardView; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOperationsPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; @@ -222,11 +222,11 @@ public class ActivityView extends EnhancedVLayout implements DashboardContainer, dashboard.addPortlet(ops, colRight, rowRight++); groupKeyNameMap.remove(GroupOperationsPortlet.KEY); } - if (groupKeyNameMap.containsKey(GroupConfigurationUpdatesPortlet.KEY)) {//operations if available - DashboardPortlet ops = new DashboardPortlet(GroupConfigurationUpdatesPortlet.NAME, - GroupConfigurationUpdatesPortlet.KEY, 220); + if (groupKeyNameMap.containsKey(GroupConfigUpdatesPortlet.KEY)) {//operations if available + DashboardPortlet ops = new DashboardPortlet(GroupConfigUpdatesPortlet.NAME, + GroupConfigUpdatesPortlet.KEY, 220); dashboard.addPortlet(ops, colRight, rowRight++); - groupKeyNameMap.remove(GroupConfigurationUpdatesPortlet.KEY); + groupKeyNameMap.remove(GroupConfigUpdatesPortlet.KEY); } //Fill out left column(typically smaller portlets) then alternate cols with remaining @@ -235,10 +235,10 @@ public class ActivityView extends EnhancedVLayout implements DashboardContainer, return dashboard; } - /**Iterates list of new portlets and updates the dashboard reference with these new portlets. + /**Iterates list of new portlets and updates the dashboard reference with these new portlets. * Attempts to fill the spaces around the remaining larger portlets if already installed, then alternates * adding to left and right columns. Assumes dashboard has only two columns. - * + * * @param keyNameMap portlet key|name map * @param dashboard dasboard instance to update */ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 8d7da04..71f00b4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -59,10 +59,10 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwo import org.rhq.enterprise.gui.coregui.client.inventory.common.event.EventCompositeHistoryView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceCompositeSearchView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationEditView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationHistoryListView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; @@ -199,7 +199,7 @@ public class ResourceDetailView extends MSG.view_tabs_common_child_history()), null); SubTab inventoryConn = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CONNECTION_SETTINGS, MSG.view_tabs_common_connectionSettings()), null); - SubTab inventoryConnHistory = new SubTab(inventoryTab, PluginConfigurationHistoryListView.VIEW_ID, null); + SubTab inventoryConnHistory = new SubTab(inventoryTab, PluginConfigHistoryListView.VIEW_ID, null); SubTab inventoryGroups = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.GROUPS, MSG.view_tabs_common_groups()), null); SubTab inventoryAgent = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.AGENT, @@ -383,7 +383,7 @@ public class ResourceDetailView extends viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new PluginConfigurationHistoryListView(resourceComposite.getResourcePermission().isInventory(), + return new PluginConfigHistoryListView(resourceComposite.getResourcePermission().isInventory(), resourceComposite.getResource().getId()); } }; @@ -532,7 +532,7 @@ public class ResourceDetailView extends updateSubTab(this.configurationTab, this.configHistory, true, true, new ViewFactory() { @Override public Canvas createView() { - return new ResourceConfigurationHistoryListView(resourceComposite.getResourcePermission() + return new ResourceConfigHistoryListView(resourceComposite.getResourcePermission() .isConfigureWrite(), resource.getId()); } }); @@ -678,7 +678,7 @@ public class ResourceDetailView extends public static final String CHILDREN = "Children"; public static final String CHILD_HISTORY = "ChildHistory"; public static final String CONNECTION_SETTINGS = "ConnectionSettings"; - public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigurationHistoryListView.VIEW_ID + public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigHistoryListView.VIEW_ID .getName(); public static final String GROUPS = "Groups"; public static final String AGENT = "Agent"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryDS.java new file mode 100644 index 0000000..b9cfbec --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryDS.java @@ -0,0 +1,348 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.configuration; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceIntegerField; +import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.ListGridFieldType; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordClickEvent; +import com.smartgwt.client.widgets.grid.events.RecordClickHandler; + +import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; +import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.criteria.AbstractResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * A superclass data source that loads information about all the plugin/resource configuration changes that happened + * for a resource or across all inventory. + * + * @author Greg Hinkle + * @author John Mazzitelli + */ +public abstract class AbstractConfigHistoryDS<T extends AbstractResourceConfigurationUpdate, C extends AbstractResourceConfigurationUpdateCriteria> + extends RPCDataSource<T, C> { + + public static abstract class Field { + public static final String ID = "id"; + public static final String CREATED_TIME = "createdTime"; + public static final String STATUS = "status"; + public static final String SUBJECT = "subjectName"; + public static final String CONFIGURATION = "configuration"; + public static final String GROUP_CONFIG_UPDATE_ID = "groupConfigUpdateId"; + public static final String GROUP_ID = "groupId"; // will only be non-null if group config update id is non-null + public static final String DURATION = "duration"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String MODIFIED_TIME = "modifiedTime"; + public static final String CURRENT_CONFIG = "currentConfig"; // will be true if the history item represents the current config + public static final String OBJECT = "object"; // the full entity object is stored in this attribute + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + public static final String IDS = "ids"; + } + + public static abstract class RequestProperty { + public static final String FETCH_CONFIGURATION = "fetchConfiguration"; + } + + // Specify 60s timeout to compensate for Configurations being fetched for all of the config updates. + // TODO (ips, 08/31/11): Remove this once fetching of Configurations has been disabled. + private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(60 * 1000); + + protected ConfigurationGWTServiceAsync getConfigurationService() { + return this.configurationService; + } + + public AbstractConfigHistoryDS() { + super(); + List<DataSourceField> fields = addDataSourceFields(); + addFields(fields); + } + + protected String getStatusHtmlString(Record record) { + String html = null; + AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record.getAttributeAsObject(Field.OBJECT); + switch (obj.getStatus()) { + case SUCCESS: { + html = MSG.view_configurationHistoryList_table_statusSuccess(); + break; + } + case INPROGRESS: { + html = "<p>" + MSG.view_configurationHistoryList_table_statusInprogress() + "</p>"; + break; + } + case NOCHANGE: { + html = MSG.view_configurationHistoryList_table_statusNochange(); + break; + } + case FAILURE: { + html = obj.getErrorMessage(); + if (html == null) { + html = "<p>" + MSG.view_configurationHistoryList_table_statusFailure() + "</p>"; + } else { + if (html.length() > 80) { + // this was probably an error stack trace, snip it so the tooltip isn't too big + html = "<pre>" + html.substring(0, 80) + "...</pre><p>" + + MSG.view_configurationHistoryList_table_clickStatusIcon() + "</p>"; + } else { + html = "<pre>" + html + "</pre>"; + } + } + break; + } + } + return html; + } + + /** + * Views that use this data source can call this method to get a list of fields + * that can be used in a list grid to show the data for this data source. + * + * @param includeResourceFields if true, the list of fields that are returned will + * include fields to show individual resource data. + * Pass in false if you are only collecting data on a + * single resource, since you don't need every row to + * show the same data on the same resource. + * @return fields + */ + public ArrayList<ListGridField> getListGridFields(boolean includeResourceFields) { + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(); + + ListGridField idField = new ListGridField(Field.ID, MSG.common_title_version()); + idField.setShowHover(true); + idField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + if (Boolean.parseBoolean(record.getAttribute(Field.CURRENT_CONFIG))) { + return MSG.dataSource_configurationHistory_currentConfig(); + } + return null; + } + }); + fields.add(idField); + + ListGridField submittedTimeField = new ListGridField(Field.CREATED_TIME, MSG + .dataSource_configurationHistory_dateSubmitted()); + submittedTimeField.setType(ListGridFieldType.DATE); + TimestampCellFormatter.prepareDateField(submittedTimeField); + fields.add(submittedTimeField); + + ListGridField completedTimeField = new ListGridField(Field.MODIFIED_TIME, MSG + .dataSource_configurationHistory_dateCompleted()); + completedTimeField.setType(ListGridFieldType.DATE); + TimestampCellFormatter.prepareDateField(completedTimeField); + fields.add(completedTimeField); + + ListGridField statusField = new ListGridField(Field.STATUS, MSG.common_title_status()); + statusField.setAlign(Alignment.CENTER); + statusField.setCellFormatter(new CellFormatter() { + public String format(Object value, ListGridRecord listGridRecord, int i, int i1) { + ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf(value.toString()); + return Canvas.imgHTML(getConfigurationUpdateStatusIcon(status), 16, 16); + } + }); + statusField.setShowHover(true); + statusField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String html = getStatusHtmlString(record); + return html; + } + }); + statusField.addRecordClickHandler(new RecordClickHandler() { + @Override + public void onRecordClick(RecordClickEvent event) { + String err = event.getRecord().getAttribute(Field.ERROR_MESSAGE); + if (err != null && err.length() > 0) { + err = "<pre>" + err + "</pre>"; + new ErrorMessageWindow(MSG.common_severity_error(), err).show(); + } + } + }); + fields.add(statusField); + + ListGridField subjectField = new ListGridField(Field.SUBJECT, MSG.common_title_user()); + fields.add(subjectField); + + ListGridField updateTypeField = new ListGridField(Field.GROUP_CONFIG_UPDATE_ID, MSG + .dataSource_configurationHistory_updateType()); + updateTypeField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return MSG.dataSource_configurationHistory_updateType_individual(); + } + Integer groupId = record.getAttributeAsInt(Field.GROUP_ID); + return "<a href=\"" + getGroupConfigurationUpdateHistoryLink(groupId, (Number) value) + "\">" + + MSG.dataSource_configurationHistory_updateType_group() + "</a>"; + } + }); + fields.add(updateTypeField); + + // determine the widths of our columns + if (includeResourceFields) { + ListGridField resourceNameField = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); + resourceNameField.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + String url = LinkManager + .getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); + return LinkManager.getHref(url, o.toString()); + } + }); + resourceNameField.setShowHover(true); + resourceNameField.setHoverCustomizer(new HoverCustomizer() { + + public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { + return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); + } + }); + fields.add(resourceNameField); + + ListGridField ancestryField = AncestryUtil.setupAncestryListGridField(); + fields.add(ancestryField); + + idField.setWidth("10%"); + submittedTimeField.setWidth(150); + completedTimeField.setWidth(150); + statusField.setWidth("10%"); + subjectField.setWidth("10%"); + updateTypeField.setWidth("10%"); + resourceNameField.setWidth("30%"); + ancestryField.setWidth("*"); + } else { + idField.setWidth("10%"); + submittedTimeField.setWidth("20%"); + completedTimeField.setWidth("20%"); + statusField.setWidth("10%"); + subjectField.setWidth("10%"); + updateTypeField.setWidth("*"); + } + + return fields; + } + + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG.common_title_version()); + idField.setPrimaryKey(true); + fields.add(idField); + return fields; + } + + @SuppressWarnings("unchecked") + @Override + public T copyValues(Record from) { + return (T) from.getAttributeAsObject(Field.OBJECT); + } + + @Override + public ListGridRecord copyValues(T from) { + ListGridRecord record = new ListGridRecord(); + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.CONFIGURATION, from.getConfiguration()); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.CREATED_TIME, new Date(from.getCreatedTime())); + // if it is still in progress, the modified time (which we label as "date completed") is meaningless since it isn't completed yet + if (from.getStatus() != ConfigurationUpdateStatus.INPROGRESS) { + record.setAttribute(Field.MODIFIED_TIME, new Date(from.getModifiedTime())); + } + if (from.getAbstractGroupConfigurationUpdate() != null) { + record.setAttribute(Field.GROUP_CONFIG_UPDATE_ID, from.getAbstractGroupConfigurationUpdate().getId()); + record.setAttribute(Field.GROUP_ID, from.getAbstractGroupConfigurationUpdate().getGroup().getId()); // note group must be eagerly loaded here + } + + // for ancestry handling + Resource resource = from.getResource(); + record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); + record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); + record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + + record.setAttribute(Field.OBJECT, from); + return record; + } + + @Override + protected String getSortFieldForColumn(String columnName) { + if (Field.GROUP_CONFIG_UPDATE_ID.equals(columnName)) { + return "groupConfigurationUpdate.id"; + } + if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { + return "resource.ancestry"; + } + + return super.getSortFieldForColumn(columnName); + } + + protected abstract String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status); + + protected abstract String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value); + + protected abstract C createFetchCriteria(); + + @Override + protected C getFetchCriteria(DSRequest request) { + C criteria = createFetchCriteria(); + + PageControl pageControl = getPageControl(request); + pageControl.addDefaultOrderingField(Field.ID, PageOrdering.DESC); + criteria.setPageControl(pageControl); + + List<Integer> ids = getFilter(request, CriteriaField.IDS, List.class); + if (ids != null) { + criteria.addFilterIds(ids.toArray(new Integer[0])); + } + + Boolean fetchConfiguration = request.getAttributeAsBoolean(RequestProperty.FETCH_CONFIGURATION); + if (fetchConfiguration != null && fetchConfiguration) { + criteria.fetchConfiguration(true); + } + + return criteria; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryListView.java new file mode 100644 index 0000000..dad820f --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigHistoryListView.java @@ -0,0 +1,200 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration; + +import java.util.ArrayList; +import java.util.List; + +import com.smartgwt.client.data.Criteria; +import com.smartgwt.client.data.DSCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.AbstractResourceConfigurationUpdateCriteria; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; +import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +/** + * The superclass to the main plugin/resource views that lists all configuration history items. + * + * @author Greg Hinkle + * @author John Mazzitelli + */ +public abstract class AbstractConfigHistoryListView<T extends AbstractConfigHistoryDS<? extends AbstractResourceConfigurationUpdate, ? extends AbstractResourceConfigurationUpdateCriteria>> + extends TableSection<T> { + + private Integer resourceId; + private boolean hasWritePerm; // can delete history or rollback to a previous config + + /** + * Use this constructor to view config histories for all viewable Resources. + */ + public AbstractConfigHistoryListView(String title, boolean hasWritePerm) { + super(title); + this.hasWritePerm = hasWritePerm; + this.resourceId = null; + } + + /** + * Use this constructor to view the config history for the Resource with the specified ID. + * + * @param resourceId a Resource ID + */ + public AbstractConfigHistoryListView(String title, boolean hasWritePerm, int resourceId) { + super(title, createCriteria(resourceId)); + this.hasWritePerm = hasWritePerm; + this.resourceId = resourceId; + } + + private static Criteria createCriteria(int resourceId) { + Criteria criteria = new Criteria(); + criteria.addCriteria(AbstractConfigHistoryDS.CriteriaField.RESOURCE_ID, resourceId); + return criteria; + } + + public Integer getResourceId() { + return resourceId; + } + + public boolean hasWritePermission() { + return hasWritePerm; + } + + @Override + protected void configureTable() { + List<ListGridField> fields = getDataSource().getListGridFields(this.resourceId == null); + setListGridFields(true, fields.toArray(new ListGridField[fields.size()])); // true = always show the ID field + + addTableAction(MSG.common_button_delete(), MSG.common_msg_areYouSure(), new AbstractTableAction( + hasWritePerm ? TableActionEnablement.ANY : TableActionEnablement.NEVER) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + if (selection != null && selection.length > 0) { + int[] doomedIds = new int[selection.length]; + int i = 0; + for (ListGridRecord selected : selection) { + doomedIds[i++] = selected.getAttributeAsInt(AbstractConfigHistoryDS.Field.ID); + if (selected.getAttribute(AbstractConfigHistoryDS.Field.GROUP_CONFIG_UPDATE_ID) != null) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_cannotDeleteGroupItems(), + Severity.Warning)); + return; // abort + } + if (Boolean.parseBoolean(selected + .getAttribute(AbstractConfigHistoryDS.Field.CURRENT_CONFIG))) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_cannotDeleteCurrent(), Severity.Warning)); + return; // abort + } + } + delete(doomedIds); + } + } + }); + + addTableAction(MSG.common_button_compare(), null, new AbstractTableAction(TableActionEnablement.MULTIPLE) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + // The config updates do not have their Configurations fetched, so we need to reload the selected + // config updates, specifying that their Configurations should be fetched, in order to compare the + // Configurations. + + List<Integer> updateIds = new ArrayList<Integer>(); + for (ListGridRecord record : selection) { + int updateId = record.getAttributeAsInt(AbstractConfigHistoryDS.Field.ID); + updateIds.add(updateId); + } + + Criteria criteria = new Criteria(); + criteria.addCriteria(AbstractConfigHistoryDS.CriteriaField.IDS, + updateIds.toArray(new Integer[updateIds.size()])); + + DSRequest requestProperties = new DSRequest(); + requestProperties.setAttribute( + AbstractConfigHistoryDS.RequestProperty.FETCH_CONFIGURATION, true); + + getDataSource().fetchData(criteria, new DSCallback() { + public void execute(DSResponse response, Object rawData, DSRequest request) { + ArrayList<AbstractResourceConfigurationUpdate> updatesWithConfigs = new ArrayList<AbstractResourceConfigurationUpdate>(); + Record[] records = response.getData(); + for (Record record : records) { + AbstractResourceConfigurationUpdate update = (AbstractResourceConfigurationUpdate) record + .getAttributeAsObject(AbstractConfigHistoryDS.Field.OBJECT); + updatesWithConfigs.add(update); + } + ConfigurationComparisonView.displayComparisonDialog(updatesWithConfigs); + } + }, requestProperties); + } + }); + + if (getResourceId() != null) { + addTableAction(MSG.view_configurationHistoryList_rollback(), MSG.common_msg_areYouSure(), + new AbstractTableAction(hasWritePerm ? TableActionEnablement.SINGLE : TableActionEnablement.NEVER) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + if (selection != null && selection.length == 1) { + ListGridRecord record = selection[0]; + int configHistoryIdToRollbackTo = record + .getAttributeAsInt(AbstractConfigHistoryDS.Field.ID); + rollback(configHistoryIdToRollbackTo); + } + } + }); + } + + super.configureTable(); + } + + @Override + protected String getDetailsLinkColumnName() { + return AbstractConfigHistoryDS.Field.ID; + } + + @Override + protected CellFormatter getDetailsLinkColumnCellFormatter() { + return new CellFormatter() { + public String format(Object value, ListGridRecord record, int i, int i1) { + Integer recordId = getId(record); + String detailsUrl = "#" + getBasePath() + "/" + recordId; + String cellHtml = LinkManager.getHref(detailsUrl, value.toString()); + String isCurrentConfig = record + .getAttribute(AbstractConfigHistoryDS.Field.CURRENT_CONFIG); + if (Boolean.parseBoolean(isCurrentConfig)) { + cellHtml = Canvas.imgHTML(ImageManager.getApproveIcon()) + cellHtml; + } + return cellHtml; + } + }; + } + + protected abstract void rollback(int configHistoryIdToRollbackTo); + + protected abstract void delete(int[] doomedIds); +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java deleted file mode 100644 index acb7e23..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.configuration; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.fields.DataSourceIntegerField; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.HoverCustomizer; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.grid.events.RecordClickEvent; -import com.smartgwt.client.widgets.grid.events.RecordClickHandler; - -import org.rhq.core.domain.configuration.AbstractConfigurationUpdate; -import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.criteria.AbstractResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; - -/** - * A superclass data source that loads information about all the plugin/resource configuration changes that happened - * for a resource or across all inventory. - * - * @author Greg Hinkle - * @author John Mazzitelli - */ -public abstract class AbstractConfigurationHistoryDataSource<T extends AbstractResourceConfigurationUpdate, C extends AbstractResourceConfigurationUpdateCriteria> - extends RPCDataSource<T, C> { - - public static abstract class Field { - public static final String ID = "id"; - public static final String CREATED_TIME = "createdTime"; - public static final String STATUS = "status"; - public static final String SUBJECT = "subjectName"; - public static final String CONFIGURATION = "configuration"; - public static final String GROUP_CONFIG_UPDATE_ID = "groupConfigUpdateId"; - public static final String GROUP_ID = "groupId"; // will only be non-null if group config update id is non-null - public static final String DURATION = "duration"; - public static final String ERROR_MESSAGE = "errorMessage"; - public static final String MODIFIED_TIME = "modifiedTime"; - public static final String CURRENT_CONFIG = "currentConfig"; // will be true if the history item represents the current config - public static final String OBJECT = "object"; // the full entity object is stored in this attribute - } - - public static abstract class CriteriaField { - public static final String RESOURCE_ID = "resourceId"; - public static final String IDS = "ids"; - } - - public static abstract class RequestProperty { - public static final String FETCH_CONFIGURATION = "fetchConfiguration"; - } - - // Specify 60s timeout to compensate for Configurations being fetched for all of the config updates. - // TODO (ips, 08/31/11): Remove this once fetching of Configurations has been disabled. - private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(60 * 1000); - - protected ConfigurationGWTServiceAsync getConfigurationService() { - return this.configurationService; - } - - public AbstractConfigurationHistoryDataSource() { - super(); - List<DataSourceField> fields = addDataSourceFields(); - addFields(fields); - } - - protected String getStatusHtmlString(Record record) { - String html = null; - AbstractConfigurationUpdate obj = (AbstractConfigurationUpdate) record.getAttributeAsObject(Field.OBJECT); - switch (obj.getStatus()) { - case SUCCESS: { - html = MSG.view_configurationHistoryList_table_statusSuccess(); - break; - } - case INPROGRESS: { - html = "<p>" + MSG.view_configurationHistoryList_table_statusInprogress() + "</p>"; - break; - } - case NOCHANGE: { - html = MSG.view_configurationHistoryList_table_statusNochange(); - break; - } - case FAILURE: { - html = obj.getErrorMessage(); - if (html == null) { - html = "<p>" + MSG.view_configurationHistoryList_table_statusFailure() + "</p>"; - } else { - if (html.length() > 80) { - // this was probably an error stack trace, snip it so the tooltip isn't too big - html = "<pre>" + html.substring(0, 80) + "...</pre><p>" - + MSG.view_configurationHistoryList_table_clickStatusIcon() + "</p>"; - } else { - html = "<pre>" + html + "</pre>"; - } - } - break; - } - } - return html; - } - - /** - * Views that use this data source can call this method to get a list of fields - * that can be used in a list grid to show the data for this data source. - * - * @param includeResourceFields if true, the list of fields that are returned will - * include fields to show individual resource data. - * Pass in false if you are only collecting data on a - * single resource, since you don't need every row to - * show the same data on the same resource. - * @return fields - */ - public ArrayList<ListGridField> getListGridFields(boolean includeResourceFields) { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(); - - ListGridField idField = new ListGridField(Field.ID, MSG.common_title_version()); - idField.setShowHover(true); - idField.setHoverCustomizer(new HoverCustomizer() { - @Override - public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - if (Boolean.parseBoolean(record.getAttribute(Field.CURRENT_CONFIG))) { - return MSG.dataSource_configurationHistory_currentConfig(); - } - return null; - } - }); - fields.add(idField); - - ListGridField submittedTimeField = new ListGridField(Field.CREATED_TIME, MSG - .dataSource_configurationHistory_dateSubmitted()); - submittedTimeField.setType(ListGridFieldType.DATE); - TimestampCellFormatter.prepareDateField(submittedTimeField); - fields.add(submittedTimeField); - - ListGridField completedTimeField = new ListGridField(Field.MODIFIED_TIME, MSG - .dataSource_configurationHistory_dateCompleted()); - completedTimeField.setType(ListGridFieldType.DATE); - TimestampCellFormatter.prepareDateField(completedTimeField); - fields.add(completedTimeField); - - ListGridField statusField = new ListGridField(Field.STATUS, MSG.common_title_status()); - statusField.setAlign(Alignment.CENTER); - statusField.setCellFormatter(new CellFormatter() { - public String format(Object value, ListGridRecord listGridRecord, int i, int i1) { - ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf(value.toString()); - return Canvas.imgHTML(getConfigurationUpdateStatusIcon(status), 16, 16); - } - }); - statusField.setShowHover(true); - statusField.setHoverCustomizer(new HoverCustomizer() { - @Override - public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - String html = getStatusHtmlString(record); - return html; - } - }); - statusField.addRecordClickHandler(new RecordClickHandler() { - @Override - public void onRecordClick(RecordClickEvent event) { - String err = event.getRecord().getAttribute(Field.ERROR_MESSAGE); - if (err != null && err.length() > 0) { - err = "<pre>" + err + "</pre>"; - new ErrorMessageWindow(MSG.common_severity_error(), err).show(); - } - } - }); - fields.add(statusField); - - ListGridField subjectField = new ListGridField(Field.SUBJECT, MSG.common_title_user()); - fields.add(subjectField); - - ListGridField updateTypeField = new ListGridField(Field.GROUP_CONFIG_UPDATE_ID, MSG - .dataSource_configurationHistory_updateType()); - updateTypeField.setCellFormatter(new CellFormatter() { - @Override - public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - if (value == null) { - return MSG.dataSource_configurationHistory_updateType_individual(); - } - Integer groupId = record.getAttributeAsInt(Field.GROUP_ID); - return "<a href=\"" + getGroupConfigurationUpdateHistoryLink(groupId, (Number) value) + "\">" - + MSG.dataSource_configurationHistory_updateType_group() + "</a>"; - } - }); - fields.add(updateTypeField); - - // determine the widths of our columns - if (includeResourceFields) { - ListGridField resourceNameField = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); - resourceNameField.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - String url = LinkManager - .getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); - return LinkManager.getHref(url, o.toString()); - } - }); - resourceNameField.setShowHover(true); - resourceNameField.setHoverCustomizer(new HoverCustomizer() { - - public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { - return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); - } - }); - fields.add(resourceNameField); - - ListGridField ancestryField = AncestryUtil.setupAncestryListGridField(); - fields.add(ancestryField); - - idField.setWidth("10%"); - submittedTimeField.setWidth(150); - completedTimeField.setWidth(150); - statusField.setWidth("10%"); - subjectField.setWidth("10%"); - updateTypeField.setWidth("10%"); - resourceNameField.setWidth("30%"); - ancestryField.setWidth("*"); - } else { - idField.setWidth("10%"); - submittedTimeField.setWidth("20%"); - completedTimeField.setWidth("20%"); - statusField.setWidth("10%"); - subjectField.setWidth("10%"); - updateTypeField.setWidth("*"); - } - - return fields; - } - - @Override - protected List<DataSourceField> addDataSourceFields() { - List<DataSourceField> fields = super.addDataSourceFields(); - DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, MSG.common_title_version()); - idField.setPrimaryKey(true); - fields.add(idField); - return fields; - } - - @SuppressWarnings("unchecked") - @Override - public T copyValues(Record from) { - return (T) from.getAttributeAsObject(Field.OBJECT); - } - - @Override - public ListGridRecord copyValues(T from) { - ListGridRecord record = new ListGridRecord(); - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.SUBJECT, from.getSubjectName()); - record.setAttribute(Field.STATUS, from.getStatus().name()); - record.setAttribute(Field.CONFIGURATION, from.getConfiguration()); - record.setAttribute(Field.DURATION, from.getDuration()); - record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); - record.setAttribute(Field.CREATED_TIME, new Date(from.getCreatedTime())); - // if it is still in progress, the modified time (which we label as "date completed") is meaningless since it isn't completed yet - if (from.getStatus() != ConfigurationUpdateStatus.INPROGRESS) { - record.setAttribute(Field.MODIFIED_TIME, new Date(from.getModifiedTime())); - } - if (from.getAbstractGroupConfigurationUpdate() != null) { - record.setAttribute(Field.GROUP_CONFIG_UPDATE_ID, from.getAbstractGroupConfigurationUpdate().getId()); - record.setAttribute(Field.GROUP_ID, from.getAbstractGroupConfigurationUpdate().getGroup().getId()); // note group must be eagerly loaded here - } - - // for ancestry handling - Resource resource = from.getResource(); - record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); - record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); - record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); - - record.setAttribute(Field.OBJECT, from); - return record; - } - - @Override - protected String getSortFieldForColumn(String columnName) { - if (Field.GROUP_CONFIG_UPDATE_ID.equals(columnName)) { - return "groupConfigurationUpdate.id"; - } - if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { - return "resource.ancestry"; - } - - return super.getSortFieldForColumn(columnName); - } - - protected abstract String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status); - - protected abstract String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value); - - protected abstract C createFetchCriteria(); - - @Override - protected C getFetchCriteria(DSRequest request) { - C criteria = createFetchCriteria(); - - PageControl pageControl = getPageControl(request); - pageControl.addDefaultOrderingField(Field.ID, PageOrdering.DESC); - criteria.setPageControl(pageControl); - - List<Integer> ids = getFilter(request, CriteriaField.IDS, List.class); - if (ids != null) { - criteria.addFilterIds(ids.toArray(new Integer[0])); - } - - Boolean fetchConfiguration = request.getAttributeAsBoolean(RequestProperty.FETCH_CONFIGURATION); - if (fetchConfiguration != null && fetchConfiguration) { - criteria.fetchConfiguration(true); - } - - return criteria; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java deleted file mode 100644 index 3d27035..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration; - -import java.util.ArrayList; -import java.util.List; - -import com.smartgwt.client.data.Criteria; -import com.smartgwt.client.data.DSCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.AbstractResourceConfigurationUpdateCriteria; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView; -import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; -import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; -import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; - -/** - * The superclass to the main plugin/resource views that lists all configuration history items. - * - * @author Greg Hinkle - * @author John Mazzitelli - */ -public abstract class AbstractConfigurationHistoryListView<T extends AbstractConfigurationHistoryDataSource<? extends AbstractResourceConfigurationUpdate, ? extends AbstractResourceConfigurationUpdateCriteria>> - extends TableSection<T> { - - private Integer resourceId; - private boolean hasWritePerm; // can delete history or rollback to a previous config - - /** - * Use this constructor to view config histories for all viewable Resources. - */ - public AbstractConfigurationHistoryListView(String title, boolean hasWritePerm) { - super(title); - this.hasWritePerm = hasWritePerm; - this.resourceId = null; - } - - /** - * Use this constructor to view the config history for the Resource with the specified ID. - * - * @param resourceId a Resource ID - */ - public AbstractConfigurationHistoryListView(String title, boolean hasWritePerm, int resourceId) { - super(title, createCriteria(resourceId)); - this.hasWritePerm = hasWritePerm; - this.resourceId = resourceId; - } - - private static Criteria createCriteria(int resourceId) { - Criteria criteria = new Criteria(); - criteria.addCriteria(AbstractConfigurationHistoryDataSource.CriteriaField.RESOURCE_ID, resourceId); - return criteria; - } - - public Integer getResourceId() { - return resourceId; - } - - public boolean hasWritePermission() { - return hasWritePerm; - } - - @Override - protected void configureTable() { - List<ListGridField> fields = getDataSource().getListGridFields(this.resourceId == null); - setListGridFields(true, fields.toArray(new ListGridField[fields.size()])); // true = always show the ID field - - addTableAction(MSG.common_button_delete(), MSG.common_msg_areYouSure(), new AbstractTableAction( - hasWritePerm ? TableActionEnablement.ANY : TableActionEnablement.NEVER) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection != null && selection.length > 0) { - int[] doomedIds = new int[selection.length]; - int i = 0; - for (ListGridRecord selected : selection) { - doomedIds[i++] = selected.getAttributeAsInt(AbstractConfigurationHistoryDataSource.Field.ID); - if (selected.getAttribute(AbstractConfigurationHistoryDataSource.Field.GROUP_CONFIG_UPDATE_ID) != null) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_cannotDeleteGroupItems(), - Severity.Warning)); - return; // abort - } - if (Boolean.parseBoolean(selected - .getAttribute(AbstractConfigurationHistoryDataSource.Field.CURRENT_CONFIG))) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_cannotDeleteCurrent(), Severity.Warning)); - return; // abort - } - } - delete(doomedIds); - } - } - }); - - addTableAction(MSG.common_button_compare(), null, new AbstractTableAction(TableActionEnablement.MULTIPLE) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - // The config updates do not have their Configurations fetched, so we need to reload the selected - // config updates, specifying that their Configurations should be fetched, in order to compare the - // Configurations. - - List<Integer> updateIds = new ArrayList<Integer>(); - for (ListGridRecord record : selection) { - int updateId = record.getAttributeAsInt(AbstractConfigurationHistoryDataSource.Field.ID); - updateIds.add(updateId); - } - - Criteria criteria = new Criteria(); - criteria.addCriteria(AbstractConfigurationHistoryDataSource.CriteriaField.IDS, - updateIds.toArray(new Integer[updateIds.size()])); - - DSRequest requestProperties = new DSRequest(); - requestProperties.setAttribute( - AbstractConfigurationHistoryDataSource.RequestProperty.FETCH_CONFIGURATION, true); - - getDataSource().fetchData(criteria, new DSCallback() { - public void execute(DSResponse response, Object rawData, DSRequest request) { - ArrayList<AbstractResourceConfigurationUpdate> updatesWithConfigs = new ArrayList<AbstractResourceConfigurationUpdate>(); - Record[] records = response.getData(); - for (Record record : records) { - AbstractResourceConfigurationUpdate update = (AbstractResourceConfigurationUpdate) record - .getAttributeAsObject(AbstractConfigurationHistoryDataSource.Field.OBJECT); - updatesWithConfigs.add(update); - } - ConfigurationComparisonView.displayComparisonDialog(updatesWithConfigs); - } - }, requestProperties); - } - }); - - if (getResourceId() != null) { - addTableAction(MSG.view_configurationHistoryList_rollback(), MSG.common_msg_areYouSure(), - new AbstractTableAction(hasWritePerm ? TableActionEnablement.SINGLE : TableActionEnablement.NEVER) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection != null && selection.length == 1) { - ListGridRecord record = selection[0]; - int configHistoryIdToRollbackTo = record - .getAttributeAsInt(AbstractConfigurationHistoryDataSource.Field.ID); - rollback(configHistoryIdToRollbackTo); - } - } - }); - } - - super.configureTable(); - } - - @Override - protected String getDetailsLinkColumnName() { - return AbstractConfigurationHistoryDataSource.Field.ID; - } - - @Override - protected CellFormatter getDetailsLinkColumnCellFormatter() { - return new CellFormatter() { - public String format(Object value, ListGridRecord record, int i, int i1) { - Integer recordId = getId(record); - String detailsUrl = "#" + getBasePath() + "/" + recordId; - String cellHtml = LinkManager.getHref(detailsUrl, value.toString()); - String isCurrentConfig = record - .getAttribute(AbstractConfigurationHistoryDataSource.Field.CURRENT_CONFIG); - if (Boolean.parseBoolean(isCurrentConfig)) { - cellHtml = Canvas.imgHTML(ImageManager.getApproveIcon()) + cellHtml; - } - return cellHtml; - } - }; - } - - protected abstract void rollback(int configHistoryIdToRollbackTo); - - protected abstract void delete(int[] doomedIds); -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryDS.java new file mode 100644 index 0000000..85ac513 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryDS.java @@ -0,0 +1,178 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.configuration; + +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; +import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.Log; + +/** + * A data source that loads information about all the configuration changes that happened + * for a resource or across all inventory. + * + * @author Greg Hinkle + * @author John Mazzitelli + */ +public class ResourceConfigHistoryDS extends + AbstractConfigHistoryDS<ResourceConfigurationUpdate, ResourceConfigurationUpdateCriteria> { + + public ResourceConfigHistoryDS() { + super(); + } + + @Override + protected String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status) { + return ImageManager.getResourceConfigurationIcon(status); + } + + @Override + protected String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value) { + return LinkManager.getGroupResourceConfigurationUpdateHistoryLink(EntityContext.forGroup(groupId), value.intValue()); + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final ResourceConfigurationUpdateCriteria criteria) { + + final Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); + getConfigurationService().findResourceConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), + caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + public void onSuccess(final PageList<ResourceConfigurationUpdate> result) { + if (resourceId == null) { + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (ResourceConfigurationUpdate update : result) { + Resource resource = update.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), + new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil + .getAncestryValue(record)); + } + response.setData(records); + response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set + processResponse(request.getRequestId(), response); + } + }); + + return; + } + + final ListGridRecord[] records = buildRecords(result); + + // we are obtaining a single resource's history items. Let's find out which is + // its latest, current config item so we can mark it as such + getConfigurationService().getLatestResourceConfigurationUpdate(resourceId, + new AsyncCallback<ResourceConfigurationUpdate>() { + @Override + public void onSuccess(ResourceConfigurationUpdate latestResult) { + if (latestResult != null) { + for (ListGridRecord record : records) { + boolean latest = record.getAttributeAsInt(Field.ID) == latestResult + .getId(); + record.setAttribute(Field.CURRENT_CONFIG, latest); + } + } + finish(); + } + + @Override + public void onFailure(Throwable caught) { + // should we show an error message? this just means we can't show any item as the "current" one + Log.error("Field to get latest Resource configuration update.", caught); + finish(); + } + + private void finish() { + response.setData(records); + response.setTotalRows(result.getTotalSize()); + processResponse(request.getRequestId(), response); + } + }); + } + }); + } + + @Override + protected ResourceConfigurationUpdateCriteria createFetchCriteria() { + return new ResourceConfigurationUpdateCriteria(); + } + + @Override + protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + ResourceConfigurationUpdateCriteria criteria = super.getFetchCriteria(request); + + criteria.fetchResource(true); + criteria.fetchGroupConfigurationUpdate(true); + + final Integer resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); + if (resourceId != null) { + criteria.addFilterResourceIds(resourceId); + } + + return criteria; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryListView.java new file mode 100644 index 0000000..c861dff --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigHistoryListView.java @@ -0,0 +1,109 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.Canvas; + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +/** + * The main view that lists all resource configuration history items. + * + * @author Greg Hinkle + * @author John Mazzitelli + */ +public class ResourceConfigHistoryListView extends + AbstractConfigHistoryListView<ResourceConfigHistoryDS> implements HasViewName { + public static final ViewName VIEW_ID = new ViewName("ConfigurationHistoryView", + MSG.view_configurationHistoryList_title(), IconEnum.CONFIGURATION_HISTORY); + + /** + * Use this constructor to view config histories for all viewable Resources. + */ + public ResourceConfigHistoryListView(boolean hasWritePerm) { + super(null, hasWritePerm); + ResourceConfigHistoryDS datasource = new ResourceConfigHistoryDS(); + setDataSource(datasource); + } + + /** + * Use this constructor to view the config history for the Resource with the specified ID. + * + * @param resourceId a Resource ID + */ + public ResourceConfigHistoryListView(boolean hasWritePerm, int resourceId) { + super(VIEW_ID.getTitle(), hasWritePerm, resourceId); + ResourceConfigHistoryDS datasource = new ResourceConfigHistoryDS(); + setDataSource(datasource); + } + + @Override + public Canvas getDetailsView(Integer id) { + ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView(); + return detailView; + } + + @Override + protected void rollback(int configHistoryIdToRollbackTo) { + GWTServiceLookup.getConfigurationService().rollbackResourceConfiguration(getResourceId().intValue(), + configHistoryIdToRollbackTo, new AsyncCallback<Void>() { + @Override + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_rollback_success(), Severity.Info)); + refresh(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_rollback_failure(), caught); + } + }); + } + + @Override + protected void delete(int[] doomedIds) { + GWTServiceLookup.getConfigurationService().purgeResourceConfigurationUpdates(doomedIds, true, + new AsyncCallback<Void>() { + @Override + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_delete_success(), Severity.Info)); + refresh(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_delete_failure(), caught); + } + }); + } + + @Override + public ViewName getViewName() { + return VIEW_ID; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java deleted file mode 100644 index 0b2d049..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.configuration; - -import java.util.HashSet; -import java.util.Map; - -import java.util.logging.Logger; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; -import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.Log; - -/** - * A data source that loads information about all the configuration changes that happened - * for a resource or across all inventory. - * - * @author Greg Hinkle - * @author John Mazzitelli - */ -public class ResourceConfigurationHistoryDataSource extends - AbstractConfigurationHistoryDataSource<ResourceConfigurationUpdate, ResourceConfigurationUpdateCriteria> { - - public ResourceConfigurationHistoryDataSource() { - super(); - } - - @Override - protected String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status) { - return ImageManager.getResourceConfigurationIcon(status); - } - - @Override - protected String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value) { - return LinkManager.getGroupResourceConfigurationUpdateHistoryLink(EntityContext.forGroup(groupId), value.intValue()); - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final ResourceConfigurationUpdateCriteria criteria) { - - final Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); - getConfigurationService().findResourceConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), - caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(final PageList<ResourceConfigurationUpdate> result) { - if (resourceId == null) { - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (ResourceConfigurationUpdate update : result) { - Resource resource = update.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), - new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil - .getAncestryValue(record)); - } - response.setData(records); - response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set - processResponse(request.getRequestId(), response); - } - }); - - return; - } - - final ListGridRecord[] records = buildRecords(result); - - // we are obtaining a single resource's history items. Let's find out which is - // its latest, current config item so we can mark it as such - getConfigurationService().getLatestResourceConfigurationUpdate(resourceId, - new AsyncCallback<ResourceConfigurationUpdate>() { - @Override - public void onSuccess(ResourceConfigurationUpdate latestResult) { - if (latestResult != null) { - for (ListGridRecord record : records) { - boolean latest = record.getAttributeAsInt(Field.ID) == latestResult - .getId(); - record.setAttribute(Field.CURRENT_CONFIG, latest); - } - } - finish(); - } - - @Override - public void onFailure(Throwable caught) { - // should we show an error message? this just means we can't show any item as the "current" one - Log.error("Field to get latest Resource configuration update.", caught); - finish(); - } - - private void finish() { - response.setData(records); - response.setTotalRows(result.getTotalSize()); - processResponse(request.getRequestId(), response); - } - }); - } - }); - } - - @Override - protected ResourceConfigurationUpdateCriteria createFetchCriteria() { - return new ResourceConfigurationUpdateCriteria(); - } - - @Override - protected ResourceConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - ResourceConfigurationUpdateCriteria criteria = super.getFetchCriteria(request); - - criteria.fetchResource(true); - criteria.fetchGroupConfigurationUpdate(true); - - final Integer resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); - if (resourceId != null) { - criteria.addFilterResourceIds(resourceId); - } - - return criteria; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java deleted file mode 100644 index f02c4cb..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.Canvas; - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.IconEnum; -import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; -import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; - -/** - * The main view that lists all resource configuration history items. - * - * @author Greg Hinkle - * @author John Mazzitelli - */ -public class ResourceConfigurationHistoryListView extends - AbstractConfigurationHistoryListView<ResourceConfigurationHistoryDataSource> implements HasViewName { - public static final ViewName VIEW_ID = new ViewName("ConfigurationHistoryView", - MSG.view_configurationHistoryList_title(), IconEnum.CONFIGURATION_HISTORY); - - /** - * Use this constructor to view config histories for all viewable Resources. - */ - public ResourceConfigurationHistoryListView(boolean hasWritePerm) { - super(null, hasWritePerm); - ResourceConfigurationHistoryDataSource datasource = new ResourceConfigurationHistoryDataSource(); - setDataSource(datasource); - } - - /** - * Use this constructor to view the config history for the Resource with the specified ID. - * - * @param resourceId a Resource ID - */ - public ResourceConfigurationHistoryListView(boolean hasWritePerm, int resourceId) { - super(VIEW_ID.getTitle(), hasWritePerm, resourceId); - ResourceConfigurationHistoryDataSource datasource = new ResourceConfigurationHistoryDataSource(); - setDataSource(datasource); - } - - @Override - public Canvas getDetailsView(Integer id) { - ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView(); - return detailView; - } - - @Override - protected void rollback(int configHistoryIdToRollbackTo) { - GWTServiceLookup.getConfigurationService().rollbackResourceConfiguration(getResourceId().intValue(), - configHistoryIdToRollbackTo, new AsyncCallback<Void>() { - @Override - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_rollback_success(), Severity.Info)); - refresh(); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_rollback_failure(), caught); - } - }); - } - - @Override - protected void delete(int[] doomedIds) { - GWTServiceLookup.getConfigurationService().purgeResourceConfigurationUpdates(doomedIds, true, - new AsyncCallback<Void>() { - @Override - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_delete_success(), Severity.Info)); - refresh(); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_delete_failure(), caught); - } - }); - } - - @Override - public ViewName getViewName() { - return VIEW_ID; - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryDS.java new file mode 100644 index 0000000..669a9a2 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryDS.java @@ -0,0 +1,176 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.inventory; + +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PluginConfigurationUpdate; +import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.AbstractConfigHistoryDS; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.Log; + +/** + * A data source that loads information about all the plugin configuration changes that happened + * for a resource or across all inventory. + * + * @author John Mazzitelli + */ +public class PluginConfigHistoryDS extends + AbstractConfigHistoryDS<PluginConfigurationUpdate, PluginConfigurationUpdateCriteria> { + + public PluginConfigHistoryDS() { + super(); + } + + @Override + protected String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status) { + return ImageManager.getPluginConfigurationIcon(status); + } + + @Override + protected String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value) { + return LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(groupId), value.intValue()); + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final PluginConfigurationUpdateCriteria criteria) { + + final Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); + getConfigurationService().findPluginConfigurationUpdatesByCriteria(criteria, + new AsyncCallback<PageList<PluginConfigurationUpdate>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), + caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + public void onSuccess(final PageList<PluginConfigurationUpdate> result) { + final ListGridRecord[] records = buildRecords(result); + if (resourceId == null) { + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (PluginConfigurationUpdate update : result) { + Resource resource = update.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), + new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil + .getAncestryValue(record)); + } + response.setData(records); + response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set + processResponse(request.getRequestId(), response); + } + }); + + return; + } + + // we are obtaining a single resource's history items. Let's find out which is + // its latest, current config item so we can mark it as such + getConfigurationService().getLatestPluginConfigurationUpdate(resourceId.intValue(), + new AsyncCallback<PluginConfigurationUpdate>() { + @Override + public void onSuccess(PluginConfigurationUpdate latestResult) { + if (latestResult != null) { + for (ListGridRecord record : records) { + boolean latest = record.getAttributeAsInt(Field.ID).intValue() == latestResult + .getId(); + record.setAttribute(Field.CURRENT_CONFIG, latest); + } + } + finish(); + } + + @Override + public void onFailure(Throwable caught) { + // should we show an error message? this just means we can't show any item as the "current" one + Log.error("cannot get latest plugin config", caught); + finish(); + } + + private void finish() { + response.setData(records); + response.setTotalRows(result.getTotalSize()); + processResponse(request.getRequestId(), response); + } + }); + } + }); + } + + @Override + protected PluginConfigurationUpdateCriteria createFetchCriteria() { + return new PluginConfigurationUpdateCriteria(); + } + + @Override + protected PluginConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { + PluginConfigurationUpdateCriteria criteria = super.getFetchCriteria(request); + + criteria.fetchResource(true); + criteria.fetchGroupConfigurationUpdate(true); + + final Integer resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); + if (resourceId != null) { + criteria.addFilterResourceIds(resourceId); + } + return criteria; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryListView.java new file mode 100644 index 0000000..b85a63b --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigHistoryListView.java @@ -0,0 +1,103 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.Canvas; + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.AbstractConfigHistoryListView; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; + +/** + * The main view that lists all plugin configuration history items. + * + * @author Greg Hinkle + * @author John Mazzitelli + */ +public class PluginConfigHistoryListView extends + AbstractConfigHistoryListView<PluginConfigHistoryDS> { + public static final ViewName VIEW_ID = new ViewName("PluginConfigurationHistoryView", + MSG.view_tabs_common_connectionSettingsHistory()); + + /** + * Use this constructor to view plugin config histories for all viewable Resources. + */ + public PluginConfigHistoryListView(boolean hasWritePerm) { + super(VIEW_ID.getTitle(), hasWritePerm); + PluginConfigHistoryDS datasource = new PluginConfigHistoryDS(); + setDataSource(datasource); + } + + /** + * Use this constructor to view the plugin config history for the Resource with the specified ID. + * + * @param resourceId a Resource ID + */ + public PluginConfigHistoryListView(boolean hasWritePerm, int resourceId) { + super(VIEW_ID.getTitle(), hasWritePerm, resourceId); + PluginConfigHistoryDS datasource = new PluginConfigHistoryDS(); + setDataSource(datasource); + } + + @Override + public Canvas getDetailsView(Integer id) { + PluginConfigurationHistoryDetailView detailView = new PluginConfigurationHistoryDetailView(); + return detailView; + } + + @Override + protected void rollback(int configHistoryIdToRollbackTo) { + GWTServiceLookup.getConfigurationService().rollbackPluginConfiguration(getResourceId().intValue(), + configHistoryIdToRollbackTo, new AsyncCallback<Void>() { + @Override + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_rollback_success(), Severity.Info)); + refresh(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_rollback_failure(), caught); + } + }); + } + + @Override + protected void delete(int[] doomedIds) { + GWTServiceLookup.getConfigurationService().purgePluginConfigurationUpdates(doomedIds, true, + new AsyncCallback<Void>() { + @Override + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_configurationHistoryList_delete_success(), Severity.Info)); + refresh(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_delete_failure(), caught); + } + }); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java deleted file mode 100644 index b2db1eb..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.inventory.resource.detail.inventory; - -import java.util.HashSet; -import java.util.Map; - -import java.util.logging.Logger; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.PluginConfigurationUpdate; -import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.AbstractConfigurationHistoryDataSource; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.Log; - -/** - * A data source that loads information about all the plugin configuration changes that happened - * for a resource or across all inventory. - * - * @author John Mazzitelli - */ -public class PluginConfigurationHistoryDataSource extends - AbstractConfigurationHistoryDataSource<PluginConfigurationUpdate, PluginConfigurationUpdateCriteria> { - - public PluginConfigurationHistoryDataSource() { - super(); - } - - @Override - protected String getConfigurationUpdateStatusIcon(ConfigurationUpdateStatus status) { - return ImageManager.getPluginConfigurationIcon(status); - } - - @Override - protected String getGroupConfigurationUpdateHistoryLink(Integer groupId, Number value) { - return LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(groupId), value.intValue()); - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final PluginConfigurationUpdateCriteria criteria) { - - final Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); - getConfigurationService().findPluginConfigurationUpdatesByCriteria(criteria, - new AsyncCallback<PageList<PluginConfigurationUpdate>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), - caught); - response.setStatus(DSResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(final PageList<PluginConfigurationUpdate> result) { - final ListGridRecord[] records = buildRecords(result); - if (resourceId == null) { - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (PluginConfigurationUpdate update : result) { - Resource resource = update.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), - new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil - .getAncestryValue(record)); - } - response.setData(records); - response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set - processResponse(request.getRequestId(), response); - } - }); - - return; - } - - // we are obtaining a single resource's history items. Let's find out which is - // its latest, current config item so we can mark it as such - getConfigurationService().getLatestPluginConfigurationUpdate(resourceId.intValue(), - new AsyncCallback<PluginConfigurationUpdate>() { - @Override - public void onSuccess(PluginConfigurationUpdate latestResult) { - if (latestResult != null) { - for (ListGridRecord record : records) { - boolean latest = record.getAttributeAsInt(Field.ID).intValue() == latestResult - .getId(); - record.setAttribute(Field.CURRENT_CONFIG, latest); - } - } - finish(); - } - - @Override - public void onFailure(Throwable caught) { - // should we show an error message? this just means we can't show any item as the "current" one - Log.error("cannot get latest plugin config", caught); - finish(); - } - - private void finish() { - response.setData(records); - response.setTotalRows(result.getTotalSize()); - processResponse(request.getRequestId(), response); - } - }); - } - }); - } - - @Override - protected PluginConfigurationUpdateCriteria createFetchCriteria() { - return new PluginConfigurationUpdateCriteria(); - } - - @Override - protected PluginConfigurationUpdateCriteria getFetchCriteria(final DSRequest request) { - PluginConfigurationUpdateCriteria criteria = super.getFetchCriteria(request); - - criteria.fetchResource(true); - criteria.fetchGroupConfigurationUpdate(true); - - final Integer resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); - if (resourceId != null) { - criteria.addFilterResourceIds(resourceId); - } - return criteria; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java deleted file mode 100644 index bbff660..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.Canvas; - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.AbstractConfigurationHistoryListView; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; - -/** - * The main view that lists all plugin configuration history items. - * - * @author Greg Hinkle - * @author John Mazzitelli - */ -public class PluginConfigurationHistoryListView extends - AbstractConfigurationHistoryListView<PluginConfigurationHistoryDataSource> { - public static final ViewName VIEW_ID = new ViewName("PluginConfigurationHistoryView", - MSG.view_tabs_common_connectionSettingsHistory()); - - /** - * Use this constructor to view plugin config histories for all viewable Resources. - */ - public PluginConfigurationHistoryListView(boolean hasWritePerm) { - super(VIEW_ID.getTitle(), hasWritePerm); - PluginConfigurationHistoryDataSource datasource = new PluginConfigurationHistoryDataSource(); - setDataSource(datasource); - } - - /** - * Use this constructor to view the plugin config history for the Resource with the specified ID. - * - * @param resourceId a Resource ID - */ - public PluginConfigurationHistoryListView(boolean hasWritePerm, int resourceId) { - super(VIEW_ID.getTitle(), hasWritePerm, resourceId); - PluginConfigurationHistoryDataSource datasource = new PluginConfigurationHistoryDataSource(); - setDataSource(datasource); - } - - @Override - public Canvas getDetailsView(Integer id) { - PluginConfigurationHistoryDetailView detailView = new PluginConfigurationHistoryDetailView(); - return detailView; - } - - @Override - protected void rollback(int configHistoryIdToRollbackTo) { - GWTServiceLookup.getConfigurationService().rollbackPluginConfiguration(getResourceId().intValue(), - configHistoryIdToRollbackTo, new AsyncCallback<Void>() { - @Override - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_rollback_success(), Severity.Info)); - refresh(); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_rollback_failure(), caught); - } - }); - } - - @Override - protected void delete(int[] doomedIds) { - GWTServiceLookup.getConfigurationService().purgePluginConfigurationUpdates(doomedIds, true, - new AsyncCallback<Void>() { - @Override - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_configurationHistoryList_delete_success(), Severity.Info)); - refresh(); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryList_delete_failure(), caught); - } - }); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java index eb9af82..b13e483 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java @@ -27,7 +27,7 @@ import com.smartgwt.client.widgets.grid.ListGridField; import org.rhq.core.domain.common.EntityContext; import org.rhq.enterprise.gui.coregui.client.IconEnum; -import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; @@ -75,7 +75,7 @@ public class CalltimeView extends TableSection<CalltimeDataSource> implements Ha protected void configureTable() { ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields(); getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); - addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true); + addExtraWidget(new UserPreferencesMeasRangeEditor(), true); super.configureTable(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java deleted file mode 100644 index 4bc457e..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2010-2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history; - -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDataSource; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; - -/** - * @author Ian Springer - */ -public class ResourceOperationHistoryDataSource extends - AbstractOperationHistoryDataSource<ResourceOperationHistory, ResourceOperationHistoryCriteria> { - - public static abstract class Field extends AbstractOperationHistoryDataSource.Field { - public static final String RESOURCE = "resource"; - public static final String GROUP_OPERATION_HISTORY = "groupOperationHistory"; - } - - public static abstract class CriteriaField { - public static final String RESOURCE_ID = "resourceId"; - public static final String GROUP_OPERATION_HISTORY_ID = "groupOperationHistoryId"; - } - - @Override - protected List<DataSourceField> addDataSourceFields() { - List<DataSourceField> fields = super.addDataSourceFields(); - - DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE); - fields.add(resourceField); - - return fields; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final ResourceOperationHistoryCriteria criteria) { - operationService.findResourceOperationHistoriesByCriteria(criteria, - new AsyncCallback<PageList<ResourceOperationHistory>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), caught); - } - - public void onSuccess(PageList<ResourceOperationHistory> result) { - dataRetrieved(result, response, request); - } - }); - } - - @Override - protected ResourceOperationHistoryCriteria getFetchCriteria(final DSRequest request) { - ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); - - if (request.getCriteria().getValues().containsKey(CriteriaField.RESOURCE_ID)) { - int resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); - criteria.addFilterResourceIds(resourceId); - } - - if (request.getCriteria().getValues().containsKey(CriteriaField.GROUP_OPERATION_HISTORY_ID)) { - int groupOperationHistoryId = getFilter(request, CriteriaField.GROUP_OPERATION_HISTORY_ID, Integer.class); - criteria.addFilterGroupOperationHistoryId(groupOperationHistoryId); - } - - return criteria; - } - - @Override - protected String getSortFieldForColumn(String columnName) { - if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { - return "resource.ancestry"; - } - - return super.getSortFieldForColumn(columnName); - } - - protected void dataRetrieved(final PageList<ResourceOperationHistory> result, final DSResponse response, - final DSRequest request) { - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (ResourceOperationHistory history : result) { - Resource resource = history.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - // NOTE: this may be too labor intensive in general, but since this datasource is a singleton I couldn't - // make it easily optional. - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record)); - } - response.setData(records); - response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - protected ResourceOperationHistory createOperationHistory() { - return new ResourceOperationHistory(null, null, null, null, null, null, null); - } - - @Override - public ListGridRecord copyValues(ResourceOperationHistory from) { - ListGridRecord record = super.copyValues(from); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.RESOURCE, from.getResource().getName()); - - // for ancestry handling - record.setAttribute(AncestryUtil.RESOURCE_ID, from.getResource().getId()); - record.setAttribute(AncestryUtil.RESOURCE_NAME, from.getResource().getName()); - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getResource().getAncestry()); - record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResource().getResourceType().getId()); - - return record; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java index 86a8a0c..76fe804 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java @@ -73,7 +73,7 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor List<FormItem> items = super.createFields(operationHistory); if (this.showResourceField) { - StaticTextItem resourceItem = new StaticTextItem(ResourceOperationHistoryDataSource.Field.RESOURCE, + StaticTextItem resourceItem = new StaticTextItem(ResourceOpsHistoryDataSource.Field.RESOURCE, "Resource"); resourceItem.setValue(this.disambiguatedResourceName); items.add(1, resourceItem); @@ -82,7 +82,7 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor GroupOperationHistory groupOperationHistory = operationHistory.getGroupOperationHistory(); if (groupOperationHistory != null) { StaticTextItem groupOperationHistoryItem = new StaticTextItem( - ResourceOperationHistoryDataSource.Field.GROUP_OPERATION_HISTORY, "Parent Group Execution"); + ResourceOpsHistoryDataSource.Field.GROUP_OPERATION_HISTORY, "Parent Group Execution"); String groupOperationHistoryUrl = LinkManager.getGroupOperationHistoryLink( groupOperationHistory.getGroup(), groupOperationHistory.getId()); String value = "<a href=\"" + groupOperationHistoryUrl + "\">" + groupOperationHistory.getId() diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOpsHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOpsHistoryDataSource.java new file mode 100644 index 0000000..e60a449 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOpsHistoryDataSource.java @@ -0,0 +1,171 @@ +/* + * RHQ Management Platform + * Copyright 2010-2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history; + +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOpsHistoryDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; + +/** + * @author Ian Springer + */ +public class ResourceOpsHistoryDataSource extends + AbstractOpsHistoryDataSource<ResourceOperationHistory, ResourceOperationHistoryCriteria> { + + public static abstract class Field extends AbstractOpsHistoryDataSource.Field { + public static final String RESOURCE = "resource"; + public static final String GROUP_OPERATION_HISTORY = "groupOperationHistory"; + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + public static final String GROUP_OPERATION_HISTORY_ID = "groupOperationHistoryId"; + } + + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + + DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE); + fields.add(resourceField); + + return fields; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final ResourceOperationHistoryCriteria criteria) { + operationService.findResourceOperationHistoriesByCriteria(criteria, + new AsyncCallback<PageList<ResourceOperationHistory>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), caught); + } + + public void onSuccess(PageList<ResourceOperationHistory> result) { + dataRetrieved(result, response, request); + } + }); + } + + @Override + protected ResourceOperationHistoryCriteria getFetchCriteria(final DSRequest request) { + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + + if (request.getCriteria().getValues().containsKey(CriteriaField.RESOURCE_ID)) { + int resourceId = getFilter(request, CriteriaField.RESOURCE_ID, Integer.class); + criteria.addFilterResourceIds(resourceId); + } + + if (request.getCriteria().getValues().containsKey(CriteriaField.GROUP_OPERATION_HISTORY_ID)) { + int groupOperationHistoryId = getFilter(request, CriteriaField.GROUP_OPERATION_HISTORY_ID, Integer.class); + criteria.addFilterGroupOperationHistoryId(groupOperationHistoryId); + } + + return criteria; + } + + @Override + protected String getSortFieldForColumn(String columnName) { + if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { + return "resource.ancestry"; + } + + return super.getSortFieldForColumn(columnName); + } + + protected void dataRetrieved(final PageList<ResourceOperationHistory> result, final DSResponse response, + final DSRequest request) { + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (ResourceOperationHistory history : result) { + Resource resource = history.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + // NOTE: this may be too labor intensive in general, but since this datasource is a singleton I couldn't + // make it easily optional. + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record)); + } + response.setData(records); + response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected ResourceOperationHistory createOperationHistory() { + return new ResourceOperationHistory(null, null, null, null, null, null, null); + } + + @Override + public ListGridRecord copyValues(ResourceOperationHistory from) { + ListGridRecord record = super.copyValues(from); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.RESOURCE, from.getResource().getName()); + + // for ancestry handling + record.setAttribute(AncestryUtil.RESOURCE_ID, from.getResource().getId()); + record.setAttribute(AncestryUtil.RESOURCE_NAME, from.getResource().getName()); + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getResource().getAncestry()); + record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResource().getResourceType().getId()); + + return record; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDS.java new file mode 100644 index 0000000..67db1a5 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDS.java @@ -0,0 +1,119 @@ +/* + * RHQ Management Platform + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule; + +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; + +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDS; + +/** + * A DataSource for {@link ResourceOperationSchedule}s for a given {@link Resource}. + * + * @author Ian Springer + */ +public class ResourceOperationScheduleDS extends AbstractOperationScheduleDS<ResourceOperationSchedule> { + + private ResourceComposite resourceComposite; + + public ResourceOperationScheduleDS(ResourceComposite resourceComposite) { + super(resourceComposite.getResource().getResourceType()); + this.resourceComposite = resourceComposite; + } + + @Override + protected ResourceOperationSchedule createOperationSchedule() { + ResourceOperationSchedule resourceOperationSchedule = new ResourceOperationSchedule(); + resourceOperationSchedule.setResource(this.resourceComposite.getResource()); + return resourceOperationSchedule; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { + final Integer scheduleId = request.getCriteria().getAttributeAsInt(Field.ID); + if (scheduleId != null) { + operationService.getResourceOperationSchedule(scheduleId, new AsyncCallback<ResourceOperationSchedule>() { + public void onSuccess(ResourceOperationSchedule result) { + sendSuccessResponse(request, response, result); + } + + public void onFailure(Throwable caught) { + sendFailureResponse(request, response, "Failed to fetch ResourceOperationSchedule with id " + + scheduleId + ".", caught); + } + }); + } else { + operationService.findScheduledResourceOperations(this.resourceComposite.getResource().getId(), + new AsyncCallback<List<ResourceOperationSchedule>>() { + public void onSuccess(List<ResourceOperationSchedule> result) { + Record[] records = buildRecords(result); + response.setData(records); + processResponse(request.getRequestId(), response); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to find scheduled operations for " + + resourceComposite.getResource() + ".", caught); + } + }); + } + } + + @Override + protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) { + addRequestPropertiesToRecord(request, recordToAdd); + + final ResourceOperationSchedule scheduleToAdd = copyValues(recordToAdd); + + operationService.scheduleResourceOperation(scheduleToAdd, new AsyncCallback<Integer>() { + public void onSuccess(Integer scheduleId) { + scheduleToAdd.setId(scheduleId); + sendSuccessResponse(request, response, scheduleToAdd); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to add " + scheduleToAdd, caught); + } + }); + } + + @Override + protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { + final ResourceOperationSchedule scheduleToRemove = copyValues(recordToRemove); + + operationService.unscheduleResourceOperation(scheduleToRemove, new AsyncCallback<Void>() { + public void onSuccess(Void result) { + sendSuccessResponse(request, response, scheduleToRemove); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException(caught); + } + }); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java deleted file mode 100644 index a2513a3..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule; - -import java.util.List; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; - -import org.rhq.core.domain.criteria.Criteria; -import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDataSource; - -/** - * A DataSource for {@link ResourceOperationSchedule}s for a given {@link Resource}. - * - * @author Ian Springer - */ -public class ResourceOperationScheduleDataSource extends AbstractOperationScheduleDataSource<ResourceOperationSchedule> { - - private ResourceComposite resourceComposite; - - public ResourceOperationScheduleDataSource(ResourceComposite resourceComposite) { - super(resourceComposite.getResource().getResourceType()); - this.resourceComposite = resourceComposite; - } - - @Override - protected ResourceOperationSchedule createOperationSchedule() { - ResourceOperationSchedule resourceOperationSchedule = new ResourceOperationSchedule(); - resourceOperationSchedule.setResource(this.resourceComposite.getResource()); - return resourceOperationSchedule; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - final Integer scheduleId = request.getCriteria().getAttributeAsInt(Field.ID); - if (scheduleId != null) { - operationService.getResourceOperationSchedule(scheduleId, new AsyncCallback<ResourceOperationSchedule>() { - public void onSuccess(ResourceOperationSchedule result) { - sendSuccessResponse(request, response, result); - } - - public void onFailure(Throwable caught) { - sendFailureResponse(request, response, "Failed to fetch ResourceOperationSchedule with id " - + scheduleId + ".", caught); - } - }); - } else { - operationService.findScheduledResourceOperations(this.resourceComposite.getResource().getId(), - new AsyncCallback<List<ResourceOperationSchedule>>() { - public void onSuccess(List<ResourceOperationSchedule> result) { - Record[] records = buildRecords(result); - response.setData(records); - processResponse(request.getRequestId(), response); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to find scheduled operations for " - + resourceComposite.getResource() + ".", caught); - } - }); - } - } - - @Override - protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) { - addRequestPropertiesToRecord(request, recordToAdd); - - final ResourceOperationSchedule scheduleToAdd = copyValues(recordToAdd); - - operationService.scheduleResourceOperation(scheduleToAdd, new AsyncCallback<Integer>() { - public void onSuccess(Integer scheduleId) { - scheduleToAdd.setId(scheduleId); - sendSuccessResponse(request, response, scheduleToAdd); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to add " + scheduleToAdd, caught); - } - }); - } - - @Override - protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { - final ResourceOperationSchedule scheduleToRemove = copyValues(recordToRemove); - - operationService.unscheduleResourceOperation(scheduleToRemove, new AsyncCallback<Void>() { - public void onSuccess(Void result) { - sendSuccessResponse(request, response, scheduleToRemove); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException(caught); - } - }); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java index 88cbbd1..b533182 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java @@ -13,7 +13,7 @@ public class ResourceOperationScheduleDetailsView extends AbstractOperationSched private ResourceComposite resourceComposite; public ResourceOperationScheduleDetailsView(ResourceComposite resourceComposite, int scheduleId) { - super(new ResourceOperationScheduleDataSource(resourceComposite), resourceComposite.getResource() + super(new ResourceOperationScheduleDS(resourceComposite), resourceComposite.getResource() .getResourceType(), scheduleId); this.resourceComposite = resourceComposite; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java index bc68bc2..4280802 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java @@ -36,7 +36,7 @@ public class ResourceOperationScheduleListView extends AbstractOperationSchedule private ResourceComposite resourceComposite; public ResourceOperationScheduleListView(ResourceComposite resourceComposite) { - super(new ResourceOperationScheduleDataSource(resourceComposite), TITLE); + super(new ResourceOperationScheduleDS(resourceComposite), TITLE); this.resourceComposite = resourceComposite; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java index b410629..2c7ba33 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java @@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardContainer; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardView; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceAlertsPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigUpdatesPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceMetricsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceOperationsPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; @@ -96,7 +96,7 @@ public class ActivityView extends EnhancedVLayout implements DashboardContainer, isInitialized = true; - // draw() may be done since onInit finishes asynchronously, if so redraw + // draw() may be done since onInit finishes asynchronously, if so redraw if (isDrawn()) { markForRedraw(); } @@ -194,11 +194,11 @@ public class ActivityView extends EnhancedVLayout implements DashboardContainer, dashboard.addPortlet(ops, colRight, rowRight++); resKeyNameMap.remove(ResourceOperationsPortlet.KEY); } - if (resKeyNameMap.containsKey(ResourceConfigurationUpdatesPortlet.KEY)) {//configuration if available - DashboardPortlet ops = new DashboardPortlet(ResourceConfigurationUpdatesPortlet.NAME, - ResourceConfigurationUpdatesPortlet.KEY, 220); + if (resKeyNameMap.containsKey(ResourceConfigUpdatesPortlet.KEY)) {//configuration if available + DashboardPortlet ops = new DashboardPortlet(ResourceConfigUpdatesPortlet.NAME, + ResourceConfigUpdatesPortlet.KEY, 220); dashboard.addPortlet(ops, colRight, rowRight++); - resKeyNameMap.remove(ResourceConfigurationUpdatesPortlet.KEY); + resKeyNameMap.remove(ResourceConfigUpdatesPortlet.KEY); } //Fill out left column(typically smaller portlets) then alternate cols with remaining diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java index 908fa0a..3703da7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java @@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; -import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; +import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -48,7 +48,7 @@ public class TimelineView extends EnhancedVLayout { + resourceComposite.getResource().getId()); // we create a simple subclass because we need to know when a new range has been set in order to refresh the timeline - class RangeEditor extends UserPreferencesMeasurementRangeEditor { + class RangeEditor extends UserPreferencesMeasRangeEditor { RangeEditor() { super(); } @@ -61,7 +61,7 @@ public class TimelineView extends EnhancedVLayout { } RangeEditor range = new RangeEditor(); - addMember(range); // put it at the top above the timeline's filters + addMember(range); // put it at the top above the timeline's filters addMember(timelinePane); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java index a9fe9f3..457d535 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java @@ -36,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDataSource; +import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDS; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; /** @@ -67,7 +67,7 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep impleme TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); supportedUnits.add(TimeUnit.SECONDS); supportedUnits.add(TimeUnit.MINUTES); - timeoutItem = new DurationItem(AbstractOperationScheduleDataSource.Field.TIMEOUT, + timeoutItem = new DurationItem(AbstractOperationScheduleDS.Field.TIMEOUT, MSG.view_operationScheduleDetails_field_timeout(), TimeUnit.MILLISECONDS, supportedUnits, false, false); ProductInfo productInfo = CoreGUI.get().getProductInfo(); timeoutItem.setContextualHelp(MSG.widget_resourceFactoryWizard_timeoutHelp(productInfo.getShortName())); @@ -80,7 +80,7 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep impleme // if this is a newCanvas, or if the starting config has changed, create a new config editor. The starting // config (i.e. template) may have changed if the user, via the previous button, backed up and changed the - // selected template. + // selected template. if (newCanvas || this.startingConfig != wizard.getNewResourceStartingConfiguration()) { final ConfigurationDefinition def = wizard.getNewResourceConfigurationDefinition(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java deleted file mode 100644 index df1e09e..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java +++ /dev/null @@ -1,472 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-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.gui.coregui.client.operation; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Map; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.HTMLPane; -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.CloseClickEvent; -import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.HoverCustomizer; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.grid.events.RecordClickEvent; -import com.smartgwt.client.widgets.grid.events.RecordClickHandler; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.operation.OperationRequestStatus; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; - -/** - * @author Jay Shaughnessy - * @author Ian Springer - */ -public class OperationHistoryDataSource extends - RPCDataSource<ResourceOperationHistory, ResourceOperationHistoryCriteria> { - - private EntityContext entityContext; - - public static abstract class Field { - public static final String ID = "id"; - public static final String OPERATION_NAME = "operationName"; - public static final String STATUS = "status"; - public static final String STARTED_TIME = "startedTime"; - public static final String CREATED_TIME = "createdTime"; - public static final String DURATION = "duration"; - public static final String SUBJECT = "subjectName"; - public static final String OPERATION_DEFINITION = "operationDefinition"; - public static final String ERROR_MESSAGE = "errorMessage"; - public static final String PARAMETERS = "parameters"; - } - - protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); - - public OperationHistoryDataSource() { - this(EntityContext.forSubsystemView()); - } - - public OperationHistoryDataSource(EntityContext context) { - super(); - this.entityContext = context; - - addDataSourceFields(); - } - - /** - * The view that contains the list grid which will display this datasource's data will call this - * method to get the field information which is used to control the display of the data. - * - * @return list grid fields used to display the datasource data - */ - public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); - - ListGridField startTimeField = createStartedTimeField(); - fields.add(startTimeField); - - ListGridField opNameField = new ListGridField(Field.OPERATION_NAME, - MSG.view_operationHistoryDetails_operation()); - fields.add(opNameField); - - ListGridField subjectField = new ListGridField(Field.SUBJECT, MSG.view_operationHistoryDetails_requestor()); - fields.add(subjectField); - - ListGridField statusField = createStatusField(); - fields.add(statusField); - - if (this.entityContext.type != EntityContext.Type.Resource) { - ListGridField resourceNameField = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); - resourceNameField.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); - return LinkManager.getHref(url, o.toString()); - } - }); - resourceNameField.setShowHover(true); - resourceNameField.setHoverCustomizer(new HoverCustomizer() { - - public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { - return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); - } - }); - fields.add(resourceNameField); - - ListGridField ancestryField = AncestryUtil.setupAncestryListGridField(); - fields.add(ancestryField); - - startTimeField.setWidth(200); - opNameField.setWidth("25%"); - subjectField.setWidth("15%"); - statusField.setWidth(100); - resourceNameField.setWidth("25%"); - ancestryField.setWidth("35%"); - } else { - startTimeField.setWidth(200); - opNameField.setWidth("*"); - subjectField.setWidth("*"); - statusField.setWidth(100); - } - - return fields; - } - - protected ListGridField createStartedTimeField() { - ListGridField startedTimeField = new ListGridField(Field.STARTED_TIME, - MSG.view_operationHistoryDetails_dateSubmitted()); - startedTimeField.setAlign(Alignment.LEFT); - startedTimeField.setCellAlign(Alignment.LEFT); - startedTimeField.setCellFormatter(new TimestampCellFormatter() { - public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - if (value != null) { - String timestamp = super.format(value, record, rowNum, colNum); - Integer opHistoryId = record.getAttributeAsInt("id"); - String url = LinkManager.getEntityTabLink(entityContext, "Operations", "History") + "/" - + opHistoryId; - return LinkManager.getHref(url, timestamp); - } else { - return "<i>" + MSG.view_operationHistoryList_notYetStarted() + "</i>"; - } - } - }); - startedTimeField.setShowHover(true); - startedTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(Field.STARTED_TIME)); - - return startedTimeField; - } - - protected ListGridField createStatusField() { - ListGridField statusField = new ListGridField(Field.STATUS, MSG.view_operationHistoryDetails_status()); - statusField.setAlign(Alignment.CENTER); - statusField.setCellAlign(Alignment.CENTER); - statusField.setShowHover(true); - statusField.setHoverCustomizer(new HoverCustomizer() { - @Override - public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - String statusStr = record.getAttribute(Field.STATUS); - OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); - switch (status) { - case SUCCESS: { - return MSG.common_status_success(); - } - case FAILURE: { - return MSG.common_status_failed(); - } - case INPROGRESS: { - return MSG.common_status_inprogress(); - } - case CANCELED: { - return MSG.common_status_canceled(); - } - } - // should never get here - return MSG.common_status_unknown(); - } - }); - statusField.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - OperationRequestStatus status = OperationRequestStatus.valueOf((String) o); - String icon = ImageManager.getOperationResultsIcon(status); - return Canvas.imgHTML(icon, 16, 16); - } - }); - statusField.addRecordClickHandler(new RecordClickHandler() { - @Override - public void onRecordClick(RecordClickEvent event) { - Record record = event.getRecord(); - String statusStr = record.getAttribute(Field.STATUS); - OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); - if (status == OperationRequestStatus.FAILURE) { - final Window winModal = new Window(); - winModal.setTitle(MSG.common_title_details()); - winModal.setOverflow(Overflow.VISIBLE); - winModal.setShowMinimizeButton(false); - winModal.setShowMaximizeButton(true); - winModal.setIsModal(true); - winModal.setShowModalMask(true); - winModal.setAutoSize(true); - winModal.setAutoCenter(true); - winModal.setShowResizer(true); - winModal.setCanDragResize(true); - winModal.centerInPage(); - winModal.addCloseClickHandler(new CloseClickHandler() { - @Override - public void onCloseClick(CloseClickEvent event) { - winModal.markForDestroy(); - } - }); - - HTMLPane htmlPane = new HTMLPane(); - htmlPane.setMargin(10); - htmlPane.setDefaultWidth(500); - htmlPane.setDefaultHeight(400); - String errorMsg = record.getAttribute(Field.ERROR_MESSAGE); - if (errorMsg == null) { - errorMsg = MSG.common_status_failed(); - } - htmlPane.setContents("<pre>" + errorMsg + "</pre>"); - winModal.addItem(htmlPane); - winModal.show(); - } - } - }); - - return statusField; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - final ResourceOperationHistoryCriteria criteria) { - - if (criteria == null) { - // the user selected no statuses in the filter - it makes sense from the UI perspective to show 0 rows - response.setTotalRows(0); - processResponse(request.getRequestId(), response); - return; - } - - final long start = System.currentTimeMillis(); - - this.operationService.findResourceOperationHistoriesByCriteria(criteria, - new AsyncCallback<PageList<ResourceOperationHistory>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler() - .handleError(MSG.view_operationHistoryDetails_error_fetchFailure(), caught); - response.setStatus(RPCResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(PageList<ResourceOperationHistory> result) { - long fetchTime = System.currentTimeMillis() - start; - Log.info(result.size() + " operation histories fetched in: " + fetchTime + "ms"); - - dataRetrieved(result, response, request); - } - }); - } - - /** - * Sub-classes can override this to add fine-grained control over the result set size. By default the - * total rows are set to the total result set for the query, allowing proper paging. But some views (portlets) - * may want to limit results to a small set (like most recent). - * @param result - * @param response - * @param request - * - * @return should not exceed result.getTotalSize(). - */ - protected int getTotalRows(final PageList<ResourceOperationHistory> result, final DSResponse response, - final DSRequest request) { - - return result.getTotalSize(); - } - - /** - * Additional processing to support entity-specific or cross-resource views, and something that can be overidden. - */ - private void dataRetrieved(final PageList<ResourceOperationHistory> result, final DSResponse response, - final DSRequest request) { - switch (entityContext.type) { - - // no need to disambiguate the history for a single resource - case Resource: - response.setData(buildRecords(result)); - // for paging to work we have to specify size of full result set - response.setTotalRows(getTotalRows(result, response, request)); - processResponse(request.getRequestId(), response); - break; - - // disambiguate as the results could be cross-resource - default: - HashSet<Integer> typesSet = new HashSet<Integer>(); - HashSet<String> ancestries = new HashSet<String>(); - for (ResourceOperationHistory history : result) { - Resource resource = history.getResource(); - typesSet.add(resource.getResourceType().getId()); - ancestries.add(resource.getAncestry()); - } - - // In addition to the types of the result resources, get the types of their ancestry - typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); - - ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); - typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. - AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); - - Record[] records = buildRecords(result); - for (Record record : records) { - // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. - // Store the types map off the records so we can build a detailed hover string as needed. - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); - - // Build the decoded ancestry Strings now for display - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record)); - } - response.setData(records); - // for paging to work we have to specify size of full result set - response.setTotalRows(getTotalRows(result, response, request)); - processResponse(request.getRequestId(), response); - } - }); - } - } - - @Override - protected ResourceOperationHistoryCriteria getFetchCriteria(DSRequest request) { - OperationRequestStatus[] statusFilter = getArrayFilter(request, Field.STATUS, OperationRequestStatus.class); - - if (statusFilter == null || statusFilter.length == 0) { - return null; // user didn't select any severities - return null to indicate no data should be displayed - } - - ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); - - criteria.addFilterStatuses(statusFilter); - - Date startDateFilter = getFilter(request, DateFilterItem.START_DATE_FILTER, Date.class); - if(startDateFilter != null){ - Date startOfDay = DateFilterItem.adjustTimeToStartOfDay(startDateFilter); - criteria.addFilterStartTime(startOfDay.getTime()); - } - - Date endDateFilter = getFilter(request, DateFilterItem.END_DATE_FILTER, Date.class); - if( endDateFilter!= null){ - Date endOfDay = DateFilterItem.adjustTimeToEndOfDay(endDateFilter); - criteria.addFilterEndTime(endOfDay.getTime()); - } - - switch (entityContext.type) { - case Resource: - criteria.addFilterResourceIds(entityContext.resourceId); - break; - - case ResourceGroup: - criteria.addFilterGroupOperationHistoryId(entityContext.groupId); - break; - } - - return criteria; - } - - @Override - protected String getSortFieldForColumn(String columnName) { - if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { - return "resource.ancestry"; - } - - return super.getSortFieldForColumn(columnName); - } - - @Override - protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { - final ResourceOperationHistory operationHistoryToRemove = copyValues(recordToRemove); - Boolean forceValue = request.getAttributeAsBoolean("force"); - boolean force = ((forceValue != null) && forceValue); - operationService.deleteOperationHistory(operationHistoryToRemove.getId(), force, new AsyncCallback<Void>() { - public void onSuccess(Void result) { - sendSuccessResponse(request, response, operationHistoryToRemove, null); - } - - public void onFailure(Throwable caught) { - throw new RuntimeException("Failed to delete " + operationHistoryToRemove + ".", caught); - } - }); - } - - @Override - public ResourceOperationHistory copyValues(Record from) { - Resource resource = new Resource(); - resource.setId(from.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); - ResourceOperationHistory resourceOperationHistory = new ResourceOperationHistory(null, null, - from.getAttribute(Field.SUBJECT), - (OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION), - (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource, null); - resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID)); - return resourceOperationHistory; - } - - @Override - public ListGridRecord copyValues(ResourceOperationHistory from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(Field.ID, from.getId()); - record.setAttribute(Field.CREATED_TIME, convertTimestampToDate(from.getCreatedTime())); - record.setAttribute(Field.STARTED_TIME, convertTimestampToDate(from.getStartedTime())); - record.setAttribute(Field.DURATION, from.getDuration()); - record.setAttribute(Field.SUBJECT, from.getSubjectName()); - record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); - record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); - record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); - record.setAttribute(Field.STATUS, from.getStatus().name()); - record.setAttribute(Field.PARAMETERS, from.getParameters()); - - // for ancestry handling - Resource resource = from.getResource(); - record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); - record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); - record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); - record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); - - return record; - } - - protected EntityContext getEntityContext() { - return entityContext; - } - - protected void setEntityContext(EntityContext entityContext) { - this.entityContext = entityContext; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java index 578962b..4299e43 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java @@ -57,11 +57,11 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; /** * A view that displays a paginated table of operation history. Support exists of subsystem and resource contexts. * Group operation history is (currently) handled separately as the view is comprised of group operation history - * entities, not [resource] operation history entities. + * entities, not [resource] operation history entities. ( * @author Jay Shaughnessy */ -public class OperationHistoryView extends TableSection<OperationHistoryDataSource> implements HasViewName { +public class OperationHistoryView extends TableSection<OpsHistoryDS> implements HasViewName { public static final ViewName SUBSYSTEM_VIEW_ID = new ViewName("RecentOperations", MSG.common_title_recent_operations(), IconEnum.RECENT_OPERATIONS); @@ -69,7 +69,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc private static final Criteria INITIAL_CRITERIA = new Criteria(); private static final SortSpecifier DEFAULT_SORT_SPECIFIER = new SortSpecifier( - OperationHistoryDataSource.Field.CREATED_TIME, SortDirection.DESCENDING); + OpsHistoryDS.Field.CREATED_TIME, SortDirection.DESCENDING); protected SelectItem statusFilter; protected DateFilterItem startDateFilter; @@ -77,7 +77,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc EntityContext context; boolean hasControlPermission; - OperationHistoryDataSource dataSource; + OpsHistoryDS dataSource; static { OperationRequestStatus[] statusValues = OperationRequestStatus.values(); @@ -87,7 +87,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc statusNames[i++] = s.name(); } - INITIAL_CRITERIA.addCriteria(OperationHistoryDataSource.Field.STATUS, statusNames); + INITIAL_CRITERIA.addCriteria(OpsHistoryDS.Field.STATUS, statusNames); } // for subsystem views @@ -113,9 +113,9 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc } @Override - public OperationHistoryDataSource getDataSource() { + public OpsHistoryDS getDataSource() { if (null == this.dataSource) { - this.dataSource = new OperationHistoryDataSource(context); + this.dataSource = new OpsHistoryDS(context); } return this.dataSource; } @@ -137,7 +137,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc statusIcons.put(OperationRequestStatus.FAILURE.name(), ImageManager.getOperationResultsIcon(OperationRequestStatus.FAILURE)); - statusFilter = new EnumSelectItem(OperationHistoryDataSource.Field.STATUS, MSG.common_title_operation_status(), + statusFilter = new EnumSelectItem(OpsHistoryDS.Field.STATUS, MSG.common_title_operation_status(), OperationRequestStatus.class, statusValues, statusIcons); startDateFilter = new DateFilterItem(DateFilterItem.START_DATE_FILTER, MSG.filter_from_date()); @@ -172,7 +172,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc int count = selection.length; for (ListGridRecord item : selection) { if (!OperationRequestStatus.INPROGRESS.name().equals( - item.getAttribute(OperationHistoryDataSource.Field.STATUS))) { + item.getAttribute(OpsHistoryDS.Field.STATUS))) { count--; // one selected item was not in-progress, it doesn't count } } @@ -185,9 +185,9 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc for (ListGridRecord toBeCanceled : selection) { // only cancel those selected operations that are currently in progress if (OperationRequestStatus.INPROGRESS.name().equals( - toBeCanceled.getAttribute(OperationHistoryDataSource.Field.STATUS))) { + toBeCanceled.getAttribute(OpsHistoryDS.Field.STATUS))) { numCancelRequestsSubmitted++; - final int historyId = toBeCanceled.getAttributeAsInt(OperationHistoryDataSource.Field.ID); + final int historyId = toBeCanceled.getAttributeAsInt(OpsHistoryDS.Field.ID); opService.cancelOperationHistory(historyId, false, new AsyncCallback<Void>() { public void onSuccess(Void result) { Message msg = new Message(MSG.view_operationHistoryList_cancelSuccess(String @@ -246,7 +246,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc final List<Integer> successIds = new ArrayList<Integer>(); final List<Integer> failureIds = new ArrayList<Integer>(); for (ListGridRecord record : recordsToBeDeleted) { - final ResourceOperationHistory operationHistoryToRemove = new OperationHistoryDataSource() + final ResourceOperationHistory operationHistoryToRemove = new OpsHistoryDS() .copyValues(record); GWTServiceLookup.getOperationService().deleteOperationHistory(operationHistoryToRemove.getId(), force, new AsyncCallback<Void>() { @@ -292,7 +292,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc @Override protected String getTitleFieldName() { - return OperationHistoryDataSource.Field.OPERATION_NAME; + return OpsHistoryDS.Field.OPERATION_NAME; } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OpsHistoryDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OpsHistoryDS.java new file mode 100644 index 0000000..83c6b9d --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OpsHistoryDS.java @@ -0,0 +1,472 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-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.gui.coregui.client.operation; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Map; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.rpc.RPCResponse; +import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLPane; +import com.smartgwt.client.widgets.Window; +import com.smartgwt.client.widgets.events.CloseClickEvent; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordClickEvent; +import com.smartgwt.client.widgets.grid.events.RecordClickHandler; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * @author Jay Shaughnessy + * @author Ian Springer + */ +public class OpsHistoryDS extends + RPCDataSource<ResourceOperationHistory, ResourceOperationHistoryCriteria> { + + private EntityContext entityContext; + + public static abstract class Field { + public static final String ID = "id"; + public static final String OPERATION_NAME = "operationName"; + public static final String STATUS = "status"; + public static final String STARTED_TIME = "startedTime"; + public static final String CREATED_TIME = "createdTime"; + public static final String DURATION = "duration"; + public static final String SUBJECT = "subjectName"; + public static final String OPERATION_DEFINITION = "operationDefinition"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String PARAMETERS = "parameters"; + } + + protected OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService(); + + public OpsHistoryDS() { + this(EntityContext.forSubsystemView()); + } + + public OpsHistoryDS(EntityContext context) { + super(); + this.entityContext = context; + + addDataSourceFields(); + } + + /** + * The view that contains the list grid which will display this datasource's data will call this + * method to get the field information which is used to control the display of the data. + * + * @return list grid fields used to display the datasource data + */ + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField startTimeField = createStartedTimeField(); + fields.add(startTimeField); + + ListGridField opNameField = new ListGridField(Field.OPERATION_NAME, + MSG.view_operationHistoryDetails_operation()); + fields.add(opNameField); + + ListGridField subjectField = new ListGridField(Field.SUBJECT, MSG.view_operationHistoryDetails_requestor()); + fields.add(subjectField); + + ListGridField statusField = createStatusField(); + fields.add(statusField); + + if (this.entityContext.type != EntityContext.Type.Resource) { + ListGridField resourceNameField = new ListGridField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()); + resourceNameField.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); + return LinkManager.getHref(url, o.toString()); + } + }); + resourceNameField.setShowHover(true); + resourceNameField.setHoverCustomizer(new HoverCustomizer() { + + public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) { + return AncestryUtil.getResourceHoverHTML(listGridRecord, 0); + } + }); + fields.add(resourceNameField); + + ListGridField ancestryField = AncestryUtil.setupAncestryListGridField(); + fields.add(ancestryField); + + startTimeField.setWidth(200); + opNameField.setWidth("25%"); + subjectField.setWidth("15%"); + statusField.setWidth(100); + resourceNameField.setWidth("25%"); + ancestryField.setWidth("35%"); + } else { + startTimeField.setWidth(200); + opNameField.setWidth("*"); + subjectField.setWidth("*"); + statusField.setWidth(100); + } + + return fields; + } + + protected ListGridField createStartedTimeField() { + ListGridField startedTimeField = new ListGridField(Field.STARTED_TIME, + MSG.view_operationHistoryDetails_dateSubmitted()); + startedTimeField.setAlign(Alignment.LEFT); + startedTimeField.setCellAlign(Alignment.LEFT); + startedTimeField.setCellFormatter(new TimestampCellFormatter() { + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value != null) { + String timestamp = super.format(value, record, rowNum, colNum); + Integer opHistoryId = record.getAttributeAsInt("id"); + String url = LinkManager.getEntityTabLink(entityContext, "Operations", "History") + "/" + + opHistoryId; + return LinkManager.getHref(url, timestamp); + } else { + return "<i>" + MSG.view_operationHistoryList_notYetStarted() + "</i>"; + } + } + }); + startedTimeField.setShowHover(true); + startedTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(Field.STARTED_TIME)); + + return startedTimeField; + } + + protected ListGridField createStatusField() { + ListGridField statusField = new ListGridField(Field.STATUS, MSG.view_operationHistoryDetails_status()); + statusField.setAlign(Alignment.CENTER); + statusField.setCellAlign(Alignment.CENTER); + statusField.setShowHover(true); + statusField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String statusStr = record.getAttribute(Field.STATUS); + OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); + switch (status) { + case SUCCESS: { + return MSG.common_status_success(); + } + case FAILURE: { + return MSG.common_status_failed(); + } + case INPROGRESS: { + return MSG.common_status_inprogress(); + } + case CANCELED: { + return MSG.common_status_canceled(); + } + } + // should never get here + return MSG.common_status_unknown(); + } + }); + statusField.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + OperationRequestStatus status = OperationRequestStatus.valueOf((String) o); + String icon = ImageManager.getOperationResultsIcon(status); + return Canvas.imgHTML(icon, 16, 16); + } + }); + statusField.addRecordClickHandler(new RecordClickHandler() { + @Override + public void onRecordClick(RecordClickEvent event) { + Record record = event.getRecord(); + String statusStr = record.getAttribute(Field.STATUS); + OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr); + if (status == OperationRequestStatus.FAILURE) { + final Window winModal = new Window(); + winModal.setTitle(MSG.common_title_details()); + winModal.setOverflow(Overflow.VISIBLE); + winModal.setShowMinimizeButton(false); + winModal.setShowMaximizeButton(true); + winModal.setIsModal(true); + winModal.setShowModalMask(true); + winModal.setAutoSize(true); + winModal.setAutoCenter(true); + winModal.setShowResizer(true); + winModal.setCanDragResize(true); + winModal.centerInPage(); + winModal.addCloseClickHandler(new CloseClickHandler() { + @Override + public void onCloseClick(CloseClickEvent event) { + winModal.markForDestroy(); + } + }); + + HTMLPane htmlPane = new HTMLPane(); + htmlPane.setMargin(10); + htmlPane.setDefaultWidth(500); + htmlPane.setDefaultHeight(400); + String errorMsg = record.getAttribute(Field.ERROR_MESSAGE); + if (errorMsg == null) { + errorMsg = MSG.common_status_failed(); + } + htmlPane.setContents("<pre>" + errorMsg + "</pre>"); + winModal.addItem(htmlPane); + winModal.show(); + } + } + }); + + return statusField; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, + final ResourceOperationHistoryCriteria criteria) { + + if (criteria == null) { + // the user selected no statuses in the filter - it makes sense from the UI perspective to show 0 rows + response.setTotalRows(0); + processResponse(request.getRequestId(), response); + return; + } + + final long start = System.currentTimeMillis(); + + this.operationService.findResourceOperationHistoriesByCriteria(criteria, + new AsyncCallback<PageList<ResourceOperationHistory>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler() + .handleError(MSG.view_operationHistoryDetails_error_fetchFailure(), caught); + response.setStatus(RPCResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + public void onSuccess(PageList<ResourceOperationHistory> result) { + long fetchTime = System.currentTimeMillis() - start; + Log.info(result.size() + " operation histories fetched in: " + fetchTime + "ms"); + + dataRetrieved(result, response, request); + } + }); + } + + /** + * Sub-classes can override this to add fine-grained control over the result set size. By default the + * total rows are set to the total result set for the query, allowing proper paging. But some views (portlets) + * may want to limit results to a small set (like most recent). + * @param result + * @param response + * @param request + * + * @return should not exceed result.getTotalSize(). + */ + protected int getTotalRows(final PageList<ResourceOperationHistory> result, final DSResponse response, + final DSRequest request) { + + return result.getTotalSize(); + } + + /** + * Additional processing to support entity-specific or cross-resource views, and something that can be overidden. + */ + private void dataRetrieved(final PageList<ResourceOperationHistory> result, final DSResponse response, + final DSRequest request) { + switch (entityContext.type) { + + // no need to disambiguate the history for a single resource + case Resource: + response.setData(buildRecords(result)); + // for paging to work we have to specify size of full result set + response.setTotalRows(getTotalRows(result, response, request)); + processResponse(request.getRequestId(), response); + break; + + // disambiguate as the results could be cross-resource + default: + HashSet<Integer> typesSet = new HashSet<Integer>(); + HashSet<String> ancestries = new HashSet<String>(); + for (ResourceOperationHistory history : result) { + Resource resource = history.getResource(); + typesSet.add(resource.getResourceType().getId()); + ancestries.add(resource.getAncestry()); + } + + // In addition to the types of the result resources, get the types of their ancestry + typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries)); + + ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance(); + typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() { + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo. + AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types); + + Record[] records = buildRecords(result); + for (Record record : records) { + // To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text. + // Store the types map off the records so we can build a detailed hover string as needed. + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper); + + // Build the decoded ancestry Strings now for display + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record)); + } + response.setData(records); + // for paging to work we have to specify size of full result set + response.setTotalRows(getTotalRows(result, response, request)); + processResponse(request.getRequestId(), response); + } + }); + } + } + + @Override + protected ResourceOperationHistoryCriteria getFetchCriteria(DSRequest request) { + OperationRequestStatus[] statusFilter = getArrayFilter(request, Field.STATUS, OperationRequestStatus.class); + + if (statusFilter == null || statusFilter.length == 0) { + return null; // user didn't select any severities - return null to indicate no data should be displayed + } + + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + + criteria.addFilterStatuses(statusFilter); + + Date startDateFilter = getFilter(request, DateFilterItem.START_DATE_FILTER, Date.class); + if(startDateFilter != null){ + Date startOfDay = DateFilterItem.adjustTimeToStartOfDay(startDateFilter); + criteria.addFilterStartTime(startOfDay.getTime()); + } + + Date endDateFilter = getFilter(request, DateFilterItem.END_DATE_FILTER, Date.class); + if( endDateFilter!= null){ + Date endOfDay = DateFilterItem.adjustTimeToEndOfDay(endDateFilter); + criteria.addFilterEndTime(endOfDay.getTime()); + } + + switch (entityContext.type) { + case Resource: + criteria.addFilterResourceIds(entityContext.resourceId); + break; + + case ResourceGroup: + criteria.addFilterGroupOperationHistoryId(entityContext.groupId); + break; + } + + return criteria; + } + + @Override + protected String getSortFieldForColumn(String columnName) { + if (AncestryUtil.RESOURCE_ANCESTRY.equals(columnName)) { + return "resource.ancestry"; + } + + return super.getSortFieldForColumn(columnName); + } + + @Override + protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) { + final ResourceOperationHistory operationHistoryToRemove = copyValues(recordToRemove); + Boolean forceValue = request.getAttributeAsBoolean("force"); + boolean force = ((forceValue != null) && forceValue); + operationService.deleteOperationHistory(operationHistoryToRemove.getId(), force, new AsyncCallback<Void>() { + public void onSuccess(Void result) { + sendSuccessResponse(request, response, operationHistoryToRemove, null); + } + + public void onFailure(Throwable caught) { + throw new RuntimeException("Failed to delete " + operationHistoryToRemove + ".", caught); + } + }); + } + + @Override + public ResourceOperationHistory copyValues(Record from) { + Resource resource = new Resource(); + resource.setId(from.getAttributeAsInt(AncestryUtil.RESOURCE_ID)); + ResourceOperationHistory resourceOperationHistory = new ResourceOperationHistory(null, null, + from.getAttribute(Field.SUBJECT), + (OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION), + (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource, null); + resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID)); + return resourceOperationHistory; + } + + @Override + public ListGridRecord copyValues(ResourceOperationHistory from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.CREATED_TIME, convertTimestampToDate(from.getCreatedTime())); + record.setAttribute(Field.STARTED_TIME, convertTimestampToDate(from.getStartedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); + record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.PARAMETERS, from.getParameters()); + + // for ancestry handling + Resource resource = from.getResource(); + record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId()); + record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName()); + record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); + record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + + return record; + } + + protected EntityContext getEntityContext() { + return entityContext; + } + + protected void setEntityContext(EntityContext entityContext) { + this.entityContext = entityContext; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java index 1701392..b472bfa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java @@ -42,10 +42,10 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.platform.PlatformSummaryPortlet; import org.rhq.enterprise.gui.coregui.client.drift.DriftHistoryView; import org.rhq.enterprise.gui.coregui.client.drift.SubsystemResourceDriftView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigHistoryListView; import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView; import org.rhq.enterprise.gui.coregui.client.report.alert.SubsystemRecentAlertsView; -import org.rhq.enterprise.gui.coregui.client.report.configuration.SubsystemConfigurationHistoryListView; +import org.rhq.enterprise.gui.coregui.client.report.configuration.SubsystemConfigHistoryListView; import org.rhq.enterprise.gui.coregui.client.report.inventory.DriftComplianceReport; import org.rhq.enterprise.gui.coregui.client.report.inventory.ResourceInstallReport; import org.rhq.enterprise.gui.coregui.client.report.measurement.MeasurementOOBView; @@ -112,9 +112,9 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView { }); NavigationItem recentConfigurationChangesItem = new NavigationItem( - ResourceConfigurationHistoryListView.VIEW_ID, new ViewFactory() { + ResourceConfigHistoryListView.VIEW_ID, new ViewFactory() { public Canvas createView() { - return new SubsystemConfigurationHistoryListView(getGlobalPermissions().contains( + return new SubsystemConfigHistoryListView(getGlobalPermissions().contains( Permission.MANAGE_INVENTORY)); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigHistoryListView.java new file mode 100644 index 0000000..7a01558 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigHistoryListView.java @@ -0,0 +1,38 @@ +package org.rhq.enterprise.gui.coregui.client.report.configuration; + +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; +import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigHistoryListView; + +public class SubsystemConfigHistoryListView extends ResourceConfigHistoryListView { + + + public SubsystemConfigHistoryListView(boolean hasWritePerm) { + super(hasWritePerm); + } + + @Override + protected void configureTable() { + super.configureTable(); + addExportAction(); + } + + private void addExportAction() { + addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { + @Override + public boolean isEnabled(ListGridRecord[] selection) { + return true; + } + + @Override + public void executeAction(ListGridRecord[] selection, Object actionValue) { + ReportExporter exporter = ReportExporter.createStandardExporter("configurationHistory"); + exporter.export(); + refreshTableInfo(); + } + }); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java deleted file mode 100644 index c82d837..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.report.configuration; - -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.enterprise.gui.coregui.client.components.ReportExporter; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView; - -public class SubsystemConfigurationHistoryListView extends ResourceConfigurationHistoryListView { - - - public SubsystemConfigurationHistoryListView(boolean hasWritePerm) { - super(hasWritePerm); - } - - @Override - protected void configureTable() { - super.configureTable(); - addExportAction(); - } - - private void addExportAction() { - addTableAction("Export", MSG.common_button_reports_export(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return true; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - ReportExporter exporter = ReportExporter.createStandardExporter("configurationHistory"); - exporter.export(); - refreshTableInfo(); - } - }); - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java index 50d5400..6087ba3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -22,13 +22,14 @@ package org.rhq.enterprise.gui.coregui.client.util.preferences; import java.util.Arrays; import java.util.List; -import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor.MetricRangePreferences; +import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasRangeEditor.MetricRangePreferences; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; +import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * This wraps a UserPreferences object to obtain measurement specific preferences. - * + * * @author John Mazzitelli */ public class MeasurementUserPreferences { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java index 371951a..bb1213a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java @@ -25,8 +25,8 @@ import org.rhq.enterprise.gui.alert.ListAlertHistoryUIBean; import org.rhq.enterprise.gui.alert.ListGroupAlertDefinitionsUIBean; import org.rhq.enterprise.gui.alert.ListGroupAlertHistoryUIBean; import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.configuration.group.GroupResourceConfigurationHistoryDetailsUIBean; -import org.rhq.enterprise.gui.configuration.group.GroupResourceConfigurationHistoryUIBean; +import org.rhq.enterprise.gui.configuration.group.GroupResConfigHistoryDetailsUIBean; +import org.rhq.enterprise.gui.configuration.group.GroupResourceConfigHistoryUIBean; import org.rhq.enterprise.gui.configuration.history.ListConfigurationUpdateUIBean; import org.rhq.enterprise.gui.content.AuditTrailUIBean; import org.rhq.enterprise.gui.content.AvailableResourceReposUIBean; @@ -76,23 +76,23 @@ import org.rhq.enterprise.gui.inventory.browse.BrowseGroupsUIBean; import org.rhq.enterprise.gui.inventory.browse.BrowseResourcesUIBean; import org.rhq.enterprise.gui.inventory.group.ListResourceGroupMembersUIBean; import org.rhq.enterprise.gui.inventory.group.ResourceGroupSummaryUIBean; -import org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropertyDetailsUIBean; -import org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropertyHistoryUIBean; +import org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropDetailsUIBean; +import org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropsHistUIBean; import org.rhq.enterprise.gui.inventory.resource.ListChildResourcesUIBean; import org.rhq.enterprise.gui.inventory.resource.ListContainingGroupsUIBean; import org.rhq.enterprise.gui.inventory.resource.ListCreateResourceHistoryUIBean; import org.rhq.enterprise.gui.inventory.resource.ListDeleteResourceHistoryUIBean; import org.rhq.enterprise.gui.inventory.resource.history.ListAvailabilityHistoryUIBean; -import org.rhq.enterprise.gui.inventory.resource.history.ListPluginConfigurationUpdateUIBean; +import org.rhq.enterprise.gui.inventory.resource.history.ListPluginConfigUpdateUIBean; import org.rhq.enterprise.gui.measurement.calltime.CallTimeUIBean; -import org.rhq.enterprise.gui.measurement.schedule.group.ListResourceGroupMeasurementScheduleUIBean; -import org.rhq.enterprise.gui.measurement.schedule.resource.ListResourceMeasurementScheduleUIBean; +import org.rhq.enterprise.gui.measurement.schedule.group.ListResGroupMeasScheduleUIBean; +import org.rhq.enterprise.gui.measurement.schedule.resource.ListResourceMeasScheduleUIBean; import org.rhq.enterprise.gui.measurement.tables.group.ResourceGroupMetricsTableUIBean; -import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationCompletedHistoryUIBean; -import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationHistoryDetailsUIBean; -import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationPendingHistoryUIBean; -import org.rhq.enterprise.gui.operation.history.resource.ResourceOperationCompletedHistoryUIBean; -import org.rhq.enterprise.gui.operation.history.resource.ResourceOperationPendingHistoryUIBean; +import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsCompletedHistoryUIBean; +import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsHistoryDetailsUIBean; +import org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsPendingHistoryUIBean; +import org.rhq.enterprise.gui.operation.history.resource.ResourceOpsCompletedHistUIBean; +import org.rhq.enterprise.gui.operation.history.resource.ResourceOpsPendingHistUIBean; import org.rhq.enterprise.gui.subsystem.SubsystemAlertDefinitionUIBean; import org.rhq.enterprise.gui.subsystem.SubsystemAlertHistoryUIBean; import org.rhq.enterprise.gui.subsystem.SubsystemConfigurationUpdateUIBean; @@ -112,7 +112,7 @@ public enum PageControlView { /** */ ConfigurationHistory(ListConfigurationUpdateUIBean.class), /** */ - PluginConfigurationHistory(ListPluginConfigurationUpdateUIBean.class), + PluginConfigurationHistory(ListPluginConfigUpdateUIBean.class), // Content @@ -188,18 +188,18 @@ public enum PageControlView { // Resource Control /** */ - ResourceOperationCompletedHistory(ResourceOperationCompletedHistoryUIBean.class), + ResourceOperationCompletedHistory(ResourceOpsCompletedHistUIBean.class), /** */ - ResourceOperationPendingHistory(ResourceOperationPendingHistoryUIBean.class), + ResourceOperationPendingHistory(ResourceOpsPendingHistUIBean.class), // Resource Group Control /** */ - ResourceGroupOperationCompletedHistory(ResourceGroupOperationCompletedHistoryUIBean.class), + ResourceGroupOperationCompletedHistory(ResourceGroupOpsCompletedHistoryUIBean.class), /** */ - ResourceGroupOperationPendingHistory(ResourceGroupOperationPendingHistoryUIBean.class), + ResourceGroupOperationPendingHistory(ResourceGroupOpsPendingHistoryUIBean.class), /** */ - ResourceGroupOperationHistoryDetails(ResourceGroupOperationHistoryDetailsUIBean.class), + ResourceGroupOperationHistoryDetails(ResourceGroupOpsHistoryDetailsUIBean.class), // Group Definition @@ -226,17 +226,17 @@ public enum PageControlView { MiniResourceGroupMemberList(ResourceGroupSummaryUIBean.class), /** */ - GroupConnectionPropertyUpdateHistory(ViewGroupConnectionPropertyHistoryUIBean.class), + GroupConnectionPropertyUpdateHistory(ViewGroupConnectionPropsHistUIBean.class), /** */ - GroupConnectionPropertyUpdateDetails(ViewGroupConnectionPropertyDetailsUIBean.class), + GroupConnectionPropertyUpdateDetails(ViewGroupConnectionPropDetailsUIBean.class), /** */ ResourceGroupHealthSummary(ResourceGroupMetricsTableUIBean.class), // Group Configuration /** */ - GroupResourceConfigurationUpdateHistory(GroupResourceConfigurationHistoryUIBean.class), + GroupResourceConfigurationUpdateHistory(GroupResourceConfigHistoryUIBean.class), /** */ - GroupResourceConfigurationUpdateDetails(GroupResourceConfigurationHistoryDetailsUIBean.class), + GroupResourceConfigurationUpdateDetails(GroupResConfigHistoryDetailsUIBean.class), // Auto Discovery @@ -275,11 +275,11 @@ public enum PageControlView { // Monitor /** */ - AutoGroupMeasurementScheduleList(ListResourceGroupMeasurementScheduleUIBean.class, true), + AutoGroupMeasurementScheduleList(ListResGroupMeasScheduleUIBean.class, true), /** */ - ResourceMeasurementScheduleList(ListResourceMeasurementScheduleUIBean.class, true), + ResourceMeasurementScheduleList(ListResourceMeasScheduleUIBean.class, true), /** */ - ResourceGroupMeasurementScheduleList(ListResourceGroupMeasurementScheduleUIBean.class, true), + ResourceGroupMeasurementScheduleList(ListResGroupMeasScheduleUIBean.class, true), /** */ EventsHistoryList(EventHistoryUIBean.class), /** */ diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java index ab8e360..a385db6 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java @@ -63,7 +63,7 @@ public class EditGroupResourceConfigurationUIBean extends AbstractGroupResourceC FacesContextUtility .addMessage(FacesMessage.SEVERITY_INFO, "Group Resource Configuration update scheduled."); //Conversation.instance().endBeforeRedirect(); - viewId = GroupResourceConfigurationHistoryUIBean.VIEW_ID; + viewId = GroupResourceConfigHistoryUIBean.VIEW_ID; } catch (ConfigurationUpdateStillInProgressException updateException) { FacesContextUtility .addMessage(FacesMessage.SEVERITY_WARN, diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResConfigHistoryDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResConfigHistoryDetailsUIBean.java new file mode 100644 index 0000000..21c9d56 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResConfigHistoryDetailsUIBean.java @@ -0,0 +1,99 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.configuration.group; + +import java.util.Map; + +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.configuration.propset.ConfigurationSet; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * @author Joseph Marques + */ +public class GroupResConfigHistoryDetailsUIBean extends PagedDataTableUIBean { + public static final String VIEW_ID = "/rhq/group/configuration/details.xhtml"; + + public static final String MANAGED_BEAN_NAME = "GroupResConfigHistoryDetailsUIBean"; + + private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + private Map<Integer, Configuration> resourceConfigurations; + private ConfigurationSet configurationSet; + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupResourceConfigUpdateDetailsDataModel( + PageControlView.GroupResourceConfigurationUpdateDetails, + GroupResConfigHistoryDetailsUIBean.MANAGED_BEAN_NAME); + } + return dataModel; + } + + public ConfigurationSet getConfigurationSet() { + if (configurationSet == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ResourceGroup group = EnterpriseFacesContextUtility.getResourceGroup(); + int groupResourceConfigurationUpdateId = getGroupResourceConfigurationUpdateId(); + + this.resourceConfigurations = this.configurationManager.getResourceConfigurationMapForGroupUpdate( + getSubject(), groupResourceConfigurationUpdateId); + this.configurationSet = GroupResourceConfigurationUtility.buildConfigurationSet(subject, group, + resourceConfigurations); + } + return configurationSet; + } + + private int getGroupResourceConfigurationUpdateId() { + return FacesContextUtility.getRequiredRequestParameter("arcuId", Integer.class); + } + + private class ListGroupResourceConfigUpdateDetailsDataModel extends + PagedListDataModel<ConfigurationUpdateComposite> { + + public ListGroupResourceConfigUpdateDetailsDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<ConfigurationUpdateComposite> fetchPage(PageControl pc) { + int groupResourceConfigurationUpdateId = getGroupResourceConfigurationUpdateId(); + PageList<ConfigurationUpdateComposite> childUpdates = configurationManager + .findResourceConfigurationUpdateCompositesByParentId(getSubject(), groupResourceConfigurationUpdateId, + pc); + + return childUpdates; + } + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigHistoryUIBean.java new file mode 100644 index 0000000..d775e54 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigHistoryUIBean.java @@ -0,0 +1,89 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.configuration.group; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * @author Joseph Marques + */ +public class GroupResourceConfigHistoryUIBean extends PagedDataTableUIBean { + public static final String VIEW_ID = "/rhq/group/configuration/history.xhtml"; + + public static final String MANAGED_BEAN_NAME = "GroupResourceConfigHistoryUIBean"; + + private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupResourceConfigurationUpdatesDataModel( + PageControlView.GroupResourceConfigurationUpdateHistory, + GroupResourceConfigHistoryUIBean.MANAGED_BEAN_NAME); + } + return dataModel; + } + + public String deleteSelectedUpdates() { + String[] selectedUpdates = getSelectedUpdates(); + Integer[] groupConfigUpdateIds = StringUtility.getIntegerArray(selectedUpdates); + + try { + configurationManager.deleteGroupResourceConfigurationUpdates(getSubject(), getResourceGroup().getId(), + groupConfigUpdateIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted " + groupConfigUpdateIds.length + + " group updates."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete selected group updates.", e); + } + + return "success"; + } + + private class ListGroupResourceConfigurationUpdatesDataModel extends + PagedListDataModel<GroupResourceConfigurationUpdate> { + + public ListGroupResourceConfigurationUpdatesDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<GroupResourceConfigurationUpdate> fetchPage(PageControl pc) { + return configurationManager.findGroupResourceConfigurationUpdates(getSubject(), getResourceGroup().getId(), + pc); + } + } + + private String[] getSelectedUpdates() { + return FacesContextUtility.getRequest().getParameterValues("selectedUpdates"); + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryDetailsUIBean.java deleted file mode 100644 index 8a29d06..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryDetailsUIBean.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.configuration.group; - -import java.util.Map; - -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.configuration.propset.ConfigurationSet; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * @author Joseph Marques - */ -public class GroupResourceConfigurationHistoryDetailsUIBean extends PagedDataTableUIBean { - public static final String VIEW_ID = "/rhq/group/configuration/details.xhtml"; - - public static final String MANAGED_BEAN_NAME = "GroupResourceConfigurationHistoryDetailsUIBean"; - - private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - private Map<Integer, Configuration> resourceConfigurations; - private ConfigurationSet configurationSet; - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupResourceConfigurationUpdateDetailsDataModel( - PageControlView.GroupResourceConfigurationUpdateDetails, - GroupResourceConfigurationHistoryDetailsUIBean.MANAGED_BEAN_NAME); - } - return dataModel; - } - - public ConfigurationSet getConfigurationSet() { - if (configurationSet == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ResourceGroup group = EnterpriseFacesContextUtility.getResourceGroup(); - int groupResourceConfigurationUpdateId = getGroupResourceConfigurationUpdateId(); - - this.resourceConfigurations = this.configurationManager.getResourceConfigurationMapForGroupUpdate( - getSubject(), groupResourceConfigurationUpdateId); - this.configurationSet = GroupResourceConfigurationUtility.buildConfigurationSet(subject, group, - resourceConfigurations); - } - return configurationSet; - } - - private int getGroupResourceConfigurationUpdateId() { - return FacesContextUtility.getRequiredRequestParameter("arcuId", Integer.class); - } - - private class ListGroupResourceConfigurationUpdateDetailsDataModel extends - PagedListDataModel<ConfigurationUpdateComposite> { - - public ListGroupResourceConfigurationUpdateDetailsDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<ConfigurationUpdateComposite> fetchPage(PageControl pc) { - int groupResourceConfigurationUpdateId = getGroupResourceConfigurationUpdateId(); - PageList<ConfigurationUpdateComposite> childUpdates = configurationManager - .findResourceConfigurationUpdateCompositesByParentId(getSubject(), groupResourceConfigurationUpdateId, - pc); - - return childUpdates; - } - } - -} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryUIBean.java deleted file mode 100644 index 86fedc7..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryUIBean.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.configuration.group; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * @author Joseph Marques - */ -public class GroupResourceConfigurationHistoryUIBean extends PagedDataTableUIBean { - public static final String VIEW_ID = "/rhq/group/configuration/history.xhtml"; - - public static final String MANAGED_BEAN_NAME = "GroupResourceConfigurationHistoryUIBean"; - - private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupResourceConfigurationUpdatesDataModel( - PageControlView.GroupResourceConfigurationUpdateHistory, - GroupResourceConfigurationHistoryUIBean.MANAGED_BEAN_NAME); - } - return dataModel; - } - - public String deleteSelectedUpdates() { - String[] selectedUpdates = getSelectedUpdates(); - Integer[] groupConfigUpdateIds = StringUtility.getIntegerArray(selectedUpdates); - - try { - configurationManager.deleteGroupResourceConfigurationUpdates(getSubject(), getResourceGroup().getId(), - groupConfigUpdateIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted " + groupConfigUpdateIds.length - + " group updates."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete selected group updates.", e); - } - - return "success"; - } - - private class ListGroupResourceConfigurationUpdatesDataModel extends - PagedListDataModel<GroupResourceConfigurationUpdate> { - - public ListGroupResourceConfigurationUpdatesDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<GroupResourceConfigurationUpdate> fetchPage(PageControl pc) { - return configurationManager.findGroupResourceConfigurationUpdates(getSubject(), getResourceGroup().getId(), - pc); - } - } - - private String[] getSelectedUpdates() { - return FacesContextUtility.getRequest().getParameterValues("selectedUpdates"); - } - -} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropDetailsUIBean.java new file mode 100644 index 0000000..9c93546 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropDetailsUIBean.java @@ -0,0 +1,104 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.inventory.group; + +import java.util.Map; + +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.configuration.propset.ConfigurationSet; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ViewGroupConnectionPropDetailsUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ViewGroupConnectionPropDetailsUIBean"; + public static final String VIEW_ID = "/rhq/group/inventory/view-plugin-configuration-update-details.xhtml"; + + private ResourceGroup resourceGroup; + private Map<Integer, Configuration> pluginConfigurations; + private ConfigurationSet configurationSet; + + private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupConnectionPropertyUpdateDetailsDataModel( + PageControlView.GroupConnectionPropertyUpdateDetails, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public ConfigurationSet getConfigurationSet() { + if (this.configurationSet == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ResourceGroup group = EnterpriseFacesContextUtility.getResourceGroup(); + int groupPluginConfigurationUpdateId = getPluginResourceConfigurationUpdateId(); + + this.pluginConfigurations = this.configurationManager.getPluginConfigurationMapForGroupUpdate(subject, + groupPluginConfigurationUpdateId); + this.configurationSet = GroupPluginConfigurationUtility.buildConfigurationSet(subject, group, + this.pluginConfigurations); + } + return configurationSet; + } + + private int getPluginResourceConfigurationUpdateId() { + return FacesContextUtility.getRequiredRequestParameter("apcuId", Integer.class); + } + + private class ListGroupConnectionPropertyUpdateDetailsDataModel extends + PagedListDataModel<ConfigurationUpdateComposite> { + private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + public ListGroupConnectionPropertyUpdateDetailsDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<ConfigurationUpdateComposite> fetchPage(PageControl pc) { + ResourceGroup requestResourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); + + if (requestResourceGroup == null) { + requestResourceGroup = resourceGroup; + } else { + resourceGroup = requestResourceGroup; + } + + int groupPluginConfigurationUpdateId = FacesContextUtility.getRequiredRequestParameter("apcuId", + Integer.class); + PageList<ConfigurationUpdateComposite> childUpdates = configurationManager + .findPluginConfigurationUpdateCompositesByParentId(groupPluginConfigurationUpdateId, pc); + + return childUpdates; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyDetailsUIBean.java deleted file mode 100644 index dd463a3..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyDetailsUIBean.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.inventory.group; - -import java.util.Map; - -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.configuration.propset.ConfigurationSet; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ViewGroupConnectionPropertyDetailsUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ViewGroupConnectionPropertyDetailsUIBean"; - public static final String VIEW_ID = "/rhq/group/inventory/view-plugin-configuration-update-details.xhtml"; - - private ResourceGroup resourceGroup; - private Map<Integer, Configuration> pluginConfigurations; - private ConfigurationSet configurationSet; - - private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupConnectionPropertyUpdateDetailsDataModel( - PageControlView.GroupConnectionPropertyUpdateDetails, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public ConfigurationSet getConfigurationSet() { - if (this.configurationSet == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ResourceGroup group = EnterpriseFacesContextUtility.getResourceGroup(); - int groupPluginConfigurationUpdateId = getPluginResourceConfigurationUpdateId(); - - this.pluginConfigurations = this.configurationManager.getPluginConfigurationMapForGroupUpdate(subject, - groupPluginConfigurationUpdateId); - this.configurationSet = GroupPluginConfigurationUtility.buildConfigurationSet(subject, group, - this.pluginConfigurations); - } - return configurationSet; - } - - private int getPluginResourceConfigurationUpdateId() { - return FacesContextUtility.getRequiredRequestParameter("apcuId", Integer.class); - } - - private class ListGroupConnectionPropertyUpdateDetailsDataModel extends - PagedListDataModel<ConfigurationUpdateComposite> { - private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - public ListGroupConnectionPropertyUpdateDetailsDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<ConfigurationUpdateComposite> fetchPage(PageControl pc) { - ResourceGroup requestResourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); - - if (requestResourceGroup == null) { - requestResourceGroup = resourceGroup; - } else { - resourceGroup = requestResourceGroup; - } - - int groupPluginConfigurationUpdateId = FacesContextUtility.getRequiredRequestParameter("apcuId", - Integer.class); - PageList<ConfigurationUpdateComposite> childUpdates = configurationManager - .findPluginConfigurationUpdateCompositesByParentId(groupPluginConfigurationUpdateId, pc); - - return childUpdates; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyHistoryUIBean.java deleted file mode 100644 index 05a4971..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyHistoryUIBean.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.inventory.group; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.common.Outcomes; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ViewGroupConnectionPropertyHistoryUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ViewGroupConnectionPropertyHistoryUIBean"; - public static final String VIEW_ID = "/rhq/group/inventory/connectionHistory.xhtml"; - - private ResourceGroup resourceGroup; - private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - public String begin() { - return "viewHistory"; - } - - public String deleteSelectedUpdates() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ResourceGroup resourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); - - String[] selectedUpdateStringIds = FacesContextUtility.getRequest().getParameterValues("selectedUpdates"); - Integer[] selectedUpdateIds = StringUtility.getIntegerArray(selectedUpdateStringIds); - - try { - int deleteCount = configurationManager.deleteGroupPluginConfigurationUpdates(subject, resourceGroup - .getId(), selectedUpdateIds); - if (deleteCount == selectedUpdateIds.length) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted " + selectedUpdateIds.length - + " group connection property updates."); - } else { - int failedToDelete = selectedUpdateIds.length - deleteCount; - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Unknown error deleting " + failedToDelete - + " group connection property updates."); - } - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, - "Failed to delete selected group connection property updates.", e); - } - - return Outcomes.SUCCESS; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupConnectionPropertyUpdateHistoryDataModel( - PageControlView.GroupConnectionPropertyUpdateHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - private class ListGroupConnectionPropertyUpdateHistoryDataModel extends - PagedListDataModel<GroupPluginConfigurationUpdate> { - public ListGroupConnectionPropertyUpdateHistoryDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<GroupPluginConfigurationUpdate> fetchPage(PageControl pc) { - ResourceGroup requestResourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); - ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - if (requestResourceGroup == null) { - requestResourceGroup = resourceGroup; - } else { - resourceGroup = requestResourceGroup; - } - - PageList<GroupPluginConfigurationUpdate> results = null; - results = configurationManager.findGroupPluginConfigurationUpdates( - requestResourceGroup.getId(), pc); - return results; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropsHistUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropsHistUIBean.java new file mode 100644 index 0000000..91d480e --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropsHistUIBean.java @@ -0,0 +1,108 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.inventory.group; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.common.Outcomes; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ViewGroupConnectionPropsHistUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ViewGroupConnectionPropsHistUIBean"; + public static final String VIEW_ID = "/rhq/group/inventory/connectionHistory.xhtml"; + + private ResourceGroup resourceGroup; + private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + public String begin() { + return "viewHistory"; + } + + public String deleteSelectedUpdates() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ResourceGroup resourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); + + String[] selectedUpdateStringIds = FacesContextUtility.getRequest().getParameterValues("selectedUpdates"); + Integer[] selectedUpdateIds = StringUtility.getIntegerArray(selectedUpdateStringIds); + + try { + int deleteCount = configurationManager.deleteGroupPluginConfigurationUpdates(subject, resourceGroup + .getId(), selectedUpdateIds); + if (deleteCount == selectedUpdateIds.length) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted " + selectedUpdateIds.length + + " group connection property updates."); + } else { + int failedToDelete = selectedUpdateIds.length - deleteCount; + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Unknown error deleting " + failedToDelete + + " group connection property updates."); + } + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, + "Failed to delete selected group connection property updates.", e); + } + + return Outcomes.SUCCESS; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupConnectionPropertyUpdateHistoryDataModel( + PageControlView.GroupConnectionPropertyUpdateHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + private class ListGroupConnectionPropertyUpdateHistoryDataModel extends + PagedListDataModel<GroupPluginConfigurationUpdate> { + public ListGroupConnectionPropertyUpdateHistoryDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<GroupPluginConfigurationUpdate> fetchPage(PageControl pc) { + ResourceGroup requestResourceGroup = EnterpriseFacesContextUtility.getResourceGroup(); + ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + if (requestResourceGroup == null) { + requestResourceGroup = resourceGroup; + } else { + resourceGroup = requestResourceGroup; + } + + PageList<GroupPluginConfigurationUpdate> results = null; + results = configurationManager.findGroupPluginConfigurationUpdates( + requestResourceGroup.getId(), pc); + return results; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigUpdateUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigUpdateUIBean.java new file mode 100644 index 0000000..e49b3ee --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigUpdateUIBean.java @@ -0,0 +1,128 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.inventory.resource.history; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.PluginConfigurationUpdate; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * @author Joseph Marques + */ +public class ListPluginConfigUpdateUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ListPluginConfigUpdateUIBean"; + + private Resource resource; + private Integer selectedResourceConfiguration; + + public ListPluginConfigUpdateUIBean() { + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListResourcesDataModel(PageControlView.PluginConfigurationHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public String delete() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ConfigurationManagerLocal manager = LookupUtil.getConfigurationManager(); + + String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("selectedItems"); + + List<String> success = new ArrayList<String>(); + Map<String, String> failure = new HashMap<String, String>(); + + String next = null; + Integer doomed; + for (int i = 0; i < selectedItems.length; i++) { + try { + next = selectedItems[i]; + doomed = Integer.valueOf(next); + + manager.purgePluginConfigurationUpdate(subject, doomed, true); + + success.add(next); + } catch (Exception e) { + failure.put(next, ThrowableUtil.getAllMessages(e, true)); + } + } + + if (success.size() > 0) { + // one success message for all successful deletions + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted plugin configuration update versions: " + + StringUtility.getListAsDelimitedString(success)); + } + + for (Map.Entry<String, String> error : failure.entrySet()) { + // one message per failed deletion (hopefully rare) + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, + "Failed to delete plugin configuration update version " + error.getKey() + ". Cause: " + + error.getValue()); + } + + return "success"; + } + + private class ListResourcesDataModel extends PagedListDataModel<PluginConfigurationUpdate> { + public ListResourcesDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<PluginConfigurationUpdate> fetchPage(PageControl pc) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + Resource requestResource = EnterpriseFacesContextUtility.getResourceIfExists(); + ConfigurationManagerLocal manager = LookupUtil.getConfigurationManager(); + + if (requestResource == null) { + requestResource = resource; // request not associated with a resource - use the resource we used before + } else { + resource = requestResource; // request switched the resource this UI bean is using + } + + PageList<PluginConfigurationUpdate> result; + result = manager.findPluginConfigurationUpdates(subject, requestResource.getId(), null, null, pc); + + return result; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigurationUpdateUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigurationUpdateUIBean.java deleted file mode 100644 index 6437b87..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/history/ListPluginConfigurationUpdateUIBean.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.inventory.resource.history; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.PluginConfigurationUpdate; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * @author Joseph Marques - */ -public class ListPluginConfigurationUpdateUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ListPluginConfigurationUpdateUIBean"; - - private Resource resource; - private Integer selectedResourceConfiguration; - - public ListPluginConfigurationUpdateUIBean() { - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListResourcesDataModel(PageControlView.PluginConfigurationHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public String delete() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ConfigurationManagerLocal manager = LookupUtil.getConfigurationManager(); - - String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("selectedItems"); - - List<String> success = new ArrayList<String>(); - Map<String, String> failure = new HashMap<String, String>(); - - String next = null; - Integer doomed; - for (int i = 0; i < selectedItems.length; i++) { - try { - next = selectedItems[i]; - doomed = Integer.valueOf(next); - - manager.purgePluginConfigurationUpdate(subject, doomed, true); - - success.add(next); - } catch (Exception e) { - failure.put(next, ThrowableUtil.getAllMessages(e, true)); - } - } - - if (success.size() > 0) { - // one success message for all successful deletions - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted plugin configuration update versions: " - + StringUtility.getListAsDelimitedString(success)); - } - - for (Map.Entry<String, String> error : failure.entrySet()) { - // one message per failed deletion (hopefully rare) - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, - "Failed to delete plugin configuration update version " + error.getKey() + ". Cause: " - + error.getValue()); - } - - return "success"; - } - - private class ListResourcesDataModel extends PagedListDataModel<PluginConfigurationUpdate> { - public ListResourcesDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<PluginConfigurationUpdate> fetchPage(PageControl pc) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - Resource requestResource = EnterpriseFacesContextUtility.getResourceIfExists(); - ConfigurationManagerLocal manager = LookupUtil.getConfigurationManager(); - - if (requestResource == null) { - requestResource = resource; // request not associated with a resource - use the resource we used before - } else { - resource = requestResource; // request switched the resource this UI bean is using - } - - PageList<PluginConfigurationUpdate> result; - result = manager.findPluginConfigurationUpdates(subject, requestResource.getId(), null, null, pc); - - return result; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasScheduleUIBean.java new file mode 100644 index 0000000..e7b0f7d --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasScheduleUIBean.java @@ -0,0 +1,110 @@ +package org.rhq.enterprise.gui.measurement.schedule.autogroup; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.common.time.DurationComponent; +import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ListAutoGroupMeasScheduleUIBean extends PagedDataTableUIBean { + + public static final String MANAGED_BEAN_NAME = "ListAutoGroupMeasurementScheduleUIBean"; + + private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); + private DurationComponent duration; + + public DurationComponent getDuration() { + return duration; + } + + public void setDuration(DurationComponent duration) { + this.duration = duration; + } + + public String disableSelected() { + int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); + int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); + int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); + try { + measurementScheduleManager.disableSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, + measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); + } + return "success"; + } + + public String enableSelected() { + int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); + int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); + int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); + try { + measurementScheduleManager.enableSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, + measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); + } + return "success"; + } + + public String enableAndSetSelected() { + long collectionInterval = duration.getMillis(); + int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); + int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); + int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); + try { + measurementScheduleManager.updateSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, + measurementDefinitionIds, collectionInterval); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " + + measurementDefinitionIds.length + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, + "Failed to enabled and set selected schedules.", e); + } + return "success"; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListAutoGroupMeasScheduleDataModel(PageControlView.AutoGroupMeasurementScheduleList, + MANAGED_BEAN_NAME); + } + + return dataModel; + } + + private class ListAutoGroupMeasScheduleDataModel extends PagedListDataModel<MeasurementScheduleComposite> { + public ListAutoGroupMeasScheduleDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { + int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); + int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); + return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext + .forAutoGroup(parentResourceId, childResourceType), pc); + } + } + + private int[] getSelectedAutoGroupScheduleList() { + String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues("selectedAutoGroupSchedules"); + return StringUtility.getIntArray(resourceSchedules); + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasurementScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasurementScheduleUIBean.java deleted file mode 100644 index 39004f0..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/autogroup/ListAutoGroupMeasurementScheduleUIBean.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.rhq.enterprise.gui.measurement.schedule.autogroup; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.common.time.DurationComponent; -import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ListAutoGroupMeasurementScheduleUIBean extends PagedDataTableUIBean { - - public static final String MANAGED_BEAN_NAME = "ListAutoGroupMeasurementScheduleUIBean"; - - private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); - private DurationComponent duration; - - public DurationComponent getDuration() { - return duration; - } - - public void setDuration(DurationComponent duration) { - this.duration = duration; - } - - public String disableSelected() { - int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); - int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); - int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); - try { - measurementScheduleManager.disableSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, - measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); - } - return "success"; - } - - public String enableSelected() { - int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); - int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); - int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); - try { - measurementScheduleManager.enableSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, - measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); - } - return "success"; - } - - public String enableAndSetSelected() { - long collectionInterval = duration.getMillis(); - int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); - int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); - int[] measurementDefinitionIds = getSelectedAutoGroupScheduleList(); - try { - measurementScheduleManager.updateSchedulesForAutoGroup(getSubject(), parentResourceId, childResourceType, - measurementDefinitionIds, collectionInterval); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " - + measurementDefinitionIds.length + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, - "Failed to enabled and set selected schedules.", e); - } - return "success"; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListAutoGroupMeasurementScheduleDataModel(PageControlView.AutoGroupMeasurementScheduleList, - MANAGED_BEAN_NAME); - } - - return dataModel; - } - - private class ListAutoGroupMeasurementScheduleDataModel extends PagedListDataModel<MeasurementScheduleComposite> { - public ListAutoGroupMeasurementScheduleDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { - int parentResourceId = FacesContextUtility.getRequiredRequestParameter("parent", Integer.class); - int childResourceType = FacesContextUtility.getRequiredRequestParameter("type", Integer.class); - return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext - .forAutoGroup(parentResourceId, childResourceType), pc); - } - } - - private int[] getSelectedAutoGroupScheduleList() { - String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues("selectedAutoGroupSchedules"); - return StringUtility.getIntArray(resourceSchedules); - } - -} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResGroupMeasScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResGroupMeasScheduleUIBean.java new file mode 100644 index 0000000..7344ca5 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResGroupMeasScheduleUIBean.java @@ -0,0 +1,108 @@ +package org.rhq.enterprise.gui.measurement.schedule.group; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.common.time.DurationComponent; +import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ListResGroupMeasScheduleUIBean extends PagedDataTableUIBean { + + public static final String MANAGED_BEAN_NAME = "ListResGroupMeasScheduleUIBean"; + + private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); + private DurationComponent duration; + + public DurationComponent getDuration() { + return duration; + } + + public void setDuration(DurationComponent duration) { + this.duration = duration; + } + + public String disableSelected() { + int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); + try { + measurementScheduleManager.disableSchedulesForCompatibleGroup(getSubject(), groupId, + measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); + } + return "success"; + } + + public String enableSelected() { + int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); + try { + measurementScheduleManager.enableSchedulesForCompatibleGroup(getSubject(), groupId, + measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); + } + return "success"; + } + + public String enableAndSetSelected() { + long collectionInterval = duration.getMillis(); + int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); + try { + measurementScheduleManager.updateSchedulesForCompatibleGroup(getSubject(), groupId, + measurementDefinitionIds, collectionInterval); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " + + measurementDefinitionIds.length + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, + "Failed to enabled and set selected schedules.", e); + } + return "success"; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListResourceGroupMeasScheduleDataModel( + PageControlView.ResourceGroupMeasurementScheduleList, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + private class ListResourceGroupMeasScheduleDataModel extends + PagedListDataModel<MeasurementScheduleComposite> { + public ListResourceGroupMeasScheduleDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { + int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); + return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext + .forGroup(groupId), pc); + } + } + + private int[] getSelectedResourceGroupScheduleList() { + String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues( + "selectedResourceGroupSchedules"); + return StringUtility.getIntArray(resourceSchedules); + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResourceGroupMeasurementScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResourceGroupMeasurementScheduleUIBean.java deleted file mode 100644 index 3c2cf04..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/group/ListResourceGroupMeasurementScheduleUIBean.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.rhq.enterprise.gui.measurement.schedule.group; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.common.time.DurationComponent; -import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ListResourceGroupMeasurementScheduleUIBean extends PagedDataTableUIBean { - - public static final String MANAGED_BEAN_NAME = "ListResourceGroupMeasurementScheduleUIBean"; - - private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); - private DurationComponent duration; - - public DurationComponent getDuration() { - return duration; - } - - public void setDuration(DurationComponent duration) { - this.duration = duration; - } - - public String disableSelected() { - int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); - try { - measurementScheduleManager.disableSchedulesForCompatibleGroup(getSubject(), groupId, - measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); - } - return "success"; - } - - public String enableSelected() { - int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); - try { - measurementScheduleManager.enableSchedulesForCompatibleGroup(getSubject(), groupId, - measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); - } - return "success"; - } - - public String enableAndSetSelected() { - long collectionInterval = duration.getMillis(); - int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceGroupScheduleList(); - try { - measurementScheduleManager.updateSchedulesForCompatibleGroup(getSubject(), groupId, - measurementDefinitionIds, collectionInterval); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " - + measurementDefinitionIds.length + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, - "Failed to enabled and set selected schedules.", e); - } - return "success"; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListResourceGroupMeasurementScheduleDataModel( - PageControlView.ResourceGroupMeasurementScheduleList, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - private class ListResourceGroupMeasurementScheduleDataModel extends - PagedListDataModel<MeasurementScheduleComposite> { - public ListResourceGroupMeasurementScheduleDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { - int groupId = FacesContextUtility.getRequiredRequestParameter("groupId", Integer.class); - return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext - .forGroup(groupId), pc); - } - } - - private int[] getSelectedResourceGroupScheduleList() { - String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues( - "selectedResourceGroupSchedules"); - return StringUtility.getIntArray(resourceSchedules); - } - -} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasScheduleUIBean.java new file mode 100644 index 0000000..929edfc --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasScheduleUIBean.java @@ -0,0 +1,104 @@ +package org.rhq.enterprise.gui.measurement.schedule.resource; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.common.time.DurationComponent; +import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ListResourceMeasScheduleUIBean extends PagedDataTableUIBean { + + public static final String MANAGED_BEAN_NAME = "ListResourceMeasScheduleUIBean"; + + private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); + private DurationComponent duration; + + public DurationComponent getDuration() { + return duration; + } + + public void setDuration(DurationComponent duration) { + this.duration = duration; + } + + public String disableSelected() { + int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceScheduleList(); + try { + measurementScheduleManager.disableSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); + } + return "success"; + } + + public String enableSelected() { + int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceScheduleList(); + try { + measurementScheduleManager.enableSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length + + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); + } + return "success"; + } + + public String enableAndSetSelected() { + long collectionInterval = duration.getMillis(); + int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); + int[] measurementDefinitionIds = getSelectedResourceScheduleList(); + try { + measurementScheduleManager.updateSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds, + collectionInterval); + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " + + measurementDefinitionIds.length + " schedules."); + } catch (Exception e) { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, + "Failed to enabled and set selected schedules.", e); + } + return "success"; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListResourceMeasurementScheduleDataModel(PageControlView.ResourceMeasurementScheduleList, + MANAGED_BEAN_NAME); + } + + return dataModel; + } + + private class ListResourceMeasurementScheduleDataModel extends PagedListDataModel<MeasurementScheduleComposite> { + public ListResourceMeasurementScheduleDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { + int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); + return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext + .forResource(resourceId), pc); + } + } + + private int[] getSelectedResourceScheduleList() { + String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues("selectedResourceSchedules"); + return StringUtility.getIntArray(resourceSchedules); + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasurementScheduleUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasurementScheduleUIBean.java deleted file mode 100644 index 2dda70b..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/schedule/resource/ListResourceMeasurementScheduleUIBean.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.rhq.enterprise.gui.measurement.schedule.resource; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.common.EntityContext; -import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.common.time.DurationComponent; -import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ListResourceMeasurementScheduleUIBean extends PagedDataTableUIBean { - - public static final String MANAGED_BEAN_NAME = "ListResourceMeasurementScheduleUIBean"; - - private MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager(); - private DurationComponent duration; - - public DurationComponent getDuration() { - return duration; - } - - public void setDuration(DurationComponent duration) { - this.duration = duration; - } - - public String disableSelected() { - int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceScheduleList(); - try { - measurementScheduleManager.disableSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected schedules.", e); - } - return "success"; - } - - public String enableSelected() { - int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceScheduleList(); - try { - measurementScheduleManager.enableSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled " + measurementDefinitionIds.length - + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected schedules.", e); - } - return "success"; - } - - public String enableAndSetSelected() { - long collectionInterval = duration.getMillis(); - int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); - int[] measurementDefinitionIds = getSelectedResourceScheduleList(); - try { - measurementScheduleManager.updateSchedulesForResource(getSubject(), resourceId, measurementDefinitionIds, - collectionInterval); - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enabled and set " - + measurementDefinitionIds.length + " schedules."); - } catch (Exception e) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, - "Failed to enabled and set selected schedules.", e); - } - return "success"; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListResourceMeasurementScheduleDataModel(PageControlView.ResourceMeasurementScheduleList, - MANAGED_BEAN_NAME); - } - - return dataModel; - } - - private class ListResourceMeasurementScheduleDataModel extends PagedListDataModel<MeasurementScheduleComposite> { - public ListResourceMeasurementScheduleDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<MeasurementScheduleComposite> fetchPage(PageControl pc) { - int resourceId = FacesContextUtility.getRequiredRequestParameter("id", Integer.class); - return measurementScheduleManager.getMeasurementScheduleCompositesByContext(getSubject(), EntityContext - .forResource(resourceId), pc); - } - } - - private int[] getSelectedResourceScheduleList() { - String[] resourceSchedules = FacesContextUtility.getRequest().getParameterValues("selectedResourceSchedules"); - return StringUtility.getIntArray(resourceSchedules); - } - -} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java deleted file mode 100644 index 99e4460..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.operation.history.group; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.operation.GroupOperationHistory; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ResourceGroupOperationCompletedHistoryUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ResourceGroupOperationCompletedHistoryUIBean"; - - private ResourceGroup resourceGroup; - private OperationManagerLocal manager = LookupUtil.getOperationManager(); - - public ResourceGroupOperationCompletedHistoryUIBean() { - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupOperationCompletedHistoryDataModel( - PageControlView.ResourceGroupOperationCompletedHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public String delete() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("completedSelectedItems"); - - List<String> success = new ArrayList<String>(); - Map<String, String> failure = new HashMap<String, String>(); - - String next = null; - Integer doomed; - - for (int i = 0; i < selectedItems.length; i++) { - try { - next = selectedItems[i]; - doomed = Integer.valueOf(next); - - manager.deleteOperationHistory(subject, doomed, true); - - success.add(next); - } catch (Exception e) { - failure.put(next, ThrowableUtil.getAllMessages(e, true)); - } - } - - if (success.size() > 0) { - // one success message for all successful deletions - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted operation records: " - + StringUtility.getListAsDelimitedString(success)); - } - - for (Map.Entry<String, String> error : failure.entrySet()) { - // one message per failed deletion (hopefully rare) - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete operation record: " - + error.getKey() + ". Cause: " + error.getValue()); - } - - return "success"; - } - - private class ListGroupOperationCompletedHistoryDataModel extends PagedListDataModel<GroupOperationHistory> { - public ListGroupOperationCompletedHistoryDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<GroupOperationHistory> fetchPage(PageControl pc) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ResourceGroup requestGroup = EnterpriseFacesContextUtility.getResourceGroup(); - OperationManagerLocal manager = LookupUtil.getOperationManager(); - - if (requestGroup == null) { - requestGroup = resourceGroup; // request not associated with a resource - use the resource we used before - } else { - resourceGroup = requestGroup; // request switched the resource this UI bean is using - } - - PageList<GroupOperationHistory> results; - results = manager.findCompletedGroupOperationHistories(subject, resourceGroup.getId(), pc); - return results; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationHistoryDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationHistoryDetailsUIBean.java deleted file mode 100644 index 7e392d1..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationHistoryDetailsUIBean.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.operation.history.group; - -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.operation.GroupOperationHistory; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.operation.model.OperationParameters; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ResourceGroupOperationHistoryDetailsUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ResourceGroupOperationHistoryDetailsUIBean"; - - private GroupOperationHistory history; - private OperationParameters parameters; - - private OperationManagerLocal operationManager = LookupUtil.getOperationManager(); - - private void init() { - if (this.history == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - Integer operationId = FacesContextUtility.getRequiredRequestParameter("opId", Integer.class); - OperationManagerLocal operationManager = LookupUtil.getOperationManager(); - - this.history = (GroupOperationHistory) operationManager - .getOperationHistoryByHistoryId(subject, operationId); - - this.parameters = new OperationParameters(this.history); - } - } - - public GroupOperationHistory getHistory() { - init(); - - return this.history; - } - - public OperationParameters getParameters() { - init(); - - return parameters; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupOperationHistoryDetailsDataModel( - PageControlView.ResourceGroupOperationHistoryDetails, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - private class ListGroupOperationHistoryDetailsDataModel extends PagedListDataModel<ResourceOperationHistory> { - public ListGroupOperationHistoryDetailsDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - GroupOperationHistory groupHistory = getHistory(); - - PageList<ResourceOperationHistory> resourceHistories = null; - resourceHistories = operationManager.findResourceOperationHistoriesByGroupHistoryId(subject, groupHistory - .getId(), pc); - - return resourceHistories; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java deleted file mode 100644 index 8f418c4..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.operation.history.group; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.operation.GroupOperationHistory; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ResourceGroupOperationPendingHistoryUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ResourceGroupOperationPendingHistoryUIBean"; - - private ResourceGroup resourceGroup; - private OperationManagerLocal manager = LookupUtil.getOperationManager(); - - /* - * the schedule page (in 1.x known at the current subtab) always showed the status of the currently running - * operation; and since we can have many operations INPROGRESS, the one that's currently being executed on the - * resource must be the first one scheduled (the oldest) of them - */ - private ResourceOperationHistory oldestInProgressResourceOperation = null; - - public ResourceGroupOperationPendingHistoryUIBean() { - } - - public ResourceOperationHistory getOldestInProgressResourceOperation() { - if (oldestInProgressResourceOperation == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - Resource resource = EnterpriseFacesContextUtility.getResource(); - - oldestInProgressResourceOperation = manager.getOldestInProgressResourceOperation(subject, resource.getId()); - } - - return oldestInProgressResourceOperation; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListGroupOperationPendingHistoryDataModel( - PageControlView.ResourceGroupOperationPendingHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public String cancel() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("pendingSelectedItems"); - - List<String> success = new ArrayList<String>(); - Map<String, String> failure = new HashMap<String, String>(); - - String next = null; - Integer doomed = null; - - for (int i = 0; i < selectedItems.length; i++) { - try { - next = selectedItems[i]; - doomed = Integer.valueOf(next); - - manager.cancelOperationHistory(subject, doomed, false); - - success.add(next); - } catch (Exception e) { - failure.put(next, ThrowableUtil.getAllMessages(e, true)); - } - } - - if (success.size() > 0) { - // one success message for all successful cancel request - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, - "Sent cancel request to the follow in-progress operations: " - + StringUtility.getListAsDelimitedString(success)); - } - - for (Map.Entry<String, String> error : failure.entrySet()) { - // one message per failure (hopefully rare) - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to send the cancel request to: " - + error.getKey() + ". Cause: " + error.getValue()); - } - - return "success"; - } - - private class ListGroupOperationPendingHistoryDataModel extends PagedListDataModel<GroupOperationHistory> { - public ListGroupOperationPendingHistoryDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<GroupOperationHistory> fetchPage(PageControl pc) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - ResourceGroup requestGroup = EnterpriseFacesContextUtility.getResourceGroup(); - OperationManagerLocal manager = LookupUtil.getOperationManager(); - - if (requestGroup == null) { - requestGroup = resourceGroup; // request not associated with a resource - use the resource we used before - } else { - resourceGroup = requestGroup; // request switched the resource this UI bean is using - } - - PageList<GroupOperationHistory> results; - results = manager.findPendingGroupOperationHistories(subject, requestGroup.getId(), pc); - return results; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsCompletedHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsCompletedHistoryUIBean.java new file mode 100644 index 0000000..673246f --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsCompletedHistoryUIBean.java @@ -0,0 +1,123 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.operation.history.group; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ResourceGroupOpsCompletedHistoryUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ResourceGroupOpsCompletedHistoryUIBean"; + + private ResourceGroup resourceGroup; + private OperationManagerLocal manager = LookupUtil.getOperationManager(); + + public ResourceGroupOpsCompletedHistoryUIBean() { + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupOpsCompletedHistoryDataModel( + PageControlView.ResourceGroupOperationCompletedHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public String delete() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("completedSelectedItems"); + + List<String> success = new ArrayList<String>(); + Map<String, String> failure = new HashMap<String, String>(); + + String next = null; + Integer doomed; + + for (int i = 0; i < selectedItems.length; i++) { + try { + next = selectedItems[i]; + doomed = Integer.valueOf(next); + + manager.deleteOperationHistory(subject, doomed, true); + + success.add(next); + } catch (Exception e) { + failure.put(next, ThrowableUtil.getAllMessages(e, true)); + } + } + + if (success.size() > 0) { + // one success message for all successful deletions + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted operation records: " + + StringUtility.getListAsDelimitedString(success)); + } + + for (Map.Entry<String, String> error : failure.entrySet()) { + // one message per failed deletion (hopefully rare) + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete operation record: " + + error.getKey() + ". Cause: " + error.getValue()); + } + + return "success"; + } + + private class ListGroupOpsCompletedHistoryDataModel extends PagedListDataModel<GroupOperationHistory> { + public ListGroupOpsCompletedHistoryDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<GroupOperationHistory> fetchPage(PageControl pc) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ResourceGroup requestGroup = EnterpriseFacesContextUtility.getResourceGroup(); + OperationManagerLocal manager = LookupUtil.getOperationManager(); + + if (requestGroup == null) { + requestGroup = resourceGroup; // request not associated with a resource - use the resource we used before + } else { + resourceGroup = requestGroup; // request switched the resource this UI bean is using + } + + PageList<GroupOperationHistory> results; + results = manager.findCompletedGroupOperationHistories(subject, resourceGroup.getId(), pc); + return results; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsHistoryDetailsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsHistoryDetailsUIBean.java new file mode 100644 index 0000000..b546c56 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsHistoryDetailsUIBean.java @@ -0,0 +1,97 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.operation.history.group; + +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.operation.model.OperationParameters; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ResourceGroupOpsHistoryDetailsUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ResourceGroupOpsHistoryDetailsUIBean"; + + private GroupOperationHistory history; + private OperationParameters parameters; + + private OperationManagerLocal operationManager = LookupUtil.getOperationManager(); + + private void init() { + if (this.history == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + Integer operationId = FacesContextUtility.getRequiredRequestParameter("opId", Integer.class); + OperationManagerLocal operationManager = LookupUtil.getOperationManager(); + + this.history = (GroupOperationHistory) operationManager + .getOperationHistoryByHistoryId(subject, operationId); + + this.parameters = new OperationParameters(this.history); + } + } + + public GroupOperationHistory getHistory() { + init(); + + return this.history; + } + + public OperationParameters getParameters() { + init(); + + return parameters; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupOperationHistoryDetailsDataModel( + PageControlView.ResourceGroupOperationHistoryDetails, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + private class ListGroupOperationHistoryDetailsDataModel extends PagedListDataModel<ResourceOperationHistory> { + public ListGroupOperationHistoryDetailsDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + GroupOperationHistory groupHistory = getHistory(); + + PageList<ResourceOperationHistory> resourceHistories = null; + resourceHistories = operationManager.findResourceOperationHistoriesByGroupHistoryId(subject, groupHistory + .getId(), pc); + + return resourceHistories; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsPendingHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsPendingHistoryUIBean.java new file mode 100644 index 0000000..26d4b44 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOpsPendingHistoryUIBean.java @@ -0,0 +1,144 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.operation.history.group; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ResourceGroupOpsPendingHistoryUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ResourceGroupOpsPendingHistoryUIBean"; + + private ResourceGroup resourceGroup; + private OperationManagerLocal manager = LookupUtil.getOperationManager(); + + /* + * the schedule page (in 1.x known at the current subtab) always showed the status of the currently running + * operation; and since we can have many operations INPROGRESS, the one that's currently being executed on the + * resource must be the first one scheduled (the oldest) of them + */ + private ResourceOperationHistory oldestInProgressResourceOperation = null; + + public ResourceGroupOpsPendingHistoryUIBean() { + } + + public ResourceOperationHistory getOldestInProgressResourceOperation() { + if (oldestInProgressResourceOperation == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + Resource resource = EnterpriseFacesContextUtility.getResource(); + + oldestInProgressResourceOperation = manager.getOldestInProgressResourceOperation(subject, resource.getId()); + } + + return oldestInProgressResourceOperation; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListGroupOperationPendingHistoryDataModel( + PageControlView.ResourceGroupOperationPendingHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public String cancel() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("pendingSelectedItems"); + + List<String> success = new ArrayList<String>(); + Map<String, String> failure = new HashMap<String, String>(); + + String next = null; + Integer doomed = null; + + for (int i = 0; i < selectedItems.length; i++) { + try { + next = selectedItems[i]; + doomed = Integer.valueOf(next); + + manager.cancelOperationHistory(subject, doomed, false); + + success.add(next); + } catch (Exception e) { + failure.put(next, ThrowableUtil.getAllMessages(e, true)); + } + } + + if (success.size() > 0) { + // one success message for all successful cancel request + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, + "Sent cancel request to the follow in-progress operations: " + + StringUtility.getListAsDelimitedString(success)); + } + + for (Map.Entry<String, String> error : failure.entrySet()) { + // one message per failure (hopefully rare) + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to send the cancel request to: " + + error.getKey() + ". Cause: " + error.getValue()); + } + + return "success"; + } + + private class ListGroupOperationPendingHistoryDataModel extends PagedListDataModel<GroupOperationHistory> { + public ListGroupOperationPendingHistoryDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<GroupOperationHistory> fetchPage(PageControl pc) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + ResourceGroup requestGroup = EnterpriseFacesContextUtility.getResourceGroup(); + OperationManagerLocal manager = LookupUtil.getOperationManager(); + + if (requestGroup == null) { + requestGroup = resourceGroup; // request not associated with a resource - use the resource we used before + } else { + resourceGroup = requestGroup; // request switched the resource this UI bean is using + } + + PageList<GroupOperationHistory> results; + results = manager.findPendingGroupOperationHistories(subject, requestGroup.getId(), pc); + return results; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationCompletedHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationCompletedHistoryUIBean.java deleted file mode 100644 index d3febcb..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationCompletedHistoryUIBean.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.operation.history.resource; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ResourceOperationCompletedHistoryUIBean extends PagedDataTableUIBean { - - private final Log log = LogFactory.getLog(ResourceOperationCompletedHistoryUIBean.class); - - public static final String MANAGED_BEAN_NAME = "ResourceOperationCompletedHistoryUIBean"; - - private OperationManagerLocal manager = LookupUtil.getOperationManager(); - - private ResourceOperationHistory latestCompletedResourceOperation = null; - - public ResourceOperationCompletedHistoryUIBean() { - } - - public ResourceOperationHistory getLatestCompletedResourceOperation() { - if (latestCompletedResourceOperation == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - Resource resource = EnterpriseFacesContextUtility.getResource(); - OperationManagerLocal manager = LookupUtil.getOperationManager(); - - latestCompletedResourceOperation = manager.getLatestCompletedResourceOperation(subject, resource.getId()); - } - - return latestCompletedResourceOperation; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListResourceOperationCompletedHistoryDataModel( - PageControlView.ResourceOperationCompletedHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public String delete() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("completedSelectedItems"); - - List<String> success = new ArrayList<String>(); - Map<String, String> failure = new HashMap<String, String>(); - - String next = null; - Integer doomed; - - long start = System.currentTimeMillis(); - for (int i = 0; i < selectedItems.length; i++) { - try { - next = selectedItems[i]; - doomed = Integer.valueOf(next); - - manager.deleteOperationHistory(subject, doomed, true); - - success.add(next); - } catch (Exception e) { - failure.put(next, ThrowableUtil.getAllMessages(e, true)); - } - } - long end = System.currentTimeMillis(); - log.debug("Performance: took [" + (end - start) + "]ms to delete " + selectedItems.length - + " Resource OperationHistory elements"); - - if (success.size() > 0) { - // one success message for all successful deletions - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted resource operation records: " - + StringUtility.getListAsDelimitedString(success)); - } - - for (Map.Entry<String, String> error : failure.entrySet()) { - // one message per failed deletion (hopefully rare) - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete resource operation record " - + error.getKey() + ". Cause: " + error.getValue()); - } - - return "success"; - } - - private class ListResourceOperationCompletedHistoryDataModel extends PagedListDataModel<ResourceOperationHistory> { - public ListResourceOperationCompletedHistoryDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { - OperationManagerLocal manager = LookupUtil.getOperationManager(); - - PageList<ResourceOperationHistory> results; - results = manager.findCompletedResourceOperationHistories(getSubject(), getResource().getId(), null, null, - pc); - return results; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationPendingHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationPendingHistoryUIBean.java deleted file mode 100644 index aeffddf..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOperationPendingHistoryUIBean.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.operation.history.resource; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.application.FacesMessage; -import javax.faces.model.DataModel; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.util.StringUtility; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; -import org.rhq.enterprise.gui.common.paging.PageControlView; -import org.rhq.enterprise.gui.common.paging.PagedListDataModel; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ResourceOperationPendingHistoryUIBean extends PagedDataTableUIBean { - public static final String MANAGED_BEAN_NAME = "ResourceOperationPendingHistoryUIBean"; - - private OperationManagerLocal manager = LookupUtil.getOperationManager(); - - /* - * the schedule page (in 1.x known at the current subtab) always showed the status of the currently running - * operation; and since we can have many operations INPROGRESS, the one that's currently being executed on the - * resource must be the first one scheduled (the oldest) of them - */ - private ResourceOperationHistory oldestInProgressResourceOperation = null; - - public ResourceOperationPendingHistoryUIBean() { - } - - public ResourceOperationHistory getOldestInProgressResourceOperation() { - if (oldestInProgressResourceOperation == null) { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - Resource resource = EnterpriseFacesContextUtility.getResource(); - - oldestInProgressResourceOperation = manager.getOldestInProgressResourceOperation(subject, resource.getId()); - } - - return oldestInProgressResourceOperation; - } - - @Override - public DataModel getDataModel() { - if (dataModel == null) { - dataModel = new ListResourceOperationPendingHistoryDataModel( - PageControlView.ResourceOperationPendingHistory, MANAGED_BEAN_NAME); - } - - return dataModel; - } - - public String cancel() { - Subject subject = EnterpriseFacesContextUtility.getSubject(); - String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("pendingSelectedItems"); - - List<String> success = new ArrayList<String>(); - Map<String, String> failure = new HashMap<String, String>(); - - String next = null; - Integer doomed = null; - - for (int i = 0; i < selectedItems.length; i++) { - try { - next = selectedItems[i]; - doomed = Integer.valueOf(next); - - manager.cancelOperationHistory(subject, doomed, false); - - success.add(next); - } catch (Exception e) { - failure.put(next, ThrowableUtil.getAllMessages(e, true)); - } - } - - if (success.size() > 0) { - // one success message for all successful cancel request - FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, - "Sent cancel request to the follow in-progress operations: " - + StringUtility.getListAsDelimitedString(success)); - } - - for (Map.Entry<String, String> error : failure.entrySet()) { - // one message per failure (hopefully rare) - FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to send the cancel request to: " - + error.getKey() + ". Cause: " + error.getValue()); - } - - return "success"; - } - - private class ListResourceOperationPendingHistoryDataModel extends PagedListDataModel<ResourceOperationHistory> { - public ListResourceOperationPendingHistoryDataModel(PageControlView view, String beanName) { - super(view, beanName); - } - - @Override - public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { - OperationManagerLocal manager = LookupUtil.getOperationManager(); - - PageList<ResourceOperationHistory> results; - results = manager.findPendingResourceOperationHistories(getSubject(), getResource().getId(), pc); - return results; - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsCompletedHistUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsCompletedHistUIBean.java new file mode 100644 index 0000000..4746b71 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsCompletedHistUIBean.java @@ -0,0 +1,139 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.operation.history.resource; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ResourceOpsCompletedHistUIBean extends PagedDataTableUIBean { + + private final Log log = LogFactory.getLog(ResourceOpsCompletedHistUIBean.class); + + public static final String MANAGED_BEAN_NAME = "ResourceOpsCompletedHistUIBean"; + + private OperationManagerLocal manager = LookupUtil.getOperationManager(); + + private ResourceOperationHistory latestCompletedResourceOperation = null; + + public ResourceOpsCompletedHistUIBean() { + } + + public ResourceOperationHistory getLatestCompletedResourceOperation() { + if (latestCompletedResourceOperation == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + Resource resource = EnterpriseFacesContextUtility.getResource(); + OperationManagerLocal manager = LookupUtil.getOperationManager(); + + latestCompletedResourceOperation = manager.getLatestCompletedResourceOperation(subject, resource.getId()); + } + + return latestCompletedResourceOperation; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListResourceOpsCompletedHistoryDataModel( + PageControlView.ResourceOperationCompletedHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public String delete() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("completedSelectedItems"); + + List<String> success = new ArrayList<String>(); + Map<String, String> failure = new HashMap<String, String>(); + + String next = null; + Integer doomed; + + long start = System.currentTimeMillis(); + for (int i = 0; i < selectedItems.length; i++) { + try { + next = selectedItems[i]; + doomed = Integer.valueOf(next); + + manager.deleteOperationHistory(subject, doomed, true); + + success.add(next); + } catch (Exception e) { + failure.put(next, ThrowableUtil.getAllMessages(e, true)); + } + } + long end = System.currentTimeMillis(); + log.debug("Performance: took [" + (end - start) + "]ms to delete " + selectedItems.length + + " Resource OperationHistory elements"); + + if (success.size() > 0) { + // one success message for all successful deletions + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Deleted resource operation records: " + + StringUtility.getListAsDelimitedString(success)); + } + + for (Map.Entry<String, String> error : failure.entrySet()) { + // one message per failed deletion (hopefully rare) + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to delete resource operation record " + + error.getKey() + ". Cause: " + error.getValue()); + } + + return "success"; + } + + private class ListResourceOpsCompletedHistoryDataModel extends PagedListDataModel<ResourceOperationHistory> { + public ListResourceOpsCompletedHistoryDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { + OperationManagerLocal manager = LookupUtil.getOperationManager(); + + PageList<ResourceOperationHistory> results; + results = manager.findCompletedResourceOperationHistories(getSubject(), getResource().getId(), null, null, + pc); + return results; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsPendingHistUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsPendingHistUIBean.java new file mode 100644 index 0000000..bcd7e41 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/resource/ResourceOpsPendingHistUIBean.java @@ -0,0 +1,133 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.operation.history.resource; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; +import org.rhq.enterprise.gui.common.paging.PageControlView; +import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +public class ResourceOpsPendingHistUIBean extends PagedDataTableUIBean { + public static final String MANAGED_BEAN_NAME = "ResourceOpsPendingHistUIBean"; + + private OperationManagerLocal manager = LookupUtil.getOperationManager(); + + /* + * the schedule page (in 1.x known at the current subtab) always showed the status of the currently running + * operation; and since we can have many operations INPROGRESS, the one that's currently being executed on the + * resource must be the first one scheduled (the oldest) of them + */ + private ResourceOperationHistory oldestInProgressResourceOperation = null; + + public ResourceOpsPendingHistUIBean() { + } + + public ResourceOperationHistory getOldestInProgressResourceOperation() { + if (oldestInProgressResourceOperation == null) { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + Resource resource = EnterpriseFacesContextUtility.getResource(); + + oldestInProgressResourceOperation = manager.getOldestInProgressResourceOperation(subject, resource.getId()); + } + + return oldestInProgressResourceOperation; + } + + @Override + public DataModel getDataModel() { + if (dataModel == null) { + dataModel = new ListResourceOperationPendingHistoryDataModel( + PageControlView.ResourceOperationPendingHistory, MANAGED_BEAN_NAME); + } + + return dataModel; + } + + public String cancel() { + Subject subject = EnterpriseFacesContextUtility.getSubject(); + String[] selectedItems = FacesContextUtility.getRequest().getParameterValues("pendingSelectedItems"); + + List<String> success = new ArrayList<String>(); + Map<String, String> failure = new HashMap<String, String>(); + + String next = null; + Integer doomed = null; + + for (int i = 0; i < selectedItems.length; i++) { + try { + next = selectedItems[i]; + doomed = Integer.valueOf(next); + + manager.cancelOperationHistory(subject, doomed, false); + + success.add(next); + } catch (Exception e) { + failure.put(next, ThrowableUtil.getAllMessages(e, true)); + } + } + + if (success.size() > 0) { + // one success message for all successful cancel request + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, + "Sent cancel request to the follow in-progress operations: " + + StringUtility.getListAsDelimitedString(success)); + } + + for (Map.Entry<String, String> error : failure.entrySet()) { + // one message per failure (hopefully rare) + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to send the cancel request to: " + + error.getKey() + ". Cause: " + error.getValue()); + } + + return "success"; + } + + private class ListResourceOperationPendingHistoryDataModel extends PagedListDataModel<ResourceOperationHistory> { + public ListResourceOperationPendingHistoryDataModel(PageControlView view, String beanName) { + super(view, beanName); + } + + @Override + public PageList<ResourceOperationHistory> fetchPage(PageControl pc) { + OperationManagerLocal manager = LookupUtil.getOperationManager(); + + PageList<ResourceOperationHistory> results; + results = manager.findPendingResourceOperationHistories(getSubject(), getResource().getId(), pc); + return results; + } + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/measurement-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/measurement-beans.xml index 82b2d51..c6c6821 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/measurement-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/measurement-beans.xml @@ -3,12 +3,12 @@ <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - +  <managed-bean> <managed-bean-name>ListAutoGroupMeasurementScheduleUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.autogroup.ListAutoGroupMeasurementScheduleUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.autogroup.ListAutoGroupMeasScheduleUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + </faces-config> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/configuration-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/configuration-beans.xml index 327d6bc..2401ecd 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/configuration-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/configuration-beans.xml @@ -8,15 +8,14 @@ <managed-bean> <managed-bean-name>GroupResourceConfigurationHistoryUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.configuration.group.GroupResourceConfigurationHistoryUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.configuration.group.GroupResourceConfigHistoryUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + <managed-bean> <managed-bean-name>GroupResourceConfigurationHistoryDetailsUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.configuration.group.GroupResourceConfigurationHistoryDetailsUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.configuration.group.GroupResConfigHistoryDetailsUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> -</faces-config> - \ No newline at end of file +</faces-config> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml index ae8c5c9..6e0a0dc 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml @@ -13,7 +13,7 @@ </managed-bean>  - + <managed-bean> <managed-bean-name>ListResourceGroupMembersUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.inventory.group.ListResourceGroupMembersUIBean</managed-bean-class> @@ -28,28 +28,27 @@ <managed-bean> <managed-bean-name>ViewGroupConnectionPropertyHistoryUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropertyHistoryUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropsHistUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>ViewGroupConnectionPropertyDetailsUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropertyDetailsUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.inventory.group.ViewGroupConnectionPropDetailsUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + <managed-bean> <managed-bean-name>DeleteResourcesFromGroupUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.inventory.group.DeleteResourcesFromGroupUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> -  +  <managed-bean> <managed-bean-name>EditGroupGeneralPropertiesUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.inventory.group.EditGroupGeneralPropertiesUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> -</faces-config> - \ No newline at end of file +</faces-config> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/measurement-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/measurement-beans.xml index 0e73c80..2d271cd 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/measurement-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/measurement-beans.xml @@ -3,14 +3,14 @@ <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - +  <managed-bean> <managed-bean-name>ListResourceGroupMeasurementScheduleUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.group.ListResourceGroupMeasurementScheduleUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.group.ListResGroupMeasScheduleUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> @@ -18,11 +18,11 @@ <managed-bean-class>org.rhq.enterprise.gui.measurement.tables.group.ResourceGroupMetricsTableUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + <managed-bean> <managed-bean-name>ResourceGroupMetricsCompareUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.measurement.tables.group.ResourceGroupMetricsCompareUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + </faces-config> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml index c0bc22d..4bf4b82 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml @@ -21,7 +21,7 @@ <managed-bean-class>org.rhq.enterprise.gui.operation.definition.group.ResourceGroupExecutionTypeUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> <managed-bean-name>ResourceGroupOperationScheduleDetailsUIBean</managed-bean-name> @@ -35,21 +35,21 @@ <managed-bean> <managed-bean-name>ResourceGroupOperationCompletedHistoryUIBean</managed-bean-name> <managed-bean-class> - org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationCompletedHistoryUIBean + org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsCompletedHistoryUIBean </managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>ResourceGroupOperationPendingHistoryUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationPendingHistoryUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsPendingHistoryUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> <managed-bean-name>ResourceGroupOperationHistoryDetailsUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.operation.history.group.ResourceGroupOperationHistoryDetailsUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.operation.history.group.ResourceGroupOpsHistoryDetailsUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + </faces-config> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml index f4b8995..c9c7893 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml @@ -150,7 +150,7 @@  <managed-bean> <managed-bean-name>ListPluginConfigurationUpdateUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.inventory.resource.history.ListPluginConfigurationUpdateUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.inventory.resource.history.ListPluginConfigUpdateUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> <managed-bean> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml index b4eef7c..a92f34c 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml @@ -3,7 +3,7 @@ <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - +  <managed-bean> <managed-bean-name>ListOfTraits</managed-bean-name> @@ -14,10 +14,10 @@  <managed-bean> <managed-bean-name>ListResourceMeasurementScheduleUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.resource.ListResourceMeasurementScheduleUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.measurement.schedule.resource.ListResourceMeasScheduleUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> <managed-bean-name>ResourceMetricsTableUIBean</managed-bean-name> @@ -34,5 +34,5 @@ </managed-bean> - + </faces-config> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml index ef4b54f..1cbe9ac 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml @@ -23,7 +23,7 @@ <managed-bean-class>org.rhq.enterprise.gui.operation.schedule.resource.ResourceOperationScheduleUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> <managed-bean-name>ResourceOperationScheduleDetailsUIBean</managed-bean-name> @@ -34,20 +34,20 @@  <managed-bean> <managed-bean-name>ResourceOperationCompletedHistoryUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOperationCompletedHistoryUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOpsCompletedHistUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>ResourceOperationPendingHistoryUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOperationPendingHistoryUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOpsPendingHistUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - +  <managed-bean> <managed-bean-name>ResourceOperationHistoryDetailsUIBean</managed-bean-name> - <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOperationHistoryDetailsUIBean</managed-bean-class> + <managed-bean-class>org.rhq.enterprise.gui.operation.history.resource.ResourceOpsHistoryDetailsUIBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + </faces-config> \ No newline at end of file

10 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits September 2013