rhq-commits January 2013

rhq-commits@lists.fedorahosted.org

12 participants
269 discussions

[rhq] Branch 'bug/902406' - modules/common modules/enterprise
by mazz 21 Jan '13

21 Jan '13

modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/TransactionsJBossASClient.java | 52 ++++++++++ modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 3 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 15 ++ 3 files changed, 69 insertions(+), 1 deletion(-) New commits: commit 620c5ed4354d05eae835915de866372681c23059 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jan 21 13:35:35 2013 -0500 we want to bump up the default tx timeout to 10 minutes since that is what we used in older versions of RHQ (the out of box AS7 default is 5) diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/TransactionsJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/TransactionsJBossASClient.java new file mode 100644 index 0000000..11fa5f4 --- /dev/null +++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/TransactionsJBossASClient.java @@ -0,0 +1,52 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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.common.jbossas.client.controller; + +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.dmr.ModelNode; + +/** + * Provides management of the transactions subsystem. + * + * @author John Mazzitelli + */ +public class TransactionsJBossASClient extends JBossASClient { + + public static final String TRANSACTIONS = "transactions"; + + public TransactionsJBossASClient(ModelControllerClient client) { + super(client); + } + + /** + * Sets the default transaction timeout. + * @param timeoutSecs the new default transaction timeout, in seconds. + * @throws Exception + */ + public void setDefaultTransactionTimeout(int timeoutSecs) throws Exception { + final Address address = Address.root().add(SUBSYSTEM, TRANSACTIONS); + final ModelNode req = createWriteAttributeRequest("default-timeout", String.valueOf(timeoutSecs), address); + final ModelNode response = execute(req); + + if (!isSuccess(response)) { + throw new FailureException(response); + } + return; + } +} 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 de729cf..b4a73d9 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 @@ -248,6 +248,9 @@ public class InstallerServiceImpl implements InstallerService { // Make sure our deployment scanner is configured as we need it ServerInstallUtil.configureDeploymentScanner(mcc); + // Set up the transaction manager. + ServerInstallUtil.configureTransactionManager(mcc); + // create a keystore whose cert has a CN of this server's public endpoint address File keystoreFile = ServerInstallUtil.createKeystore(serverDetails, appServerConfigDir); 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 f7bd3c0..8349336 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 @@ -55,6 +55,7 @@ import org.rhq.common.jbossas.client.controller.JBossASClient; import org.rhq.common.jbossas.client.controller.MessagingJBossASClient; import org.rhq.common.jbossas.client.controller.SecurityDomainJBossASClient; import org.rhq.common.jbossas.client.controller.SocketBindingJBossASClient; +import org.rhq.common.jbossas.client.controller.TransactionsJBossASClient; import org.rhq.common.jbossas.client.controller.WebJBossASClient; import org.rhq.common.jbossas.client.controller.WebJBossASClient.ConnectorConfiguration; import org.rhq.common.jbossas.client.controller.WebJBossASClient.SSLConfiguration; @@ -146,7 +147,19 @@ public class ServerInstallUtil { private static final String RHQ_MGMT_USER = "rhqadmin"; /** - * Configure the deployment scanner to get ready to deploy the application. + * Configure the transaction manager. + * @param mcc JBossAS management client + * @throws Exception + */ + public static void configureTransactionManager(ModelControllerClient mcc) throws Exception { + TransactionsJBossASClient client = new TransactionsJBossASClient(mcc); + + // we want to bump up the transaction timeout + client.setDefaultTransactionTimeout(600); + } + + /** + * Configure the deployment scanner. * @param mcc JBossAS management client * @throws Exception */

1 0

[rhq] Branch 'mtho11/d3-charts2' - modules/enterprise
by mike thompson 21 Jan '13

21 Jan '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 143 ++++++---- 2 files changed, 90 insertions(+), 57 deletions(-) New commits: commit 03754024b3b00531c6c8f307bea2d6335b3c6d34 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jan 21 07:23:30 2013 -0800 Charting Performance enhancements add countdown latch to D3GraphListView. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java index d079022..6f61bdf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java @@ -37,8 +37,8 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; /** * The data portion of the graphs making these methods accessible via JSNI to * classes extending this and implementing graphs. - * Provide i18n labels and format the json data for the graph taking things into - * consideration such as + * Provide i18n labels and format the json data for the graph. + * * @author Mike Thompson */ public class MetricGraphData implements JsonMetricProducer { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 476b627..1fea016 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.Label; @@ -49,6 +50,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGr import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; /** @@ -65,6 +68,8 @@ public class D3GraphListView extends LocatableVLayout { private Label loadingLabel = new Label(MSG.common_msg_loading()); private UserPreferencesMeasurementRangeEditor measurementRangeEditor; private boolean useSummaryData = false; + private PageList<Availability> downAvailList; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; public static D3GraphListView createMultipleGraphs(String locatorId, Resource resource, Set<Integer> definitionIds) { @@ -108,8 +113,6 @@ public class D3GraphListView extends LocatableVLayout { @Override protected void onDraw() { super.onDraw(); - //Log.debug(" *** Invoking onDraw()"); - destroyMembers(); addMember(measurementRangeEditor); @@ -166,6 +169,36 @@ public class D3GraphListView extends LocatableVLayout { measDefIdArray[i] = measurementDefinitions.get(i).getId(); } + // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) + // we know there are exactly 2 resources + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + @Override + /** + * Satisfied only after ALL of the metric queries AND availability have completed + */ + public void execute() { + Log.debug("Total Time for async metrics/avail query: " + (System.currentTimeMillis() - startTimer)); + if (metricsDataList.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + if (useSummaryData) { + buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, + measurementDefinitions); + } else { + determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); + } + } + } + }); + + queryMetricData(measDefIdArray,countDownLatch); + queryAvailability(resource, countDownLatch); + // now the countDown latch will run sometime asynchronously + + } + + private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, startTime, endTime, 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { @@ -174,24 +207,52 @@ public class D3GraphListView extends LocatableVLayout { CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + countDownLatch.countDown(); } @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { - Log.debug("Metric graph data queried in: "+ (System.currentTimeMillis() - startTimer +" ms.")); - if (result.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - if (useSummaryData) { - buildSummaryGraphs(result, summaryMeasurementDefinitions, measurementDefinitions); - } else { - determineGraphsToBuild(result, measurementDefinitions, definitionIds); + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { + metricsDataList = metrics; + Log.debug("Metric graph data queried in: " + (System.currentTimeMillis() - startTimer + " ms.")); + countDownLatch.countDown(); + + } + }); + } + + private void queryAvailability(final Resource resource, final CountDownLatch countDownLatch) { + + final long startTime = System.currentTimeMillis(); + + // now return the availability + AvailabilityCriteria c = new AvailabilityCriteria(); + c.addFilterResourceId(resource.getId()); + c.addFilterInitialAvailability(false); + c.addSortStartTime(PageOrdering.ASC); + GWTServiceLookup.getAvailabilityService().findAvailabilityByCriteria(c, + new AsyncCallback<PageList<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_resource_monitor_availability_loadFailed(), caught); + countDownLatch.countDown(); + } + + @Override + public void onSuccess(PageList<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + + (System.currentTimeMillis() - startTime) + " ms."); + downAvailList = new PageList<Availability>(); + for (Availability availability : availList) { + if (availability.getAvailabilityType().equals(AvailabilityType.DOWN) + || availability.getAvailabilityType().equals(AvailabilityType.DISABLED)) { + downAvailList.add(availability); } } + Log.debug("Down avail list: "+downAvailList.size()); + countDownLatch.countDown(); } }); - } /** @@ -212,7 +273,7 @@ public class D3GraphListView extends LocatableVLayout { int i = 0; for (MeasurementDefinition measurementDefinition : measurementDefinitions) { if (summaryIds.contains(measurementDefinition.getId())) { - buildIndividualGraph(measurementDefinition, measurementData.get(i), 130); + buildSingleGraph(downAvailList, measurementDefinition, measurementData.get(i), 130); } i++; } @@ -231,11 +292,11 @@ public class D3GraphListView extends LocatableVLayout { if (null != selectedDefinitionId) { // single graph case if (measurementId == selectedDefinitionId) { - buildIndividualGraph(measurementDefinition, measurement, 360); + buildSingleGraph(downAvailList, measurementDefinition, measurement, 360); } } else { // multiple graph case - buildIndividualGraph(measurementDefinition, measurement, 330); + buildSingleGraph(downAvailList, measurementDefinition, measurement, 330); } } i++; @@ -245,49 +306,21 @@ public class D3GraphListView extends LocatableVLayout { } - private void buildIndividualGraph(final MeasurementDefinition measurementDefinition, - final List<MeasurementDataNumericHighLowComposite> data, final int height) { - final long startTime = System.currentTimeMillis(); - - // augment our data with availability data - AvailabilityCriteria c = new AvailabilityCriteria(); - c.addFilterResourceId(resource.getId()); - c.addFilterInitialAvailability(false); - c.addSortStartTime(PageOrdering.ASC); - GWTServiceLookup.getAvailabilityService().findAvailabilityByCriteria(c, - new AsyncCallback<PageList<Availability>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); - } - - @Override - public void onSuccess(PageList<Availability> availList) { - PageList<Availability> downAvailList = new PageList<Availability>(); - for (Availability availability : availList) { - if (availability.getAvailabilityType().equals(AvailabilityType.DOWN) - || availability.getAvailabilityType().equals(AvailabilityType.DISABLED)) { - downAvailList.add(availability); - } - } - Log.debug("Down availList: " + downAvailList.size() + " for Resource: " + - resource.getId() +" in: "+(System.currentTimeMillis() - startTime)+ " ms.\n\n"); - MetricGraphData metricGraphData = new MetricGraphData(resource.getId(),resource.getName(),measurementDefinition,data); - MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData); - graph.setAvailabilityDownList(downAvailList); + private void buildSingleGraph(PageList<Availability> downAvailList, MeasurementDefinition measurementDefinition, + List<MeasurementDataNumericHighLowComposite> data, int height) { + MetricGraphData metricGraphData = new MetricGraphData(resource.getId(), resource.getName(), + measurementDefinition, data); + MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData); + graph.setAvailabilityDownList(downAvailList); - ResourceMetricD3GraphView graphView = new ResourceMetricD3GraphView( - extendLocatorId(measurementDefinition.getName()), metricGraphData, graph); + ResourceMetricD3GraphView graphView = new ResourceMetricD3GraphView( + extendLocatorId(measurementDefinition.getName()), metricGraphData, graph); - graphView.setWidth("95%"); - graphView.setHeight(height); - - addMember(graphView); - - } - }); + graphView.setWidth("95%"); + graphView.setHeight(height); + addMember(graphView); } }

1 0

[rhq] Changes to 'bug/902406'
by mazz 21 Jan '13

21 Jan '13

New branch 'bug/902406' available with the following commits:

1 0

[rhq] Changes to 'bug/885664'
by Thomas Segismont 21 Jan '13

21 Jan '13

New branch 'bug/885664' available with the following commits: commit 93badb1eecc93dc2d8ff183fc5f90d49b0aee114 Author: Thomas SEGISMONT <tsegismo(a)redhat.com> Date: Mon Dec 10 21:53:49 2012 +0100 Bug 885664 OpenSSHD and MySQL availability check may report stale data Refactoring of ProcessInfo The class has now a subtype which groups non static data and operations on this data. The purpose is to make clear for users of the class that it caches data and only takes snaphots via SIGAR calls OpenSSHDComponent and MySQLComponent have their availability check fixed and using this API Other classes were updated with new API calls for isRunning method

1 0

[rhq] Branch 'bug/885664' - 0 commits -
by Thomas Segismont 21 Jan '13

21 Jan '13

Rebased ref, commits from common ancestor:

1 0

[rhq] Branch 'tsegismont/as7plugin-httpclient' - 0 commits -
by Thomas Segismont 21 Jan '13

21 Jan '13

Rebased ref, commits from common ancestor:

1 0

[rhq] .classpath modules/core modules/enterprise modules/plugins pom.xml
by Thomas Segismont 21 Jan '13

21 Jan '13

.classpath | 24 modules/core/arquillian-integration/container/pom.xml | 22 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java | 33 modules/core/arquillian-integration/container/src/main/resources/maven-properties.properties | 4 modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java | 15 modules/enterprise/gui/content_http-war/pom.xml | 2 modules/enterprise/gui/portal-war/pom.xml | 2 modules/enterprise/server/jar/pom.xml | 2 modules/enterprise/server/plugins/jboss-software/pom.xml | 2 modules/enterprise/server/plugins/url/pom.xml | 2 modules/plugins/jboss-as-7/pom.xml | 61 + modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 43 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 412 ++++++---- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 90 +- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 111 +- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 87 +- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java | 27 modules/plugins/netservices/pom.xml | 4 pom.xml | 7 19 files changed, 625 insertions(+), 325 deletions(-) New commits: commit 84b4cbcc2016590189eda3e3adfe48e4f10f1ac7 Author: Thomas SEGISMONT <tsegismo(a)redhat.com> Date: Tue Dec 18 17:56:46 2012 +0100 AS7 plugin upload connection now with httpclient Add common property for commons-httpclient version and update POMs Add httpclient dependency Make as7 integration test launch generic Integation tests: make rid of SigarInstaller hard coded Sigar version ANT version to 1.8.4 Fix eclipse classpath issues diff --git a/.classpath b/.classpath index 4d6da55..e7fd638 100644 --- a/.classpath +++ b/.classpath @@ -124,6 +124,7 @@ <classpathentry kind="src" path="modules/plugins/netservices/src/main/java"/> <classpathentry kind="src" path="modules/plugins/ant-bundle/src/main/java"/> <classpathentry kind="src" path="modules/plugins/ant-bundle/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/ant-bundle/src/test/resources"/> <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/main/java"/> <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/test/java"/> <classpathentry kind="src" path="modules/plugins/snmptrapd/src/main/java"/> @@ -169,9 +170,11 @@ <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/> <classpathentry kind="src" path="modules/core/plugin-container-itest/src/test/java"/> <classpathentry kind="src" path="modules/core/plugin-test-util/src/main/java"/> - <classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/java"/> <classpathentry kind="src" path="modules/core/arquillian-integration/archive/src/main/java"/> <classpathentry kind="src" path="modules/core/arquillian-integration/container/src/main/java"/> + <classpathentry kind="src" path="modules/core/arquillian-integration/container/src/main/resources"/> + <classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/java"/> + <classpathentry kind="src" path="modules/core/arquillian-integration/container/src/test/resources"/> <classpathentry kind="src" path="modules/test-utils/src/main/java"/> <classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/> <classpathentry kind="src" path="etc/samples/skeleton-plugin/src/main/java"/> @@ -190,12 +193,12 @@ <classpathentry exported="true" kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.4/jaxb-impl-2.2.4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="/M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0-sources.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant-nodeps/1.8.0/ant-nodeps-1.8.0.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant/1.8.4/ant-1.8.4.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.8.4/ant-1.8.4-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.8.4/ant-launcher-1.8.4.jar" sourcepath="M2_REPO/org/apache/ant/ant-launcher/1.8.4/ant-launcher-1.8.4-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> @@ -220,9 +223,8 @@ <classpathentry exported="true" kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jbpm/3.1.1/jbpm-3.1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="/M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_14/jsf-api-1.2_14.jar" sourcepath="/M2_REPO/javax/faces/jsf-api/1.2_14/jsf-api-1.2_14-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14.jar" sourcepath="/M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14-sources.jar"/> @@ -235,7 +237,7 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/framework/richfaces-api/3.1.3.GA/richfaces-api-3.1.3.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/framework/richfaces-impl/3.3.0.GA/richfaces-impl-3.3.0.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.1-902.jdbc4/postgresql-9.1-902.jdbc4.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.2-1002.jdbc4/postgresql-9.2-1002.jdbc4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.3.82/sigar-1.6.3.82-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossts/jbossjts/4.16.2.Final/jbossjts-4.16.2.Final.jar"/> @@ -274,8 +276,8 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-orm/3.1/unitils-orm-3.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.8.5/jackson-core-asl-1.8.5.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.8.5/jackson-mapper-asl-1.8.5.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.8.5/jackson-core-asl-1.8.5.jar" sourcepath="/M2_REPO/org/codehaus/jackson/jackson-core-asl/1.8.5/jackson-core-asl-1.8.5-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.8.5/jackson-mapper-asl-1.8.5.jar" sourcepath="/M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.8.5/jackson-mapper-asl-1.8.5-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/com/google/code/morphia/morphia/0.99/morphia-0.99.jar"/> @@ -311,8 +313,8 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/shrinkwrap-api/1.0.1/shrinkwrap-api-1.0.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.1/shrinkwrap-spi-1.0.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-api-base/2.0.0-alpha-3/shrinkwrap-descriptors-api-base-2.0.0-alpha-3.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/2.0.0-alpha-7/shrinkwrap-resolver-api-2.0.0-alpha-7.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/2.0.0-alpha-7/shrinkwrap-resolver-api-maven-2.0.0-alpha-7.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/2.0.0-alpha-7/shrinkwrap-resolver-api-2.0.0-alpha-7.jar" sourcepath="/M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/2.0.0-alpha-7/shrinkwrap-resolver-api-2.0.0-alpha-7-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/2.0.0-alpha-7/shrinkwrap-resolver-api-maven-2.0.0-alpha-7.jar" sourcepath="/M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/2.0.0-alpha-7/shrinkwrap-resolver-api-maven-2.0.0-alpha-7-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/test/arquillian-test-spi/1.0.3.Final/arquillian-test-spi-1.0.3.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/test/arquillian-test-api/1.0.3.Final/arquillian-test-api-1.0.3.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/core/arquillian-core-spi/1.0.3.Final/arquillian-core-spi-1.0.3.Final.jar"/> diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 36be907..65043aa 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -20,6 +20,28 @@ <name>RHQ Arquillian Plugin Container</name> <description>RHQ Embedded Agent Plugin Container integration for Arquillian</description> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>maven-properties.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>maven-properties.properties</exclude> + </excludes> + </resource> + </resources> + </build> +  <dependencies> diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java index a07c139..34726a3 100644 --- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java +++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java @@ -21,6 +21,8 @@ package org.rhq.test.arquillian.impl.util; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; import java.util.UUID; import org.apache.commons.logging.Log; @@ -28,7 +30,6 @@ import org.apache.commons.logging.LogFactory; import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact; -import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.file.FileUtil; @@ -42,7 +43,6 @@ public class SigarInstaller { private static final Log LOG = LogFactory.getLog(SigarInstaller.class); - private static final String USER_HOME = System.getProperty("user.home"); private static final String TMP_DIR = System.getProperty("java.io.tmpdir"); private File rootDir; @@ -54,12 +54,31 @@ public class SigarInstaller { } private void init() { - MavenResolverSystem mavenDependencyResolver = Maven.resolver(); - // artifact specifier format is "<groupId>:<artifactId>[:<extension>[:<classifier>]][:<version >]" - // TODO (ips, 05/02/12): Figure out how to make this work without hard-coding the version. - sigarDistArtifact = mavenDependencyResolver.offline().loadPomFromFile("pom.xml") - .resolve("org.hyperic:sigar-dist:zip:1.6.5.132-3").withoutTransitivity().asSingleResolvedArtifact(); + // Read the properties from the Maven filtered resource file + Properties pomProperties = new Properties(); + InputStream propertyFileInputStream = getClass().getClassLoader().getResourceAsStream( + "maven-properties.properties"); + try { + pomProperties.load(propertyFileInputStream); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + if (propertyFileInputStream != null) { + try { + propertyFileInputStream.close(); + } catch (IOException ignore) { + } + } + } + + String sigarVersion = pomProperties.getProperty("sigar.version"); + if (sigarVersion == null) { + throw new RuntimeException("Could not read Sigar version from the properties file"); + } + + sigarDistArtifact = Maven.resolver().offline().loadPomFromFile("pom.xml") + .resolve("org.hyperic:sigar-dist:zip:" + sigarVersion).withoutTransitivity().asSingleResolvedArtifact(); } public boolean isSigarAvailable() { diff --git a/modules/core/arquillian-integration/container/src/main/resources/maven-properties.properties b/modules/core/arquillian-integration/container/src/main/resources/maven-properties.properties new file mode 100644 index 0000000..0eb80b4 --- /dev/null +++ b/modules/core/arquillian-integration/container/src/main/resources/maven-properties.properties @@ -0,0 +1,4 @@ +#This file helps test classes to load properties coming from Maven POM +#It is filtered during the process-resources phase of a Maven build +#Add the properties you need here +sigar.version=${sigar.version} \ No newline at end of file diff --git a/modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java index bf020ca..59a09f2 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java @@ -284,7 +284,7 @@ public class StringUtil { for (int i = 0; i < (size - 1); i++) { buf.append(objs.get(i).toString()); - buf.append( delim); + buf.append(delim); } if (size != 0) { @@ -553,4 +553,17 @@ public class StringUtil { public static boolean isEmpty(String s) { return s == null || s.length() == 0; } + + public static boolean isNotEmpty(String s) { + return !isEmpty(s); + } + + public static boolean isBlank(String s) { + return s == null || s.trim().length() == 0; + } + + public static boolean isNotBlank(String s) { + return !isBlank(s); + } + } \ No newline at end of file diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 6ca6272..104b50d 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -96,7 +96,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> <scope>provided</scope>  </dependency> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index afe8498..d032b6d 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -94,7 +94,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> <scope>provided</scope>  </dependency> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 2033a2c..3b9f92d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -197,7 +197,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> </dependency> <dependency> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b2b1775..55b2aea 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -26,7 +26,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> <scope>provided</scope> </dependency> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index c141d2a..e4f17ed 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -29,7 +29,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> <scope>provided</scope> </dependency> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index c6265ae..bee2bbb 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -65,7 +65,27 @@ <artifactId>jboss-sasl</artifactId> <version>${jboss.sasl.version}</version> </dependency> - + +  + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${commons-httpclient.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> +  <dependency> @@ -119,6 +139,16 @@ <groupId>org.jboss.sasl</groupId> <artifactId>jboss-sasl</artifactId> </artifactItem> + + <artifactItem> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </artifactItem> + + <artifactItem> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> @@ -298,19 +328,20 @@ </goals> <configuration> <target> - <condition property="as7.product" value="eap" else="as"> - <matches pattern="^6\." string="${as7.version}"/> - </condition> - <property name="as7.zipfile" - location="${java.io.tmpdir}/jboss-${as7.product}-${as7.version}.zip"/> - <delete file="${as7.zipfile}"/> - <get src="${as7.url}" dest="${as7.zipfile}" usetimestamp="true" verbose="true"/> - <unzip src="${as7.zipfile}" dest="${java.io.tmpdir}"/> -  -  - <move file="${java.io.tmpdir}/jboss-eap-6.0" - tofile="${jboss7.home}" failonerror="false"/> - +  + <property name="as7.zipfile" location="${java.io.tmpdir}/jboss-as7-${as7.version}.zip"/> +  + <delete dir="${jboss7.home}" quiet="true"/> +  + <get src="${as7.url}" dest="${as7.zipfile}" usetimestamp="true" verbose="true" /> +  + <unzip src="${as7.zipfile}" dest="${jboss7.home}"> +  +  +  +  + <cutdirsmapper dirs="1"/> + </unzip> <chmod perm="u+rx"> <fileset dir="${jboss7.home}/bin" includes="*.sh"/> </chmod> @@ -334,7 +365,7 @@ </goals> <configuration> <target> - <delete dir="${jboss7.home}" verbose="true"/> + <delete dir="${jboss7.home}" /> </target> </configuration> </execution> 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 0687516..2a5640d 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 @@ -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 @@ -32,6 +32,7 @@ import java.net.SocketTimeoutException; import java.net.URL; import java.util.StringTokenizer; +import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.jackson.JsonNode; @@ -77,6 +78,8 @@ public class ASConnection { private String host; private int port; + private UsernamePasswordCredentials credentials; + /** * Construct an ASConnection object. The real "physical" connection is done in {@link #executeRaw(Operation)}. * @@ -105,6 +108,10 @@ public class ASConnection { passwordAuthenticator = new AS7Authenticator(user, password); Authenticator.setDefault(passwordAuthenticator); + // This will hold a reference to user and password + // and will be used in the future when switching this class communication layer to httpclient + credentials = new UsernamePasswordCredentials(user, password); + // read system property "as7plugin.verbose" verbose = Boolean.getBoolean("as7plugin.verbose"); @@ -217,17 +224,18 @@ public class ASConnection { if (responseStatus.getResponseCode() >= 400) { if (verbose) { log.debug(operation + " failed with " + responseStatus + " - response body was [" + responseBody - + "]."); + + "]."); } - if (responseBody.contains("JBAS014807") || responseBody.contains("JBAS010850") || responseBody.contains("JBAS014793")) { + if (responseBody.contains("JBAS014807") || responseBody.contains("JBAS010850") + || 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()); } } else { - log.warn("Received " + responseStatus + " response to " + operation + " - response body was [" + - responseBody + "]."); + log.warn("Received " + responseStatus + " response to " + operation + " - response body was [" + + responseBody + "]."); } } @@ -237,11 +245,12 @@ public class ASConnection { operationResult = mapper.readTree(responseBody); } catch (IOException ioe) { log.error("Failed to deserialize response to " + operation + " to JsonNode - response status was " - + responseStatus + ", and body was [" + responseBody + "]: " + ioe); + + responseStatus + ", and body was [" + responseBody + "]: " + ioe); Result result = new Result(); result.setOutcome("failure"); - result.setFailureDescription("Failed to deserialize response to " + operation + " to JsonNode - response status was " - + responseStatus + ", and body was [" + responseBody + "]: " + ioe); + result.setFailureDescription("Failed to deserialize response to " + operation + + " to JsonNode - response status was " + responseStatus + ", and body was [" + responseBody + + "]: " + ioe); result.setRolledBack(responseBody.contains("rolled-back=true")); result.setRhqThrowable(ioe); operationResult = mapper.valueToTree(result); @@ -304,7 +313,7 @@ public class ASConnection { private void handleAuthorizationFailureResponse(Operation operation, ResponseStatus responseStatus) { if (log.isDebugEnabled()) { log.debug("Response to " + operation + " was " + responseStatus - + " - throwing InvalidPluginConfigurationException..."); + + " - throwing InvalidPluginConfigurationException..."); } // Throw a InvalidPluginConfigurationException, so the user will get a yellow plugin connection // warning message in the GUI. @@ -317,14 +326,6 @@ public class ASConnection { throw new InvalidPluginConfigurationException(message); } - private String getResponseMessage(HttpURLConnection conn) throws IOException { - String responseMessage = conn.getResponseMessage(); - if ((responseMessage == null) && (conn.getResponseCode() == HTTP_TEMPORARY_REDIRECT)) { - responseMessage = "Temporary Redirect"; - } - return responseMessage; - } - /** Method parses Operation.getAddress().getPath() for invalid spaces in the path passed in. * * @param path Operation.getAddress().getPath() value. @@ -454,6 +455,14 @@ public class ASConnection { return port; } + public String getUser() { + return credentials.getUserName(); + } + + public String getPassword() { + return credentials.getPassword(); + } + @NotNull private String getResponseBody(HttpURLConnection connection) { InputStream inputStream; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java index a7fe82d..9a55eb7 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 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 @@ -19,200 +19,328 @@ package org.rhq.modules.plugins.jbossas7; import java.io.BufferedOutputStream; -import java.io.BufferedReader; import java.io.Closeable; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.Authenticator; -import java.net.HttpURLConnection; -import java.net.URL; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.SimpleHttpConnectionManager; +import org.apache.commons.httpclient.UsernamePasswordCredentials; +import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.multipart.FilePart; +import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; +import org.apache.commons.httpclient.methods.multipart.Part; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.map.ObjectMapper; +import org.rhq.core.util.StringUtil; +import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; + /** * Connection for uploading of content. - * Partially taken from https://github.com/jbossas/jboss-as/blob/master/testsuite/smoke/src/test/ja… + * + * This class needs to cache the content to be uploaded. Users of this class should: + * <ol> + * <li>Call {@link #getOutputStream()} an write their content to the returned {@link OutputStream}</li> + * <li>Call {@link #finishUpload()} to actually upload the content</li> + * </ol> + * + * As instances of this class held some resources it is the caller responsibility to call {@link #cancelUpload()} + * instead of {@link #finishUpload()} if, for example, an {@link IOException} occured while writing their content + * to the {@link OutputStream}. + * + * Original code taken from https://github.com/jbossas/jboss-as/blob/master/testsuite/smoke/src/test/ja… * * @author Jonathan Pearlin (of the original code) * @author Heiko W. Rupp + * @author Thomas Segismont */ public class ASUploadConnection { - private static final String BOUNDARY_PARAM = "NeAG1QNIHHOyB5joAS7Rox!!"; + private static final String HTTP_SCHEME = "http"; - private static final String BOUNDARY = "--" + BOUNDARY_PARAM; + private static final int SOCKET_CONNECTION_TIMEOUT = 30 * 1000; // 60sec - private static final String CRLF = "\r\n"; + private static final int SOCKET_READ_TIMEOUT = 60 * 1000; // 30sec - private static final String POST_REQUEST_METHOD = "POST"; + private static final String TRIGGER_AUTH_URL_PATH = ASConnection.MANAGEMENT; private static final String UPLOAD_URL_PATH = ASConnection.MANAGEMENT + "/add-content"; + private static final int FILE_POST_MAX_LOGGABLE_RESPONSE_LENGTH = 1024 * 2; // 2k max + + private static final String SYSTEM_LINE_SEPARATOR = System.getProperty("line.separator"); + + private static final String EMPTY_JSON_TREE = "{}"; + + private static final String JSON_NODE_FAILURE_DESCRIPTION = "failure-description"; + + private static final String JSON_NODE_FAILURE_DESCRIPTION_VALUE_DEFAULT = "FailureDescription: -input was null-"; + + private static final String JSON_NODE_OUTCOME = "outcome"; + + private static final String JSON_NODE_OUTCOME_VALUE_FAILED = "failed"; + private static final Log log = LogFactory.getLog(ASUploadConnection.class); - Authenticator passwordAuthenticator ; - BufferedOutputStream os = null; - InputStream is = null; - private HttpURLConnection connection; + private String scheme = HTTP_SCHEME; + private String host; + private int port; + + private UsernamePasswordCredentials credentials; + + private String fileName; + private int timeout; - private static final int DEFAULT_TIMEOUT = 60; // 60sec - public ASUploadConnection(String dcHost, int port, String user, String password) { - if (dcHost == null) { + private File cacheFile; + + private BufferedOutputStream cacheOutputStream; + + /** + * @deprecated as of 4.6. This class is not reusable so there is no reason not to provide the filename to the + * constructor. Use {@link #ASUploadConnection(String, int, String, String, String)} instead. + */ + @Deprecated + public ASUploadConnection(String host, int port, String user, String password) { + this(host, port, user, password, null); + } + + /** + * Creates a new {@link ASUploadConnection} for a remote http management interface. + * + * If null user or password is given, this instance will not be able to reply to an authentication challenge. + * + * It's the responsibility of the caller to make sure either {@link #finishUpload()} or {@link #cancelUpload()} + * will be called to free resources this class helds. + * + * @param host - hostname of the remote http management interface + * @param port - port of the remote http management interface + * @param user - username to logon with to the remote http management interface. + * @param password - password to logon with to the remote http management interface + * @param fileName - fileName of the content (to provide in multipart post request) + */ + public ASUploadConnection(String host, int port, String user, String password, String fileName) { + if (host == null) { throw new IllegalArgumentException("Management host cannot be null."); } if (port <= 0 || port > 65535) { throw new IllegalArgumentException("Invalid port: " + port); } - this.host = dcHost; + if (StringUtil.isBlank(fileName)) { + throw new IllegalArgumentException("Filename cannot be blank"); + } + this.host = host; this.port = port; - if (user != null) { - passwordAuthenticator = new AS7Authenticator(user,password); - Authenticator.setDefault(passwordAuthenticator); + if (user != null && password != null) { + credentials = new UsernamePasswordCredentials(user, password); } - timeout = DEFAULT_TIMEOUT; + this.fileName = fileName; + this.timeout = SOCKET_READ_TIMEOUT; } + /** + * @deprecated as of 4.6. This class is not reusable so there is no reason not to provide the filename to the + * constructor. Use {@link #ASUploadConnection(ASConnection, String) instead. + */ + @Deprecated public ASUploadConnection(ASConnection asConnection) { - this.host=asConnection.getHost(); - this.port=asConnection.getPort(); - this.timeout = DEFAULT_TIMEOUT; + this(asConnection.getHost(), asConnection.getPort(), asConnection.getUser(), asConnection.getPassword(), null); } + /** + * Creates a new {@link ASUploadConnection} from an existing {@link ASConnection}. + * + * This constructor has the same requirements as {@link #ASUploadConnection(String, int, String, String, String)} + * which it uses internally. + * + * @param asConnection - existing {@link ASConnection} instance + * @param fileName - fileName of the content (to provide in multipart post request) + */ + public ASUploadConnection(ASConnection asConnection, String fileName) { + this(asConnection.getHost(), asConnection.getPort(), asConnection.getUser(), asConnection.getPassword(), + fileName); + } - public OutputStream getOutputStream(String fileName) { - String url = "http://" + host + ":" + port + UPLOAD_URL_PATH; - try { - // Create the HTTP connection to the upload URL - connection = (HttpURLConnection) new URL(url).openConnection(); - connection.setConnectTimeout(30 * 1000); // 30s - connection.setReadTimeout(timeout * 1000); // default 60s - connection.setDoInput(true); - connection.setDoOutput(true); - connection.setRequestMethod(POST_REQUEST_METHOD); - connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY_PARAM); - - // Grab the test WAR file and get a stream to its contents to be included in the POST. - os = new BufferedOutputStream(connection.getOutputStream()); - os.write(buildPostRequestHeader(fileName)); - - return os; - } - catch (Exception e) { - log.error("Failed to open output stream to URL [" + url + "]: " + e, e); - } + /** + * This factory method simplifies creation of a new {@link ASUploadConnection} instance given the caller has + * access to the {@link ServerPluginConfiguration}. + * + * @param pluginConfig - the {@link ServerPluginConfiguration} + * @param fileName - fileName of the content (to provide in multipart post request) + * @return + */ + public static ASUploadConnection newInstanceForServerPluginConfiguration(ServerPluginConfiguration pluginConfig, + String fileName) { + return new ASUploadConnection(pluginConfig.getHostname(), pluginConfig.getPort(), pluginConfig.getUser(), + pluginConfig.getPassword(), fileName); + } - return null; + /** + * @deprecated as of 4.6. Instances of this class should be created with fileName supplied to the constructor. + * If the caller does that there is no reason for late initialization of fileName. Then use + * {@link #getOutputStream()} instead. + */ + @Deprecated + public OutputStream getOutputStream(String fileName) { + this.fileName = fileName; + return getOutputStream(); } - public JsonNode finishUpload() { - JsonNode tree = null; + /** + * Gives an outpustream where callers should write the content which will be uploaded to AS7 + * when {@link #finishUpload()} will be called. + * + * @return an {@link OutputStream} or null if it could not be created. + */ + public OutputStream getOutputStream() { try { - os.write(buildPostRequestFooter()); - os.flush(); + cacheFile = File.createTempFile(getClass().getSimpleName(), ".cache"); + cacheOutputStream = new BufferedOutputStream(new FileOutputStream(cacheFile)); + return cacheOutputStream; + } catch (IOException e) { + log.error("Could not create outputstream for " + fileName, e); + } + return null; + } - int code = connection.getResponseCode(); - if (code != 200) { - log.warn("Response code for file upload: " + code + " " + connection.getResponseMessage()); - } - if (code == 500) - is = connection.getErrorStream(); - else - is = connection.getInputStream(); - - if (is != null) { - BufferedReader in = new BufferedReader(new InputStreamReader(is)); - String line; - StringBuilder builder = new StringBuilder(); - while ((line = in.readLine()) != null) { - builder.append(line); - } + /** + * To be called instead of {@link #finishUpload()} if one doesn't want to upload the cached content. + * + * It's important to call this method if not actually uploading as it frees resources this class helds. + */ + public void cancelUpload() { + closeQuietly(cacheOutputStream); + deleteCacheFile(); + } - ObjectMapper mapper = new ObjectMapper(); + /** + * Triggers the real upload to the AS7 instance. At this point the caller should have written + * the content in the {@link OutputStream} given by {@link #getOutputStream()}. + * + * @return a {@link JsonNode} instance read from the upload response body or null if something went wrong. + */ + public JsonNode finishUpload() { - String s = builder.toString(); - if (s!=null) - tree = mapper.readTree(s); - else - log.warn("- no result received from InputStream -"); - } - else - log.warn("- no InputStream available -"); + if (fileName == null) { + // At this point the fileName should have been set whether at instanciation or in #getOutputStream(String) + throw new IllegalStateException("Upload fileName is null"); + } - } catch (IOException e) { - log.error(e); + closeQuietly(cacheOutputStream); + + // We will first send a simple get request in order to trigger authentication challenge. + // This allows to send the potentially big file only once to the server + // The typical resulting http exchange would be: + // + // GET without auth <- 401 (start auth challenge : the server will name the realm and the scheme) + // GET with auth <- 200 + // POST big file + // + // Note this only works because we use SimpleHttpConnectionManager which maintains + // only one HttpConnection + // + // A better way to avoid uploading a big file multiple times would be to use header Expect: Continue + // Unfortunately AS7 responds 100 Continue even if the authentication headers are not yet present + + SimpleHttpConnectionManager httpConnectionManager = new SimpleHttpConnectionManager(); + HttpClient client = new HttpClient(httpConnectionManager); + if (credentialsProvided()) { + client.getState().setCredentials(new AuthScope(host, port, AuthScope.ANY_REALM), credentials); } - finally { - closeQuietly(is); - closeQuietly(os); + client.getHttpConnectionManager().getParams().setConnectionTimeout(SOCKET_CONNECTION_TIMEOUT); + client.getHttpConnectionManager().getParams().setSoTimeout(timeout); + + String triggerAuthURL = scheme + "://" + host + ":" + port + TRIGGER_AUTH_URL_PATH; + GetMethod triggerAuthGET = new GetMethod(triggerAuthURL); + try { + // Send GET request in order to trigger authentication + // We don't check response code because we're not already uploading the file + client.executeMethod(triggerAuthGET); + } catch (Exception ignore) { + // We don't stop trying upload if triggerAuthGET raises exception + // See comment above + } finally { + triggerAuthGET.releaseConnection(); } - return tree; - } + String uploadURL = scheme + "://" + host + ":" + port + UPLOAD_URL_PATH; + PostMethod filePOST = new PostMethod(uploadURL); + try { + // Now upload file with multipart POST request + Part[] parts = { new FilePart(fileName, cacheFile) }; + filePOST.setRequestEntity(new MultipartRequestEntity(parts, filePOST.getParams())); + int responseCode = client.executeMethod(filePOST); + if (responseCode != HttpStatus.SC_OK) { + logUploadDoesNotEndWithHttpOkStatus(filePOST, responseCode); + return null; + } - private byte[] buildPostRequestHeader(String fileName) throws UnsupportedEncodingException { - final StringBuilder builder = new StringBuilder(); - builder.append(buildPostRequestHeaderSection("form-data; name=\"file\"; filename=\""+fileName+"\"", "application/octet-stream", "")); - return builder.toString().getBytes("US-ASCII"); - } + ObjectMapper objectMapper = new ObjectMapper(); + InputStream responseBodyAsStream = filePOST.getResponseBodyAsStream(); + if (responseBodyAsStream == null) { + log.warn("POST request has no response body"); + return objectMapper.readTree(EMPTY_JSON_TREE); + } + return objectMapper.readTree(responseBodyAsStream); - private StringBuilder buildPostRequestHeaderSection(final String contentDisposition, final String contentType, final String content) { - final StringBuilder builder = new StringBuilder(); - builder.append(BOUNDARY); - builder.append(CRLF); - if(contentDisposition != null && contentDisposition.length() > 0) { - builder.append(String.format("Content-Disposition: %s", contentDisposition)); - } - builder.append(CRLF); - if(contentType != null && contentType.length() > 0) { - builder.append(String.format("Content-Type: %s", contentType)); - } - builder.append(CRLF); - if(content != null && content.length() > 0) { - builder.append(content); + } catch (Exception e) { + log.error(e); + return null; + } finally { + // First release connection + filePOST.releaseConnection(); + // Then force close + httpConnectionManager.closeIdleConnections(0); + deleteCacheFile(); } - builder.append(CRLF); - return builder; - } - - private byte[] buildPostRequestFooter() throws UnsupportedEncodingException{ - final StringBuilder builder = new StringBuilder(); - builder.append(CRLF); - builder.append(BOUNDARY); - builder.append("--"); - builder.append(CRLF); - return builder.toString().getBytes("US-ASCII"); } + /** + * Inspects the supplied {@link JsonNode} instance and returns the json 'failure-description' node value as text. + * + * @param jsonNode + * @return + */ public static String getFailureDescription(JsonNode jsonNode) { - if (jsonNode==null) - return "getFailureDescription: -input was null-"; - JsonNode node = jsonNode.findValue("failure-description"); + if (jsonNode == null) { + return JSON_NODE_FAILURE_DESCRIPTION_VALUE_DEFAULT; + } + JsonNode node = jsonNode.findValue(JSON_NODE_FAILURE_DESCRIPTION); + if (node == null) { + return JSON_NODE_FAILURE_DESCRIPTION_VALUE_DEFAULT; + } return node.getValueAsText(); } - static boolean isErrorReply(JsonNode in) { - if (in == null) + /** + * Inspects the supplied {@link JsonNode} instance to determine if it represents an error outcome. + * + * @param jsonNode + * @return + */ + public static boolean isErrorReply(JsonNode jsonNode) { + if (jsonNode == null) { return true; + } - if (in.has("outcome")) { + if (jsonNode.has(JSON_NODE_OUTCOME)) { String outcome = null; try { - JsonNode outcomeNode = in.findValue("outcome"); + JsonNode outcomeNode = jsonNode.findValue(JSON_NODE_OUTCOME); outcome = outcomeNode.getTextValue(); - if (outcome.equals("failed")) { - JsonNode reasonNode = in.findValue("failure-description"); - - String reason = reasonNode.getTextValue(); + if (outcome.equals(JSON_NODE_OUTCOME_VALUE_FAILED)) { return true; } } catch (Exception e) { @@ -223,8 +351,31 @@ public class ASUploadConnection { return false; } + private boolean credentialsProvided() { + // If null user or password is given to the constructor + // no credentials instance is created + return credentials != null; + } + + private void logUploadDoesNotEndWithHttpOkStatus(PostMethod filePOST, int responseCode) { + StringBuilder logMessageBuilder = new StringBuilder("File upload failed: ").append(HttpStatus + .getStatusText(responseCode)); + // If it's sure there is a response body and it's not too long + if (filePOST.getResponseContentLength() > 0 + && filePOST.getResponseContentLength() < FILE_POST_MAX_LOGGABLE_RESPONSE_LENGTH) { + try { + // It is safe to call getResponseBodyAsString as we know the body is not too long + String responseBodyAsString = filePOST.getResponseBodyAsString(); + logMessageBuilder.append(SYSTEM_LINE_SEPARATOR).append(responseBodyAsString); + } catch (IOException ignore) { + // If we can't get the response body, we'll just not log it + } + } + log.warn(logMessageBuilder.toString()); + } + private void closeQuietly(final Closeable closeable) { - if(closeable != null) { + if (closeable != null) { try { closeable.close(); } catch (final IOException ignore) { @@ -232,6 +383,12 @@ public class ASUploadConnection { } } + private void deleteCacheFile() { + if (cacheFile != null) { + cacheFile.delete(); + } + } + /** * Get the currently active upload timeout * @return timeout in seconds @@ -247,4 +404,5 @@ public class ASUploadConnection { public void setTimeout(int timeout) { this.timeout = timeout; } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 080c60f..2451728 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -63,7 +63,6 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.pluginapi.util.StartScriptConfiguration; -import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -80,7 +79,7 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * @param <T> the type of the component's parent resource component */ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Component<T>, MeasurementFacet, - ConfigurationFacet, DeleteResourceFacet, CreateChildResourceFacet, OperationFacet { + ConfigurationFacet, DeleteResourceFacet, CreateChildResourceFacet, OperationFacet { private static final String INTERNAL = "_internal:"; private static final int INTERNAL_SIZE = INTERNAL.length(); @@ -105,6 +104,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone * Start the resource connection * @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext) */ + @Override public void start(ResourceContext<T> context) throws InvalidPluginConfigurationException, Exception { this.context = context; pluginConfiguration = context.getPluginConfiguration(); @@ -132,6 +132,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone * Return availability of this resource * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() */ + @Override public AvailabilityType getAvailability() { ReadResource op = new ReadResource(address); Result res = getASConnection().execute(op); @@ -147,7 +148,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone while ((component != null) && !(component instanceof BaseServerComponent)) { component = (BaseComponent<?>) component.context.getParentResourceComponent(); } - return (BaseServerComponent)component; + return (BaseServerComponent) component; } public BaseServerComponent getServerComponent() { @@ -158,6 +159,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone * Gather measurement data * @see org.rhq.core.pluginapi.measurement.MeasurementFacet#getValues(org.rhq.core.domain.measurement.MeasurementReport, java.util.Set) */ + @Override public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { for (MeasurementScheduleRequest req : metrics) { @@ -262,19 +264,22 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone report.addData(data); } + @Override public ASConnection getASConnection() { return (this.testConnection != null) ? this.testConnection : getServerComponent().getASConnection(); } + @Override public String getPath() { return path; } + @Override public Configuration loadResourceConfiguration() throws Exception { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, getASConnection(), address, - includeRuntime); + includeRuntime); Configuration configuration = delegate.loadResourceConfiguration(); // Read server state @@ -289,7 +294,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } if (res.isReloadRequired()) { - PropertySimple oobMessage = new PropertySimple("__OOB","The server needs a reload for the latest changes to come effective."); + PropertySimple oobMessage = new PropertySimple("__OOB", + "The server needs a reload for the latest changes to come effective."); configuration.put(oobMessage); } if (res.isRestartRequired()) { @@ -300,6 +306,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone return configuration; } + @Override public void updateResourceConfiguration(ConfigurationUpdateReport report) { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); @@ -354,18 +361,19 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone // check if there is already a child with th desired type is present Configuration pluginConfig = report.getPluginConfiguration(); PropertySimple pathProperty = pluginConfig.getSimple("path"); - if (path==null || path.isEmpty()) { + if (path == null || path.isEmpty()) { report.setErrorMessage("No path property found in plugin configuration"); report.setStatus(CreateResourceStatus.INVALID_CONFIGURATION); return report; } - ReadChildrenNames op = new ReadChildrenNames(address,pathProperty.getStringValue()); + ReadChildrenNames op = new ReadChildrenNames(address, pathProperty.getStringValue()); Result res = connection.execute(op); if (res.isSuccess()) { List<String> entries = (List<String>) res.getResult(); if (!entries.isEmpty()) { - report.setErrorMessage("Resource is a singleton, but there are already children " + entries + " please remove them and retry"); + report.setErrorMessage("Resource is a singleton, but there are already children " + entries + + " please remove them and retry"); report.setStatus(CreateResourceStatus.FAILURE); return report; } @@ -395,11 +403,23 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone ContentServices contentServices = cctx.getContentServices(); String resourceTypeName = report.getResourceType().getName(); - ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration(); - ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(), - serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword()); - OutputStream out = uploadConnection.getOutputStream(details.getKey().getName()); - contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out); + ASUploadConnection uploadConnection = ASUploadConnection.newInstanceForServerPluginConfiguration( + getServerComponent().getServerPluginConfiguration(), details.getKey().getName()); + + OutputStream out = uploadConnection.getOutputStream(); + if (out == null) { + report.setStatus(CreateResourceStatus.FAILURE); + report.setErrorMessage("An error occured while the agent was preparing for content download"); + return report; + } + try { + contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out); + } catch (Exception e) { + uploadConnection.cancelUpload(); + report.setStatus(CreateResourceStatus.FAILURE); + report.setErrorMessage("An error occured while the agent was downloading the content"); + return report; + } JsonNode uploadResult = uploadConnection.finishUpload(); if (verbose) { @@ -409,12 +429,11 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone if (ASUploadConnection.isErrorReply(uploadResult)) { report.setStatus(CreateResourceStatus.FAILURE); report.setErrorMessage(ASUploadConnection.getFailureDescription(uploadResult)); - return report; } // Key is available from UI and CLI - String fileName = details.getKey().getName(); + String fileName = details.getKey().getName(); String runtimeName = report.getPackageDetails().getDeploymentTimeConfiguration().getSimpleValue("runtimeName"); if (runtimeName == null || runtimeName.isEmpty()) { @@ -523,14 +542,12 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone int colonPos = name.indexOf(':'); what = name.substring(0, colonPos); op = name.substring(colonPos + 1); - } - else { - what=""; // dummy value + } else { + what = ""; // dummy value op = name; } Operation operation = null; - Address theAddress = new Address(); if (what.equals("server-group")) { @@ -583,11 +600,10 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone if (prop instanceof PropertySimple) { PropertySimple ps = (PropertySimple) prop; if (ps.getStringValue() != null) { - Object val = getObjectForProperty(ps,op); - operation.addAdditionalProperty(ps.getName(),val); + Object val = getObjectForProperty(ps, op); + operation.addAdditionalProperty(ps.getName(), val); } - } - else if (prop instanceof PropertyList) { + } else if (prop instanceof PropertyList) { PropertyList pl = (PropertyList) prop; List<Object> items = new ArrayList<Object>(pl.getList().size()); // Loop over the inner elements of the list @@ -595,14 +611,13 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone if (p2 instanceof PropertySimple) { PropertySimple ps = (PropertySimple) p2; if (ps.getStringValue() != null) { - Object val = getObjectForPropertyList(ps,pl,op); + Object val = getObjectForPropertyList(ps, pl, op); items.add(val); } } } - operation.addAdditionalProperty(pl.getName(),items); - } - else { + operation.addAdditionalProperty(pl.getName(), items); + } else { log.error("PropertyMap for " + prop.getName() + " not yet supported"); } } @@ -637,7 +652,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone */ Object getObjectForProperty(PropertySimple prop, String operationName) { ConfigurationDefinition parameterDefinitions = getParameterDefinitionsForOperation(operationName); - if (parameterDefinitions==null) + if (parameterDefinitions == null) return null; PropertyDefinition pd = parameterDefinitions.get(prop.getName()); @@ -660,14 +675,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone */ Object getObjectForPropertyList(PropertySimple prop, PropertyList propertyList, String operationName) { ConfigurationDefinition parameterDefinitions = getParameterDefinitionsForOperation(operationName); - if (parameterDefinitions==null) + if (parameterDefinitions == null) return null; PropertyDefinition def = parameterDefinitions.get(propertyList.getName()); - if (def instanceof PropertyDefinitionList) { + if (def instanceof PropertyDefinitionList) { PropertyDefinitionList definitionList = (PropertyDefinitionList) def; PropertyDefinition tmp = definitionList.getMemberDefinition(); - if (tmp instanceof PropertyDefinitionSimple) { + if (tmp instanceof PropertyDefinitionSimple) { return getObjectForProperty(prop, (PropertyDefinitionSimple) tmp); } } @@ -755,7 +770,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone Result res = getASConnection().execute(op); if (!res.isSuccess()) { throw new Exception("Failed to read attribute [" + name + "] of address [" + getAddress().getPath() - + "] - response: " + res); + + "] - response: " + res); } return (T) res.getResult(); } @@ -797,11 +812,13 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone int endIndex = expressionValue.indexOf('}', beginIndex); if (endIndex >= 0) { String expression = expressionValue.substring(beginIndex + 2, endIndex); - StartScriptConfiguration startScriptConfig = getServerComponent().getStartScriptConfiguration(); + StartScriptConfiguration startScriptConfig = getServerComponent() + .getStartScriptConfiguration(); List<String> startScriptArgs = startScriptConfig.getStartScriptArgs(); for (String startScriptArg : startScriptArgs) { if (startScriptArg.startsWith("-Djboss.default.multicast.address=")) { - multicastHost = startScriptArg.substring("-Djboss.default.multicast.address=".length()); + multicastHost = startScriptArg.substring("-Djboss.default.multicast.address=" + .length()); break; } } @@ -812,7 +829,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone multicastHost = defaultValue; } else { log.error("Failed to resolve expression value [" + expressionValue - + "] of 'multicast-address' attribute."); + + "] of 'multicast-address' attribute."); } } } @@ -822,7 +839,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } multicastPort = readAttribute(jgroupsSocketBindingAddress, "multicast-port", Integer.class); } catch (Exception e) { - throw new RuntimeException("Failed to lookup multicast address for socket binding [" + socketBinding + "]."); + throw new RuntimeException("Failed to lookup multicast address for socket binding [" + socketBinding + + "]."); } if (multicastHost != null && multicastPort != null) { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java index 3cf2cdb..0d166b4 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java @@ -50,34 +50,35 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Deal with deployments * @author Heiko W. Rupp */ -public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> implements OperationFacet, ContentFacet { +public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> implements OperationFacet, ContentFacet { private static final String DOMAIN_DATA_CONTENT_SUBDIR = "/data/content"; private boolean verbose = ASConnection.verbose; private File deploymentFile; @Override - public void start(ResourceContext<ResourceComponent<?>> context) throws InvalidPluginConfigurationException, Exception { + public void start(ResourceContext<ResourceComponent<?>> context) throws InvalidPluginConfigurationException, + Exception { super.start(context); deploymentFile = determineDeploymentFile(); } @Override public AvailabilityType getAvailability() { - Operation op = new ReadAttribute(getAddress(),"enabled"); + Operation op = new ReadAttribute(getAddress(), "enabled"); Result res = getASConnection().execute(op); if (!res.isSuccess()) return AvailabilityType.DOWN; - if (res.getResult()== null || !(Boolean)(res.getResult())) + if (res.getResult() == null || !(Boolean) (res.getResult())) return AvailabilityType.DOWN; return AvailabilityType.UP; } @Override - public OperationResult invokeOperation(String name, - Configuration parameters) throws InterruptedException, Exception { + public OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, + Exception { if (name.equals("enable")) { return invokeSimpleOperation("deploy"); @@ -86,7 +87,7 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp } else if (name.equals("restart")) { OperationResult result = invokeSimpleOperation("undeploy"); - if(result.getErrorMessage() == null){ + if (result.getErrorMessage() == null) { result = invokeSimpleOperation("deploy"); } @@ -97,7 +98,7 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp } private OperationResult invokeSimpleOperation(String action) { - Operation op = new Operation(action,getAddress()); + Operation op = new Operation(action, getAddress()); Result res = getASConnection().execute(op); OperationResult result = new OperationResult(); if (res.isSuccess()) { @@ -115,19 +116,17 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp return result; } - @Override public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) { return new ArrayList<DeployPackageStep>(); } @Override - public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages, - ContentServices contentServices) { + public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages, ContentServices contentServices) { log.debug("Starting deployment.."); DeployPackagesResponse response = new DeployPackagesResponse(); - if (packages.size()!=1) { + if (packages.size() != 1) { response.setOverallRequestResult(ContentResponseResult.FAILURE); response.setOverallRequestErrorMessage("Can only deploy one package at a time"); log.warn("deployPackages can only deploy one package at a time"); @@ -135,14 +134,27 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp ResourcePackageDetails detail = packages.iterator().next(); - ASUploadConnection uploadConnection = new ASUploadConnection(getASConnection()); - OutputStream out = uploadConnection.getOutputStream(detail.getKey().getName()); + ASUploadConnection uploadConnection = ASUploadConnection.newInstanceForServerPluginConfiguration( + getServerComponent().getServerPluginConfiguration(), detail.getKey().getName()); + OutputStream out = uploadConnection.getOutputStream(); + if (out == null) { + response.setOverallRequestResult(ContentResponseResult.FAILURE); + response + .setOverallRequestErrorMessage("An error occured while the agent was preparing for content download"); + return response; + } ResourceType resourceType = context.getResourceType(); - log.info("Deploying " + resourceType.getName() + " Resource with key [" + detail.getKey() +"]..."); + log.info("Deploying " + resourceType.getName() + " Resource with key [" + detail.getKey() + "]..."); - contentServices.downloadPackageBits(context.getContentContext(), - detail.getKey(), out, true); + try { + contentServices.downloadPackageBits(context.getContentContext(), detail.getKey(), out, true); + } catch (Exception e) { + uploadConnection.cancelUpload(); + response.setOverallRequestResult(ContentResponseResult.FAILURE); + response.setOverallRequestErrorMessage("An error occured while the agent was downloading the content"); + return response; + } JsonNode uploadResult = uploadConnection.finishUpload(); if (verbose) { @@ -152,32 +164,29 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp if (ASUploadConnection.isErrorReply(uploadResult)) { response.setOverallRequestResult(ContentResponseResult.FAILURE); response.setOverallRequestErrorMessage(ASUploadConnection.getFailureDescription(uploadResult)); - return response; } + JsonNode resultNode = uploadResult.get("result"); String hash = resultNode.get("BYTES_VALUE").getTextValue(); - - CreateResourceReport report1 = new CreateResourceReport("", resourceType, new Configuration(), - new Configuration(), detail); - //CreateResourceReport report = runDeploymentMagicOnServer(report1,detail.getKey().getName(),hash, hash); + new CreateResourceReport("", resourceType, new Configuration(), new Configuration(), detail); try { redeployOnServer(detail.getKey().getName(), hash); response.setOverallRequestResult(ContentResponseResult.SUCCESS); //we just deployed a different file on the AS7 server, so let's refresh ourselves deploymentFile = determineDeploymentFile(); - DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(detail.getKey(), ContentResponseResult.SUCCESS); - response.addPackageResponse(packageResponse); + DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(detail.getKey(), + ContentResponseResult.SUCCESS); + response.addPackageResponse(packageResponse); - } - catch (Exception e) { + } catch (Exception e) { response.setOverallRequestResult(ContentResponseResult.FAILURE); } - log.info("Result of deployment of " + resourceType.getName() + " Resource with key [" + detail.getKey() - + "]: " + response); + log.info("Result of deployment of " + resourceType.getName() + " Resource with key [" + detail.getKey() + "]: " + + response); return response; } @@ -185,12 +194,12 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp private void redeployOnServer(String name, String hash) throws Exception { Operation op = new Operation("full-replace-deployment", new Address()); - op.addAdditionalProperty("name",name); + op.addAdditionalProperty("name", name); List<Object> content = new ArrayList<Object>(1); - Map<String,Object> contentValues = new HashMap<String,Object>(); - contentValues.put("hash",new PROPERTY_VALUE("BYTES_VALUE",hash)); + Map<String, Object> contentValues = new HashMap<String, Object>(); + contentValues.put("hash", new PROPERTY_VALUE("BYTES_VALUE", hash)); content.add(contentValues); - op.addAdditionalProperty("content",content); + op.addAdditionalProperty("content", content); Result result = getASConnection().execute(op); if (result.isRolledBack()) throw new Exception(result.getFailureDescription()); @@ -257,12 +266,12 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp // No content -> check for server group if (path.startsWith(("server-group="))) { // Server group has no content of its own - use the domain deployment - String name = (String) path.substring(path.lastIndexOf("=")+1); - op = new ReadResource(new Address("deployment",name)); + String name = (String) path.substring(path.lastIndexOf("=") + 1); + op = new ReadResource(new Address("deployment", name)); result = getASConnection().execute(op); if (result.isSuccess()) { @SuppressWarnings("unchecked") - Map<String,Object> contentMap = (Map<String, Object>) result.getResult(); + Map<String, Object> contentMap = (Map<String, Object>) result.getResult(); content = (List<Map<String, Object>>) contentMap.get("content"); if (content.get(0).containsKey("path")) { String path = (String) content.get(0).get("path"); @@ -270,19 +279,21 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp deploymentFile = getDeploymentFileFromPath(relativeTo, path); } else if (content.get(0).containsKey("hash")) { @SuppressWarnings("unchecked") - String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE"); + String base64Hash = ((Map<String, String>) content.get(0).get("hash")).get("BYTES_VALUE"); byte[] hash = Base64.decode(base64Hash); ServerGroupComponent sgc = (ServerGroupComponent) context.getParentResourceComponent(); - String baseDir = ((HostControllerComponent) sgc.context.getParentResourceComponent()).pluginConfiguration.getSimpleValue("baseDir"); - String contentPath = new File(baseDir , "/data/content").getAbsolutePath(); + String baseDir = ((HostControllerComponent) sgc.context.getParentResourceComponent()).pluginConfiguration + .getSimpleValue("baseDir"); + String contentPath = new File(baseDir, "/data/content").getAbsolutePath(); deploymentFile = getDeploymentFileFromHash(hash, contentPath); } return deploymentFile; } + } else { + log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + + getAddress() + "."); + return null; } - else { - log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + getAddress() + "."); - return null;} } Boolean archive = (Boolean) content.get(0).get("archive"); @@ -298,17 +309,16 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp deploymentFile = getDeploymentFileFromPath(relativeTo, path); } else if (content.get(0).containsKey("hash")) { @SuppressWarnings("unchecked") - String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE"); + String base64Hash = ((Map<String, String>) content.get(0).get("hash")).get("BYTES_VALUE"); byte[] hash = Base64.decode(base64Hash); Address contentPathAddress; if (context.getParentResourceComponent() instanceof ManagedASComponent) { // -> managed server we need to check for host=x/server=y, but the path brings host=x,server-config=y String p = ((ManagedASComponent) context.getParentResourceComponent()).getPath(); - p = p.replaceAll("server-config=","server="); + p = p.replaceAll("server-config=", "server="); contentPathAddress = new Address(p); contentPathAddress.add("core-service", "server-environment"); - } - else { + } else { // standalone contentPathAddress = new Address("core-service", "server-environment"); } @@ -321,16 +331,17 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp } else { // No success above -> check if this is a domain deployment if (this instanceof DomainDeploymentComponent) { - String baseDir = ((HostControllerComponent) context.getParentResourceComponent()).pluginConfiguration.getSimpleValue("baseDir"); - contentPath = new File(baseDir , DOMAIN_DATA_CONTENT_SUBDIR).getAbsolutePath(); - } - else { + String baseDir = ((HostControllerComponent) context.getParentResourceComponent()).pluginConfiguration + .getSimpleValue("baseDir"); + contentPath = new File(baseDir, DOMAIN_DATA_CONTENT_SUBDIR).getAbsolutePath(); + } else { contentPath = "-unknown-"; } } deploymentFile = getDeploymentFileFromHash(hash, contentPath); } else { - log.warn("Failed to determine the deployment file of " + getAddress() + " deployment. Neither path nor hash attributes were available."); + log.warn("Failed to determine the deployment file of " + getAddress() + + " deployment. Neither path nor hash attributes were available."); } return deploymentFile; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java index 82b1042..71967e5 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java @@ -44,7 +44,6 @@ import org.rhq.core.pluginapi.content.ContentServices; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -58,24 +57,23 @@ import org.rhq.modules.plugins.jbossas7.json.Result; */ @SuppressWarnings("unused") public class ServerGroupComponent extends BaseComponent implements ContentFacet, CreateChildResourceFacet, - OperationFacet { + OperationFacet { private static final String SUCCESS = "success"; private static final String OUTCOME = "outcome"; @Override - public OperationResult invokeOperation(String name, - Configuration parameters) throws InterruptedException, Exception { + public OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, + Exception { - Operation op = new Operation(name,getAddress()); + Operation op = new Operation(name, getAddress()); Result res = getASConnection().execute(op); OperationResult result = new OperationResult(); if (res.isSuccess()) { result.setSimpleResult(SUCCESS); - } - else { + } else { result.setErrorMessage(res.getFailureDescription()); } return result; @@ -84,13 +82,12 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, @Override public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) { - return null; // TODO: Customise this generated block + return null; // TODO: Customise this generated block } // TODO I think this package code is not used. @Override - public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages, - ContentServices contentServices) { + public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages, ContentServices contentServices) { ContentContext cctx = context.getContentContext(); @@ -98,13 +95,28 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, for (ResourcePackageDetails details : packages) { - ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration(); - ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(), - serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword()); String packageName = details.getName(); - OutputStream out = uploadConnection.getOutputStream(packageName); - contentServices.downloadPackageBits(cctx, details.getKey(), out, false); + + ASUploadConnection uploadConnection = ASUploadConnection.newInstanceForServerPluginConfiguration( + getServerComponent().getServerPluginConfiguration(), packageName); + OutputStream out = uploadConnection.getOutputStream(); + if (out == null) { + response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(), + ContentResponseResult.FAILURE)); + continue; + } + + try { + contentServices.downloadPackageBits(cctx, details.getKey(), out, false); + } catch (Exception e) { + uploadConnection.cancelUpload(); + response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(), + ContentResponseResult.FAILURE)); + continue; + } + JsonNode uploadResult = uploadConnection.finishUpload(); + if (uploadResult.has(OUTCOME)) { String outcome = uploadResult.get(OUTCOME).getTextValue(); if (outcome.equals(SUCCESS)) { // Upload was successful, so now add the file to the server group @@ -114,20 +126,20 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, Address deploymentsAddress = new Address(); deploymentsAddress.add("deployment", packageName); - Operation step1 = new Operation("add",deploymentsAddress); -// step1.addAdditionalProperty("hash", new PROPERTY_VALUE("BYTES_VALUE", hash)); + Operation step1 = new Operation("add", deploymentsAddress); + // step1.addAdditionalProperty("hash", new PROPERTY_VALUE("BYTES_VALUE", hash)); List<Object> content = new ArrayList<Object>(1); - Map<String,Object> contentValues = new HashMap<String,Object>(); - contentValues.put("hash",new PROPERTY_VALUE("BYTES_VALUE",hash)); + Map<String, Object> contentValues = new HashMap<String, Object>(); + contentValues.put("hash", new PROPERTY_VALUE("BYTES_VALUE", hash)); content.add(contentValues); - step1.addAdditionalProperty("content",content); + step1.addAdditionalProperty("content", content); step1.addAdditionalProperty("name", packageName); Address serverGroupAddress = new Address(context.getResourceKey()); serverGroupAddress.add("deployment", packageName); - Operation step2 = new Operation("add",serverGroupAddress); - Operation step3 = new Operation("deploy",serverGroupAddress); + Operation step2 = new Operation("add", serverGroupAddress); + Operation step3 = new Operation("deploy", serverGroupAddress); CompositeOperation cop = new CompositeOperation(); cop.addStep(step1); @@ -136,36 +148,35 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, Result result = connection.execute(cop); if (!result.isSuccess()) // TODO get failure message into response - response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(),ContentResponseResult.FAILURE)); + response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(), + ContentResponseResult.FAILURE)); else { DeployIndividualPackageResponse individualPackageResponse = new DeployIndividualPackageResponse( - details.getKey(), ContentResponseResult.SUCCESS); + details.getKey(), ContentResponseResult.SUCCESS); response.addPackageResponse(individualPackageResponse); response.setOverallRequestResult(ContentResponseResult.SUCCESS); } - } - else - response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(),ContentResponseResult.FAILURE)); - } - else { - response.addPackageResponse( - new DeployIndividualPackageResponse(details.getKey(), ContentResponseResult.FAILURE)); + } else + response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(), + ContentResponseResult.FAILURE)); + } else { + response.addPackageResponse(new DeployIndividualPackageResponse(details.getKey(), + ContentResponseResult.FAILURE)); } } - return response; } @Override public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) { - return null; // TODO: Customise this generated block + return null; // TODO: Customise this generated block } @Override public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { - Operation op = new ReadChildrenNames(address,"deployment"); // TODO read full packages not only names + Operation op = new ReadChildrenNames(address, "deployment"); // TODO read full packages not only names Result node = getASConnection().execute(op); if (!node.isSuccess()) return null; @@ -175,11 +186,11 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, for (String file : resultList) { String t; if (file.contains(".")) - t = file.substring(file.lastIndexOf(".")+1); + t = file.substring(file.lastIndexOf(".") + 1); else t = "-none-"; - ResourcePackageDetails detail = new ResourcePackageDetails(new PackageDetailsKey(file,"1.0",t,"all")); + ResourcePackageDetails detail = new ResourcePackageDetails(new PackageDetailsKey(file, "1.0", t, "all")); details.add(detail); } return details; @@ -188,11 +199,11 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, @Override public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { - return null; // TODO: Customise this generated block + return null; // TODO: Customise this generated block } private String serverGroupFromKey() { String key1 = context.getResourceKey(); - return key1.substring(key1.lastIndexOf("/")+1); + return key1.substring(key1.lastIndexOf("/") + 1); } } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java index 130f7f3..428f854 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java @@ -59,7 +59,7 @@ import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE; * * @author Heiko W. Rupp */ -@Test(groups = {"integration", "nonpc"}, dependsOnGroups = "discovery") +@Test(groups = { "integration", "nonpc" }, dependsOnGroups = "discovery") public abstract class AbstractIntegrationTest { protected static final String PLUGIN_NAME = "JBossAS7"; @@ -71,19 +71,19 @@ public abstract class AbstractIntegrationTest { protected static final String MAVEN_REPO_LOCAL = System.getProperty("settings.localRepository"); String uploadToAs(String deploymentPath) throws IOException { - ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT, DC_USER, DC_PASS); String fileName = new File(deploymentPath).getName(); - OutputStream os = conn.getOutputStream(fileName); + ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT, DC_USER, DC_PASS, fileName); + OutputStream os = conn.getOutputStream(); -// URL url = getClass().getClassLoader().getResource("."); -// System.out.println(url); + // URL url = getClass().getClassLoader().getResource("."); + // System.out.println(url); InputStream fis = getClass().getClassLoader().getResourceAsStream(deploymentPath); if (fis == null) { File inputFile = new File(deploymentPath); if (!inputFile.canRead()) { throw new FileNotFoundException("Input stream for path [" + deploymentPath - + "] could not be opened - does the file exist either in the test classpath or on the filesystem?"); + + "] could not be opened - does the file exist either in the test classpath or on the filesystem?"); } fis = new FileInputStream(inputFile); } @@ -96,7 +96,7 @@ public abstract class AbstractIntegrationTest { } JsonNode node = conn.finishUpload(); -// System.out.println(node); + // System.out.println(node); assert node != null : "No result from upload - node was null"; assert node.has("outcome") : "No outcome from upload"; String outcome = node.get("outcome").getTextValue(); @@ -111,13 +111,12 @@ public abstract class AbstractIntegrationTest { return connection; } - Operation addDeployment(String deploymentName, String bytes_value) - { + Operation addDeployment(String deploymentName, String bytes_value) { Address deploymentsAddress = new Address("deployment", deploymentName); Operation op = new Operation("add", deploymentsAddress); List<Object> content = new ArrayList<Object>(1); - Map<String,Object> contentValues = new HashMap<String,Object>(); - contentValues.put("hash",new PROPERTY_VALUE("BYTES_VALUE", bytes_value)); + Map<String, Object> contentValues = new HashMap<String, Object>(); + contentValues.put("hash", new PROPERTY_VALUE("BYTES_VALUE", bytes_value)); content.add(contentValues); op.addAdditionalProperty("content", content); op.addAdditionalProperty("name", deploymentName); // this needs to be unique per upload @@ -156,7 +155,8 @@ public abstract class AbstractIntegrationTest { List<ServerDescriptor> servers = pluginDescriptor.getServers(); ServerDescriptor serverDescriptor = findServer(serverName, servers); - assert serverDescriptor != null : "Server descriptor for server [" + serverName + "] not found in test plugin descriptor"; + assert serverDescriptor != null : "Server descriptor for server [" + serverName + + "] not found in test plugin descriptor"; return ConfigurationMetadataParser.parse("null", serverDescriptor.getResourceConfiguration()); } @@ -165,7 +165,8 @@ public abstract class AbstractIntegrationTest { List<ServiceDescriptor> services = pluginDescriptor.getServices(); ServiceDescriptor serviceDescriptor = findService(serviceName, services); - assert serviceDescriptor != null : "Service descriptor for service [" + serviceName + "] not found in plugin descriptor"; + assert serviceDescriptor != null : "Service descriptor for service [" + serviceName + + "] not found in plugin descriptor"; return ConfigurationMetadataParser.parse("null", serviceDescriptor.getResourceConfiguration()); } diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index db8f6ba..7805daa 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -50,7 +50,7 @@ <artifactItem> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${commons-httpclient.version}</version> </artifactItem> <artifactItem> <groupId>commons-codec</groupId> diff --git a/pom.xml b/pom.xml index 87b833a..0c51f00 100644 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,7 @@ <shrinkwrap-resolver.version>2.0.0-alpha-7</shrinkwrap-resolver.version> <xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version>  <opencsv.version>1.8</opencsv.version> + <commons-httpclient.version>3.0.1</commons-httpclient.version> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> @@ -690,11 +691,11 @@ <artifactId>maven-antrun-plugin</artifactId> <version>1.7</version> <dependencies> -  +  <dependency> <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.8.1</version> + <artifactId>ant</artifactId> + <version>1.8.4</version> </dependency>

1 0

[rhq] Changes to 'tsegismont/as7plugin-httpclient'
by Thomas Segismont 21 Jan '13

21 Jan '13

New branch 'tsegismont/as7plugin-httpclient' available with the following commits: commit 197cfcbd54ac3058e29a93d116351bc379faf4f7 Author: Thomas SEGISMONT <tsegismo(a)redhat.com> Date: Tue Dec 18 17:56:46 2012 +0100 AS7 plugin upload connection now with httpclient Add common property for commons-httpclient version and update POMs Add httpclient dependency Make as7 integration test launch generic Integation tests: make rid of SigarInstaller hard coded Sigar version ANT version to 1.8.4 Fix eclipse classpath issues

1 0

[rhq] Branch 'mtho11/d3-charts2' - modules/enterprise
by mike thompson 21 Jan '13

21 Jan '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 142 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 44 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3GraphView.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 3 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 5 11 files changed, 183 insertions(+), 31 deletions(-) New commits: commit 4f980569947b7744d30f52d88a7fda88e46c5036 Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jan 18 09:08:04 2013 -0800 Add intervals to down and unknown chart hover areas. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java index 561aeb0..d079022 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype; import java.util.Date; +import java.util.LinkedList; import java.util.List; import org.rhq.core.domain.measurement.Availability; @@ -51,6 +52,9 @@ public class MetricGraphData implements JsonMetricProducer { private final String chartTimeLabel = MSG.chart_time_label(); private final String chartDownLabel = MSG.chart_down_label(); private final String chartUnknownLabel = MSG.chart_unknown_label(); + private final String chartHoverStartLabel = MSG.chart_hover_start_label(); + private final String chartHoverEndLabel = MSG.chart_hover_end_label(); + private final String chartHoverPeriodLabel = MSG.chart_hover_period_label(); private int entityId; private String entityName; @@ -59,6 +63,7 @@ public class MetricGraphData implements JsonMetricProducer { private MeasurementUnits adjustedMeasurementUnits; private MeasurementDefinition definition; private List<MeasurementDataNumericHighLowComposite> metricData; + private List<DatePair> unknownIntervalList; private PageList<Availability> availabilityDownList; public MetricGraphData() { @@ -70,7 +75,7 @@ public class MetricGraphData implements JsonMetricProducer { * @param entityId * @param measurementDefId */ - public MetricGraphData(int entityId, int measurementDefId){ + public MetricGraphData(int entityId, int measurementDefId) { setEntityId(entityId); setDefinitionId(measurementDefId); } @@ -115,8 +120,8 @@ public class MetricGraphData implements JsonMetricProducer { } public String getChartId() { - Log.debug("DefId: "+ definitionId); - Log.debug("EntityId: "+entityId ); + Log.debug("DefId: " + definitionId); + Log.debug("EntityId: " + entityId); return entityId + "-" + definitionId; } @@ -164,6 +169,18 @@ public class MetricGraphData implements JsonMetricProducer { return chartUnknownLabel; } + public String getChartHoverStartLabel() { + return chartHoverStartLabel; + } + + public String getChartHoverEndLabel() { + return chartHoverEndLabel; + } + + public String getChartHoverPeriodLabel() { + return chartHoverPeriodLabel; + } + public String getYAxisTitle() { if (null != definition.getDisplayName() && definition.getDisplayName().length() > 55) { return entityName + " - " + definition.getDisplayName().substring(0, 55) + "..."; @@ -190,13 +207,31 @@ public class MetricGraphData implements JsonMetricProducer { } @Override + /** + * Format the json for the front JSNI(javascript) UI to consume. + */ public String getJsonMetrics() { StringBuilder sb = new StringBuilder("["); boolean gotAdjustedMeasurementUnits = false; //Log.debug(" avail records loaded: "+getAvailabilityDownList().size()); - if(null != metricData){ + if (null != metricData) { + calculateUnknownIntervals(); + dumpUnknownIntervals(); + for (MeasurementDataNumericHighLowComposite measurement : metricData) { sb.append("{ x:" + measurement.getTimestamp() + ","); + + // loop through the avail down intervals + for (Availability availability : availabilityDownList) { + // we know we are in an interval + //if (barDateTime.after(datePair.startDateTime) && barDateTime.before(datePair.getEndDateTime())) { + if (measurement.getTimestamp() >= availability.getStartTime() && measurement.getTimestamp() <= availability.getEndTime()) { + sb.append(" availStart:" + availability.getStartTime() + ", "); + sb.append(" availEnd:" + availability.getEndTime() + ", "); + break; + } + } + if (isTimestampDownOrDisabled(measurement.getTimestamp())) { sb.append(" down:true, "); } @@ -216,27 +251,81 @@ public class MetricGraphData implements JsonMetricProducer { sb.append(" low:" + newLow.getValue() + ","); sb.append(" y:" + newValue.getValue() + "},"); } else { - // NaN measure no measurement was collected - sb.append(" nodata:true },"); + if(!isTimestampDownOrDisabled(measurement.getTimestamp())){ + // NaN measure no measurement was collected + // loop through the unknown intervals + for (DatePair datePair : unknownIntervalList) { + // we know we are in an interval + if (measurement.getTimestamp() >= datePair.getStartDateTime().getTime() && + measurement.getTimestamp() <= datePair.getEndDateTime().getTime()) { + sb.append(" unknownStart:" + datePair.getStartDateTime().getTime() + ", "); + sb.append(" unknownEnd:" + datePair.getEndDateTime().getTime() + ", "); + break; + } + } + sb.append(" nodata:true },"); + }else { + sb.append(" },"); + } } } + //} sb.setLength(sb.length() - 1); // delete the last ',' } sb.append("]"); - //Log.debug("Json data has "+data.size()+" entries."); - //Log.debug(sb.toString()); + Log.debug(sb.toString()); return sb.toString(); } + private void dumpUnknownIntervals(){ + for (DatePair datePair : unknownIntervalList) { + Log.debug("Interval: "+ datePair.getStartDateTime()+ " - "+ datePair.getEndDateTime()); + } + } + + private void calculateUnknownIntervals() { + + unknownIntervalList = new LinkedList<DatePair>(); + List<Integer> startPoints = new LinkedList<Integer>(); + //find all possible starting interval points + int i = 0; + for (MeasurementDataNumericHighLowComposite measurement : metricData) { + boolean notAtStart = i > 1; + boolean currentBarUndefined = Double.isNaN(measurement.getValue()); + boolean previousBarDefined = (notAtStart) ? !Double.isNaN(metricData.get(i -1).getValue()) : false; + if(currentBarUndefined && previousBarDefined && notAtStart){ + Log.debug("Adding Down or Disabled start Point: "+i); + startPoints.add(i); + } + i++; + } + // iterate over the start points to the end of the consecutive bars or end of metricData + // from the starting interval points find the interval end point + for (Integer startPoint : startPoints) { + Log.debug("StartPoint: " + new Date(metricData.get(startPoint).getTimestamp())); + for (int j = 0; j < metricData.size() -1 ; j++) { + boolean notAtEnd = i < metricData.size(); + boolean currentBarUndefined = Double.isNaN(metricData.get(j).getValue()); + boolean nextBarDefined = (notAtEnd) ? !Double.isNaN(metricData.get(j +1).getValue()) : false; + if(currentBarUndefined && nextBarDefined && notAtEnd){ + Date startDate = new Date(metricData.get(startPoint).getTimestamp()); + Date endDate = new Date(metricData.get(j - 1).getTimestamp()); + Log.debug("\n\nStartDate: " + startDate); + Log.debug("EndDate: " + endDate); + DatePair datePair = new DatePair(startDate, endDate); + //Log.debug(" metricDataIntervalSet " + unknownIntervalList); + unknownIntervalList.add(datePair); + } + } + } + Log.debug("intervalDatePairList.size():"+ unknownIntervalList.size()); + } + private boolean isTimestampDownOrDisabled(long timestamp) { Date timestampDate = new Date(timestamp); - if (null == availabilityDownList) { - //@todo: take this out this is just to testing purposes - Log.debug("AvailabilityList is null"); - } if (null != availabilityDownList) { for (Availability availability : availabilityDownList) { - if (timestampDate.after(new Date(availability.getStartTime())) + if (null != timestampDate && timestampDate.after(new Date(availability.getStartTime())) && timestampDate.before(new Date(availability.getEndTime()))) { return true; } @@ -247,7 +336,7 @@ public class MetricGraphData implements JsonMetricProducer { private MeasurementNumericValueAndUnits normalizeUnitsAndValues(double value, MeasurementUnits measurementUnits) { MeasurementNumericValueAndUnits newValue = MeasurementConverterClient.fit(value, measurementUnits); - MeasurementNumericValueAndUnits returnValue = null; + MeasurementNumericValueAndUnits returnValue; // adjust for percentage numbers if (measurementUnits.equals(MeasurementUnits.PERCENTAGE)) { @@ -271,4 +360,29 @@ public class MetricGraphData implements JsonMetricProducer { long timeThreshold = 24 * 60 * 60 * 1000; // 1 days return startTime + timeThreshold < endTime; } + + /** + * Immutable DatePair for storing the start and DateTime for an interval. + * Used in measuring downtime and unknown intervals. + * Intervals are inclusive of the startDateTime and endDateTime. + */ + private final class DatePair { + + private Date startDateTime; + private Date endDateTime; + + public DatePair(Date startDateTime, Date endDateTime) { + this.startDateTime = startDateTime; + this.endDateTime = endDateTime; + } + + public Date getStartDateTime() { + return startDateTime; + } + + public Date getEndDateTime() { + return endDateTime; + } + + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java index cd32289..1532fc2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java @@ -67,7 +67,10 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartDateLabel()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartTimeLabel()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartDownLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartUnknownLabel()() + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartUnknownLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartHoverStartLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartHoverEndLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartHoverPeriodLabel()() ); @@ -117,7 +120,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD xAxis = $wnd.d3.svg.axis() .scale(timeScale) - .ticks(10) + .ticks(12) .tickSubdivide(5) .tickSize(4, 4, 0) .orient("bottom"), @@ -299,7 +302,6 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD }) .attr("opacity", 0.9) .attr("fill", "#1794bc"); - //.attr("fill", "url(#topBarGrad)"); // lower portion representing avg to low @@ -326,7 +328,6 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD }) .attr("opacity", 0.9) .attr("fill", "#70c4e2"); - //.attr("fill", "url(#bottomBarGrad)"); // if high == low put a "cap" on the bar to show non-aggregated bar svg.selectAll("rect.singleValue") @@ -382,6 +383,10 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD svg.append("g") .attr("class", "x axis") .attr("transform", "translate(0," + height + ")") + .attr("font-size", "10px") + .attr("font-family", "'Liberation Sans', Arial, Helvetica, sans-serif") + .attr("letter-spacing", "3") + .style("text-anchor", "end") .call(xAxis); @@ -488,37 +493,46 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD var hoverString, xValue = (d.x == undefined) ? 0 : +d.x, date = new Date(+xValue), + availStartDate = new Date(+d.availStart), + availEndDate = new Date(+d.availEnd), + unknownStartDate = new Date(+d.unknownStart), + unknownEndDate = new Date(+d.unknownEnd), timeFormatter = $wnd.d3.time.format("%I:%M:%S %P"), dateFormatter = $wnd.d3.time.format("%m/%d/%y"), highValue = (d.high == undefined) ? 0 : d.high.toFixed(2), lowValue = (d.low == undefined) ? 0 : d.low.toFixed(2), avgValue = (d.y == undefined) ? 0 : d.y.toFixed(2); - if (d.y == undefined) { + if (d.down) { hoverString = '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' + - '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></div>' + - '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.unknownLabel+'</span></div>' + - '</div>' + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(availStartDate)+ '</span></div>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(availEndDate) + '</span></div>' + + '<div style="text-align: right;"><span style="width:100%;font-weight: bold;color:#ff8a9a"";">'+chartContext.downLabel +'</span></div>' + + '</div>'; } - else if (d.down) { + else if (d.y == undefined) { hoverString = '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' + - '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></div>' + - '<div style="text-align: right;"><span style="width:100%;font-weight: bold;color:#ff8a9a"";">Down</span></div>' + - '</div>' + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(unknownStartDate)+ '</span></div>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverEndLabel+": "+ timeFormatter(unknownEndDate) + '</span></div>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.unknownLabel+'</span></div>' + + '</div>'; } else { hoverString = '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span><span style="width:50px;">' + timeFormatter(date) + '</span></div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span><span style="width:50px;">' + dateFormatter(date) + '</span></div>' + - '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></div>' + + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + '<div style="text-align: right;"><span style="width:50px;font-weight:bold;color:#ff8a9a;";">' + chartContext.peakChartTitle + ': </span><span style="width:50px;">' + highValue + '</span></div>' + '<div style="text-align: right;"><span style="text-align:right;width:50px;font-weight:bold;color: #b0d9b0;"">' + chartContext.avgChartTitle + ': </span style="width:50px;">' + avgValue + '</span></div>' + - '<div style="text-align: right;"><span style="width:50px;font-weight:bold;color:#8ad6ff"">' + chartContext.minChartTitle + ': </span><span style="width:50px;">' + lowValue + '</span></div>'; + '<div style="text-align: right;"><span style="width:50px;font-weight:bold;color:#8ad6ff"">' + chartContext.minChartTitle + ': </span><span style="width:50px;">' + lowValue + '</span></div>' + + '</div>'; } return hoverString; @@ -532,7 +546,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD trigger: 'hover', title: function () { var d = this.__data__; - //console.log("y: " + d.y); + console.log("y: " + d.y); return formatHovers(chartContext, d); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3GraphView.java index 213e385..90b5338 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3GraphView.java @@ -90,7 +90,7 @@ public class ResourceMetricD3GraphView extends AbstractMetricD3GraphView Log.debug("Chart path for: dashboard metrics"); queryMetricsDataForDashboardGraphs(); } else { - Log.debug("Chart path for: loaded metrics"); + Log.debug("Chart path for: non-dashboard metrics"); drawGraph(); } } 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 6cef557..07bfb99 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 @@ -13,6 +13,9 @@ chart_unknown_label = Unknown chart_title_avg_label = Avg chart_title_min_label = Min chart_title_peak_label = Peak +chart_hover_start_label = Start +chart_hover_end_label = End +chart_hover_period_label = Period common_alert_high = High common_alert_low = Low common_alert_medium = Medium 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 e28f368..1082e5d 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 @@ -36,6 +36,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period common_alert_high = Vysoká common_alert_low = Nízká common_alert_medium = Střední 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 fc73e11..135af03 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 @@ -16,6 +16,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period common_alert_high = HOCH common_alert_low = NIEDRIG common_alert_medium = MITTEL 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 e33186c..753bd5f 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 @@ -16,6 +16,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period common_alert_high = 高 common_alert_low = 低 common_alert_medium = 中 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 59e0948..64f6538 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 @@ -13,6 +13,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period view_admin_systemSettings_BaselineDataSet_desc = Quantidade de dados mensurados que ser\u00E1 utilizada para determinar um baseline. Valor especificado em dias. common_alert_high = Alto common_alert_low = Baixo 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 ac50a84..a5b62ef 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 @@ -13,6 +13,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period #common_alert_high = High #common_alert_low = Low #common_alert_medium = Medium 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 c662f30..83bc3f3 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 @@ -13,6 +13,9 @@ ##chart_title_avg_label = Avg ##chart_title_min_label = Min ##chart_title_peak_label = Peak +##chart_hover_start_label = Start +##chart_hover_end_label = End +##chart_hover_period_label = Period common_alert_high = High common_alert_low = Low common_alert_medium = Medium diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 7a306ee..16af41f 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -9,7 +9,7 @@ * A ChartContext can be passed to multiple chart renders to display different chart types * of that data. */ -var ChartContext = function (chartId, metricsData, xAxisLabel, yAxisLabel, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel) +var ChartContext = function (chartId, metricsData, xAxisLabel, yAxisLabel, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel) { this.chartId = chartId; this.chartHandle = "#rChart-" + this.chartId; @@ -25,6 +25,9 @@ var ChartContext = function (chartId, metricsData, xAxisLabel, yAxisLabel, yAxis this.timeLabel = timeLabel; this.downLabel = downLabel; this.unknownLabel = unknownLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverEndLabel = hoverEndLabel; + this.hoverPeriodLabel = hoverPeriodLabel; /** * Can be called to validate the charting arguments. * @return {boolean}

1 0

[rhq] 3 commits - .classpath modules/core modules/enterprise modules/plugins
by Jay Shaughnessy 19 Jan '13

19 Jan '13

.classpath | 4 ++-- modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java | 3 ++- modules/enterprise/server/itests-2/pom.xml | 3 +-- modules/plugins/jboss-as-5/pom.xml | 9 ++++++++- 4 files changed, 13 insertions(+), 6 deletions(-) New commits: commit e554bc75c9a653924a518609c93e8134da32ab87 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jan 18 20:08:05 2013 -0500 Try to fix issues in AS5 itests due to shrinkwrap upgrade diff --git a/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java b/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java index 8b850aa..544c1ce 100644 --- a/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java +++ b/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java @@ -135,8 +135,9 @@ public abstract class AbstractAgentPluginTest extends Arquillian { // Pull in any required plugins from our pom's dependencies. Collection<RhqAgentPluginArchive> requiredPlugins = Arrays.asList(mavenDependencyResolver - .loadPomFromFile("pom.xml").importRuntimeDependencies(new AcceptScopesStrategy(ScopeType.PROVIDED)) + .loadPomFromFile("pom.xml").importRuntimeAndTestDependencies(new AcceptScopesStrategy(ScopeType.PROVIDED)) .as(RhqAgentPluginArchive.class)); + return ShrinkWrap.create(ZipImporter.class, pluginJarFile.getName()).importFrom(pluginJarFile) .as(RhqAgentPluginArchive.class).withRequiredPluginsFrom(requiredPlugins); } diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index fff3f1d..2474eec 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -447,7 +447,14 @@ </properties> <dependencies> - + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> + </dependencies> <build> commit 9b513917ec33631c96a8fe2cfbb135f09984500d Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jan 18 19:58:27 2013 -0500 trivial, remove commented code diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 8895077..5c0da0d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -65,8 +65,7 @@ <artifactId>arquillian-testng-container</artifactId> <scope>test</scope> </dependency> -  + <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-depchain</artifactId> commit 86671512862efc76878f0c137e67ca10ac644405 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jan 18 19:58:06 2013 -0500 Update Eclipse .classpath to latest shrinkwrap resolver diff --git a/.classpath b/.classpath index cd7c799..4d6da55 100644 --- a/.classpath +++ b/.classpath @@ -311,8 +311,8 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/shrinkwrap-api/1.0.1/shrinkwrap-api-1.0.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.1/shrinkwrap-spi-1.0.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-api-base/2.0.0-alpha-3/shrinkwrap-descriptors-api-base-2.0.0-alpha-3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/2.0.0-alpha-6/shrinkwrap-resolver-api-2.0.0-alpha-6.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/2.0.0-alpha-6/shrinkwrap-resolver-api-maven-2.0.0-alpha-6.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/2.0.0-alpha-7/shrinkwrap-resolver-api-2.0.0-alpha-7.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/2.0.0-alpha-7/shrinkwrap-resolver-api-maven-2.0.0-alpha-7.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/test/arquillian-test-spi/1.0.3.Final/arquillian-test-spi-1.0.3.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/test/arquillian-test-api/1.0.3.Final/arquillian-test-api-1.0.3.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/arquillian/core/arquillian-core-spi/1.0.3.Final/arquillian-core-spi-1.0.3.Final.jar"/>

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits January 2013