New branch 'bug/747925' available with the following commits:
1
0
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 4 ++
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java | 20 ++++++----
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 8 ++++
3 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit bf2b0ec898f4cd8ff89b7f6c4695d36ffd95ab97
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 16 16:17:32 2012 -0500
[BZ 769861] add a new "Maximum Threads" trait to the Tomcat Connector ResourceTypes in both the as4 and as5 plugins (https://bugzilla.redhat.com/show_bug.cgi?id=769861)
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index f7fa423..72aa6dc 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1237,6 +1237,10 @@
category="utilization" displayType="summary"
description="the number of threads for this connector that currently exist"/>
+ <metric property="ThreadPool|maxThreads"
+ displayName="Maximum Threads"
+ category="utilization" displayType="summary" dataType="trait"
+ description="Maximum number of threads that can be allocated for the thread pool of this connector"/>
</service>
<service name="Virtual Host"
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java
index 0256469..8244437 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java
@@ -1,6 +1,6 @@
- /*
+/*
* Jopr Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,9 @@ import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementReport;
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -90,13 +92,17 @@ public class JBossASTomcatConnectorComponent extends MBeanResourceComponent<JBos
}
EmsAttribute attribute = eBean.getAttribute(attributeName);
-
Object valueObject = attribute.refresh();
- Number value = (Number) valueObject;
-
- report.addData(new MeasurementDataNumeric(request, value.doubleValue()));
+
+ if (valueObject != null) {
+ if (request.getDataType() == DataType.TRAIT) {
+ report.addData(new MeasurementDataTrait(request, valueObject.toString()));
+ } else { // numeric
+ report.addData(new MeasurementDataNumeric(request, ((Number)valueObject).doubleValue()));
+ }
+ }
} catch (Exception e) {
- log.error("Failed to obtain measurement [" + name + "]", e);
+ log.error("Failed to obtain measurement [" + name + "].", e);
}
}
}
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index d4d0874..e7c1def 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -415,7 +415,14 @@
displayName="Threads Allocated"
category="utilization" displayType="summary"/>
+ <!-- jboss.web:name=http-0.0.0.0-8080,type=ThreadPool:maxThreads -->
+ <metric property="jboss.web:name=%schema%%dash%%address%-%port%,type=ThreadPool:maxThreads"
+ displayName="Maximum Threads"
+ description="Maximum number of threads that can be allocated for the thread pool of this connector"
+ category="utilization" displayType="summary" dataType="trait"/>
+
</service>
+
<service name="VHost"
discovery="JBossASTomcatVHostDiscoveryService"
class="JBossASTomcatVHostService"
@@ -432,6 +439,7 @@
displayName="Aliases"
dataType="trait" />
</service>
+
</server>
<server name="JBoss AS JVM"
1
0
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/DatasourceOrConnectionFactoryComponent.java | 77 ++++++++++
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 24 +--
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 14 +
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 20 ++
4 files changed, 116 insertions(+), 19 deletions(-)
New commits:
commit 708c398f00e5d09d4346b51225fb1ce083cc4ce6
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 16 15:25:46 2012 -0500
[BZ 786161] add a new "Connection Available?" trait to datasource and connection factory Resource types
(https://bugzilla.redhat.com/show_bug.cgi?id=786161)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/DatasourceOrConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/DatasourceOrConnectionFactoryComponent.java
new file mode 100644
index 0000000..9dd794e
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/DatasourceOrConnectionFactoryComponent.java
@@ -0,0 +1,77 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 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, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbossas5;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ManagedComponent;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.operation.OperationResult;
+
+/**
+ * A Resource component for managing JBoss AS 5/6 datasources or connection factories.
+ *
+ * @author Ian Springer
+ */
+public class DatasourceOrConnectionFactoryComponent extends ManagedComponentComponent {
+
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ @Override
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
+ getValues(getManagedComponent(), report, metrics);
+ }
+
+ @Override
+ protected void getValues(ManagedComponent managedComponent, MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
+ Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
+ for (MeasurementScheduleRequest request : metrics) {
+ String metricName = request.getName();
+ if (metricName.equals("custom.connectionAvailable")) {
+ try {
+ Configuration parameters = new Configuration();
+ OperationResult result = invokeOperation(managedComponent, "testConnection", parameters);
+ PropertySimple resultProp = result.getComplexResults().getSimple("result");
+ boolean connectionAvailable = resultProp.getBooleanValue();
+ MeasurementDataTrait trait = new MeasurementDataTrait(request, connectionAvailable ? "yes" : "no");
+ report.addData(trait);
+ } catch (Exception e) {
+ log.error("Failed to collect trait [" + metricName + "].", e);
+ }
+ } else {
+ uncollectedMetrics.add(request);
+ }
+ }
+
+ super.getValues(managedComponent, report, uncollectedMetrics);
+ }
+
+}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index f4ebef0..3e7e164 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -1,6 +1,6 @@
/*
* Jopr Management Platform
-* Copyright (C) 2005-2009 Red Hat, Inc.
+* Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,10 @@
package org.rhq.plugins.jbossas5;
import java.lang.reflect.Array;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -92,10 +95,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
protected static final char PREFIX_DELIMITER = '|';
- // Map the managedComponentComponent class name to a map of metricName to "isRuntimeProp". So, for a given
- // component we can quickly determine whether requested metrics need to refresh the managedComponent, or not.
- private static final Map<String, Map<String, Boolean>> runtimeMetricMaps = new HashMap<String, Map<String, Boolean>>();
-
private final Log log = LogFactory.getLog(this.getClass());
/**
@@ -237,8 +236,13 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// OperationFacet Implementation --------------------------------------------
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
+ return invokeOperation(getManagedComponent(), name, parameters);
+ }
+
+ protected OperationResult invokeOperation(ManagedComponent managedComponent, String name, Configuration parameters)
+ throws Exception {
OperationDefinition operationDefinition = getOperationDefinition(name);
- ManagedOperation managedOperation = getManagedOperation(operationDefinition);
+ ManagedOperation managedOperation = getManagedOperation(managedComponent, operationDefinition);
// Convert parameters into MetaValue array.
MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation,
parameters, operationDefinition);
@@ -419,7 +423,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
protected ManagedComponent getManagedComponent() {
- ManagedComponent managedComponent = null;
+ ManagedComponent managedComponent;
try {
ManagementView managementView = getConnection().getManagementView();
managedComponent = managementView.getComponent(this.componentName, this.componentType);
@@ -453,8 +457,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
@NotNull
- private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) {
- ManagedComponent managedComponent = getManagedComponent();
+ private ManagedOperation getManagedOperation(ManagedComponent managedComponent,
+ OperationDefinition operationDefinition) {
Set<ManagedOperation> operations = managedComponent.getOperations();
for (ManagedOperation operation : operations) {
ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
index 852b594..669bc04 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
@@ -1,6 +1,6 @@
/*
* Jopr Management Platform
- * Copyright (C) 2005-2009 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -41,17 +41,19 @@ import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
*
* @author Ian Springer
*/
-public class TxConnectionFactoryComponent extends ManagedComponentComponent {
+public class TxConnectionFactoryComponent extends DatasourceOrConnectionFactoryComponent {
+
private final Log log = LogFactory.getLog(this.getClass());
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent mc = getManagedComponent();
+ ManagedComponent managedComponent = getManagedComponent();
+
Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
for (MeasurementScheduleRequest request : metrics) {
try {
if (request.getName().equals("custom.transactionType")) {
- ManagedProperty xaTransactionProp = mc.getProperty("xa-transaction");
+ ManagedProperty xaTransactionProp = managedComponent.getProperty("xa-transaction");
SimpleValue xaTransactionMetaValue = (SimpleValue) xaTransactionProp.getValue();
Boolean xaTransactionValue = (xaTransactionMetaValue != null) ? (Boolean) xaTransactionMetaValue
.getValue() : null;
@@ -65,6 +67,8 @@ public class TxConnectionFactoryComponent extends ManagedComponentComponent {
log.error("Failed to collect metric for " + request, e);
}
}
- super.getValues(report, uncollectedMetrics);
+
+ super.getValues(managedComponent, report, uncollectedMetrics);
}
+
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index ab12497..f7fa423 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -7,6 +7,13 @@
dataType="trait" category="performance"/>
'>
+<!ENTITY datasourceAndConnectionFactoryMetrics '
+ <!-- Traits -->
+ <metric property="custom.connectionAvailable" displayType="summary" displayName="Connection Available?"
+ dataType="trait" category="availability" defaultInterval="900000"
+ description="could a connection to the underlying data provider be obtained?"/>
+'>
+
<!ENTITY datasourceAndConnectionFactoryOperations '
<operation name="flush" displayName="Flush"
description="Flush the connections in the pool"/>
@@ -1257,7 +1264,7 @@
<!-- =================================== ManagedComponent Resource types =================================== -->
<service name="No Tx Datasource"
- class="ManagedComponentComponent"
+ class="DatasourceOrConnectionFactoryComponent"
discovery="ManagedComponentDiscoveryComponent"
createDeletePolicy="both"
subCategory="Datasources"
@@ -1279,6 +1286,7 @@
&datasourceAndConnectionFactoryOperations;
&managedObjectMetrics;
+ &datasourceAndConnectionFactoryMetrics;
&datasourceMetrics;
<resource-configuration>
@@ -1306,7 +1314,7 @@
</service>
<service name="Local Tx Datasource"
- class="ManagedComponentComponent"
+ class="DatasourceOrConnectionFactoryComponent"
discovery="ManagedComponentDiscoveryComponent"
createDeletePolicy="both"
subCategory="Datasources"
@@ -1328,6 +1336,7 @@
&datasourceAndConnectionFactoryOperations;
&managedObjectMetrics;
+ &datasourceAndConnectionFactoryMetrics;
&datasourceMetrics;
<resource-configuration>
@@ -1356,7 +1365,7 @@
</service>
<service name="XA Datasource"
- class="ManagedComponentComponent"
+ class="DatasourceOrConnectionFactoryComponent"
discovery="ManagedComponentDiscoveryComponent"
createDeletePolicy="both"
subCategory="Datasources"
@@ -1378,6 +1387,7 @@
&datasourceAndConnectionFactoryOperations;
&managedObjectMetrics;
+ &datasourceAndConnectionFactoryMetrics;
&datasourceMetrics;
<resource-configuration>
@@ -1458,7 +1468,7 @@
<service name="No Tx ConnectionFactory"
description="A ConnectionFactory that does not take part in JTA transactions."
- class="ManagedComponentComponent"
+ class="DatasourceOrConnectionFactoryComponent"
createDeletePolicy="both"
subCategory="Connection Factories"
discovery="ManagedComponentDiscoveryComponent">
@@ -1488,6 +1498,7 @@
&datasourceAndConnectionFactoryOperations;
&managedObjectMetrics;
+ &datasourceAndConnectionFactoryMetrics;
&connectionFactoryMetrics;
<resource-configuration>
@@ -1541,6 +1552,7 @@
dataType="trait" category="performance"/>
&managedObjectMetrics;
+ &datasourceAndConnectionFactoryMetrics;
&connectionFactoryMetrics;
<resource-configuration>
1
0
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 22 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 161 +++++-----
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 8
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 10
9 files changed, 124 insertions(+), 103 deletions(-)
New commits:
commit 0ead40bcceb8c8d659719456f385de8d261bd116
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 14 15:26:09 2012 -0500
[BZ 790908] as-5 plugin consumes too much memory for managed components
Removing extra call to fetch managed object
We were making an extra call to getManagedCompoment in
AbstractEjbComponent during metric collection. I discovered this while
doing some profiling. With this change execution time for
AbstractEjbBeanComponent.getValues is reduced by about 50% Also adding
some logging in ManagedComponentComponent.getAvailability to indicate
when an availability refresh is needed. This could be useful for tuning
the interval.
(cherry picked from commit 097bcd786afe718d5c8316152580956c009ed9b1)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index c28dad2..a0fccc5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -54,7 +54,8 @@ import org.rhq.core.pluginapi.operation.OperationResult;
* @author Lukas Krejci
* @author Ian Springer
*/
-public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
+public abstract class
+ AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
private final Log log = LogFactory.getLog(this.getClass());
private static final String VIEW_INVOCATION_STATS_OPERATION_NAME = "viewInvocationStats";
@@ -83,7 +84,7 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
}
}
// Let our superclass handle any metrics we didn't collect.
- super.getValues(report, remainingRequests);
+ super.getValues(managedComponent, report, remainingRequests);
}
@Override
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 201484e..f4ebef0 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -127,6 +127,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > availRefreshInterval) {
+ if (log.isDebugEnabled()) {
+ log.debug("The availability refresh interval for [resourceKey: " + getResourceContext().getResourceKey()
+ + ", type: " + componentType + ", name: " + componentName + "] has been exceeded by " +
+ (timeSinceComponentRefresh - availRefreshInterval) + " ms. Reloading managed component.");
+ }
getManagedComponent();
}
@@ -249,7 +254,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = getManagedComponent();
+ getValues(getManagedComponent(), report, metrics);
+ }
+
+ protected void getValues(ManagedComponent managedComponent, MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -260,7 +269,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
log.error("Failed to collect metric for " + request, e);
} else {
log.debug("Failed to collect metric for " + request
- + ", but managed component is not in the RUNNING state.", e);
+ + ", but managed component is not in the RUNNING state.", e);
}
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index e5e4a9b..cba0136 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -999,13 +999,13 @@
<c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
default="15" type="integer"
- description="The amount of time, in minutes, that can elapse for service availability checks
- without having to refresh the managed object from the server. Services cache information
- used to perform availability checks. This property determines how frequently that
- data needs to be reloaded from the server. Any time the managed object is
- loaded from the server, like for collecting metrics, the availability information
- is updated and the interval is reset. Note that this property does not effect the
- frequency of availability scans performed by the agent."/>
+ description="The amount of time, in minutes, that can elapse for service resource
+ (e.g., EJBs, data sources) availability checks without having to refresh the
+ managed object from the JBoss server. The information used to perform availability
+ checks is cached. This property determines how frequently that data needs to be
+ reloaded from the JBoss server. Any time the managed object is loaded from the
+ server, like for collecting metrics, the availability information is updated and
+ the interval is reset."/>
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
commit 5b2d3bd898478515debe068dc6be5b8f35afe724
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 21:50:04 2012 -0500
[BZ 790908] as-5 plugin consumes too much memory for managed components
Make service availability refresh interval configurable
The refresh interval is now configurable from the application server
component. The interval setting then applies to all descendant services.
(cherry picked from commit ec9ea86edbfa45e1fcb739d8788e919557630ebd)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 374ae95..201484e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -99,11 +99,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
/**
- * The availability watermark specifies a duration that if exceeded means a managed
+ * The availability refresh interval specifies a duration that if exceeded means a managed
* component refresh is needed to perform an availability check. That duration is set
* to 15 minutes.
*/
- private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+ private static final long AVAIL_REFRESH_INTERVAL = 1000 * 60 * 15; // 15 minutes
/**
* The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
@@ -114,6 +114,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
* perform an availability check.
*/
private long lastComponentRefresh = 0L;
+
+ private long availRefreshInterval = AVAIL_REFRESH_INTERVAL;
private RunState runState = RunState.UNKNOWN;
@@ -124,7 +126,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
- if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ if (timeSinceComponentRefresh > availRefreshInterval) {
getManagedComponent();
}
@@ -141,11 +143,14 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
- this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
+ componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
Configuration pluginConfig = resourceContext.getPluginConfiguration();
- this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
- log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
- + " component '" + this.componentName + "'.");
+ componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
+ initAvailRefreshInterval(resourceContext);
+ if (log.isTraceEnabled()) {
+ log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
+ + " component '" + this.componentName + "'.");
+ }
}
public void stop() {
@@ -476,4 +481,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return value.toString();
}
}
+
+ private void initAvailRefreshInterval(ResourceContext<ProfileServiceComponent<?>> context) {
+ ProfileServiceComponent<?> component = context.getParentResourceComponent();
+ while (component != null) {
+ if (component instanceof ApplicationServerComponent) {
+ break;
+ }
+ component = (ProfileServiceComponent<?>) component.getResourceContext().getParentResourceComponent();
+ }
+
+ if (component == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to find parent " + ApplicationServerComponent.class.getSimpleName() +
+ ". Using default component refresh interval, " + AVAIL_REFRESH_INTERVAL + " ms");
+ }
+ return;
+ }
+
+ String interval = component.getResourceContext().getPluginConfiguration().getSimpleValue(
+ "serviceAvailabilityRefreshInterval", Long.toString(AVAIL_REFRESH_INTERVAL));
+ availRefreshInterval = Long.parseLong(interval) * 1000 * 60;
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index e1b8d25..e5e4a9b 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -997,6 +997,16 @@
</c:constraint>
</c:simple-property>
+ <c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
+ default="15" type="integer"
+ description="The amount of time, in minutes, that can elapse for service availability checks
+ without having to refresh the managed object from the server. Services cache information
+ used to perform availability checks. This property determines how frequently that
+ data needs to be reloaded from the server. Any time the managed object is
+ loaded from the server, like for collecting metrics, the availability information
+ is updated and the interval is reset. Note that this property does not effect the
+ frequency of availability scans performed by the agent."/>
+
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
description="The name of the JBoss AS JVM resource."/>
commit 15b91db1fb564279357b8587d63a36ab9ab3c5fb
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 11:56:54 2012 -0500
[BZ 790908] as-5 plugin consumes too much memory for managed components
Remove extra calls to getManagedComponent
There are several places where getManagedComponent was called from
within the same method. This was fine previously since the managed
object was cached, but we do not want to make those extra calls any more
since the managed object is no longer cached.
(cherry picked from commit d274464f1b3901b97d74838db4fc0fb8db715f13)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index 5f63261..c28dad2 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.CompositeValue;
@@ -60,17 +61,18 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ ManagedComponent managedComponent = getManagedComponent();
Set<MeasurementScheduleRequest> remainingRequests = new LinkedHashSet();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
if (metricName.equals("methodInvocationTime")) {
// Convert the method stats CompositeValues into nice strongly typed objects.
- InvocationStats invocationStats = getInvocationStats();
+ InvocationStats invocationStats = getInvocationStats(managedComponent);
if (!invocationStats.methodStats.isEmpty()) {
CallTimeData callTimeData = createCallTimeData(request, invocationStats);
report.addData(callTimeData);
- resetInvocationStats();
+ resetInvocationStats(managedComponent);
}
} else {
remainingRequests.add(request);
@@ -87,13 +89,14 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
OperationResult result;
+ ManagedComponent managedComponent = getManagedComponent();
if (VIEW_INVOCATION_STATS_OPERATION_NAME.equals(name)) {
result = new OperationResult();
PropertyList methodList = new PropertyList("methods");
result.getComplexResults().put(methodList);
// Convert the invocation stats CompositeValues into a nice strongly typed object.
- List<MethodStats> allMethodStats = getInvocationStats().methodStats;
+ List<MethodStats> allMethodStats = getInvocationStats(managedComponent).methodStats;
for (MethodStats methodStats : allMethodStats) {
PropertyMap method = new PropertyMap("method", new PropertySimple("methodName", methodStats.name),
@@ -108,12 +111,12 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return result;
}
- private InvocationStats getInvocationStats() {
+ private InvocationStats getInvocationStats(ManagedComponent managedComponent) {
InvocationStats invocationStats = new InvocationStats();
List<MethodStats> allMethodStats = new ArrayList<MethodStats>();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
String propName = pluginConfig.getSimple("invocationStatsPropertyName").getStringValue();
- ManagedProperty detypedInvokedStatsProp = this.getManagedComponent().getProperty(propName);
+ ManagedProperty detypedInvokedStatsProp = managedComponent.getProperty(propName);
invocationStats.endTime = System.currentTimeMillis();
CompositeValue detypedInvokeStatsMetaValue = (CompositeValue) detypedInvokedStatsProp.getValue();
CompositeValue allMethodStatsMetaValue = (CompositeValue) detypedInvokeStatsMetaValue.get("methodStats");
@@ -157,8 +160,8 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return callTimeData;
}
- private void resetInvocationStats() {
- Set<ManagedOperation> operations = getManagedComponent().getOperations();
+ private void resetInvocationStats(ManagedComponent managedComponent) {
+ Set<ManagedOperation> operations = managedComponent.getOperations();
for (ManagedOperation operation : operations) {
if (operation.getName().equals("resetInvocationStats")) {
operation.invoke();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index b89eb10..ebbf9bb 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -45,9 +45,6 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- // TODO Review with ips to see if we need the following, commented out call
- // jsanda
- //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
index e864117..e5656f5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
@@ -43,10 +43,6 @@ public class JBossMessagingComponent extends ManagedComponentComponent implement
MeasurementFacet {
private CreateChildResourceFacetDelegate createChildResourceDelegate;
- public AvailabilityType getAvailability() {
- return super.getAvailability();
- }
-
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 9637954..374ae95 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -125,15 +125,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
- try {
- getManagedComponent();
- } catch (Throwable t) {
- if (log.isDebugEnabled()) {
- log.debug("Could not get component state for " + componentType + " component '" + componentName +
- "', cause: " + t.getMessage(), t);
- return AvailabilityType.DOWN;
- }
- }
+ getManagedComponent();
}
if (runState == RunState.RUNNING) {
@@ -164,8 +156,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
+ ManagedComponent managedComponent = getManagedComponent();
try {
- ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -174,7 +166,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps,
getResourceContext().getResourceType());
} catch (Exception e) {
- RunState runState = getManagedComponent().getRunState();
+ RunState runState = managedComponent.getRunState();
if (runState == RunState.RUNNING) {
this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e);
} else {
@@ -252,7 +244,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
-// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
@@ -270,39 +261,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
-// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
-// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
-// // than once, it will settle down near immediately
-// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
-// if (null == runtimeMetricMap) {
-// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
-// runtimeMetricMap = new HashMap<String, Boolean>();
-// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
-// }
-//
-// // determine whether we can use the cachedComponent or if we need to force a component fetch to
-// // gather the requested metrics.
-// boolean forceRefresh = false;
-// for (MeasurementScheduleRequest request : metrics) {
-// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
-// // if this is the first time we've seen this metric find out if it's a runtime prop
-// if (null == isRuntimeMetric) {
-// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
-// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
-// runtimeMetricMap.put(request.getName(),
-// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
-// }
-//
-// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
-// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
-// forceRefresh = true;
-// break;
-// }
-// }
-//
-// return getManagedComponent();
-// }
-
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
@@ -461,7 +419,9 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
+ this.componentName + "].");
}
- log.trace("Retrieved " + toString(managedComponent) + ".");
+ if (log.isTraceEnabled()) {
+ log.trace("Retrieved " + toString(managedComponent) + ".");
+ }
lastComponentRefresh = System.currentTimeMillis();
runState = managedComponent.getRunState();
return managedComponent;
@@ -490,7 +450,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return operation;
}
throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName()
- + "' not found on ManagedComponent [" + getManagedComponent() + "].");
+ + "' not found on ManagedComponent [" + managedComponent + "].");
}
private static String toString(ManagedComponent managedComponent) {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
index 2926a95..ba2a4c9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
@@ -74,9 +74,10 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public AvailabilityType getAvailability() {
RunState runState = getManagedComponent().getRunState();
return (runState == RunState.RUNNING || runState == RunState.UNKNOWN) ? AvailabilityType.UP
- : AvailabilityType.DOWN;
+ : AvailabilityType.DOWN;
}
+
// ConfigurationFacet -----------------------------
@Override
@@ -189,16 +190,16 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public CreateResourceReport createResource(CreateResourceReport report) {
try {
+ ManagedComponent bindingManagerComponent = getBindingManager();
if (BINDING_SET_SERVICE_NAME.equals(report.getResourceType().getName())) {
Configuration bindingConfiguration = report.getResourceConfiguration();
checkValidity(bindingConfiguration);
- CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(getBindingSetValueMetaType(),
- bindingConfiguration);
+ CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(
+ getBindingSetValueMetaType(bindingManagerComponent), bindingConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = getBindingManager();
ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
//check that the provided binding set name is unique
@@ -242,8 +243,8 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
return report;
}
- public MetaType getBindingSetValueMetaType() {
- CollectionMetaType bindingSetsMetaType = (CollectionMetaType) getBindingManager().getProperty(
+ public MetaType getBindingSetValueMetaType(ManagedComponent bindingManager) {
+ CollectionMetaType bindingSetsMetaType = (CollectionMetaType) bindingManager.getProperty(
Util.BINDING_SETS_PROPERTY).getMetaType();
return bindingSetsMetaType.getElementType();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
index 024d60d..8303464 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
@@ -106,19 +106,19 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
ManagerComponent managerResourceComponent = context.getParentResourceComponent();
+ ManagedComponent bindingManager = managerResourceComponent.getBindingManager();
Configuration updatedConfiguration = report.getConfiguration();
managerResourceComponent.checkValidity(updatedConfiguration);
- MetaType bindingSetValueMetaType = context.getParentResourceComponent().getBindingSetValueMetaType();
+ MetaType bindingSetValueMetaType = managerResourceComponent.getBindingSetValueMetaType(bindingManager);
CompositeValue currentBindingSet = Util.getBindingSetFromConfiguration(bindingSetValueMetaType,
updatedConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = managerResourceComponent.getBindingManager();
- ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
+ ManagedProperty bindingSetsProperty = bindingManager.getProperty(Util.BINDING_SETS_PROPERTY);
String thisBindingSetName = managerResourceComponent.getBindingSetNameFromResourceKey(context.getResourceKey());
//create new set of binding sets
@@ -130,7 +130,7 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
bindingSetsProperty.setValue(newBindingSetsValue);
- context.getParentResourceComponent().updateBindingManager(bindingManagerComponent);
+ context.getParentResourceComponent().updateBindingManager(bindingManager);
report.setStatus(ConfigurationUpdateStatus.SUCCESS);
} catch (Exception e) {
commit 5c3cab229f5b743bef6f436f07736f7117953201
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Feb 9 12:31:44 2012 -0500
[BZ 790908] as-5 plugin consumes too much memory for managed components
Do not cache ManagedComponent objects to avoid high memory usage.
With this commit we no longer cache the ManagedComponent objects we get
back from the profile service. Even when we were caching them, we still
regularly fetched them for metric collections.
The caching was introduced to address high CPU utilization during
availability checks. The logic in
ManagedComponentComponent.getAvailability has been refactored so that we
do not necessarily fetch the component on every availability check.
(cherry picked from commit dbd357d545896e61bdaaebba273dee93703aefb6)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index 15ffea3..b89eb10 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -39,13 +39,15 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
private static final ComponentType MDB_COMPONENT_TYPE = new ComponentType("EJB", "MDB");
@Override
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
+ protected ManagedComponent getManagedComponent() {
if (MDB_COMPONENT_TYPE.equals(getComponentType())) {
try {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- mv.load();
+ // TODO Review with ips to see if we need the following, commented out call
+ // jsanda
+ //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
@@ -59,7 +61,7 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
throw new IllegalStateException(e);
}
} else {
- return super.getManagedComponent(forceRefresh);
+ return super.getManagedComponent();
}
return null;
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 23f8b2d..9637954 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -23,11 +23,7 @@
package org.rhq.plugins.jbossas5;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,7 +40,6 @@ import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.RunState;
-import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.metatype.api.values.ArrayValue;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.CompositeValue;
@@ -103,8 +98,24 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
- // Cache the ManagedComponent since it can be re-used to request any ViewUse.RUNTIME property values
- private ManagedComponent managedComponent = null;
+ /**
+ * The availability watermark specifies a duration that if exceeded means a managed
+ * component refresh is needed to perform an availability check. That duration is set
+ * to 15 minutes.
+ */
+ private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+
+ /**
+ * The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
+ * the life cycle of this resource component. For example during metrics collections
+ * when getValues is invoked, getManagedComponent is called. Any time getManagedComponent
+ * is called the lastComponentRefresh timestamp is updated. This timestamp is used in
+ * {@link #getAvailability} to determine whether or not a component is needed to
+ * perform an availability check.
+ */
+ private long lastComponentRefresh = 0L;
+
+ private RunState runState = RunState.UNKNOWN;
private String componentName;
private ComponentType componentType;
@@ -112,19 +123,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// ResourceComponent Implementation --------------------------------------------
public AvailabilityType getAvailability() {
- RunState runState;
- try {
- runState = getManagedComponent().getRunState();
- } catch (Throwable t) {
- log.debug("Could not get component state for " + this.componentType + " component '" + this.componentName
- + "', cause: ", t);
- return AvailabilityType.DOWN;
+ long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
+ if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ try {
+ getManagedComponent();
+ } catch (Throwable t) {
+ if (log.isDebugEnabled()) {
+ log.debug("Could not get component state for " + componentType + " component '" + componentName +
+ "', cause: " + t.getMessage(), t);
+ return AvailabilityType.DOWN;
+ }
+ }
}
+
if (runState == RunState.RUNNING) {
return AvailabilityType.UP;
} else {
- log.debug(this.componentType + " component '" + this.componentName + "' was not running, state" + " was: "
- + runState);
+ if (log.isDebugEnabled()) {
+ log.debug(componentType + " component '" + componentName + "' was not running, state was : " +
+ runState);
+ }
return AvailabilityType.DOWN;
}
}
@@ -139,7 +157,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
public void stop() {
- managedComponent = null;
super.stop();
}
@@ -148,7 +165,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -173,7 +190,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
Configuration resourceConfig = configurationUpdateReport.getConfiguration();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig);
if (this.log.isDebugEnabled())
@@ -235,7 +252,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+ ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -252,44 +270,44 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
- protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
- // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
- // than once, it will settle down near immediately
- Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
- if (null == runtimeMetricMap) {
- //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
- runtimeMetricMap = new HashMap<String, Boolean>();
- runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
- }
-
- // determine whether we can use the cachedComponent or if we need to force a component fetch to
- // gather the requested metrics.
- boolean forceRefresh = false;
- for (MeasurementScheduleRequest request : metrics) {
- Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
- // if this is the first time we've seen this metric find out if it's a runtime prop
- if (null == isRuntimeMetric) {
- //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
- ManagedProperty managedProp = getManagedProperty(managedComponent, request);
- runtimeMetricMap.put(request.getName(),
- Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
- }
-
- if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
- //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
- forceRefresh = true;
- break;
- }
- }
-
- return getManagedComponent(forceRefresh);
- }
+// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
+// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
+// // than once, it will settle down near immediately
+// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
+// if (null == runtimeMetricMap) {
+// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
+// runtimeMetricMap = new HashMap<String, Boolean>();
+// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
+// }
+//
+// // determine whether we can use the cachedComponent or if we need to force a component fetch to
+// // gather the requested metrics.
+// boolean forceRefresh = false;
+// for (MeasurementScheduleRequest request : metrics) {
+// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
+// // if this is the first time we've seen this metric find out if it's a runtime prop
+// if (null == isRuntimeMetric) {
+// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
+// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
+// runtimeMetricMap.put(request.getName(),
+// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
+// }
+//
+// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
+// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
+// forceRefresh = true;
+// break;
+// }
+// }
+//
+// return getManagedComponent();
+// }
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
} else {
- Object value = getSimpleValue(managedComponent, metricName);
+ Object value = getSimpleValue(component, metricName);
return value == null ? null : toString(value);
}
}
@@ -429,26 +447,23 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
protected ManagedComponent getManagedComponent() {
- return getManagedComponent(false);
- }
-
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
-
- if (!forceRefresh && null != this.managedComponent) {
- return this.managedComponent;
- }
-
+ ManagedComponent managedComponent = null;
try {
ManagementView managementView = getConnection().getManagementView();
managedComponent = managementView.getComponent(this.componentName, this.componentType);
} catch (Exception e) {
+ runState = RunState.UNKNOWN;
throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent ["
- + this.componentName + "].", e);
+ + this.componentName + "].", e);
}
- if (managedComponent == null)
+ if (managedComponent == null) {
+ runState = RunState.UNKNOWN;
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
- + this.componentName + "].");
+ + this.componentName + "].");
+ }
log.trace("Retrieved " + toString(managedComponent) + ".");
+ lastComponentRefresh = System.currentTimeMillis();
+ runState = managedComponent.getRunState();
return managedComponent;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
index cdfa98b..852b594 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
@@ -46,7 +46,7 @@ public class TxConnectionFactoryComponent extends ManagedComponentComponent {
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent mc = getManagedComponent(true);
+ ManagedComponent mc = getManagedComponent();
Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
for (MeasurementScheduleRequest request : metrics) {
try {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
index 0d96b2b..6eb7e7e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
@@ -115,7 +115,7 @@ public class WebApplicationContextComponent extends ManagedComponentComponent {
ProfileServiceComponent warComponent = getResourceContext().getParentResourceComponent();
ManagementView managementView = warComponent.getConnection().getManagementView();
- ManagedComponent component = prepareForMetricCollection(requests);
+ ManagedComponent component = getManagedComponent();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
1
0
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java | 22 ++
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java | 17 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 11 +
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 31 +++
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 102 +++++++++-
5 files changed, 171 insertions(+), 12 deletions(-)
New commits:
commit c2c2f680f2b9794665d1418438074382e72c9640
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Feb 16 14:30:08 2012 -0500
[BZ 790322] pass in tags as @@ replacement tokens for ant recipes to use
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java
index b7705e1..580e54a 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java
@@ -34,6 +34,28 @@ public class DeployPropertyNames {
*/
public static final String DEPLOY_DRY_RUN = "rhq.deploy.dryRun";
+ /**
+ * Prefix which is appended to Ant properties.
+ * Tags of a resource are available as Ant properties during content bundle deployment.
+ * Tags have the format "[<namespace>:][<semantic>=]name" such as:
+ *
+ * it:group=dev
+ * org=hr
+ * qa:test1
+ * test
+ *
+ * For those tags that have a semantic specified, they will be converted to property
+ * names that bundle recipe authors can use as replacement tokens.
+ * "@@rhq.tag.[<namespace>.]<semantic>@@" will be substituted with "<name>" when realized.
+ * Following the same examples above:
+ *
+ * @@rhq.tag.it.group@@ will be replaced with dev
+ * @@rhq.tag.org@@ will be replaced with hr
+ *
+ * namespace:name tags and name-only tags, such as "qa:test1" and "test", will be ignored.
+ */
+ public static final String DEPLOY_TAG_PREFIX = "rhq.tag.";
+
private DeployPropertyNames() {
}
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
index 189c420..62956ef 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -35,8 +36,8 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
-import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.bundle.ant.BundleAntProject.AuditStatus;
+import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.system.SystemInfoFactory;
@@ -104,7 +105,7 @@ public class DeploymentUnitType extends AbstractBundleType {
boolean dryRun = getProject().isDryRun();
boolean willManageRootDir = Boolean.parseBoolean(this.manageRootDir);
File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
+ TemplateEngine templateEngine = createTemplateEngine(getProject().getUserProperties());
int deploymentId = getProject().getDeploymentId();
DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
getProject().getBundleVersion(), getProject().getBundleDescription());
@@ -542,8 +543,18 @@ public class DeploymentUnitType extends AbstractBundleType {
this.ignorePattern = getPattern(fileSets);
}
- private TemplateEngine createTemplateEngine() {
+ private TemplateEngine createTemplateEngine(Hashtable<String, String> properties) {
TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
+
+ // add tags to Template Engine tokens
+ if (properties != null) {
+ for (String s : properties.keySet()) {
+ if (s.startsWith(DeployPropertyNames.DEPLOY_TAG_PREFIX)) {
+ templateEngine.getTokens().put(s, properties.get(s));
+ }
+ }
+ }
+
// Add the deployment props to the template engine's tokens.
Configuration config = getProject().getConfiguration();
for (PropertySimple prop : config.getSimpleProperties().values()) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index 819a46d..d4190db 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -78,6 +78,7 @@ import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.criteria.BundleFileCriteria;
import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
+import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
import org.rhq.core.domain.resource.Resource;
@@ -99,6 +100,7 @@ import org.rhq.enterprise.server.content.ContentManagerLocal;
import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.core.AgentManagerLocal;
import org.rhq.enterprise.server.plugin.pc.bundle.BundleServerPluginManager;
+import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
@@ -147,6 +149,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
@EJB
private ResourceGroupManagerLocal resourceGroupManager;
+ @EJB
+ private ResourceManagerLocal resourceManager;
+
@Override
public ResourceTypeBundleConfiguration getResourceTypeBundleConfiguration(Subject subject, int compatGroupId)
throws Exception {
@@ -1161,6 +1166,12 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
}
BundleResourceDeployment resourceDeployment = resourceDeployments.get(0);
+ ResourceCriteria rc = new ResourceCriteria();
+ rc.addFilterId(resourceDeployment.getResource().getId());
+ rc.fetchTags(true);
+ Resource resource = resourceManager.findResourcesByCriteria(subject, rc).get(0);
+ resourceDeployment.setResource(resource);
+
// make sure the deployment contains the info required by the schedule service
BundleDeploymentCriteria bdc = new BundleDeploymentCriteria();
bdc.addFilterId(resourceDeployment.getBundleDeployment().getId());
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index fb0aa62..cd34fb0 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,6 +50,7 @@ import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.pluginapi.bundle.BundleDeployRequest;
import org.rhq.core.pluginapi.bundle.BundleDeployResult;
import org.rhq.core.pluginapi.bundle.BundleFacet;
@@ -319,11 +321,24 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
antProps.setProperty(DeployPropertyNames.DEPLOY_REVERT, String.valueOf(request.isRevert()));
antProps.setProperty(DeployPropertyNames.DEPLOY_CLEAN, String.valueOf(request.isCleanDeployment()));
+ // add the resource tags
+ Set<Tag> tags = resourceDeployment.getResource().getTags();
+ if (tags != null) {
+ for (Tag tag : tags) {
+ String tagPropName = getTagPropertyName(tag);
+ if (tagPropName != null) {
+ antProps.setProperty(tagPropName, tag.getName());
+ }
+ }
+ }
+
+ // add the system info "facts"
Map<String, String> sysFacts = SystemInfoFactory.fetchTemplateEngine().getTokens();
for (Map.Entry<String, String> fact : sysFacts.entrySet()) {
antProps.setProperty(fact.getKey(), fact.getValue());
}
+ // add the deployment parameter properties
Configuration config = bundleDeployment.getConfiguration();
if (config != null) {
Map<String, Property> allProperties = config.getAllProperties();
@@ -345,6 +360,22 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
return antProps;
}
+ private String getTagPropertyName(Tag tag) {
+ String namespace = tag.getNamespace();
+ String semantic = tag.getSemantic();
+
+ if (semantic == null) {
+ return null; // we are ignoring tags that are not qualified with a semantic
+ }
+
+ if (namespace == null) {
+ return DeployPropertyNames.DEPLOY_TAG_PREFIX + semantic;
+ } else {
+ // note: ':' not allowed in tokens, so this is replaced with '.'
+ return DeployPropertyNames.DEPLOY_TAG_PREFIX + namespace + '.' + semantic;
+ }
+ }
+
private String formatDiff(DeployDifferences diffs) {
String indent = " ";
String nl = "\n";
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index d712401..96a8bd5 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -28,8 +28,10 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashSet;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
@@ -52,6 +54,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.pluginapi.bundle.BundleDeployRequest;
import org.rhq.core.pluginapi.bundle.BundleDeployResult;
import org.rhq.core.pluginapi.bundle.BundleManagerProvider;
@@ -94,7 +97,7 @@ public class AntBundlePluginComponentTest {
this.plugin = new AntBundlePluginComponent();
ResourceType type = new ResourceType("antBundleTestType", "antBundleTestPlugin", ResourceCategory.SERVER, null);
Resource resource = new Resource("antBundleTestKey", "antBundleTestName", type);
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
ResourceContext<?> context = new ResourceContext(resource, null, null,
SystemInfoFactory.createJavaSystemInfo(), tmpDir, null, "antBundleTestPC", null, null, null, null, null);
this.plugin.start(context);
@@ -159,7 +162,7 @@ public class AntBundlePluginComponentTest {
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
request.setRevert(true);
@@ -300,7 +303,7 @@ public class AntBundlePluginComponentTest {
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
@@ -386,7 +389,7 @@ public class AntBundlePluginComponentTest {
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
@@ -406,6 +409,76 @@ public class AntBundlePluginComponentTest {
}
/**
+ * Test realizing of replacement tokens of resource tags.
+ */
+ @Test(enabled = true)
+ public void testTags() throws Exception {
+ ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
+ BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
+ Repo repo = new Repo("testSimpleBundle");
+ PackageType packageType = new PackageType("testSimpleBundle", resourceType);
+ Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
+ BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
+ getRecipeFromFile("test-bundle.xml"));
+ BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle", new ResourceGroup(
+ "testSimpleBundle"), DEST_BASE_DIR_NAME, this.destDir.getAbsolutePath());
+
+ BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
+ deployment.setBundleVersion(bundleVersion);
+ deployment.setDestination(destination);
+
+ // create test file that will have @@ tokens for all our tags
+ // note that only tags that have semantics specified will be replaced
+ // our createNewBundleDeployment creates our test tags
+ File file1 = new File(this.bundleFilesDir, "test.properties");
+ Properties props = new Properties();
+ props.setProperty("rhq.tag.ns1.sem1", "@@rhq.tag.ns1.sem1@@"); // tag is "ns1:sem1=tag1"
+ props.setProperty("rhq.tag.sem2", "@@rhq.tag.sem2@@"); // tag is "sem2=tag2"
+ props.setProperty("rhq.tag.ns3.null", "@@rhq.tag.ns3.null@@"); // tag is "ns3:tag3"
+ props.setProperty("rhq.tag.null", "@@rhq.tag.null@@"); // tag is "tag4"
+ FileOutputStream outputStream = new FileOutputStream(file1);
+ props.store(outputStream, "replace");
+ outputStream.close();
+
+ // create noreplace test file
+ File noreplacefile = new File(this.bundleFilesDir, "noreplace.properties");
+ outputStream = new FileOutputStream(noreplacefile);
+ props.store(outputStream, "noreplace");
+ outputStream.close();
+
+ // create foo test file
+ File foofile = new File(this.bundleFilesDir, "foo.properties");
+ outputStream = new FileOutputStream(foofile);
+ props.store(outputStream, "foo");
+ outputStream.close();
+
+ BundleDeployRequest request = new BundleDeployRequest();
+ request.setBundleFilesLocation(this.bundleFilesDir);
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
+ request.setBundleManagerProvider(new MockBundleManagerProvider());
+ request.setAbsoluteDestinationDirectory(this.destDir);
+
+ BundleDeployResult results = plugin.deployBundle(request);
+
+ assertResultsSuccess(results);
+
+ // test that the prop was replaced in test.properties
+ Properties realizedProps = new Properties();
+ loadProperties(realizedProps, new FileInputStream(new File(this.destDir, "config/test.properties")));
+ assert "tag1".equals(realizedProps.getProperty("rhq.tag.ns1.sem1")) : "didn't replace prop 1";
+ assert "tag2".equals(realizedProps.getProperty("rhq.tag.sem2")) : "didn't replace prop 2";
+ assert "@@rhq.tag.ns3.null@@".equals(realizedProps.getProperty("rhq.tag.ns3.null")) : "this tag should have been ignored 3";
+ assert "@@rhq.tag.null@@".equals(realizedProps.getProperty("rhq.tag.null")) : "this tag should have been ignored 4";
+
+ // test that the prop was not replaced in noreplace.properties
+ Properties notrealizedProps = new Properties();
+ loadProperties(notrealizedProps, new FileInputStream(new File(this.destDir, "config/noreplace.properties")));
+ assert "@@rhq.tag.ns1.sem1@@".equals(notrealizedProps.getProperty("rhq.tag.ns1.sem1")) : "replaced prop 1 when it shouldn't";
+ assert "@@rhq.tag.sem2@@".equals(notrealizedProps.getProperty("rhq.tag.sem2")) : "replaced prop 2 when it shouldn't";
+ }
+
+ /**
* Test deployment of an RHQ bundle recipe where the deploy directory is not to be fully managed.
*/
@Test(enabled = true)
@@ -470,7 +543,7 @@ public class AntBundlePluginComponentTest {
// deploy the bundle
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
@@ -500,7 +573,7 @@ public class AntBundlePluginComponentTest {
// now purge the bundle - this should only purge those files that were laid down by the bundle plus the metadata directory
BundlePurgeRequest purgeRequest = new BundlePurgeRequest();
- purgeRequest.setLiveResourceDeployment(new BundleResourceDeployment(deployment, null));
+ purgeRequest.setLiveResourceDeployment(createNewBundleDeployment(deployment));
purgeRequest.setBundleManagerProvider(new MockBundleManagerProvider());
purgeRequest.setAbsoluteDestinationDirectory(this.destDir);
@@ -591,7 +664,7 @@ public class AntBundlePluginComponentTest {
// deploy the bundle
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
@@ -628,7 +701,7 @@ public class AntBundlePluginComponentTest {
// now purge the bundle - this should purge everything in the deploy dir because we are fully managing it
BundlePurgeRequest purgeRequest = new BundlePurgeRequest();
- purgeRequest.setLiveResourceDeployment(new BundleResourceDeployment(deployment, null));
+ purgeRequest.setLiveResourceDeployment(createNewBundleDeployment(deployment));
purgeRequest.setBundleManagerProvider(new MockBundleManagerProvider());
purgeRequest.setAbsoluteDestinationDirectory(this.destDir);
@@ -705,7 +778,7 @@ public class AntBundlePluginComponentTest {
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(this.bundleFilesDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setResourceDeployment(createNewBundleDeployment(deployment));
request.setBundleManagerProvider(new MockBundleManagerProvider());
request.setAbsoluteDestinationDirectory(this.destDir);
request.setCleanDeployment(clean);
@@ -798,6 +871,17 @@ public class AntBundlePluginComponentTest {
}
}
+ private BundleResourceDeployment createNewBundleDeployment(BundleDeployment deployment) {
+ Resource resource = new Resource(1);
+ Set<Tag> tags = new HashSet<Tag>();
+ tags.add(new Tag("ns1:sem1=tag1")); // we can use @@rhq.tag.ns1.sem1@@
+ tags.add(new Tag("sem2=tag2")); // we can use @@rhq.tag.sem2@@
+ tags.add(new Tag("ns3:tag3")); // no semantic is specified, bundle deployments will not see this
+ tags.add(new Tag("tag4")); // no semantic is specified, bundle deployments will not see this
+ resource.setTags(tags);
+ return new BundleResourceDeployment(deployment, resource);
+ }
+
private class MockBundleManagerProvider implements BundleManagerProvider {
public void auditDeployment(BundleResourceDeployment deployment, String action, String info,
BundleResourceDeploymentHistory.Category category, BundleResourceDeploymentHistory.Status status,
1
0
16 Feb '12
modules/cli-tests/pom.xml | 2 +-
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/drift/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/pom.xml | 2 +-
modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
128 files changed, 146 insertions(+), 146 deletions(-)
New commits:
commit 0d139f67c24e6277de4a5f690041256272213084
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Thu Feb 16 13:53:18 2012 -0500
development RHQ_4.2.0.JON.3.0.2-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 3167d39..0991c91 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1e93560..1370a4c 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 198d9bc..c41be24 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 972a5a2..0c28ff6 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 91f9d94..1b56b75 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 262a9f7..5388ea4 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 2f2f2b3..a228e4f 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 5442ad3..e834756 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index dbeb7ef..83a5f8d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ed95c9c..88e0649 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 848940f..3be4240 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index c741bd1..a693dbe 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 1c16c09..56fd6e6 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a8475ca..352de5e 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 1ce1e2c..81685e7 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 4aa616d..33d49ed 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index eaa3727..3e6ae6e 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 93a6f6b..2978ebb 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 24c2281..f845ef7 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index dca4aae..488c94f 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index be3e3a8..37fab92 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 7db2560..32b7c7c 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index a2ad386..114b7d1 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f1af689..9ffc883 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index b202e1f..15ebbec 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 3d1c787..2811c07 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 5def783..1c4c70c 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index d840e09..79ea577 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index dc59c86..c8b2614 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 638f32c..f83b2e6 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 57135c2..e2db1d4 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index ebb80cc..4c9f8c2 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5db71e7..5afc82a 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index a9be89d..4cd7b22 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 049e375..47bfa9d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index dbba668..8a25f9d 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 3ca78dc..d93e4bb 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 70427bf..c0f0d63 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 471d90c..469b489 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 69c1143..63cdc98 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 5179f25..a1ad5db 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 84f1702..e7b916b 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index aa5328b..2a51a08 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 878c288..87dcc35 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index c22ce1a..186aee8 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 452d62a..13c4903 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a30f495..a76e6c2 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6ffab76..e5c89a7 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 69f4c4b..ddc59eb 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 9ccda53..6fb795a 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index b1b56d0..3f706ad 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 6a7d56d..253c731 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 1282542..13c443a 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 7ddf833..d5774e5 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 47f753e..38e5268 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index cc629bf..a9a3f5a 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 5f5509f..f440701 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 733c73e..96044a9 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 57ec9b0..43d061c 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 492c91c..ada1b7e 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 253d03f..d7d85bf 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 4f5b853..cf08922 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index f67dc29..6e0b704 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index e2e545b..605aa69 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index b67cfb7..8977b4f 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index ca72b35..ab1c7ee 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 872737a..2acd0dc 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 1837a58..42c1dbe 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index fb0b291..d1d6a37 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index c7d0dce..5805b93 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 9902ea8..b042173 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index c5aeb57..62fca8f 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 0261e21..29dc323 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index c9bf1ce..85495c7 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 3cdb7de..84b13c6 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 26957d6..29c867e 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 704d2d1..838ec22 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 740a56f..000ca44 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index 7d9f485..246f1b6 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index eb342cf..4a259d2 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 488cf6b..7465cf4 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0344994..0561ce1 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 6c3464e..a97dbf6 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index a11d7ae..97d456c 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 0518035..930d7ca 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b19fc30..e39760b 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 4c61b27..ea3c6c9 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 35b0bd9..4a8de83 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 057ac66..6d1a653 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 8c46656..3337fb8 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index b1c024a..0c9dc76 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index d487017..33c5cdd 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 9a967d1..5d72e0a 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index bd67dd4..6717151 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 930af72..a3ea5b3 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 4bd81f0..aac7c8d 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index e466497..df9a4b2 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 9e48eb7..b9d54c7 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 3858a95..9e71b73 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 3a1120c..acfa6b6 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index dc08ac6..bc443af 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 56bdd06..6bfcb71 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index ee74e39..30a12a2 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 8dfbf66..3bb008e 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5fddda4..5558690 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9e1965c..89e3fc3 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 46abf88..0a77271 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 6935ffb..9c622f1 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 549daf1..acf1fab 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 05c6699..e960632 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 96fe70d..966a2c1 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 54ac7dc..4ba47d5 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index c0b4e13..3bd88e7 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 032969c..b3770b9 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 7673396..a6002a9 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 2add38e..be54b7e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 9116f34..cc7178f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 03323d1..a569592 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index c02a3a2..8f1f2b6 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 58001eb..919dc76 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index fc4cc67..749b647 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 0651f8c..0f1434d 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 0fcd691..5a92cac 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 60aabe3..c390e24 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 8f21c6f..13ac351 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ec51642..f790d7f 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f60d61..74705ea 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f99eff..774564f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
1
0
[rhq] Branch 'refs/tags/RHQ_4_2_0_JON_3_0_1_GA' - 25 commits - modules/core modules/enterprise modules/plugins
by rhqci 16 Feb '12
by rhqci 16 Feb '12
16 Feb '12
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 21
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 108 +
modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 4
modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 57
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java | 112 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 105 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 61
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 23
modules/enterprise/remoting/cli/src/etc/rhq-cli.sh | 23
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 259 +++
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 24
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 22
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 161 +-
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 8
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 24
modules/plugins/jboss-as-7/d2d.sh | 2
modules/plugins/jboss-as-7/pom.xml | 16
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java | 26
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 76 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 21
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 287 ++-
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 63
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 323 ++--
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 128 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 47
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 135 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 78 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 212 ++
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 57
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java | 23
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java | 53
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java | 3
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 41
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 206 +-
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java | 92 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java | 46
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java | 17
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 736 +++++-----
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java | 49
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 59
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 122 +
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 3
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java | 27
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java | 133 +
modules/plugins/jboss-as-7/src/test/resources/host1.xml | 92 +
modules/plugins/jboss-as-7/src/test/resources/host2.xml | 91 +
modules/plugins/jboss-as-7/src/test/resources/standalone70.xml | 433 +++++
modules/plugins/jboss-as-7/src/test/resources/standalone71.xml | 453 ++++++
modules/plugins/jboss-as-7/src/test/resources/system-props.json | 10
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 28
modules/plugins/jboss-as-7/src/test/resources/web.json | 62
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java | 11
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 53
67 files changed, 4244 insertions(+), 1272 deletions(-)
New commits:
commit fbca61155b83d118a289910e086b10b376705ba8
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Thu Feb 16 13:52:25 2012 -0500
tag RHQ_4_2_0_JON_3_0_1_GA
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 0991c91..3167d39 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1370a4c..1e93560 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index c41be24..198d9bc 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 0c28ff6..972a5a2 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 1b56b75..91f9d94 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 5388ea4..262a9f7 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index a228e4f..2f2f2b3 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index e834756..5442ad3 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 83a5f8d..dbeb7ef 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 88e0649..ed95c9c 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 3be4240..848940f 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index a693dbe..c741bd1 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 56fd6e6..1c16c09 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 352de5e..a8475ca 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 81685e7..1ce1e2c 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 33d49ed..4aa616d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 3e6ae6e..eaa3727 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 2978ebb..93a6f6b 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index f845ef7..24c2281 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 488c94f..dca4aae 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 37fab92..be3e3a8 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 32b7c7c..7db2560 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 114b7d1..a2ad386 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 9ffc883..f1af689 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 15ebbec..b202e1f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 2811c07..3d1c787 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 1c4c70c..5def783 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 79ea577..d840e09 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index c8b2614..dc59c86 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index f83b2e6..638f32c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index e2db1d4..57135c2 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 4c9f8c2..ebb80cc 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5afc82a..5db71e7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 4cd7b22..a9be89d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 47bfa9d..049e375 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 8a25f9d..dbba668 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index d93e4bb..3ca78dc 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index c0f0d63..70427bf 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 469b489..471d90c 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 63cdc98..69c1143 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index a1ad5db..5179f25 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index e7b916b..84f1702 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 2a51a08..aa5328b 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 87dcc35..878c288 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 186aee8..c22ce1a 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 13c4903..452d62a 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a76e6c2..a30f495 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e5c89a7..6ffab76 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index ddc59eb..69f4c4b 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 6fb795a..9ccda53 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 3f706ad..b1b56d0 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 253c731..6a7d56d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 13c443a..1282542 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index d5774e5..7ddf833 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 38e5268..47f753e 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index a9a3f5a..cc629bf 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index f440701..5f5509f 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 96044a9..733c73e 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 43d061c..57ec9b0 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index ada1b7e..492c91c 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index d7d85bf..253d03f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index cf08922..4f5b853 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 6e0b704..f67dc29 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 605aa69..e2e545b 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 8977b4f..b67cfb7 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index ab1c7ee..ca72b35 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 2acd0dc..872737a 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 42c1dbe..1837a58 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index d1d6a37..fb0b291 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 5805b93..c7d0dce 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index b042173..9902ea8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 62fca8f..c5aeb57 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 29dc323..0261e21 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 85495c7..c9bf1ce 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 84b13c6..3cdb7de 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 29c867e..26957d6 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 838ec22..704d2d1 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 000ca44..740a56f 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index 246f1b6..7d9f485 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 4a259d2..eb342cf 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 7465cf4..488cf6b 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0561ce1..0344994 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index a97dbf6..6c3464e 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 97d456c..a11d7ae 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 930d7ca..0518035 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index e39760b..b19fc30 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index ea3c6c9..4c61b27 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 4a8de83..35b0bd9 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 6d1a653..057ac66 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 3337fb8..8c46656 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 0c9dc76..b1c024a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 33c5cdd..d487017 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 5d72e0a..9a967d1 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 6717151..bd67dd4 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index a3ea5b3..930af72 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index aac7c8d..4bd81f0 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index df9a4b2..e466497 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index b9d54c7..9e48eb7 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 9e71b73..3858a95 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index acfa6b6..3a1120c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index bc443af..dc08ac6 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 6bfcb71..56bdd06 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 30a12a2..ee74e39 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 3bb008e..8dfbf66 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5558690..5fddda4 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 89e3fc3..9e1965c 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 0a77271..46abf88 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 9c622f1..6935ffb 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index acf1fab..549daf1 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index e960632..05c6699 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 966a2c1..96fe70d 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 4ba47d5..54ac7dc 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 3bd88e7..c0b4e13 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index b3770b9..032969c 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index a6002a9..7673396 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index be54b7e..2add38e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index cc7178f..9116f34 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index a569592..03323d1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 8f1f2b6..c02a3a2 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 919dc76..58001eb 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 749b647..fc4cc67 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 0f1434d..0651f8c 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 5a92cac..0fcd691 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index c390e24..60aabe3 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 13ac351..8f21c6f 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index f790d7f..ec51642 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 74705ea..5f60d61 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 774564f..3f99eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>pom</packaging>
<name>RHQ</name>
commit 9e1b8e928374ecf5f6baf748667c7f48efda4476
Merge: a7a6214 097bcd7
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Feb 16 11:28:42 2012 -0500
Merge branch 'release/jon3.0.x' into rc/jon3.0.1.GA
commit 097bcd786afe718d5c8316152580956c009ed9b1
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 14 15:26:09 2012 -0500
[BZ 788638] Removing extra call to fetch managed object
We were making an extra call to getManagedCompoment in
AbstractEjbComponent during metric collection. I discovered this while
doing some profiling. With this change execution time for
AbstractEjbBeanComponent.getValues is reduced by about 50% Also adding
some logging in ManagedComponentComponent.getAvailability to indicate
when an availability refresh is needed. This could be useful for tuning
the interval.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index c28dad2..a0fccc5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -54,7 +54,8 @@ import org.rhq.core.pluginapi.operation.OperationResult;
* @author Lukas Krejci
* @author Ian Springer
*/
-public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
+public abstract class
+ AbstractEjbBeanComponent extends ManagedComponentComponent implements OperationFacet {
private final Log log = LogFactory.getLog(this.getClass());
private static final String VIEW_INVOCATION_STATS_OPERATION_NAME = "viewInvocationStats";
@@ -83,7 +84,7 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
}
}
// Let our superclass handle any metrics we didn't collect.
- super.getValues(report, remainingRequests);
+ super.getValues(managedComponent, report, remainingRequests);
}
@Override
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 201484e..f4ebef0 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -127,6 +127,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > availRefreshInterval) {
+ if (log.isDebugEnabled()) {
+ log.debug("The availability refresh interval for [resourceKey: " + getResourceContext().getResourceKey()
+ + ", type: " + componentType + ", name: " + componentName + "] has been exceeded by " +
+ (timeSinceComponentRefresh - availRefreshInterval) + " ms. Reloading managed component.");
+ }
getManagedComponent();
}
@@ -249,7 +254,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = getManagedComponent();
+ getValues(getManagedComponent(), report, metrics);
+ }
+
+ protected void getValues(ManagedComponent managedComponent, MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -260,7 +269,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
log.error("Failed to collect metric for " + request, e);
} else {
log.debug("Failed to collect metric for " + request
- + ", but managed component is not in the RUNNING state.", e);
+ + ", but managed component is not in the RUNNING state.", e);
}
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 440c1e2..dd03491 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -999,13 +999,13 @@
<c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
default="15" type="integer"
- description="The amount of time, in minutes, that can elapse for service availability checks
- without having to refresh the managed object from the server. Services cache information
- used to perform availability checks. This property determines how frequently that
- data needs to be reloaded from the server. Any time the managed object is
- loaded from the server, like for collecting metrics, the availability information
- is updated and the interval is reset. Note that this property does not effect the
- frequency of availability scans performed by the agent."/>
+ description="The amount of time, in minutes, that can elapse for service resource
+ (e.g., EJBs, data sources) availability checks without having to refresh the
+ managed object from the JBoss server. The information used to perform availability
+ checks is cached. This property determines how frequently that data needs to be
+ reloaded from the JBoss server. Any time the managed object is loaded from the
+ server, like for collecting metrics, the availability information is updated and
+ the interval is reset."/>
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
commit ec9ea86edbfa45e1fcb739d8788e919557630ebd
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 21:50:04 2012 -0500
[BZ 788638] Make service availability refresh interval configurable
The refresh interval is now configurable from the application server
component. The interval setting then applies to all descendant services.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 374ae95..201484e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -99,11 +99,11 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
/**
- * The availability watermark specifies a duration that if exceeded means a managed
+ * The availability refresh interval specifies a duration that if exceeded means a managed
* component refresh is needed to perform an availability check. That duration is set
* to 15 minutes.
*/
- private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+ private static final long AVAIL_REFRESH_INTERVAL = 1000 * 60 * 15; // 15 minutes
/**
* The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
@@ -114,6 +114,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
* perform an availability check.
*/
private long lastComponentRefresh = 0L;
+
+ private long availRefreshInterval = AVAIL_REFRESH_INTERVAL;
private RunState runState = RunState.UNKNOWN;
@@ -124,7 +126,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
- if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ if (timeSinceComponentRefresh > availRefreshInterval) {
getManagedComponent();
}
@@ -141,11 +143,14 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
- this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
+ componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType());
Configuration pluginConfig = resourceContext.getPluginConfiguration();
- this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
- log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
- + " component '" + this.componentName + "'.");
+ componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue();
+ initAvailRefreshInterval(resourceContext);
+ if (log.isTraceEnabled()) {
+ log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType
+ + " component '" + this.componentName + "'.");
+ }
}
public void stop() {
@@ -476,4 +481,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return value.toString();
}
}
+
+ private void initAvailRefreshInterval(ResourceContext<ProfileServiceComponent<?>> context) {
+ ProfileServiceComponent<?> component = context.getParentResourceComponent();
+ while (component != null) {
+ if (component instanceof ApplicationServerComponent) {
+ break;
+ }
+ component = (ProfileServiceComponent<?>) component.getResourceContext().getParentResourceComponent();
+ }
+
+ if (component == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to find parent " + ApplicationServerComponent.class.getSimpleName() +
+ ". Using default component refresh interval, " + AVAIL_REFRESH_INTERVAL + " ms");
+ }
+ return;
+ }
+
+ String interval = component.getResourceContext().getPluginConfiguration().getSimpleValue(
+ "serviceAvailabilityRefreshInterval", Long.toString(AVAIL_REFRESH_INTERVAL));
+ availRefreshInterval = Long.parseLong(interval) * 1000 * 60;
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 2d1e86a..440c1e2 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -997,6 +997,16 @@
</c:constraint>
</c:simple-property>
+ <c:simple-property name="serviceAvailabilityRefreshInterval" units="minutes" required="false"
+ default="15" type="integer"
+ description="The amount of time, in minutes, that can elapse for service availability checks
+ without having to refresh the managed object from the server. Services cache information
+ used to perform availability checks. This property determines how frequently that
+ data needs to be reloaded from the server. Any time the managed object is
+ loaded from the server, like for collecting metrics, the availability information
+ is updated and the interval is reset. Note that this property does not effect the
+ frequency of availability scans performed by the agent."/>
+
<c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
readOnly="true" required="false"
description="The name of the JBoss AS JVM resource."/>
commit d274464f1b3901b97d74838db4fc0fb8db715f13
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 10 11:56:54 2012 -0500
[BZ 788638] Remove extra calls to getManagedComponent
There are several places where getManagedComponent was called from
within the same method. This was fine previously since the managed
object was cached, but we do not want to make those extra calls any more
since the managed object is no longer cached.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
index 5f63261..c28dad2 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.values.CompositeValue;
@@ -60,17 +61,18 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ ManagedComponent managedComponent = getManagedComponent();
Set<MeasurementScheduleRequest> remainingRequests = new LinkedHashSet();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
if (metricName.equals("methodInvocationTime")) {
// Convert the method stats CompositeValues into nice strongly typed objects.
- InvocationStats invocationStats = getInvocationStats();
+ InvocationStats invocationStats = getInvocationStats(managedComponent);
if (!invocationStats.methodStats.isEmpty()) {
CallTimeData callTimeData = createCallTimeData(request, invocationStats);
report.addData(callTimeData);
- resetInvocationStats();
+ resetInvocationStats(managedComponent);
}
} else {
remainingRequests.add(request);
@@ -87,13 +89,14 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
@Override
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
OperationResult result;
+ ManagedComponent managedComponent = getManagedComponent();
if (VIEW_INVOCATION_STATS_OPERATION_NAME.equals(name)) {
result = new OperationResult();
PropertyList methodList = new PropertyList("methods");
result.getComplexResults().put(methodList);
// Convert the invocation stats CompositeValues into a nice strongly typed object.
- List<MethodStats> allMethodStats = getInvocationStats().methodStats;
+ List<MethodStats> allMethodStats = getInvocationStats(managedComponent).methodStats;
for (MethodStats methodStats : allMethodStats) {
PropertyMap method = new PropertyMap("method", new PropertySimple("methodName", methodStats.name),
@@ -108,12 +111,12 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return result;
}
- private InvocationStats getInvocationStats() {
+ private InvocationStats getInvocationStats(ManagedComponent managedComponent) {
InvocationStats invocationStats = new InvocationStats();
List<MethodStats> allMethodStats = new ArrayList<MethodStats>();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
String propName = pluginConfig.getSimple("invocationStatsPropertyName").getStringValue();
- ManagedProperty detypedInvokedStatsProp = this.getManagedComponent().getProperty(propName);
+ ManagedProperty detypedInvokedStatsProp = managedComponent.getProperty(propName);
invocationStats.endTime = System.currentTimeMillis();
CompositeValue detypedInvokeStatsMetaValue = (CompositeValue) detypedInvokedStatsProp.getValue();
CompositeValue allMethodStatsMetaValue = (CompositeValue) detypedInvokeStatsMetaValue.get("methodStats");
@@ -157,8 +160,8 @@ public abstract class AbstractEjbBeanComponent extends ManagedComponentComponent
return callTimeData;
}
- private void resetInvocationStats() {
- Set<ManagedOperation> operations = getManagedComponent().getOperations();
+ private void resetInvocationStats(ManagedComponent managedComponent) {
+ Set<ManagedOperation> operations = managedComponent.getOperations();
for (ManagedOperation operation : operations) {
if (operation.getName().equals("resetInvocationStats")) {
operation.invoke();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index b89eb10..ebbf9bb 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -45,9 +45,6 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- // TODO Review with ips to see if we need the following, commented out call
- // jsanda
- //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
index e864117..e5656f5 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
@@ -43,10 +43,6 @@ public class JBossMessagingComponent extends ManagedComponentComponent implement
MeasurementFacet {
private CreateChildResourceFacetDelegate createChildResourceDelegate;
- public AvailabilityType getAvailability() {
- return super.getAvailability();
- }
-
public void start(ResourceContext<ProfileServiceComponent<?>> resourceContext) throws Exception {
super.start(resourceContext);
this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 9637954..374ae95 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -125,15 +125,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public AvailabilityType getAvailability() {
long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
- try {
- getManagedComponent();
- } catch (Throwable t) {
- if (log.isDebugEnabled()) {
- log.debug("Could not get component state for " + componentType + " component '" + componentName +
- "', cause: " + t.getMessage(), t);
- return AvailabilityType.DOWN;
- }
- }
+ getManagedComponent();
}
if (runState == RunState.RUNNING) {
@@ -164,8 +156,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
+ ManagedComponent managedComponent = getManagedComponent();
try {
- ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -174,7 +166,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps,
getResourceContext().getResourceType());
} catch (Exception e) {
- RunState runState = getManagedComponent().getRunState();
+ RunState runState = managedComponent.getRunState();
if (runState == RunState.RUNNING) {
this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e);
} else {
@@ -252,7 +244,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
-// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
@@ -270,39 +261,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
-// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
-// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
-// // than once, it will settle down near immediately
-// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
-// if (null == runtimeMetricMap) {
-// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
-// runtimeMetricMap = new HashMap<String, Boolean>();
-// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
-// }
-//
-// // determine whether we can use the cachedComponent or if we need to force a component fetch to
-// // gather the requested metrics.
-// boolean forceRefresh = false;
-// for (MeasurementScheduleRequest request : metrics) {
-// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
-// // if this is the first time we've seen this metric find out if it's a runtime prop
-// if (null == isRuntimeMetric) {
-// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
-// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
-// runtimeMetricMap.put(request.getName(),
-// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
-// }
-//
-// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
-// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
-// forceRefresh = true;
-// break;
-// }
-// }
-//
-// return getManagedComponent();
-// }
-
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
@@ -461,7 +419,9 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
+ this.componentName + "].");
}
- log.trace("Retrieved " + toString(managedComponent) + ".");
+ if (log.isTraceEnabled()) {
+ log.trace("Retrieved " + toString(managedComponent) + ".");
+ }
lastComponentRefresh = System.currentTimeMillis();
runState = managedComponent.getRunState();
return managedComponent;
@@ -490,7 +450,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
return operation;
}
throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName()
- + "' not found on ManagedComponent [" + getManagedComponent() + "].");
+ + "' not found on ManagedComponent [" + managedComponent + "].");
}
private static String toString(ManagedComponent managedComponent) {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
index 2926a95..ba2a4c9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java
@@ -74,9 +74,10 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public AvailabilityType getAvailability() {
RunState runState = getManagedComponent().getRunState();
return (runState == RunState.RUNNING || runState == RunState.UNKNOWN) ? AvailabilityType.UP
- : AvailabilityType.DOWN;
+ : AvailabilityType.DOWN;
}
+
// ConfigurationFacet -----------------------------
@Override
@@ -189,16 +190,16 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
public CreateResourceReport createResource(CreateResourceReport report) {
try {
+ ManagedComponent bindingManagerComponent = getBindingManager();
if (BINDING_SET_SERVICE_NAME.equals(report.getResourceType().getName())) {
Configuration bindingConfiguration = report.getResourceConfiguration();
checkValidity(bindingConfiguration);
- CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(getBindingSetValueMetaType(),
- bindingConfiguration);
+ CompositeValue newBindingSet = Util.getBindingSetFromConfiguration(
+ getBindingSetValueMetaType(bindingManagerComponent), bindingConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = getBindingManager();
ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
//check that the provided binding set name is unique
@@ -242,8 +243,8 @@ public class ManagerComponent extends ManagedComponentComponent implements Creat
return report;
}
- public MetaType getBindingSetValueMetaType() {
- CollectionMetaType bindingSetsMetaType = (CollectionMetaType) getBindingManager().getProperty(
+ public MetaType getBindingSetValueMetaType(ManagedComponent bindingManager) {
+ CollectionMetaType bindingSetsMetaType = (CollectionMetaType) bindingManager.getProperty(
Util.BINDING_SETS_PROPERTY).getMetaType();
return bindingSetsMetaType.getElementType();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
index 024d60d..8303464 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java
@@ -106,19 +106,19 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
public void updateResourceConfiguration(ConfigurationUpdateReport report) {
try {
ManagerComponent managerResourceComponent = context.getParentResourceComponent();
+ ManagedComponent bindingManager = managerResourceComponent.getBindingManager();
Configuration updatedConfiguration = report.getConfiguration();
managerResourceComponent.checkValidity(updatedConfiguration);
- MetaType bindingSetValueMetaType = context.getParentResourceComponent().getBindingSetValueMetaType();
+ MetaType bindingSetValueMetaType = managerResourceComponent.getBindingSetValueMetaType(bindingManager);
CompositeValue currentBindingSet = Util.getBindingSetFromConfiguration(bindingSetValueMetaType,
updatedConfiguration);
//ok, now we can update the bindingSets property with the update set of binding sets
- ManagedComponent bindingManagerComponent = managerResourceComponent.getBindingManager();
- ManagedProperty bindingSetsProperty = bindingManagerComponent.getProperty(Util.BINDING_SETS_PROPERTY);
+ ManagedProperty bindingSetsProperty = bindingManager.getProperty(Util.BINDING_SETS_PROPERTY);
String thisBindingSetName = managerResourceComponent.getBindingSetNameFromResourceKey(context.getResourceKey());
//create new set of binding sets
@@ -130,7 +130,7 @@ public class SetComponent implements ResourceComponent<ManagerComponent>, Config
bindingSetsProperty.setValue(newBindingSetsValue);
- context.getParentResourceComponent().updateBindingManager(bindingManagerComponent);
+ context.getParentResourceComponent().updateBindingManager(bindingManager);
report.setStatus(ConfigurationUpdateStatus.SUCCESS);
} catch (Exception e) {
commit dbd357d545896e61bdaaebba273dee93703aefb6
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Feb 9 12:31:44 2012 -0500
[BZ 788638] Do not cache ManagedComponent objects to avoid high memory usage.
With this commit we no longer cache the ManagedComponent objects we get
back from the profile service. Even when we were caching them, we still
regularly fetched them for metric collections.
The caching was introduced to address high CPU utilization during
availability checks. The logic in
ManagedComponentComponent.getAvailability has been refactored so that we
do not necessarily fetch the component on every availability check.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
index 15ffea3..b89eb10 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java
@@ -39,13 +39,15 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
private static final ComponentType MDB_COMPONENT_TYPE = new ComponentType("EJB", "MDB");
@Override
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
+ protected ManagedComponent getManagedComponent() {
if (MDB_COMPONENT_TYPE.equals(getComponentType())) {
try {
//we need to reload the management view here, because the MDBs might have changed since
//the last call, because the @object-id is part of their names.
ManagementView mv = getConnection().getManagementView();
- mv.load();
+ // TODO Review with ips to see if we need the following, commented out call
+ // jsanda
+ //mv.load();
Set<ManagedComponent> mdbs = mv.getComponentsForType(MDB_COMPONENT_TYPE);
@@ -59,7 +61,7 @@ public class Ejb2BeanComponent extends AbstractEjbBeanComponent {
throw new IllegalStateException(e);
}
} else {
- return super.getManagedComponent(forceRefresh);
+ return super.getManagedComponent();
}
return null;
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index 23f8b2d..9637954 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -23,11 +23,7 @@
package org.rhq.plugins.jbossas5;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,7 +40,6 @@ import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.RunState;
-import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.metatype.api.values.ArrayValue;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.CompositeValue;
@@ -103,8 +98,24 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
private final Log log = LogFactory.getLog(this.getClass());
- // Cache the ManagedComponent since it can be re-used to request any ViewUse.RUNTIME property values
- private ManagedComponent managedComponent = null;
+ /**
+ * The availability watermark specifies a duration that if exceeded means a managed
+ * component refresh is needed to perform an availability check. That duration is set
+ * to 15 minutes.
+ */
+ private static final long AVAIL_WATERMARK = 1000 * 60 * 15; // 15 minutes
+
+ /**
+ * The ManagedComponent is fetched from the server in {@link #getManagedComponent} throughout
+ * the life cycle of this resource component. For example during metrics collections
+ * when getValues is invoked, getManagedComponent is called. Any time getManagedComponent
+ * is called the lastComponentRefresh timestamp is updated. This timestamp is used in
+ * {@link #getAvailability} to determine whether or not a component is needed to
+ * perform an availability check.
+ */
+ private long lastComponentRefresh = 0L;
+
+ private RunState runState = RunState.UNKNOWN;
private String componentName;
private ComponentType componentType;
@@ -112,19 +123,26 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// ResourceComponent Implementation --------------------------------------------
public AvailabilityType getAvailability() {
- RunState runState;
- try {
- runState = getManagedComponent().getRunState();
- } catch (Throwable t) {
- log.debug("Could not get component state for " + this.componentType + " component '" + this.componentName
- + "', cause: ", t);
- return AvailabilityType.DOWN;
+ long timeSinceComponentRefresh = System.currentTimeMillis() - lastComponentRefresh;
+ if (timeSinceComponentRefresh > AVAIL_WATERMARK) {
+ try {
+ getManagedComponent();
+ } catch (Throwable t) {
+ if (log.isDebugEnabled()) {
+ log.debug("Could not get component state for " + componentType + " component '" + componentName +
+ "', cause: " + t.getMessage(), t);
+ return AvailabilityType.DOWN;
+ }
+ }
}
+
if (runState == RunState.RUNNING) {
return AvailabilityType.UP;
} else {
- log.debug(this.componentType + " component '" + this.componentName + "' was not running, state" + " was: "
- + runState);
+ if (log.isDebugEnabled()) {
+ log.debug(componentType + " component '" + componentName + "' was not running, state was : " +
+ runState);
+ }
return AvailabilityType.DOWN;
}
}
@@ -139,7 +157,6 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
public void stop() {
- managedComponent = null;
super.stop();
}
@@ -148,7 +165,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
public Configuration loadResourceConfiguration() {
Configuration resourceConfig;
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext()
.getPluginConfiguration());
@@ -173,7 +190,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
Configuration resourceConfig = configurationUpdateReport.getConfiguration();
Configuration pluginConfig = getResourceContext().getPluginConfiguration();
try {
- ManagedComponent managedComponent = getManagedComponent(true);
+ ManagedComponent managedComponent = getManagedComponent();
Map<String, ManagedProperty> managedProperties = managedComponent.getProperties();
Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig);
if (this.log.isDebugEnabled())
@@ -235,7 +252,8 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+// ManagedComponent managedComponent = prepareForMetricCollection(metrics);
+ ManagedComponent managedComponent = getManagedComponent();
RunState runState = managedComponent.getRunState();
for (MeasurementScheduleRequest request : metrics) {
try {
@@ -252,44 +270,44 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
}
- protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
- // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
- // than once, it will settle down near immediately
- Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
- if (null == runtimeMetricMap) {
- //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
- runtimeMetricMap = new HashMap<String, Boolean>();
- runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
- }
-
- // determine whether we can use the cachedComponent or if we need to force a component fetch to
- // gather the requested metrics.
- boolean forceRefresh = false;
- for (MeasurementScheduleRequest request : metrics) {
- Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
- // if this is the first time we've seen this metric find out if it's a runtime prop
- if (null == isRuntimeMetric) {
- //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
- ManagedProperty managedProp = getManagedProperty(managedComponent, request);
- runtimeMetricMap.put(request.getName(),
- Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
- }
-
- if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
- //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
- forceRefresh = true;
- break;
- }
- }
-
- return getManagedComponent(forceRefresh);
- }
+// protected ManagedComponent prepareForMetricCollection(Set<MeasurementScheduleRequest> metrics) {
+// // this bit could be synchronized but I don't think it really hurts to perhaps go through this logic more
+// // than once, it will settle down near immediately
+// Map<String, Boolean> runtimeMetricMap = runtimeMetricMaps.get(this.getClass().getName());
+// if (null == runtimeMetricMap) {
+// //log.info("\nADDING MAP FOR CLASS=" + this.getClass().getName());
+// runtimeMetricMap = new HashMap<String, Boolean>();
+// runtimeMetricMaps.put(this.getClass().getName(), runtimeMetricMap);
+// }
+//
+// // determine whether we can use the cachedComponent or if we need to force a component fetch to
+// // gather the requested metrics.
+// boolean forceRefresh = false;
+// for (MeasurementScheduleRequest request : metrics) {
+// Boolean isRuntimeMetric = runtimeMetricMap.get(request.getName());
+// // if this is the first time we've seen this metric find out if it's a runtime prop
+// if (null == isRuntimeMetric) {
+// //log.info("\nADDING MAP ENTRY FOR METRIC=" + request.getName());
+// ManagedProperty managedProp = getManagedProperty(managedComponent, request);
+// runtimeMetricMap.put(request.getName(),
+// Boolean.valueOf((null == managedProp || managedProp.hasViewUse(ViewUse.RUNTIME))));
+// }
+//
+// if (Boolean.FALSE.equals(runtimeMetricMap.get(request.getName()))) {
+// //log.info("\nFORCING COMPONENT REFRESH DUE TO NON-RUNTIME PROP: " + request.getName());
+// forceRefresh = true;
+// break;
+// }
+// }
+//
+// return getManagedComponent();
+// }
protected String getMeasurement(ManagedComponent component, String metricName) throws Exception {
if ("runState".equals(metricName)) {
return component.getRunState().name();
} else {
- Object value = getSimpleValue(managedComponent, metricName);
+ Object value = getSimpleValue(component, metricName);
return value == null ? null : toString(value);
}
}
@@ -429,26 +447,23 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
}
protected ManagedComponent getManagedComponent() {
- return getManagedComponent(false);
- }
-
- protected ManagedComponent getManagedComponent(boolean forceRefresh) {
-
- if (!forceRefresh && null != this.managedComponent) {
- return this.managedComponent;
- }
-
+ ManagedComponent managedComponent = null;
try {
ManagementView managementView = getConnection().getManagementView();
managedComponent = managementView.getComponent(this.componentName, this.componentType);
} catch (Exception e) {
+ runState = RunState.UNKNOWN;
throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent ["
- + this.componentName + "].", e);
+ + this.componentName + "].", e);
}
- if (managedComponent == null)
+ if (managedComponent == null) {
+ runState = RunState.UNKNOWN;
throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named ["
- + this.componentName + "].");
+ + this.componentName + "].");
+ }
log.trace("Retrieved " + toString(managedComponent) + ".");
+ lastComponentRefresh = System.currentTimeMillis();
+ runState = managedComponent.getRunState();
return managedComponent;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
index cdfa98b..852b594 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java
@@ -46,7 +46,7 @@ public class TxConnectionFactoryComponent extends ManagedComponentComponent {
@Override
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
- ManagedComponent mc = getManagedComponent(true);
+ ManagedComponent mc = getManagedComponent();
Set<MeasurementScheduleRequest> uncollectedMetrics = new HashSet<MeasurementScheduleRequest>();
for (MeasurementScheduleRequest request : metrics) {
try {
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
index 0d96b2b..6eb7e7e 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java
@@ -115,7 +115,7 @@ public class WebApplicationContextComponent extends ManagedComponentComponent {
ProfileServiceComponent warComponent = getResourceContext().getParentResourceComponent();
ManagementView managementView = warComponent.getConnection().getManagementView();
- ManagedComponent component = prepareForMetricCollection(requests);
+ ManagedComponent component = getManagedComponent();
for (MeasurementScheduleRequest request : requests) {
String metricName = request.getName();
try {
commit f55c68ee2db419cbbe2daef2f7721a7c68279039
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 14 17:02:20 2012 -0500
[Bug 789454 - Drift detection fails for whole directory if special-file is present]
File.canRead() returning true means that the process has read access to
a file, it is a security check. It does not mean that the file can be
parsed as a Stream. In particular, FileInputStream(File) can throw
FileNotFoundException on a file it can't actually handle, like a
socket file.
I added more protection for this situation, for files which drift monitoring
can not and should not be performed. They will be skipped (and logged in
debug). Moreover, taking Heiko's suggestion, don't fail drift detection
dur to a problematic file, even if the problem is unexpected.
Conflicts:
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 21341c4..5638af7 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -19,8 +19,27 @@
package org.rhq.core.pc.drift;
+import static org.rhq.common.drift.FileEntry.addedFileEntry;
+import static org.rhq.common.drift.FileEntry.changedFileEntry;
+import static org.rhq.common.drift.FileEntry.removedFileEntry;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
+import static org.rhq.core.util.file.FileUtil.copyFile;
+import static org.rhq.core.util.file.FileUtil.forEachFile;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.rhq.common.drift.ChangeSetReader;
import org.rhq.common.drift.ChangeSetWriter;
import org.rhq.common.drift.FileEntry;
@@ -31,17 +50,6 @@ import org.rhq.core.domain.drift.Filter;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.file.FileVisitor;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.*;
-
-import static org.rhq.common.drift.FileEntry.*;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
-import static org.rhq.core.domain.drift.DriftChangeSetCategory.DRIFT;
-import static org.rhq.core.util.file.FileUtil.copyFile;
-import static org.rhq.core.util.file.FileUtil.forEachFile;
-
public class DriftDetector implements Runnable {
private Log log = LogFactory.getLog(DriftDetector.class);
@@ -240,14 +248,16 @@ public class DriftDetector implements Runnable {
log.info("Detected added file for " + schedule + " --> " + file.getAbsolutePath());
}
- FileEntry newEntry = addedFileEntry(relativePath(basedir, file), sha256(file));
- deltaEntries.add(newEntry);
- snapshotEntries.add(newEntry);
- } catch (IOException e) {
- log.error("An error occurred while generating a drift change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException("An error occurred while generating a drift change set",
- e);
+ FileEntry addedFileEntry = getAddedFileEntry(basedir, file);
+ if (null != addedFileEntry) {
+ deltaEntries.add(addedFileEntry);
+ snapshotEntries.add(addedFileEntry);
+ }
+ } catch (Throwable t) {
+ // report the error but keep going, perhaps it is specific to a single file, try to
+ // finish the change set generation.
+ log.error("An unexpected error occurred while generating a drift change set for file "
+ + file.getPath() + " in schedule " + schedule + ". Skipping file.", t);
}
}
}));
@@ -288,6 +298,37 @@ public class DriftDetector implements Runnable {
}
}
+ /**
+ * File.canRead() is basically a security check and does not guarantee that the file contents can truly be read.
+ * Certain files, like socket files on linux, can not be processed and it's not known until actually trying to
+ * construct a FileInputStream, as is done when we actually try to generate the digest. These files will generate
+ * a FileNotFoundException. This method will catch, log and suppress that issue, and return null
+ * indicating the file is not suitable for drift detection.
+ *
+ * @param basedir the drift def base directory
+ * @param file the new file to add
+ * @return the new FileEntry, or null if this file is not appropriate for drift detection (typically if the
+ * underlying file does not support the needed File operations.
+ * @throws Will throw unexpected IOExceptions, outside of the FileNotFoundException it looks for.
+ */
+ private FileEntry getAddedFileEntry(File basedir, File file) throws IOException {
+ FileEntry result = null;
+
+ try {
+ String sha256 = sha256(file);
+ String relativePath = relativePath(basedir, file);
+
+ result = addedFileEntry(relativePath, sha256);
+
+ } catch (FileNotFoundException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping " + file.getPath() + " since it is missing or is not a physically readable file.");
+ }
+ }
+
+ return result;
+ }
+
private Set<File> getScanDirectories(final File basedir, List<Filter> includes) {
Set<File> directories = new HashSet<File>();
@@ -344,7 +385,6 @@ public class DriftDetector implements Runnable {
}
}
- @SuppressWarnings("unused")
private boolean isPreviousChangeSetEmpty(int resourceId, DriftDefinition definition) throws IOException {
File changeSet = changeSetMgr.findChangeSet(resourceId, definition.getName(), DRIFT);
if (!changeSet.exists()) {
@@ -520,19 +560,25 @@ public class DriftDetector implements Runnable {
try {
if (!file.canRead()) {
if (log.isDebugEnabled()) {
- log.debug("Skipping " + file.getPath() + " since it is not readable.");
+ log.debug("Skipping " + file.getPath() + " since we do not have read access.");
}
return;
}
+
if (log.isDebugEnabled()) {
log.debug("Adding " + file.getPath() + " to coverage change set for " + schedule);
}
- writer.write(addedFileEntry(relativePath(basedir, file), sha256(file)));
- } catch (IOException e) {
- log.error("An error occurred while generating a coverage change set for " + schedule + ": "
- + e.getMessage());
- throw new DriftDetectionException(
- "An error occurred while generating a coverage change set for " + schedule, e);
+
+ FileEntry addedFileEntry = getAddedFileEntry(basedir, file);
+ if (null != addedFileEntry) {
+ writer.write(addedFileEntry);
+ }
+
+ } catch (Throwable t) {
+ // report the error but keep going, perhaps it is specific to a single file, try to
+ // finish the detection.
+ log.error("An unexpected error occurred while generating a coverage change set for file "
+ + file.getPath() + " in schedule " + schedule + ". Skipping file.", t);
}
}
}));
commit 39ac89b6899e27639abd9fe0b536529abec9aa11
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 14 16:07:28 2012 -0500
[BZ 789419] sync ResourceTypeRepository up with the copy of that class in master
(https://bugzilla.redhat.com/show_bug.cgi?id=789419)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index 9ce6a3a..671fca1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -62,8 +62,8 @@ public class ResourceTypeRepository {
/**
* The following MetadadaTypes are subject to change and are always fetched from the database:<br/>
* driftDefinitionTemplates
- *
- * @author Jay Shaughnessy
+ *
+ * @author Jay Shaughnessy
*/
public enum MetadataType {
children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition, subCategory, parentTypes, processScans, productVersions, driftDefinitionTemplates(
@@ -77,7 +77,7 @@ public class ResourceTypeRepository {
/**
* @param isFetchAlways if true then the cache for this metadata will be refreshed each time it is requested.
- * Meaning, the db will always be called because this metadata is subject to change.
+ * Meaning, the db will always be called because this metadata is subject to change.
*/
private MetadataType(boolean isFetchAlways) {
this.isFetchAlways = isFetchAlways;
@@ -219,8 +219,8 @@ public class ResourceTypeRepository {
// 2. we have the basic resource type but no additional metadata, but the caller is asking for additional metadata
// 3. we have the resource type and some additional metadata, but the caller is asking for metadata that we don't have
if (!typeCache.containsKey(typeId) // 1.
- || (!metadataTypes.isEmpty() && (!typeCacheLevel.containsKey(typeId) // 2.
- || !typeCacheLevel.get(typeId).containsAll(metadataTypes)))) // 3.
+ || (!metadataTypes.isEmpty() && (!typeCacheLevel.containsKey(typeId) // 2.
+ || !typeCacheLevel.get(typeId).containsAll(metadataTypes)))) // 3.
{
// add this type to the types we need to fetch
typesNeeded.add(typeId);
@@ -299,7 +299,7 @@ public class ResourceTypeRepository {
criteria.setPageControl(PageControl.getUnlimitedInstance());
- Log.info("Loading " + typesNeeded.size() + " types fetching metadata " + metadataTypesNeeded + "...");
+ Log.info("Loading [" + typesNeeded.size() + "] types with facets=[" + metadataTypesNeeded + "]...");
if ((topLevelServerAndServiceTypes == null) && metadataTypesNeeded.contains(MetadataType.children)) {
// Perform a one-time load of server and service types with no parent types. These types are implicitly
@@ -314,9 +314,8 @@ public class ResourceTypeRepository {
}
private void loadTopLevelServerAndServiceTypes(final TypesLoadedCallback callback,
- final EnumSet<MetadataType> metadataTypes,
- final ResourceTypeCriteria criteria, final Map<Integer,
- ResourceType> cachedTypes) {
+ final EnumSet<MetadataType> metadataTypes, final ResourceTypeCriteria criteria,
+ final Map<Integer, ResourceType> cachedTypes) {
ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria();
topLevelCriteria.addFilterCategories(ResourceCategory.SERVER, ResourceCategory.SERVICE);
topLevelCriteria.addFilterParentResourceTypesEmpty(true);
@@ -351,7 +350,8 @@ public class ResourceTypeRepository {
});
}
- private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes, ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) {
+ private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes,
+ ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) {
resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught);
@@ -366,8 +366,8 @@ public class ResourceTypeRepository {
switch (metadataType) {
case children:
Set<ResourceType> childTypes = type.getChildResourceTypes();
- if (type.getCategory() == ResourceCategory.PLATFORM &&
- topLevelServerAndServiceTypes != null) {
+ if (type.getCategory() == ResourceCategory.PLATFORM
+ && topLevelServerAndServiceTypes != null) {
// Add server and service types with no parent types to the list of child types.
// These types are implicitly children of all platform types, even though they
// are not included in the platform types' childResourceTypes field.
@@ -412,7 +412,7 @@ public class ResourceTypeRepository {
break;
default:
Log.error("ERROR: metadataType " + metadataType.name()
- + " not merged into cached ResourceType.");
+ + " not merged into cached ResourceType.");
}
}
}
commit 1979ff15f1b4c7a87c0bf651ebf109cb473d0502
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Feb 14 13:39:43 2012 -0500
[BZ 789419] fix NPE that was preventing manual-add/import of top-level servers (https://bugzilla.redhat.com/show_bug.cgi?id=789419)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index 2a33d98..9ce6a3a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -299,8 +299,7 @@ public class ResourceTypeRepository {
criteria.setPageControl(PageControl.getUnlimitedInstance());
- Log.info("Loading " + typesNeeded.size()
- + ((metadataTypes != null) ? (" types: " + metadataTypes) : ""));
+ Log.info("Loading " + typesNeeded.size() + " types fetching metadata " + metadataTypesNeeded + "...");
if ((topLevelServerAndServiceTypes == null) && metadataTypesNeeded.contains(MetadataType.children)) {
// Perform a one-time load of server and service types with no parent types. These types are implicitly
@@ -310,7 +309,7 @@ public class ResourceTypeRepository {
// server/service types will be added to the platform types' childResourceTypes fields.
loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes);
} else {
- loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
+ loadRequestedTypes(callback, metadataTypesNeeded, criteria, cachedTypes);
}
}
commit f3c5218d16aa49a744d6df68f7cbbf87575dc03c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 4 10:39:27 2011 -0400
[BZ 751097] various improvements to the code used to load top-level server and
service ResourceTypes (hopefully this will fix
https://bugzilla.redhat.com/show_bug.cgi?id=751097)
(cherry picked from commit 7f74d068c450a65502c07975c2942d9e9a8b2f67)
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
index 7abb782..de69bae 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,9 @@
package org.rhq.core.domain.criteria;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -59,6 +61,8 @@ public class ResourceTypeCriteria extends Criteria {
// by default, we don't want to fetch resource types that
// are marked deleted
private Boolean filterDeleted = false;
+ private Set<ResourceCategory> filterCategories; // needs overrides
+ private Boolean filterParentResourceTypesEmpty; // needs overrides
private boolean fetchSubCategory;
private boolean fetchChildResourceTypes;
@@ -87,10 +91,15 @@ public class ResourceTypeCriteria extends Criteria {
+ " FROM ResourceType innerRt " //
+ " JOIN innerRt.parentResourceTypes innerParentRt " //
+ " WHERE innerParentRt.id IN ( ? ) )");
-
filterOverrides.put("pluginName", "plugin like ?");
filterOverrides.put("ids", "id in ( ? )");
filterOverrides.put("bundleTypeId", "bundleType.id = ?");
+ filterOverrides.put("categories", "category in ( ? )");
+ filterOverrides.put("parentResourceTypesEmpty", "" //
+ + "id IN ( SELECT innerRt.id FROM ResourceType innerRt " //
+ + " LEFT JOIN innerRt.parentResourceTypes " //
+ + " WHERE ( ? = true AND innerRt.parentResourceTypes IS EMPTY ) " //
+ + " OR ( ? = false AND innerRt.parentResourceTypes IS NOT EMPTY ) )");
sortOverrides.put("pluginName", "plugin");
}
@@ -148,6 +157,14 @@ public class ResourceTypeCriteria extends Criteria {
this.filterDeleted = deleted;
}
+ public void addFilterCategories(ResourceCategory... filterCategories) {
+ this.filterCategories = new HashSet<ResourceCategory>(Arrays.asList(filterCategories));
+ }
+
+ public void addFilterParentResourceTypesEmpty(boolean filterParentResourceTypesEmpty) {
+ this.filterParentResourceTypesEmpty = filterParentResourceTypesEmpty;
+ }
+
public void fetchSubCategory(boolean fetchSubCategory) {
this.fetchSubCategory = fetchSubCategory;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index 2fb7802..2a33d98 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -37,6 +38,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -46,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
* A cache for ResourceTypes and their various fields. Fields are only fetched as needed.
*
* @author Greg Hinkle
+ * @author Ian Springer
*/
public class ResourceTypeRepository {
static private final Messages MSG = CoreGUI.getMessages();
@@ -159,12 +162,18 @@ public class ResourceTypeRepository {
Set<Integer> types = new HashSet<Integer>();
for (ResourceGroup group : groups) {
- types.add(group.getResourceType().getId());
+ ResourceType type = group.getResourceType();
+ if (type != null) {
+ types.add(type.getId());
+ }
}
getResourceTypes(types.toArray(new Integer[types.size()]), metadataTypes, new TypesLoadedCallback() {
public void onTypesLoaded(Map<Integer, ResourceType> types) {
for (ResourceGroup group : groups) {
- group.setResourceType(types.get(group.getResourceType().getId()));
+ ResourceType type = group.getResourceType();
+ if (type != null) {
+ group.setResourceType(types.get(type.getId()));
+ }
}
if (callback != null) {
callback.onResourceTypeLoaded(groups);
@@ -293,12 +302,13 @@ public class ResourceTypeRepository {
Log.info("Loading " + typesNeeded.size()
+ ((metadataTypes != null) ? (" types: " + metadataTypes) : ""));
- if ((topLevelServerAndServiceTypes == null) && (metadataTypes != null) &&
- metadataTypes.contains(MetadataType.children)) {
+ if ((topLevelServerAndServiceTypes == null) && metadataTypesNeeded.contains(MetadataType.children)) {
// Perform a one-time load of server and service types with no parent types. These types are implicitly
// children of all platform types, even though they are not included in the platform types'
- // childResourceTypes field.
- loadTopLevelServerAndServiceTypes(callback, metadataTypes, criteria, cachedTypes);
+ // childResourceTypes field in the DB. After the top-level types are loaded, loadRequestedTypes() will be
+ // called to load the requested types. For any requested types that are platforms, the top-level
+ // server/service types will be added to the platform types' childResourceTypes fields.
+ loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes);
} else {
loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
}
@@ -309,21 +319,34 @@ public class ResourceTypeRepository {
final ResourceTypeCriteria criteria, final Map<Integer,
ResourceType> cachedTypes) {
ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria();
- topLevelCriteria.fetchParentResourceTypes(true);
+ topLevelCriteria.addFilterCategories(ResourceCategory.SERVER, ResourceCategory.SERVICE);
+ topLevelCriteria.addFilterParentResourceTypesEmpty(true);
+ topLevelCriteria.addSortCategory(PageOrdering.DESC);
+ topLevelCriteria.addSortName(PageOrdering.ASC);
resourceTypeService.findResourceTypesByCriteria(topLevelCriteria, new AsyncCallback<PageList<ResourceType>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught);
- loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
- }
-
public void onSuccess(PageList<ResourceType> types) {
- topLevelServerAndServiceTypes = new HashSet<ResourceType>();
+ topLevelServerAndServiceTypes = new LinkedHashSet<ResourceType>(types.size());
for (ResourceType type : types) {
- if ((type.getCategory() != ResourceCategory.PLATFORM) &&
- (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) {
+ if (cachedTypes.containsKey(type.getId())) {
+ ResourceType cachedType = cachedTypes.get(type.getId());
+ topLevelServerAndServiceTypes.add(cachedType);
+ } else {
+ cachedTypes.put(type.getId(), type);
topLevelServerAndServiceTypes.add(type);
}
}
+ if (Log.isDebugEnabled()) {
+ Set<String> typeNames = new LinkedHashSet<String>(topLevelServerAndServiceTypes.size());
+ for (ResourceType type : topLevelServerAndServiceTypes) {
+ typeNames.add(type.getPlugin() + ":" + type.getName());
+ }
+ Log.debug("Loaded " + typeNames.size() + " top-level server and service types: " + typeNames);
+ }
+ loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
+ }
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught);
loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
}
});
commit 0d4efdc85ef65f6cdcf7954766cd28186a36ab63
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Aug 1 14:09:29 2011 -0400
[BZ 720456] fix so all child types are shown in manual-add dropdown on Inventory>Child Resources view (https://bugzilla.redhat.com/show_bug.cgi?id=720456)
(cherry picked from commit d47438f7a5a56de5539f8635a44aed53833837dc)
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index e5ec18a..b23e733 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -22,13 +22,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
@@ -133,98 +128,50 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
super.configureTable();
}
- @SuppressWarnings("unchecked")
private void addImportButton() {
ResourceType parentType = parentResourceComposite.getResource().getResourceType();
// manual import type menu
- Set<ResourceType> importableChildTypes = getImportableChildTypes(parentType);
- if (!importableChildTypes.isEmpty()) {
- Map<String, ResourceType> displayNames = getDisplayNames(importableChildTypes);
- LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames);
+ // TODO: Use TreeMap instead, so the types will be sorted by name.
+ LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>();
+ for (ResourceType childType : parentType.getChildResourceTypes()) {
+ if (childType.isSupportsManualAdd()) {
+ importTypeValueMap.put(childType.getName(), childType);
+ }
+ }
+ if (!importTypeValueMap.isEmpty()) {
addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap,
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(),
- (ResourceType) actionValue);
- // we can refresh the table buttons immediately since the wizard is a dialog, the
- // user can't access enabled buttons anyway.
- ResourceCompositeSearchView.this.refreshTableInfo();
- }
- });
+ new AbstractTableAction(TableActionEnablement.ALWAYS) {
+
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(),
+ (ResourceType) actionValue);
+ }
+ });
}
// creatable child type menu
- Set<ResourceType> creatableChildTypes = getCreatableChildTypes(parentType);
- if (!creatableChildTypes.isEmpty()) {
- Map<String, ResourceType> displayNames = getDisplayNames(creatableChildTypes);
- LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames);
+ // TODO: Use TreeMap instead, so the types will be sorted by name.
+ LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>();
- addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, createTypeValueMap,
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ for (ResourceType childType : parentType.getChildResourceTypes()) {
+ if (childType.isCreatable()) {
+ createTypeValueMap.put(childType.getName(), childType);
+ }
+ }
+ if (!createTypeValueMap.isEmpty()) {
+ addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null,
+ createTypeValueMap, new AbstractTableAction(TableActionEnablement.ALWAYS) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
ResourceFactoryCreateWizard.showCreateWizard(parentResourceComposite.getResource(),
- (ResourceType) actionValue);
- // we can refresh the table buttons immediately since the wizard is a dialog, the
- // user can't access enabled buttons anyway.
- ResourceCompositeSearchView.this.refreshTableInfo();
+ (ResourceType) actionValue);
}
});
}
}
- private static Set<ResourceType> getImportableChildTypes(ResourceType type) {
- Set<ResourceType> results = new TreeSet<ResourceType>();
- Set<ResourceType> childTypes = type.getChildResourceTypes();
- for (ResourceType childType : childTypes) {
- if (childType.isSupportsManualAdd()) {
- results.add(childType);
- }
- }
- return results;
- }
-
- private static Set<ResourceType> getCreatableChildTypes(ResourceType type) {
- Set<ResourceType> results = new TreeSet<ResourceType>();
- Set<ResourceType> childTypes = type.getChildResourceTypes();
- for (ResourceType childType : childTypes) {
- if (childType.isCreatable()) {
- results.add(childType);
- }
- }
- return results;
- }
-
- private static Map<String, ResourceType> getDisplayNames(Set<ResourceType> types) {
- Set<String> allNames = new HashSet<String>();
- Set<String> repeatedNames = new HashSet<String>();
- for (ResourceType type : types) {
- String typeName = type.getName();
- if (allNames.contains(typeName)) {
- repeatedNames.add(typeName);
- } else {
- allNames.add(typeName);
- }
- }
- Map<String, ResourceType> results = new TreeMap<String, ResourceType>();
- for (ResourceType type : types) {
- String displayName = type.getName();
- if (repeatedNames.contains(type.getName())) {
- displayName += " (" + type.getPlugin() + " plugin)";
- }
- results.put(displayName, type);
- }
- return results;
- }
-
- protected void onUninventorySuccess() {
- // refresh the entire gui so it encompasses any relevant tree view. Don't call this.refresh()
- // because CoreGUI.refresh is more comprehensive.
- CoreGUI.refresh();
- }
-
public ResourceComposite getParentResourceComposite() {
return parentResourceComposite;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 44f3b90..d2cfb26 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -548,6 +548,7 @@ public class ResourceTreeView extends LocatableVLayout {
}
importChildMenu.setSubmenu(importChildSubMenu);
}
+
resourceContextMenu.addItem(importChildMenu);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index 15d7221..2fb7802 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -290,22 +290,24 @@ public class ResourceTypeRepository {
criteria.setPageControl(PageControl.getUnlimitedInstance());
- Log.info("Loading [" + typesNeeded.size() + "] types with facets=[" + metadataTypesNeeded + "]...");
+ Log.info("Loading " + typesNeeded.size()
+ + ((metadataTypes != null) ? (" types: " + metadataTypes) : ""));
- if ((topLevelServerAndServiceTypes == null) && (metadataTypesNeeded != null)
- && metadataTypesNeeded.contains(MetadataType.children)) {
+ if ((topLevelServerAndServiceTypes == null) && (metadataTypes != null) &&
+ metadataTypes.contains(MetadataType.children)) {
// Perform a one-time load of server and service types with no parent types. These types are implicitly
// children of all platform types, even though they are not included in the platform types'
// childResourceTypes field.
- loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes);
+ loadTopLevelServerAndServiceTypes(callback, metadataTypes, criteria, cachedTypes);
} else {
- loadRequestedTypes(callback, metadataTypesNeeded, criteria, cachedTypes);
+ loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes);
}
}
private void loadTopLevelServerAndServiceTypes(final TypesLoadedCallback callback,
- final EnumSet<MetadataType> metadataTypes, final ResourceTypeCriteria criteria,
- final Map<Integer, ResourceType> cachedTypes) {
+ final EnumSet<MetadataType> metadataTypes,
+ final ResourceTypeCriteria criteria, final Map<Integer,
+ ResourceType> cachedTypes) {
ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria();
topLevelCriteria.fetchParentResourceTypes(true);
resourceTypeService.findResourceTypesByCriteria(topLevelCriteria, new AsyncCallback<PageList<ResourceType>>() {
@@ -317,8 +319,8 @@ public class ResourceTypeRepository {
public void onSuccess(PageList<ResourceType> types) {
topLevelServerAndServiceTypes = new HashSet<ResourceType>();
for (ResourceType type : types) {
- if ((type.getCategory() != ResourceCategory.PLATFORM)
- && (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) {
+ if ((type.getCategory() != ResourceCategory.PLATFORM) &&
+ (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) {
topLevelServerAndServiceTypes.add(type);
}
}
@@ -327,8 +329,7 @@ public class ResourceTypeRepository {
});
}
- private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes,
- ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) {
+ private void loadRequestedTypes(final TypesLoadedCallback callback, final EnumSet<MetadataType> metadataTypes, ResourceTypeCriteria criteria, final Map<Integer, ResourceType> cachedTypes) {
resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.widget_typeCache_loadFail(), caught);
@@ -343,8 +344,8 @@ public class ResourceTypeRepository {
switch (metadataType) {
case children:
Set<ResourceType> childTypes = type.getChildResourceTypes();
- if (type.getCategory() == ResourceCategory.PLATFORM
- && topLevelServerAndServiceTypes != null) {
+ if (type.getCategory() == ResourceCategory.PLATFORM &&
+ topLevelServerAndServiceTypes != null) {
// Add server and service types with no parent types to the list of child types.
// These types are implicitly children of all platform types, even though they
// are not included in the platform types' childResourceTypes field.
@@ -389,7 +390,7 @@ public class ResourceTypeRepository {
break;
default:
Log.error("ERROR: metadataType " + metadataType.name()
- + " not merged into cached ResourceType.");
+ + " not merged into cached ResourceType.");
}
}
}
commit de6785597ed7e619d01c59e9c556f604570b46f6
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Feb 13 22:46:47 2012 -0500
[BZ 736737] log a detailed DEBUG message if an exception occurs during an avail check (https://bugzilla.redhat.com/show_bug.cgi?id=736737)
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
index bc843ef..f1e2c51 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
@@ -23,7 +23,6 @@
package org.jboss.on.plugins.tomcat;
import java.io.File;
-import java.sql.SQLException;
import java.util.Properties;
import java.util.Set;
@@ -124,7 +123,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
*/
private TomcatServerOperationsDelegate operationsDelegate;
- private ResourceContext resourceContext;
+ private ResourceContext<T> resourceContext;
// JMXComponent Implementation --------------------------------------------
@@ -134,7 +133,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
try {
emsConnection = loadConnection();
} catch (Exception e) {
- log.error("Component attempting to access a connection that could not be loaded");
+ if (log.isTraceEnabled()) {
+ log.debug("Component attempting to access a connection that could not be loaded:" + e.getMessage());
+ }
}
return emsConnection;
@@ -232,6 +233,7 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
if (log.isDebugEnabled())
log.debug("Successfully made connection to the Tomcat Server for resource ["
+ this.resourceContext.getResourceKey() + "]");
+
} catch (Exception e) {
// The connection will be established even in the case that the principal cannot be authenticated,
@@ -239,8 +241,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
// the connection is established. If we get to this point that an exception was thrown, close any
// connection that was made and null it out so we can try to establish it again.
if (this.connection != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Connection created but an exception was thrown. Closing the connection.", e);
+ }
try {
this.connection.close();
} catch (Exception e2) {
@@ -250,19 +253,21 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
// Since the connection is attempted each time it's used, failure to connect could result in log
- // file spamming. Log it once for every 10 consecutive times it's encountered.
- if (consecutiveConnectionErrors % 10 == 0) {
- log.warn(
- "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1)
- + "] times for resource [" + resourceContext.getResourceKey() + "]", e);
+ // file spamming. Log a warning only one time outside of debug mode, and throttle even in debug
+ // mode (once for every 10 connect errors).
+ if (0 == consecutiveConnectionErrors) {
+ log.warn("Could not connect to the Tomcat instance for resource ["
+ + resourceContext.getResourceKey() + "] (enable debug logging for more info): "
+ + e.getMessage());
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled() && (consecutiveConnectionErrors % 10 == 0)) {
log.debug(
- "Could not connect to the Tomcat instance for resource [" + resourceContext.getResourceKey()
- + "]", e);
+ "Could not establish connection to the Tomcat instance [" + (consecutiveConnectionErrors + 1)
+ + "] times for resource [" + resourceContext.getResourceKey() + "]", e);
+ }
- consecutiveConnectionErrors++;
+ ++consecutiveConnectionErrors;
throw e;
}
@@ -293,7 +298,8 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
}
- public void start(ResourceContext context) throws SQLException {
+ @Override
+ public void start(ResourceContext<T> context) throws InvalidPluginConfigurationException, Exception {
this.resourceContext = context;
this.operationsDelegate = new TomcatServerOperationsDelegate(this, resourceContext.getSystemInformation());
@@ -344,23 +350,30 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM
}
public AvailabilityType getAvailability() {
+ AvailabilityType avail;
try {
EmsConnection connection = loadConnection();
EmsBean bean = connection.getBean("Catalina:type=Server");
// this is necessary to prove that that not only the connection exists but is servicing requests.
bean.getAttribute("serverInfo").refresh();
- return AvailabilityType.UP;
+ avail = AvailabilityType.UP;
} catch (Exception e) {
- // If the connection is not servicing requests then close it. this seems necessary for the
- // Tomcat connection as when Tomcat does come up again it seems a new EMS connection is required,
- // otherwise we're not seeing EMS be able to pick up the new process.
+ if (log.isDebugEnabled()) {
+ log.debug("An exception occurred during availability check for Tomcat Server Resource with key ["
+ + this.getResourceContext().getResourceKey() + "] and plugin config ["
+ + this.getPluginConfiguration().getAllProperties() + "].", e);
+ }
+ // If the connection is not servicing requests, then close it. this seems necessary for the
+ // Tomcat connection, as, when Tomcat does come up again, it seems a new EMS connection is required,
+ // otherwise EMS is not able to pick up the new process.
closeConnection();
- return AvailabilityType.DOWN;
+ avail = AvailabilityType.DOWN;
}
+ return avail;
}
- ResourceContext getResourceContext() {
+ ResourceContext<T> getResourceContext() {
return this.resourceContext;
}
commit 1156454c955bb49b9faf5ff413ee675c068b2863
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Dec 14 18:07:25 2011 -0500
[BZ 765593] escape HTML in unified diff output (https://bugzilla.redhat.com/show_bug.cgi?id=765593)
(cherry picked from commit 6e70db5abb0b3db8b93730c27695503a461f8f40)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index bea8c99..10545bb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -20,17 +20,13 @@ package org.rhq.enterprise.gui.coregui.client.drift;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.DriftDefinitionCriteria;
@@ -45,12 +41,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.PopupWindow;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.carousel.BookmarkableCarousel;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.drift.DriftCarouselMemberView.DriftSelectionListener;
+import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility;
import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -266,7 +262,6 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
addCarouselAction("Compare", MSG.common_button_compare(), null, new CarouselAction() {
public void executeAction(Object actionValue) {
-
Record record1 = selectedRecords.get(0);
Record record2 = selectedRecords.get(1);
final String path = record1.getAttribute(DriftDataSource.ATTR_PATH);
@@ -280,68 +275,16 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
GWTServiceLookup.getDriftService().generateUnifiedDiffByIds(diffOldId, diffNewId,
new AsyncCallback<FileDiffReport>() {
- @Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught);
+ CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught);
}
- @Override
public void onSuccess(FileDiffReport diffReport) {
- String diffContents = toHtml(diffReport.getDiff(), 1, 2);
- LocatableWindow window = createDiffViewer(diffContents, path, 1, 2);
+ String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), 1, 2);
+ LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, path, 1, 2);
window.show();
}
-
- private String toHtml(List<String> deltas, int oldVersion, int newVersion) {
- StringBuilder diff = new StringBuilder();
- diff.append("<font color=\"red\">").append(deltas.get(0)).append(":").append(oldVersion)
- .append("</font><br/>");
- diff.append("<font color=\"green\">").append(deltas.get(1)).append(":").append(newVersion)
- .append("</font><br/>");
-
- for (String line : deltas.subList(2, deltas.size())) {
- if (line.startsWith("@@")) {
- diff.append("<font color=\"purple\">").append(line).append("</font><br/>");
- } else if (line.startsWith("-")) {
- diff.append("<font color=\"red\">").append(line).append("</font><br/>");
- } else if (line.startsWith("+")) {
- diff.append("<font color=\"green\">").append(line).append("</font><br/>");
- } else {
- diff.append(line).append("<br/>");
- }
- }
- return diff.toString();
- }
-
- private LocatableWindow createDiffViewer(String contents, String path, int oldVersion,
- int newVersion) {
- VLayout layout = new VLayout();
- DynamicForm form = new DynamicForm();
- form.setWidth100();
- form.setHeight100();
-
- CanvasItem canvasItem = new CanvasItem();
- canvasItem.setColSpan(2);
- canvasItem.setShowTitle(false);
- canvasItem.setWidth("*");
- canvasItem.setHeight("*");
-
- Canvas canvas = new Canvas();
- canvas.setContents(contents);
- canvasItem.setCanvas(canvas);
-
- form.setItems(canvasItem);
- layout.addMember(form);
-
- PopupWindow window = new PopupWindow("diffViewer", layout);
- window.setTitle(path + ":" + oldVersion + ":" + newVersion);
- window.setIsModal(false);
-
- return window;
- }
-
});
-
}
public boolean isEnabled() {
@@ -354,6 +297,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
return false;
}
+
});
super.configureCarousel();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
index 1dcf23b..e42de69 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
@@ -47,6 +47,7 @@ import org.rhq.core.domain.drift.FileDiffReport;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.PopupWindow;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility;
import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
@@ -287,51 +288,23 @@ public class DriftDetailsView extends LocatableVLayout {
return window;
}
- private LocatableWindow createDiffViewer(String contents, String path, int oldVersion, int newVersion) {
- VLayout layout = new VLayout();
- DynamicForm form = new DynamicForm();
- form.setWidth100();
- form.setHeight100();
-
- CanvasItem canvasItem = new CanvasItem();
- canvasItem.setColSpan(2);
- canvasItem.setShowTitle(false);
- canvasItem.setWidth("*");
- canvasItem.setHeight("*");
-
- Canvas canvas = new Canvas();
- canvas.setContents(contents);
- canvasItem.setCanvas(canvas);
-
- form.setItems(canvasItem);
- layout.addMember(form);
-
- PopupWindow window = new PopupWindow("diffViewer", layout);
- window.setTitle(path + ":" + oldVersion + ":" + newVersion);
- window.setIsModal(false);
-
- return window;
- }
-
private LinkItem createViewDiffLink(final Drift<?, ?> drift, final int oldVersion) {
LinkItem viewDiffLink = new LinkItem("viewDiff");
viewDiffLink.setLinkTitle("(view diff)");
viewDiffLink.setShowTitle(false);
viewDiffLink.addClickHandler(new ClickHandler() {
- @Override
public void onClick(ClickEvent clickEvent) {
GWTServiceLookup.getDriftService().generateUnifiedDiff(drift, new AsyncCallback<FileDiffReport>() {
- @Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to generate diff", caught);
+ CoreGUI.getErrorHandler().handleError("Failed to generate diff.", caught);
}
- @Override
public void onSuccess(FileDiffReport diffReport) {
int newVersion = drift.getChangeSet().getVersion();
- String diffContents = toHtml(diffReport.getDiff(), oldVersion, newVersion);
- LocatableWindow window = createDiffViewer(diffContents, drift.getPath(), oldVersion, newVersion);
+ String diffContents = DiffUtility.formatAsHtml(diffReport.getDiff(), oldVersion, newVersion);
+ LocatableWindow window = DiffUtility.createDiffViewerWindow(diffContents, drift.getPath(),
+ oldVersion, newVersion);
window.show();
}
});
@@ -340,24 +313,4 @@ public class DriftDetailsView extends LocatableVLayout {
return viewDiffLink;
}
- private String toHtml(List<String> deltas, int oldVersion, int newVersion) {
- StringBuilder diff = new StringBuilder();
- diff.append("<font color=\"red\">").append(deltas.get(0)).append(":").append(oldVersion).append("</font><br/>");
- diff.append("<font color=\"green\">").append(deltas.get(1)).append(":").append(newVersion).append(
- "</font><br/>");
-
- for (String line : deltas.subList(2, deltas.size())) {
- if (line.startsWith("@@")) {
- diff.append("<font color=\"purple\">").append(line).append("</font><br/>");
- } else if (line.startsWith("-")) {
- diff.append("<font color=\"red\">").append(line).append("</font><br/>");
- } else if (line.startsWith("+")) {
- diff.append("<font color=\"green\">").append(line).append("</font><br/>");
- } else {
- diff.append(line).append("<br/>");
- }
- }
- return diff.toString();
- }
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java
new file mode 100644
index 0000000..dc3fbb0
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java
@@ -0,0 +1,112 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.drift.util;
+
+import java.util.List;
+
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.CanvasItem;
+import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.enterprise.gui.coregui.client.PopupWindow;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
+
+/**
+ * A collection of utility methods for working with unified diffs.
+ */
+public class DiffUtility {
+
+ /**
+ * Formats the specified unified diff output as HTML.
+ *
+ * @param deltas
+ * @param oldVersion
+ * @param newVersion
+ *
+ * @return the specified unified diff output formatted as HTML
+ */
+ public static String formatAsHtml(List<String> deltas, int oldVersion, int newVersion) {
+ StringBuilder html = new StringBuilder();
+
+ String originalFilename = deltas.get(0);
+ html.append("<b>").append(StringUtility.escapeHtml(originalFilename)).
+ append(":").append(oldVersion).append("</b><br/>");
+ String revisedFilename = deltas.get(1);
+ html.append("<b>").append(StringUtility.escapeHtml(revisedFilename)).
+ append(":").append(newVersion).append("</b><br/>");
+
+ List<String> lines = deltas.subList(2, deltas.size());
+ for (String line : lines) {
+ String escapedLine = StringUtility.escapeHtml(line);
+ if (line.startsWith("@@")) {
+ html.append("<font color=\"blue\">").append(escapedLine).append("</font>");
+ } else if (line.startsWith("-")) {
+ html.append("<font color=\"red\">").append(escapedLine).append("</font>");
+ } else if (line.startsWith("+")) {
+ html.append("<font color=\"green\">").append(escapedLine).append("</font>");
+ } else {
+ html.append(escapedLine);
+ }
+ html.append("<br/>");
+ }
+
+ return html.toString();
+ }
+
+ /**
+ * Create a non-modal window containing unified diff HTML.
+ *
+ * @param contents
+ * @param path
+ * @param oldVersion
+ * @param newVersion
+ *
+ * @return a non-modal window containing unified diff HTML
+ */
+ public static LocatableWindow createDiffViewerWindow(String contents, String path, int oldVersion, int newVersion) {
+ VLayout layout = new VLayout();
+ DynamicForm form = new DynamicForm();
+ form.setWidth100();
+ form.setHeight100();
+
+ CanvasItem canvasItem = new CanvasItem();
+ canvasItem.setColSpan(2);
+ canvasItem.setShowTitle(false);
+ canvasItem.setWidth("*");
+ canvasItem.setHeight("*");
+
+ Canvas canvas = new Canvas();
+ canvas.setContents(contents);
+ canvasItem.setCanvas(canvas);
+
+ form.setItems(canvasItem);
+ layout.addMember(form);
+
+ PopupWindow window = new PopupWindow("diffViewer", layout);
+ window.setTitle(path + ":" + oldVersion + ":" + newVersion);
+ window.setIsModal(false);
+
+ return window;
+ }
+
+ private DiffUtility() {
+ }
+
+}
commit b032370f71979d1513416a44d109bb03a20f9884
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 9 15:23:50 2012 -0500
[BZ 771984] is appears that trying to concurrently update a subject's user preferences fails when one of the updates involves inserting a new property. The problem appears from the GWT client, so at the GWT servlet layer, we will now ensure that no two GWT requests can concurrently update a subject.
(cherry picked from commit ac2391109a7b141312f95595341a7dabed4551a4)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
index b790b79..e175134 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -36,6 +36,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
private static final long serialVersionUID = 1L;
private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ private Object subjectLock = new Object(); // used to lock out concurrent subject updates
public void createPrincipal(String username, String password) throws RuntimeException {
try {
@@ -57,7 +58,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject createSubject(Subject subjectToCreate, String password) throws RuntimeException {
try {
return SerialUtility.prepare(subjectManager.createSubject(getSessionSubject(), subjectToCreate, password),
- "SubjectManager.createSubject");
+ "SubjectManager.createSubjectPW");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
@@ -89,8 +90,12 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify) throws RuntimeException {
try {
- Subject subject = SerialUtility.prepare(subjectManager.updateSubject(getSessionSubject(), subjectToModify),
- "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubject");
// Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
// changed any prefs; otherwise the cache would contain stale prefs.
SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
@@ -102,8 +107,16 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify, String newPassword) throws RuntimeException {
try {
- return SerialUtility.prepare(subjectManager
- .updateSubject(getSessionSubject(), subjectToModify, newPassword), "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify, newPassword);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubjectPW");
+ // Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
+ // changed any prefs; otherwise the cache would contain stale prefs.
+ SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
+ return subject;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
commit 69cd904c42b383eaa93abb244347df45cf716e3e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 27 16:56:27 2012 -0500
[BZ 785268] fix the case where you do a clean deploy but a file was edited (where the file content didn't change from bundle v1 to bundle v2)
(cherry picked from commit 657f2f242c2193173b8e68b6cdb34f04f2057d43)
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
index 40ce727..602df4c 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
@@ -422,9 +422,11 @@ public class Deployer {
// that a file is different from the deployment distribution.
// If the new is different from the original and if the new is different than the current, we need to backup the
// current because we will be overwriting the current file with the new.
+ // Note that if we were told to "clean", we never leave files alone (since everything must be cleaned) but
+ // we will backup the touched file that is being removed
String changedFileHashcode = changed.getValue();
String originalFileHashcode = original.get(changedFilePath);
- if (newHashcode.equals(originalFileHashcode)) {
+ if (newHashcode.equals(originalFileHashcode) && !clean) {
currentFilesToLeaveAlone.put(changedFilePath, originalFileHashcode);
} else if (!newHashcode.equals(changedFileHashcode)) {
currentFilesToBackup.add(changedFilePath);
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
index 2736f16..58ff326 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java
@@ -118,7 +118,11 @@ public class SimpleDeployerTest {
}
public void testX_Y_X() throws Exception {
- baseX_Y_X(false);
+ baseX_Y_X(false, false);
+ }
+
+ public void testX_Y_X_Clean() throws Exception {
+ baseX_Y_X(false, true);
}
public void testX_Y_Y() throws Exception {
@@ -166,7 +170,11 @@ public class SimpleDeployerTest {
}
public void testX_Y_X_DryRun() throws Exception {
- baseX_Y_X(true);
+ baseX_Y_X(true, false);
+ }
+
+ public void testX_Y_X_DryRun_Clean() throws Exception {
+ baseX_Y_X(true, true);
}
public void testX_Y_Y_DryRun() throws Exception {
@@ -398,7 +406,7 @@ public class SimpleDeployerTest {
}
}
- private void baseX_Y_X(boolean dryRun) throws Exception {
+ private void baseX_Y_X(boolean dryRun, boolean clean) throws Exception {
String newContent = "testX_Y_X";
String newHashcode = MessageDigestGenerator.getDigestString(newContent);
writeFile(newContent, this.currentFile);
@@ -407,11 +415,7 @@ public class SimpleDeployerTest {
null, null, true, null);
Deployer deployer = new Deployer(dd);
FileHashcodeMap newFileHashcodeMap;
- if (dryRun) {
- newFileHashcodeMap = deployer.dryRun(this.diff);
- } else {
- newFileHashcodeMap = deployer.deploy(this.diff);
- }
+ newFileHashcodeMap = deployer.deploy(this.diff, clean, dryRun);
// very important to understand this - even though the current file is changed, the hashcode
// stored in the map and the metadata directory is the ORIGINAL hashcode. This is to make it
@@ -423,17 +427,37 @@ public class SimpleDeployerTest {
assert newFileHashcodeMap.equals(this.originalFileHashcodeMap);
String[] contentHash = getOriginalFilenameContentHashcode();
- assert contentHash[0].equals(newContent);
- assert contentHash[1].equals(newHashcode);
+
+ // if we are cleaning, then the old content is blown away anyway and the original is replaced
+ // (but not if this is a dryRun - dryRun always means the changed/new content remains)
+ if (clean && !dryRun) {
+ assert contentHash[0].equals(originalContent);
+ assert contentHash[1].equals(originalHashcode);
+ } else {
+ assert contentHash[0].equals(newContent);
+ assert contentHash[1].equals(newHashcode);
+ }
// note nothing changed - our current file remains as is
assert this.diff.getAddedFiles().isEmpty() : this.diff;
assert this.diff.getDeletedFiles().isEmpty() : this.diff;
assert this.diff.getChangedFiles().isEmpty() : this.diff;
- assert this.diff.getBackedUpFiles().isEmpty() : this.diff;
+ if (clean) {
+ assert this.diff.getBackedUpFiles().size() == 1 : this.diff;
+ assert this.diff.getBackedUpFiles().containsKey(originalFileName) : this.diff;
+ File backupFile = new File(this.diff.getBackedUpFiles().get(originalFileName));
+ if (dryRun) {
+ assert !backupFile.exists() : "dry run should not create backup";
+ } else {
+ assert readFile(backupFile).equals(newContent) : "did not backup the correct file?";
+ }
+ } else {
+ assert this.diff.getBackedUpFiles().isEmpty() : this.diff;
+ }
assert this.diff.getIgnoredFiles().isEmpty() : this.diff;
assert this.diff.getRealizedFiles().isEmpty() : this.diff;
assert this.diff.getErrors().isEmpty() : this.diff;
+ assert this.diff.wasCleaned() == clean : this.diff;
if (dryRun) {
assert this.metadata.getCurrentDeploymentProperties().equals(originalDeployProps);
commit 63957050f668025e2284b9db58dd6ca863036f16
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 5 11:08:25 2011 -0500
[Bug 760105 - Drift: Unchecking the 'File Changed' option in 'Category' drop-down in the carousel view displays Globally uncaught exception]
This had to do with the filtering leaving no eligible snapshots.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index 6899913..bea8c99 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -167,7 +167,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
break;
}
}
- if (null == maxSnapshotVersion || maxSnapshotVersion < carouselStart) {
+ if (null == maxSnapshotVersion || null == carouselStart || maxSnapshotVersion < carouselStart) {
maxSnapshotVersion = carouselStart;
setCarouselStartFilterMax(maxSnapshotVersion);
}
commit 34653b7a47a6f3aaea2485928d5f31e0c17f2a94
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Dec 2 13:52:59 2011 -0500
[Bug 759485 - Error viewing live data in the resource metric graph portlet]
- Fixed the live graph code to throw out metric requests returning no values
- Fixed CpuComponent to return valid data on a live metric request, instead
of null.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
index 01284cc..5076804 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
import java.util.Date;
+import java.util.Iterator;
import java.util.Set;
import ca.nanometrics.gflot.client.Axis;
@@ -81,6 +82,7 @@ public class LiveGraphView extends LocatableVLayout {
private SimplePlot plot;
private Timer dataLoader;
+ @SuppressWarnings("unused")
private long min, max;
public LiveGraphView(String locatorId) {
@@ -231,7 +233,12 @@ public class LiveGraphView extends LocatableVLayout {
}
public void onSuccess(Set<MeasurementData> result) {
- MeasurementDataNumeric d = (MeasurementDataNumeric) result.iterator().next();
+ Iterator<MeasurementData> i = result.iterator();
+ if (!i.hasNext()) {
+ return;
+ }
+
+ MeasurementDataNumeric d = (MeasurementDataNumeric) i.next();
handler.add(new DataPoint(d.getTimestamp(), d.getValue()));
plot.redraw();
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
index d5bc264..f045126 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java
@@ -124,14 +124,15 @@ public class CpuComponent implements ResourceComponent<PlatformComponent>, Measu
CpuEntry previousCpu = cpuCache.put(property, currentCpu);
previousCpu = (null == previousCpu) ? startCpuEntry : previousCpu;
- // if for some reason the delta time is excessive then toss
- // the metric, since it depends on a reasonable interval between
- // prev and curr. This can happen due to avail down or a newly
- // activated metric. Allow up to twice the metric interval.
+ // if for some reason the delta time is excessive then toss the metric, since it depends
+ // on a reasonable interval between prev and curr. This can happen due to avail down or a newly
+ // activated metric. Allow up to twice the metric interval. If the metric interval is
+ // 0 (for a live data request) then just use a 10 minute interval.
Number num = null;
long deltaTime = currentCpu.getTimestamp() - previousCpu.getTimestamp();
+ long metricInterval = (0 < request.getInterval()) ? request.getInterval() : 600000L;
- if (deltaTime <= (2 * request.getInterval())) {
+ if (deltaTime <= (2 * metricInterval)) {
// Use the same calculation that SIGAR uses to generate the percentages. The difference is that
// we use a safe "previous" cpu record.
num = getPercentage(previousCpu.getCpu(), cpu, property);
commit 238435dfb011275596e27aae58fc54cdd15d2282
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 16 13:45:09 2012 -0500
[Bug 758503 - Various AS-5 plugin types have unset read-only plugin config props]
required/read-only contextPath and filename props were not being set
[reliably] at discovery time. Removed filename props, which did not seem
to be used by the plugin. Set contextPath props to required="false".
The value does not seem to be used by the plugin but the property is
at least defined in the code.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index e1b8d25..2d1e86a 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2278,7 +2278,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="ear" readOnly="true"/>
@@ -2335,8 +2334,8 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/>
+ <!-- setting to required=false since this is not usually set properly at discovery time -->
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" required="false" readOnly="false"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="war" readOnly="true"/>
@@ -2418,7 +2417,8 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/>
+ <!-- setting to required=false since this is not usually set properly at discovery time -->
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" required="false" readOnly="false"/>
</c:group>
<c:group name="ResponseTime">
<c:simple-property name="responseTimeLogFile" required="false"
@@ -2485,7 +2485,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2581,7 +2580,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2654,7 +2652,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2731,7 +2728,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="jar" readOnly="true"/>
@@ -2793,7 +2789,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="rar" readOnly="true"/>
@@ -2839,7 +2834,6 @@
<plugin-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
</c:group>
<c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
<c:simple-property name="extension" default="rar" readOnly="true"/>
commit 2806ea72b6c6848d5897f28fee1fb10ec5a877ea
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Nov 18 16:08:13 2011 +0100
[BZ 754968] - making quoted arguments work with CLI on *nix.
Windows startup script surprisingly seems to support this ok.
(cherry picked from commit 6dac40e6a8caf01a9ad7d06fde5a511eac545569)
diff --git a/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh b/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
index 2a6ad50..9791e37 100644
--- a/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
+++ b/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
@@ -160,14 +160,6 @@ fi
debug_msg "RHQ_CLI_ADDITIONAL_JAVA_OPTS: $RHQ_CLI_ADDITIONAL_JAVA_OPTS"
# ----------------------------------------------------------------------
-# Prepare the command line arguments passed to the RHQ Agent
-# ----------------------------------------------------------------------
-if [ "x$RHQ_CLI_CMDLINE_OPTS" = "x" ]; then
- RHQ_CLI_CMDLINE_OPTS=$*
-fi
-debug_msg "RHQ_CLI_CMDLINE_OPTS: $RHQ_CLI_CMDLINE_OPTS"
-
-# ----------------------------------------------------------------------
# Execute the VM which starts the CLI
# ----------------------------------------------------------------------
@@ -191,8 +183,19 @@ if [ "x$_CYGWIN" != "x" ]; then
fi
# Build the command line that starts the VM
+# We're using an if on existence of externally passed RHQ_CLI_CMDLINE_OPTS
+# variable rather than assigning RHQ_CLI_CMDLINE_OPTS to "$@" if nothing passed
+# because doing that would expand the quoted variables at the assignment time.
+# If we then passed that variable to the actual command, the quoted arguments
+# would be already expanded and we'd therefore loose the ability to pass in
+# quoted args.
debug_msg "Executing the CLI with this command line:"
-debug_msg "${RHQ_CLI_JAVA_EXE_FILE_PATH} ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp ${CLASSPATH} org.rhq.enterprise.client.ClientMain ${RHQ_CLI_CMDLINE_OPTS}"
-"${RHQ_CLI_JAVA_EXE_FILE_PATH}" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp "${CLASSPATH}" org.rhq.enterprise.client.ClientMain ${RHQ_CLI_CMDLINE_OPTS}
+if [ "x$RHQ_CLI_CMDLINE_OPTS" = "x" ]; then
+ debug_msg "${RHQ_CLI_JAVA_EXE_FILE_PATH} ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp ${CLASSPATH} org.rhq.enterprise.client.ClientMain $@"
+ "${RHQ_CLI_JAVA_EXE_FILE_PATH}" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp "${CLASSPATH}" org.rhq.enterprise.client.ClientMain "$@"
+else
+ debug_msg "${RHQ_CLI_JAVA_EXE_FILE_PATH} ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp ${CLASSPATH} org.rhq.enterprise.client.ClientMain ${RHQ_CLI_CMDLINE_OPTS}"
+ "${RHQ_CLI_JAVA_EXE_FILE_PATH}" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp "${CLASSPATH}" org.rhq.enterprise.client.ClientMain ${RHQ_CLI_CMDLINE_OPTS}
+fi
debug_msg "$0 done."
commit 8cb8405748b2d7896e2b330808b32ebbbded92f8
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 31 14:35:07 2012 +0100
[BZ 786106] Wrap calls to obtain managers in privileged blocks so that 3rd
callers can safely obtain them.
The StandardBindings put all the managers into the script context before
the script engine is initialized with the security measures which makes
the managers available inside the scripts. Java code that gets injected as
other params into the scripts (like the "ProxyFactory" (of class
ResourceClientFactory) would suffer from access control exceptions when
it tried to obtain some manager while being called from the script because
it would try to call the methods from the LocalClient to obtain the remote
interfaces directly, without a wrapping in a privileged block). Obtaining
the remote interfaces is a safe operation wrt the scripts and so can be
wrapped in privileged block so that any caller of the LocalClient can
have access to the regardless of the access control restrictions in place.
(cherry picked from commit 02dafbc97a76c3813afd0f05b213d8a1de70a3c2)
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
index 025b60d..2414bf6 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
@@ -21,6 +21,9 @@ package org.rhq.enterprise.client;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
import java.util.HashMap;
import java.util.Map;
@@ -79,141 +82,335 @@ public class LocalClient implements RhqFacade {
this.subject = subject;
}
+ @Override
public Subject getSubject() {
return subject;
}
+ @Override
public Subject login(String user, String password) throws Exception {
return subject;
}
+ @Override
public void logout() {
}
+ @Override
public boolean isLoggedIn() {
return true;
}
+ @Override
public AlertManagerRemote getAlertManager() {
- return getProxy(LookupUtil.getAlertManager(), AlertManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AlertManagerRemote>() {
+ @Override
+ public AlertManagerRemote run() {
+ return AccessController.doPrivileged(new PrivilegedAction<AlertManagerRemote>() {
+ @Override
+ public AlertManagerRemote run() {
+ return getProxy(LookupUtil.getAlertManager(), AlertManagerRemote.class);
+ }
+ });
+ }
+ });
}
+ @Override
public AlertDefinitionManagerRemote getAlertDefinitionManager() {
- return getProxy(LookupUtil.getAlertDefinitionManager(), AlertDefinitionManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AlertDefinitionManagerRemote>() {
+ @Override
+ public AlertDefinitionManagerRemote run() {
+ return getProxy(LookupUtil.getAlertDefinitionManager(), AlertDefinitionManagerRemote.class);
+ }
+ });
}
+ @Override
public AvailabilityManagerRemote getAvailabilityManager() {
- return getProxy(LookupUtil.getAvailabilityManager(), AvailabilityManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<AvailabilityManagerRemote>() {
+ @Override
+ public AvailabilityManagerRemote run() {
+ return getProxy(LookupUtil.getAvailabilityManager(), AvailabilityManagerRemote.class);
+ }
+ });
}
+ @Override
public BundleManagerRemote getBundleManager() {
- return getProxy(LookupUtil.getBundleManager(), BundleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<BundleManagerRemote>() {
+ @Override
+ public BundleManagerRemote run() {
+ return AccessController.doPrivileged(new PrivilegedAction<BundleManagerRemote>() {
+ @Override
+ public BundleManagerRemote run() {
+ return getProxy(LookupUtil.getBundleManager(), BundleManagerRemote.class);
+ }
+ });
+ }
+ });
}
+ @Override
public CallTimeDataManagerRemote getCallTimeDataManager() {
- return getProxy(LookupUtil.getCallTimeDataManager(), CallTimeDataManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<CallTimeDataManagerRemote>() {
+ @Override
+ public CallTimeDataManagerRemote run() {
+ return getProxy(LookupUtil.getCallTimeDataManager(), CallTimeDataManagerRemote.class);
+ }
+ });
}
+ @Override
public RepoManagerRemote getRepoManager() {
- return getProxy(LookupUtil.getRepoManagerLocal(), RepoManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RepoManagerRemote>() {
+ @Override
+ public RepoManagerRemote run() {
+ return getProxy(LookupUtil.getRepoManagerLocal(), RepoManagerRemote.class);
+ }
+ });
}
+ @Override
public ConfigurationManagerRemote getConfigurationManager() {
- return getProxy(LookupUtil.getConfigurationManager(), ConfigurationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ConfigurationManagerRemote>() {
+ @Override
+ public ConfigurationManagerRemote run() {
+ return getProxy(LookupUtil.getConfigurationManager(), ConfigurationManagerRemote.class);
+ }
+ });
}
+ @Override
public ContentManagerRemote getContentManager() {
- return getProxy(LookupUtil.getContentManager(), ContentManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ContentManagerRemote>() {
+ @Override
+ public ContentManagerRemote run() {
+ return getProxy(LookupUtil.getContentManager(), ContentManagerRemote.class);
+ }
+ });
}
+ @Override
public DataAccessManagerRemote getDataAccessManager() {
- return getProxy(LookupUtil.getDataAccessManager(), DataAccessManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DataAccessManagerRemote>() {
+ @Override
+ public DataAccessManagerRemote run() {
+ return getProxy(LookupUtil.getDataAccessManager(), DataAccessManagerRemote.class);
+ }
+ });
}
+ @Override
public DiscoveryBossRemote getDiscoveryBoss() {
- return getProxy(LookupUtil.getDiscoveryBoss(), DiscoveryBossRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DiscoveryBossRemote>() {
+ @Override
+ public DiscoveryBossRemote run() {
+ return getProxy(LookupUtil.getDiscoveryBoss(), DiscoveryBossRemote.class);
+ }
+ });
}
+ @Override
public DriftManagerRemote getDriftManager() {
- return getProxy(LookupUtil.getDriftManager(), DriftManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DriftManagerRemote>() {
+ @Override
+ public DriftManagerRemote run() {
+ return getProxy(LookupUtil.getDriftManager(), DriftManagerRemote.class);
+ }
+ });
}
public DriftTemplateManagerRemote getDriftTemplateManager() {
- return getProxy(LookupUtil.getDriftTemplateManager(), DriftTemplateManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<DriftTemplateManagerRemote>() {
+ @Override
+ public DriftTemplateManagerRemote run() {
+ return getProxy(LookupUtil.getDriftTemplateManager(), DriftTemplateManagerRemote.class);
+ }
+ });
}
+ @Override
public EventManagerRemote getEventManager() {
- return getProxy(LookupUtil.getEventManager(), EventManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<EventManagerRemote>() {
+ @Override
+ public EventManagerRemote run() {
+ return getProxy(LookupUtil.getEventManager(), EventManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementBaselineManagerRemote getMeasurementBaselineManager() {
- return getProxy(LookupUtil.getMeasurementBaselineManager(), MeasurementBaselineManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementBaselineManagerRemote>() {
+ @Override
+ public MeasurementBaselineManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementBaselineManager(), MeasurementBaselineManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementDataManagerRemote getMeasurementDataManager() {
- return getProxy(LookupUtil.getMeasurementDataManager(), MeasurementDataManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementDataManagerRemote>() {
+ @Override
+ public MeasurementDataManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementDataManager(), MeasurementDataManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementDefinitionManagerRemote getMeasurementDefinitionManager() {
- return getProxy(LookupUtil.getMeasurementDefinitionManager(), MeasurementDefinitionManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementDefinitionManagerRemote>() {
+ @Override
+ public MeasurementDefinitionManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementDefinitionManager(), MeasurementDefinitionManagerRemote.class);
+ }
+ });
}
+ @Override
public MeasurementScheduleManagerRemote getMeasurementScheduleManager() {
- return getProxy(LookupUtil.getMeasurementScheduleManager(), MeasurementScheduleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<MeasurementScheduleManagerRemote>() {
+ @Override
+ public MeasurementScheduleManagerRemote run() {
+ return getProxy(LookupUtil.getMeasurementScheduleManager(), MeasurementScheduleManagerRemote.class);
+ }
+ });
}
+ @Override
public OperationManagerRemote getOperationManager() {
- return getProxy(LookupUtil.getOperationManager(), OperationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<OperationManagerRemote>() {
+ @Override
+ public OperationManagerRemote run() {
+ return getProxy(LookupUtil.getOperationManager(), OperationManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceManagerRemote getResourceManager() {
- return getProxy(LookupUtil.getResourceManager(), ResourceManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceManagerRemote>() {
+ @Override
+ public ResourceManagerRemote run() {
+ return getProxy(LookupUtil.getResourceManager(), ResourceManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceFactoryManagerRemote getResourceFactoryManager() {
- return getProxy(LookupUtil.getResourceFactoryManager(), ResourceFactoryManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceFactoryManagerRemote>() {
+ @Override
+ public ResourceFactoryManagerRemote run() {
+ return getProxy(LookupUtil.getResourceFactoryManager(), ResourceFactoryManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceGroupManagerRemote getResourceGroupManager() {
- return getProxy(LookupUtil.getResourceGroupManager(), ResourceGroupManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceGroupManagerRemote>() {
+ @Override
+ public ResourceGroupManagerRemote run() {
+ return getProxy(LookupUtil.getResourceGroupManager(), ResourceGroupManagerRemote.class);
+ }
+ });
}
+ @Override
public ResourceTypeManagerRemote getResourceTypeManager() {
- return getProxy(LookupUtil.getResourceTypeManager(), ResourceTypeManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<ResourceTypeManagerRemote>() {
+ @Override
+ public ResourceTypeManagerRemote run() {
+ return getProxy(LookupUtil.getResourceTypeManager(), ResourceTypeManagerRemote.class);
+ }
+ });
}
+ @Override
public RoleManagerRemote getRoleManager() {
- return getProxy(LookupUtil.getRoleManager(), RoleManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RoleManagerRemote>() {
+ @Override
+ public RoleManagerRemote run() {
+ return getProxy(LookupUtil.getRoleManager(), RoleManagerRemote.class);
+ }
+ });
}
+ @Override
public SavedSearchManagerRemote getSavedSearchManager() {
- return getProxy(LookupUtil.getSavedSearchManager(), SavedSearchManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SavedSearchManagerRemote>() {
+ @Override
+ public SavedSearchManagerRemote run() {
+ return getProxy(LookupUtil.getSavedSearchManager(), SavedSearchManagerRemote.class);
+ }
+ });
}
+ @Override
public SubjectManagerRemote getSubjectManager() {
- return getProxy(LookupUtil.getSubjectManager(), SubjectManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SubjectManagerRemote>() {
+ @Override
+ public SubjectManagerRemote run() {
+ return getProxy(LookupUtil.getSubjectManager(), SubjectManagerRemote.class);
+ }
+ });
}
+ @Override
public SupportManagerRemote getSupportManager() {
- return getProxy(LookupUtil.getSupportManager(), SupportManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SupportManagerRemote>() {
+ @Override
+ public SupportManagerRemote run() {
+ return getProxy(LookupUtil.getSupportManager(), SupportManagerRemote.class);
+ }
+ });
}
+ @Override
public SystemManagerRemote getSystemManager() {
- return getProxy(LookupUtil.getSystemManager(), SystemManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SystemManagerRemote>() {
+ @Override
+ public SystemManagerRemote run() {
+ return getProxy(LookupUtil.getSystemManager(), SystemManagerRemote.class);
+ }
+ });
}
+ @Override
public RemoteInstallManagerRemote getRemoteInstallManager() {
- return getProxy(LookupUtil.getRemoteInstallManager(), RemoteInstallManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<RemoteInstallManagerRemote>() {
+ @Override
+ public RemoteInstallManagerRemote run() {
+ return getProxy(LookupUtil.getRemoteInstallManager(), RemoteInstallManagerRemote.class);
+ }
+ });
}
+ @Override
public TagManagerRemote getTagManager() {
- return getProxy(LookupUtil.getTagManager(), TagManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<TagManagerRemote>() {
+ @Override
+ public TagManagerRemote run() {
+ return getProxy(LookupUtil.getTagManager(), TagManagerRemote.class);
+ }
+ });
}
+ @Override
public SynchronizationManagerRemote getSynchronizationManager() {
- return getProxy(LookupUtil.getSynchronizationManager(), SynchronizationManagerRemote.class);
+ return AccessController.doPrivileged(new PrivilegedAction<SynchronizationManagerRemote>() {
+ @Override
+ public SynchronizationManagerRemote run() {
+ return getProxy(LookupUtil.getSynchronizationManager(), SynchronizationManagerRemote.class);
+ }
+ });
}
-
+
+ @Override
public Map<String, Object> getManagers() {
if (managers == null) {
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
index af90701..06fc76a 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
@@ -21,7 +21,6 @@ package org.rhq.enterprise.client.security.test;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.SerializablePermission;
import java.security.PermissionCollection;
import java.util.Collections;
@@ -31,7 +30,6 @@ import javax.script.ScriptException;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -179,6 +177,21 @@ public class JndiAccessTest extends AbstractEJB3Test {
}
}
+ @Test
+ public void testProxyFactoryWorksWithSecuredScriptEngine() throws Exception {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ ScriptEngine engine = getEngine(overlord);
+
+ try {
+ engine.eval("var resource = ProxyFactory.getResource(10001);");
+ } catch (ScriptException e) {
+ //if the script fails (there is no resource with ID 10001)
+ //it should not be because of an access control exception
+ checkIsNotASecurityException(e);
+ }
+ }
+
private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
@@ -193,4 +206,11 @@ public class JndiAccessTest extends AbstractEJB3Test {
Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
}
+
+ private static void checkIsNotASecurityException(ScriptException e) {
+ String message = e.getMessage();
+ String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
+
+ Assert.assertFalse(message.contains(permissionTrace), "The script exception does seem to be caused by the AllowRhqServerInternalsAccessPermission security exception although it shouldn't. " + message);
+ }
}
commit 87d7abc912a383e30d6cd930c0b2e80cb47cf025
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Dec 5 15:55:31 2011 -0500
[Bug 760145 - Drift snapshot displays wrong directory name on windows]
This is fairly bad as the paths get corrupted for all drift entries when
the basedir is a windows file system root (e.g. c:/ or d:/). There is
no workaround other than not using the file system root as the basedir.
I'm not sure, this may also happen using the a linux root "/" basedir.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
index 8099de5..21341c4 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -543,7 +543,13 @@ public class DriftDetector implements Runnable {
if (basedir.equals(file)) {
return ".";
}
- return file.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ String filePath = file.getAbsolutePath();
+ String basedirPath = basedir.getAbsolutePath();
+ int basedirLen = basedirPath.length();
+ if (!basedirPath.endsWith(File.separator)) {
+ ++basedirLen;
+ }
+ return filePath.substring(basedirLen);
}
private String sha256(File file) throws IOException {
commit ffe50ce9e58bfaf507c92cd96dbcd5ab53948d8b
Author: Torben Jaeger <torben(a)jit-central.com>
Date: Fri Feb 10 11:32:24 2012 +0100
Enable gathering of server logs.
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 bc0374a..d62c55b 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
@@ -41,6 +41,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
@@ -93,6 +94,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String managementUser;
String managementPassword;
+ private LogFileEventResourceComponentHelper logFileEventDelegate;
+
/**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
@@ -121,6 +124,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
connection = new ASConnection(host,port, managementUser, managementPassword);
+ logFileEventDelegate = new LogFileEventResourceComponentHelper(context);
+ logFileEventDelegate.startLogFileEventPollers();
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -141,8 +146,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
*/
public void stop() {
-
-
+ if (!(context.getParentResourceComponent() instanceof BaseComponent)) {
+ logFileEventDelegate.stopLogFileEventPollers();
+ }
}
commit e5d3ddf2655bf961252941475ff89998d0e87d6d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 9 21:24:33 2012 +0100
Various improvements to the as7 plugin up to (and including) master rev 24aff88ad572
diff --git a/modules/plugins/jboss-as-7/d2d.sh b/modules/plugins/jboss-as-7/d2d.sh
index 16c1e57..d36d8e9 100755
--- a/modules/plugins/jboss-as-7/d2d.sh
+++ b/modules/plugins/jboss-as-7/d2d.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-java -cp target/rhq-jboss-as-7-plugin-4.1.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
+java -cp target/rhq-jboss-as-7-plugin-4.3.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 1cbe657..cfb5266 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -15,9 +15,9 @@
<name>RHQ JBossAS 7.x Plugin</name>
<properties>
- <scm.module.path>TODO</scm.module.path>
<json.version>${project.json.version}</json.version>
<jackson.version>1.7.4</jackson.version>
+ <jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
<build>
@@ -50,6 +50,11 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
@@ -77,7 +82,7 @@
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -205,6 +210,13 @@
<scope>provided</scope>
</dependency>
+ <!-- for the password hashing - we may want to copy the relevant stuff over ourselves -->
+ <dependency>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
new file mode 100644
index 0000000..703e177
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
@@ -0,0 +1,26 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+
+/**
+ * Authenticator to authenticate against as7
+ * @author Heiko W. Rupp
+ */
+public class AS7Authenticator extends Authenticator {
+
+ private String user;
+ private String pass;
+
+ public AS7Authenticator(String user, String pass) {
+ this.user = user;
+ this.pass = pass;
+ if (this.pass==null)
+ this.pass=""; // prevent NPE later
+ }
+
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(user,pass.toCharArray());
+ }
+}
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 13c9ae6..382a145 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
@@ -23,15 +23,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -51,15 +51,21 @@ public class ASConnection {
String urlString;
private ObjectMapper mapper;
public static boolean verbose = false; // This is a variable on purpose, so devs can switch it on in the debugger or in the agent
- private HttpURLConnection conn;
+ Authenticator passwordAuthenticator ;
+ private String host;
+ private int port;
/**
* Construct an ASConnection object. The real "physical" connection is done in
* #executeRaw.
* @param host Host of the DomainController or standalone server
* @param port Port of the JSON api.
+ * @param user user needed for authentication
+ * @param password password needed for authentication
*/
- public ASConnection(String host, int port) {
+ public ASConnection(String host, int port, String user, String password) {
+ this.host = host;
+ this.port = port;
try {
url = new URL("http", host, port, MANAGEMENT);
@@ -69,6 +75,9 @@ public class ASConnection {
throw new IllegalArgumentException(e.getMessage());
}
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
+
// read system property "as7plugin.verbose"
verbose = Boolean.getBoolean("as7plugin.verbose");
@@ -92,19 +101,25 @@ public class ASConnection {
InputStream inputStream = null;
BufferedReader br = null;
InputStream es = null;
+ HttpURLConnection conn=null;
long t1 = System.currentTimeMillis();
try {
-
conn = (HttpURLConnection) url.openConnection();
conn.setDoOutput(true);
conn.setRequestMethod("POST");
- conn.addRequestProperty("Content-Type","application/json");
+ conn.addRequestProperty("Content-Type", "application/json");
conn.addRequestProperty("Accept","application/json");
+ conn.setConnectTimeout(10 * 1000); // 10s
+ conn.setReadTimeout(10 * 1000); // 10s
+
+ if (conn.getReadTimeout()!=10*1000)
+ log.warn("JRE uses a broken timeout mechanism - nothing we can do");
+
OutputStream out = conn.getOutputStream();
- String result = mapper.writeValueAsString(operation);
+ String json_to_send = mapper.writeValueAsString(operation);
if (verbose) {
- log.info("Json to send: " + result);
+ log.info("Json to send: " + json_to_send);
}
mapper.writeValue(out, operation);
@@ -149,6 +164,19 @@ public class ASConnection {
} else {
log.error("IS was null and code was " + responseCode);
}
+ } catch (IllegalArgumentException iae) {
+ log.error("Illegal argument " + iae);
+ log.error(" for input " + operation);
+ } catch (SocketTimeoutException ste) {
+ log.error("Request to AS timed out " + ste.getMessage());
+ conn.disconnect();
+ Result failure = new Result();
+ failure.setFailureDescription(ste.getMessage());
+ failure.setOutcome("failure");
+ failure.setRhqThrowable(ste);
+
+ JsonNode ret = mapper.valueToTree(failure);
+ return ret;
} catch (IOException e) {
log.error("Failed to get data: " + e.getMessage());
@@ -173,7 +201,7 @@ public class ASConnection {
Result failure = new Result();
failure.setFailureDescription(e.getMessage());
failure.setOutcome("failure");
- failure.setThrowable(e);
+ failure.setRhqThrowable(e);
JsonNode ret = mapper.valueToTree(failure);
return ret;
@@ -183,14 +211,14 @@ public class ASConnection {
try {
br.close();
} catch (IOException e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e.getMessage());
}
}
if (es != null) {
try {
es.close();
} catch (IOException e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e.getMessage());
}
}
long t2 = System.currentTimeMillis();
@@ -236,6 +264,9 @@ public class ASConnection {
if (node==null) {
log.warn("Operation [" + op + "] returned null");
+ Result failure = new Result();
+ failure.setFailureDescription("Operation [" + op + "] returned null");
+ return failure;
}
try {
Result res;
@@ -245,27 +276,16 @@ public class ASConnection {
res = mapper.readValue(node, Result.class);
return res;
} catch (IOException e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e.getMessage());
return null;
}
}
- public void writeValue(OutputStream out, Object value) throws IOException, JsonGenerationException,
- JsonMappingException {
- // JsonGenerator jgen = _jsonFactory.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = mapper.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = new Js
- // boolean closed = false;
- // try {
- // writeValue(jgen, value);
- // closed = true;
- // jgen.close();
- // } finally {
- // if (!closed) {
- // jgen.close();
- // }
- // }
-
+ public String getHost() {
+ return host;
}
+ public int getPort() {
+ return port;
+ }
}
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 c505b00..90316a4 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
@@ -26,6 +26,7 @@ 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;
@@ -53,17 +54,27 @@ public class ASUploadConnection {
private static final String UPLOAD_URL_PATH = ASConnection.MANAGEMENT + "/add-content";
- private final Log log = LogFactory.getLog(ASUploadConnection.class);
+ private static final Log log = LogFactory.getLog(ASUploadConnection.class);
+ Authenticator passwordAuthenticator ;
BufferedOutputStream os = null;
InputStream is = null;
private HttpURLConnection connection;
private String host;
private int port;
- public ASUploadConnection(String dcHost, int port) {
+ public ASUploadConnection(String dcHost, int port, String user, String password) {
this.host = dcHost;
this.port = port;
+ if (user!=null) {
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
+ }
+ }
+
+ public ASUploadConnection(ASConnection asConnection) {
+ this.host=asConnection.getHost();
+ this.port=asConnection.getPort();
}
public OutputStream getOutputStream(String fileName) {
@@ -71,6 +82,8 @@ public class ASUploadConnection {
// Create the HTTP connection to the upload URL
String url = "http://" + host + ":" + port + UPLOAD_URL_PATH;
connection = (HttpURLConnection) new URL(url).openConnection();
+ connection.setConnectTimeout(10 * 1000); // 10s
+ connection.setReadTimeout(60 * 1000); // 60s
connection.setDoInput(true);
connection.setDoOutput(true);
connection.setRequestMethod(POST_REQUEST_METHOD);
@@ -122,7 +135,7 @@ public class ASUploadConnection {
log.warn("- no InputStream available -");
} catch (IOException e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e);
}
finally {
closeQuietly(is);
@@ -191,7 +204,7 @@ public class ASUploadConnection {
}
} catch (Exception e) {
- e.printStackTrace(); // TODO
+ log.error(e);
return true;
}
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 8736495..c464e4b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -24,15 +24,16 @@ import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.system.ProcessInfo;
/**
@@ -40,14 +41,24 @@ import org.rhq.core.system.ProcessInfo;
* in the area of processes and host.xml
* @author Heiko W. Rupp
*/
-public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> implements ResourceDiscoveryComponent<T> {
+public class AbstractBaseDiscovery {
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
private static final String DJBOSS_SERVER_HOME_DIR = "-Djboss.home.dir";
static final int DEFAULT_MGMT_PORT = 9990;
private static final String JBOSS_AS_PREFIX = "jboss-as-";
+ static final String CALL_READ_STANDALONE_OR_HOST_XML_FIRST = "hostXml is null. You need to call 'readStandaloneOrHostXml' first.";
protected Document hostXml;
protected final Log log = LogFactory.getLog(this.getClass());
private static final String JBOSS_EAP_PREFIX = "jboss-eap-";
+ private XPathFactory factory;
+
+
+
+ protected AbstractBaseDiscovery() {
+ synchronized (this) {
+ factory = XPathFactory.newInstance();
+ }
+ }
/**
* Read the host.xml or standalone.xml file depending on isDomainMode. If isDomainMode is true,
@@ -58,6 +69,10 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected void readStandaloneOrHostXml(ProcessInfo processInfo, boolean isDomainMode) {
String hostXmlFile = getHostXmlFileLocation(processInfo,isDomainMode);
+ readStandaloneOrHostXmlFromFile(hostXmlFile);
+ }
+
+ protected void readStandaloneOrHostXmlFromFile(String hostXmlFile) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -107,115 +122,80 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getManagementPortFromHostXml(String[] commandLine) {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("management-interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <management-interfaces> found in host.xml");
- return new HostPort();
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return new HostPort();
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String portString;
+ String interfaceExpession;
+
+ String socketBindingName;
+
+ socketBindingName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket-binding/@http");
+ String socketInterface = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket/@interface");
+
+ if (!socketInterface.isEmpty()) {
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "//interfaces/interface[@name='" + socketInterface + "']/inet-address/@value");
+ portString = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket/@port");
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
-
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("http-interface")) {
- String tmp = mgmtInterface.getAttribute("port"); // TODO if we don't find it, check for socket-binding
- int port;
- if (!tmp.isEmpty())
- port = Integer.valueOf(tmp);
- else
- port = DEFAULT_MGMT_PORT;
- HostPort hp = new HostPort();
- hp.isLocal=true; // TODO adjust when host != localhost
- hp.port = port;
-
- String nIf = mgmtInterface.getAttribute("interface");
- if (!nIf.isEmpty())
- hp.host = getInterface(nIf, commandLine);
- else
- hp.host = "localhost";
- return hp;
- }
+ else if (socketBindingName.isEmpty()) {
+ // old AS7.0, early 7.1 style
+ portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/@interface");
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
}
- return new HostPort();
- }
+ else {
+ // later AS7.1 and EAP6 standalone.xml
+ portString = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@interface");
- /**
- * Try to obtain the management interface IP from the host/standalone.xml files
- *
- * @param nIf Interface to look for
- * @param commandLine Command line arguments of the process
- * @return IP address to use
- */
- private String getInterface(String nIf, String[] commandLine) {
- if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ // TODO the next may also be expressed differently
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <interfaces> found in host.xml");
- return null;
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return null;
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("interface")) {
- String name = mgmtInterface.getAttribute("name");
- if (!name.equals(nIf))
- continue;
-
- NodeList nl = mgmtInterface.getChildNodes();
- if (nl!=null) {
- for (int j = 0 ; j < nl.getLength(); j++) {
- if (!(nl.item(j) instanceof Element))
- continue;
-
- String nodeName = nl.item(j).getNodeName();
- if (nodeName.equals("any-ipv4-address"))
- return "0.0.0.0";
-
- String value = ((Element) nl.item(j)).getAttribute("value");
- value = replaceExpression(value, commandLine);
- return value;
-
- // TODO check for <any> and so on
- }
- }
- }
+ HostPort hp = new HostPort();
+
+ if (!interfaceExpession.isEmpty())
+ hp.host = replaceDollarExpression(interfaceExpession, commandLine, "localhost");
+ else
+ hp.host = "localhost"; // Fallback
+
+ if (portString!=null && !portString.isEmpty()) {
+ String tmp = replaceDollarExpression(portString,commandLine, "9990");
+ hp.port = Integer.valueOf(tmp);
}
- return null; // TODO: Customise this generated block
+ else
+ hp.port = 9990; // Fallback to default
+ return hp;
}
+
/**
* Check if the passed value has an expression in the form of ${var} or ${var:default},
* try to resolve it. Resolution is done by looking at the command line to see if
* there are -bmanagement or -Djboss.bind.address.management arguments present
*
+ *
* @param value a hostname or hostname expression
* @param commandLine The command line from the process
+ * @param lastResort
* @return resolved value
*/
- private String replaceExpression(String value, String[] commandLine) {
+ private String replaceDollarExpression(String value, String[] commandLine, String lastResort) {
if (!value.contains("${"))
return value;
// remove ${ }
value = value.substring(2,value.length()-1);
- String fallback = "localhost";
+ String fallback = lastResort;
String expression;
if (value.contains(":")) {
int i = value.indexOf(":");
@@ -231,15 +211,27 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
* -D jboss.bind.address.management
* or
* -b management
- * to find the management port
+ * to find the management addresss
*/
String ret=null;
- for (String line: commandLine) {
- if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
- ret = line.substring(line.indexOf("=")+1);
- break;
+ for (int i = 0, commandLineLength = commandLine.length; i < commandLineLength; i++) {
+ String line = commandLine[i];
+ if (expression.contains("address")) {
+ if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
+ if (line.contains("="))
+ ret = line.substring(line.indexOf("=") + 1); // -bmanagement=1.2.3.4
+ else
+ ret = commandLine[i+1]; // -bmanagement 1.2.3.4
+ break;
+ }
+ } else if (expression.contains("port")) {
+ if (line.contains(expression)) {
+ ret = line.substring(line.indexOf("=") + 1);
+ break;
+ }
}
+
}
if (ret==null)
ret = fallback;
@@ -250,12 +242,12 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
/**
* Try to determine the host name - that is the name of a standalone server or a
- * host in domain mode by looking at the standalone/host.xml files
+ * host in domain mode by looking at the standalone.xml/host.xml files
* @return server name
*/
protected String findHostName() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
String hostName = hostXml.getDocumentElement().getAttribute("name");
return hostName;
@@ -267,29 +259,58 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getDomainControllerFromHostXml() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
-
- Element host = hostXml.getDocumentElement();
- NodeList dcParent = host.getElementsByTagName("domain-controller");
- if (dcParent==null || dcParent.getLength()==0)
- return new HostPort(false);
- NodeList interfs = dcParent.item(0).getChildNodes();
- for (int i = 0; i < interfs.getLength(); i++) {
- if (!(interfs.item(i)instanceof Element))
- continue;
-
- Element interf = (Element) interfs.item(i);
- if (interf.getNodeName().equals("local"))
- return new HostPort();
-
- // not local, so get the remote
- HostPort hp = new HostPort(false);
- hp.host = interf.getAttribute("host");
- hp.port = Integer.parseInt(interf.getAttribute("port"));
- return hp;
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ // first check remote, as we can't distinguish between a missing local element or
+ // and empty one which is the default
+ String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host");
+ String portString = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@port");
+
+ HostPort hp;
+ if (!remoteHost.isEmpty() && !portString.isEmpty()) {
+ hp = new HostPort(false);
+ hp.host = remoteHost;
+ hp.port = Integer.parseInt(portString);
+ }
+ else {
+ hp = new HostPort(true);
+ hp.port = 9999;
}
- return new HostPort(false);
+ return hp;
+
+ }
+
+ String getManagementSecurtiyRealmFromHostXml() {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String realm = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+
+ return realm;
+ }
+
+ String getSecurityPropertyFileFromHostXml(String baseDir, AS7Mode mode, String realm) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@path");
+ String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@relative-to");
+
+ String dmode;
+ if (mode==AS7Mode.STANDALONE)
+ dmode="server";
+ else
+ dmode="domain";
+
+ String fullName ;
+ if (relDir.equals("jboss." + dmode + ".config.dir"))
+ fullName = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + fileName;
+ else
+ fullName = relDir + File.separator + fileName;
+
+ return fullName;
}
/**
@@ -332,6 +353,34 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
}
/**
+ * Run the passed xpathExpression on the prepopulated hostXml document and
+ * return the target element or attribute as a String.
+ * @param xpathExpression XPath Expression to evaluate
+ * @return String value of the Element or Attribute the XPath was pointing to.
+ * Null in case the xpathExpression could not be evaluated.
+ * @throws IllegalArgumentException if hostXml is null
+ *
+ */
+ protected String obtainXmlPropertyViaXPath(String xpathExpression) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ XPath xpath = factory.newXPath();
+ try {
+ XPathExpression expr = xpath.compile(xpathExpression);
+
+ Object result = expr.evaluate(hostXml, XPathConstants.STRING);
+
+ return result.toString();
+ } catch (XPathExpressionException e) {
+ log.error("Evaluation XPath expression failed: " + e.getMessage());
+ return null;
+ }
+ }
+
+
+ /**
* Helper class that holds information about the host,port tuple
*/
protected static class HostPort {
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 0aba2d3..bc0374a 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
@@ -70,7 +70,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-public class BaseComponent<T extends ResourceComponent<?>> implements ResourceComponent<T>, MeasurementFacet, ConfigurationFacet, DeleteResourceFacet,
+public class BaseComponent<T extends ResourceComponent<?>> implements ResourceComponent<T>, MeasurementFacet, ConfigurationFacet,
+ DeleteResourceFacet,
CreateChildResourceFacet, OperationFacet
{
private static final String INTERNAL = "_internal:";
@@ -89,6 +90,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String host;
int port;
private boolean verbose = ASConnection.verbose;
+ String managementUser;
+ String managementPassword;
/**
* Return availability of this resource
@@ -99,7 +102,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ReadResource op = new ReadResource(address);
Result res = connection.execute(op);
- return res.isSuccess()? AvailabilityType.UP: AvailabilityType.DOWN;
+ return (res!=null && res.isSuccess()) ? AvailabilityType.UP: AvailabilityType.DOWN;
}
@@ -115,7 +118,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
host = pluginConfiguration.getSimpleValue("hostname", LOCALHOST);
String portString = pluginConfiguration.getSimpleValue("port", DEFAULT_HTTP_MANAGEMENT_PORT);
port = Integer.parseInt(portString);
- connection = new ASConnection(host,port);
+ managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
+ managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
+ connection = new ASConnection(host,port, managementUser, managementPassword);
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -164,14 +169,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
continue;
}
- String val = (String) res.getResult();
+ Object val = res.getResult();
if (val==null) // One of the AS7 ways of telling "This is not implemented" See also AS7-1454
continue;
if (req.getDataType()== DataType.MEASUREMENT) {
if (!val.equals("no metrics available")) { // AS 7 returns this
try {
- Double d = Double.parseDouble(val);
+ Double d = Double.parseDouble((String)val);
MeasurementDataNumeric data = new MeasurementDataNumeric(req,d);
report.addData(data);
} catch (NumberFormatException e) {
@@ -179,7 +184,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
}
}
} else if (req.getDataType()== DataType.TRAIT) {
- MeasurementDataTrait data = new MeasurementDataTrait(req,val);
+
+ String realVal;
+ if (val instanceof String)
+ realVal = (String)val;
+ else
+ realVal = String.valueOf(val);
+
+ MeasurementDataTrait data = new MeasurementDataTrait(req,realVal);
report.addData(data);
}
}
@@ -310,7 +322,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ContentServices contentServices = cctx.getContentServices();
String resourceTypeName = report.getResourceType().getName();
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, managementUser, managementPassword);
OutputStream out = uploadConnection.getOutputStream(details.getFileName());
contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out);
@@ -330,13 +342,18 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
if (fileName.startsWith("C:\\fakepath\\")) { // TODO this is a hack as the server adds the fake path somehow
fileName=fileName.substring("C:\\fakepath\\".length());
}
-
- String tmpName = fileName; // TODO figure out the tmp-name biz with the AS guys
+ String runtimeName = fileName;
+ PropertySimple rtNameProp = report.getPackageDetails().getDeploymentTimeConfiguration().getSimple("runtimeName");
+ if (rtNameProp != null) {
+ String rtn = rtNameProp.getStringValue();
+ if (rtn!=null && !rtn.isEmpty())
+ runtimeName = rtn;
+ }
JsonNode resultNode = uploadResult.get("result");
String hash = resultNode.get("BYTES_VALUE").getTextValue();
- return runDeploymentMagicOnServer(report, fileName, tmpName, hash);
+ return runDeploymentMagicOnServer(report, runtimeName, fileName, hash);
}
/**
@@ -356,7 +373,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ASConnection connection = getASConnection();
- Operation step1 = new Operation("add","deployment",deploymentName);
+ Operation step1 = new Operation("add","deployment",runtimeName);
// step1.addAdditionalProperty("hash", new PROPERTY_VALUE("BYTES_VALUE", hash));
List<Object> content = new ArrayList<Object>(1);
Map<String,Object> contentValues = new HashMap<String,Object>();
@@ -418,6 +435,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
report.setStatus(CreateResourceStatus.SUCCESS);
report.setResourceName(runtimeName);
report.setResourceKey(resourceKey);
+ report.getPackageDetails().setSHA256(hash);
+ report.getPackageDetails().setInstallationTimestamp(System.currentTimeMillis());
log.info(" ... with success and key [" + resourceKey + "]" );
}
@@ -451,7 +470,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
operation = new Operation(op,theAddress);
operation.addAdditionalProperty("profile",profile);
} else if (what.equals("server")) {
- if (context.getResourceType().getName().equals("JBossAS-Managed")) {
+ if (context.getResourceType().getName().equals("JBossAS7 Managed Server")) {
String host = pluginConfiguration.getSimpleValue("domainHost","local");
theAddress.add("host", host);
theAddress.add("server-config", myServerName);
@@ -560,11 +579,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
((CompositeOperation)operation).addStep(step);
}
}
- } else if (what.equals("naming")) {
- if (op.equals("jndi-view")) {
- theAddress.add(address);
- operation = new Operation("jndi-view",theAddress);
- }
}
@@ -572,6 +586,11 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
if (operation!=null) {
Result result = connection.execute(operation);
+ if (result==null) {
+ operationResult.setErrorMessage("Connection was null - is the server running?");
+ return operationResult;
+ }
+
if (!result.isSuccess()) {
operationResult.setErrorMessage(result.getFailureDescription());
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 465e943..46a65a5 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -41,15 +41,20 @@ import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ManualAddFacet;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Discovery class
*/
-public class BaseProcessDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
+public class BaseProcessDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent, ManualAddFacet
{
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
@@ -67,147 +72,221 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
for (ProcessScanResult psr : scans) {
- Configuration config = discoveryContext.getDefaultPluginConfiguration();
- // IF SE, then look at domain/configuration/host.xml <management interface="default" port="9990
- // for management port
- String[] commandLine = psr.getProcessInfo().getCommandLine();
- String serverNameFull;
- String serverName;
- String psName = psr.getProcessScan().getName();
- String description = discoveryContext.getResourceType().getDescription();
- String homeDir = getHomeDirFromCommandLine(commandLine);
- String version = determineServerVersionFromHomeDir(homeDir);
- boolean isEAP = false;
-
- //retrieve specific boot log file. Override for Standalone as server.log is more appropriate
- String bootLogFile = getLogFileFromCommandLine(commandLine);
- String logFile = bootLogFile;
-
- if (homeDir.contains("eap")) {
- isEAP=true;
- }
+ try {
+ Configuration config = discoveryContext.getDefaultPluginConfiguration();
+ // IF SE, then look at domain/configuration/host.xml <management interface="default" port="9990
+ // for management port
+ String[] commandLine = psr.getProcessInfo().getCommandLine();
+ String serverNameFull;
+ String serverName;
+ String psName = psr.getProcessScan().getName();
+ String description;
+ String homeDir = getHomeDirFromCommandLine(commandLine);
+ String version = determineServerVersionFromHomeDir(homeDir);
+ boolean isEAP = false;
+
+ //retrieve specific boot log file. Override for Standalone as server.log is more appropriate
+ String bootLogFile = getLogFileFromCommandLine(commandLine);
+ String logFile = bootLogFile;
+
+ if (homeDir.contains("eap")) {
+ isEAP=true;
+ }
- if (psName.equals("HostController")) {
+ if (psName.equals("HostController")) {
+
+ readStandaloneOrHostXml(psr.getProcessInfo(), true);
+ HostPort hp = getDomainControllerFromHostXml();
+ if (hp.isLocal) {
+ serverName = "DomainController"; // TODO make more unique
+ serverNameFull = "DomainController";
+ if (isEAP)
+ description = "Domain controller for a " + JBOSS_EAP_6 + " domain";
+ else
+ description = "Domain controller for an " + AS7 + " domain";
+ }
+ else {
+ serverName = "HostController"; // TODO make more unique
+ serverNameFull = "HostController";
+ if (isEAP)
+ description = "Host controller for a " + JBOSS_EAP_6 + " host";
+ else
+ description = "Host controller for an " + AS7 + " host";
+
+ }
+
+ config.put(new PropertySimple("baseDir", homeDir));
+ config.put(new PropertySimple("startScript", AS7Mode.DOMAIN.getStartScript()));
+ String host = findHost(psr.getProcessInfo(), true);
+ config.put(new PropertySimple("domainHost", host));
+
+ fillUserPassFromFile(config, AS7Mode.DOMAIN, homeDir);
+
+ // provide running config
+ String domainConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.DOMAIN);
+ String hostConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.HOST);
+ config.put(new PropertySimple("domainConfig",domainConfig));
+ config.put(new PropertySimple("hostConfig",hostConfig));
+
+ } else { // Standalone server
+ serverNameFull = homeDir;
- readStandaloneOrHostXml(psr.getProcessInfo(), true);
- HostPort hp = getDomainControllerFromHostXml();
- if (hp.isLocal) {
- serverName = "DomainController"; // TODO make more unique
- serverNameFull = "DomainController";
- if (isEAP)
- description = "Domain controller for a " + JBOSS_EAP_6 + " domain";
- else
- description = "Domain controller for an " + AS7 + " domain";
- }
- else {
- serverName = "HostController"; // TODO make more unique
- serverNameFull = "HostController";
if (isEAP)
- description = "Host controller for a " + JBOSS_EAP_6 + " host";
+ description = "Standalone " + JBOSS_EAP_6 + " server";
else
- description = "Host controller for an " + AS7 + " host";
+ description = "Standalone " + AS7 + " server";
- }
+ readStandaloneOrHostXml(psr.getProcessInfo(), false);
+ if ( serverNameFull.isEmpty()) {
+ // Try to obtain the server name
+ // -Dorg.jboss.boot.log.file=domain/servers/server-one/log/boot.log
+ // This is a hack until I know a better way to do so.
+ String tmp = getLogFileFromCommandLine(commandLine);
+ int i = tmp.indexOf("servers/");
+ tmp = tmp.substring(i + 8);
+ tmp = tmp.substring(0, tmp.indexOf("/"));
+ serverNameFull = tmp;
- config.put(new PropertySimple("baseDir", homeDir));
- config.put(new PropertySimple("startScript", AS7Mode.DOMAIN.getStartScript()));
- String host = findHost(psr.getProcessInfo(), true);
- config.put(new PropertySimple("domainHost", host));
-
- fillUserPassFromFile(config, "domain", homeDir);
-
- // provide running config
- String domainConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.DOMAIN);
- String hostConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.HOST);
- config.put(new PropertySimple("domainConfig",domainConfig));
- config.put(new PropertySimple("hostConfig",hostConfig));
-
- } else { // Standalone server
- serverNameFull = homeDir;
-
- if (isEAP)
- description = "Standalone " + JBOSS_EAP_6 + " server";
- else
- description = "Standalone " + AS7 + " server";
-
- readStandaloneOrHostXml(psr.getProcessInfo(), false);
- if ( serverNameFull.isEmpty()) {
- // Try to obtain the server name
- // -Dorg.jboss.boot.log.file=domain/servers/server-one/log/boot.log
- // This is a hack until I know a better way to do so.
- String tmp = getLogFileFromCommandLine(commandLine);
- int i = tmp.indexOf("servers/");
- tmp = tmp.substring(i + 8);
- tmp = tmp.substring(0, tmp.indexOf("/"));
- serverNameFull = tmp;
+ }
+ String host = findHost(psr.getProcessInfo(), false);
+ config.put(new PropertySimple("domainHost", host));
- }
- String host = findHost(psr.getProcessInfo(), false);
- config.put(new PropertySimple("domainHost", host));
+ config.put(new PropertySimple("baseDir", serverNameFull));
- config.put(new PropertySimple("baseDir", serverNameFull));
+ serverName = findHostName();
+ if (serverName.isEmpty())
+ serverName = serverNameFull;
- serverName = findHostName();
- if (serverName.isEmpty())
- serverName = serverNameFull;
+ String serverConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.STANDALONE);
+ config.put(new PropertySimple("config",serverConfig));
+ config.put(new PropertySimple("startScript",AS7Mode.STANDALONE.getStartScript()));
- String serverConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.STANDALONE);
- config.put(new PropertySimple("config",serverConfig));
- config.put(new PropertySimple("startScript",AS7Mode.STANDALONE.getStartScript()));
+ fillUserPassFromFile(config, AS7Mode.STANDALONE, serverNameFull);
- fillUserPassFromFile(config, "standalone", serverNameFull);
+ //preload server.log file for event log monitoring
+ logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
+ }
- //preload server.log file for event log monitoring
- logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
- }
+ if (isEAP) {
+ serverName = "EAP " + serverName;
+ version="EAP " + version;
+ }
- if (isEAP) {
- serverName = "EAP " + serverName;
- version="EAP " + version;
+ initLogEventSourcesConfigProp(logFile, config);
+
+ HostPort managmentPort = getManagementPortFromHostXml(commandLine);
+ config.put(new PropertySimple("hostname", managmentPort.host));
+ config.put(new PropertySimple("port", managmentPort.port));
+ config.put(new PropertySimple("realm",getManagementSecurtiyRealmFromHostXml()));
+
+ // String javaClazz = psr.getProcessInfo().getName();
+
+ /*
+ * We'll connect to the discovered VM on the local host, so set the jmx connection
+ * properties accordingly. This may only work on JDK6+, but then JDK5 is deprecated
+ * anyway.
+ */
+ // config.put(new PropertySimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY,
+ // javaClazz));
+ // config.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE,
+ // LocalVMTypeDescriptor.class.getName()));
+ //
+ // // TODO vmid will change when the detected server is bounced - how do we follow this?
+ // config.put(new PropertySimple(JMXDiscoveryComponent.VMID_CONFIG_PROPERTY,psr.getProcessInfo().getPid()));
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
+ serverNameFull, // key TODO distinguish per domain?
+ serverName, // Name
+ version, // TODO get via API ?
+ description, // Description
+ config, psr.getProcessInfo());
+
+ // Add to return values
+ discoveredResources.add(detail);
+ log.info("Discovered new ... " + discoveryContext.getResourceType() + ", " + serverNameFull);
+ } catch (Exception e) {
+ log.warn("Discovery for a " + discoveryContext.getResourceType() + " failed for process " + psr + " :" + e.getMessage());
}
-
- initLogEventSourcesConfigProp(logFile, config);
-
- HostPort managmentPort = getManagementPortFromHostXml(commandLine);
- config.put(new PropertySimple("hostname", managmentPort.host));
- config.put(new PropertySimple("port", managmentPort.port));
- // String javaClazz = psr.getProcessInfo().getName();
-
- /*
- * We'll connect to the discovered VM on the local host, so set the jmx connection
- * properties accordingly. This may only work on JDK6+, but then JDK5 is deprecated
- * anyway.
- */
- // config.put(new PropertySimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY,
- // javaClazz));
- // config.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE,
- // LocalVMTypeDescriptor.class.getName()));
- //
- // // TODO vmid will change when the detected server is bounced - how do we follow this?
- // config.put(new PropertySimple(JMXDiscoveryComponent.VMID_CONFIG_PROPERTY,psr.getProcessInfo().getPid()));
-
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
- serverNameFull, // key TODO distinguish per domain?
- serverName, // Name
- version, // TODO get via API ?
- description, // Description
- config, psr.getProcessInfo());
-
- // Add to return values
- discoveredResources.add(detail);
- log.info("Discovered new ... " + discoveryContext.getResourceType() + ", " + serverNameFull);
}
return discoveredResources;
}
- private void fillUserPassFromFile(Configuration config, String mode, String baseDir) {
+ /**
+ * Allow to manually add a (remote) AS7
+ * @param pluginConfiguration the plugin configuration that describes how to discover the Resource being manually
+ * added
+ * @param context
+ * @return
+ * @throws InvalidPluginConfigurationException
+ */
+ @Override
+ public DiscoveredResourceDetails discoverResource(Configuration pluginConfiguration,
+ ResourceDiscoveryContext context) throws InvalidPluginConfigurationException {
+
+ String hostname = pluginConfiguration.getSimpleValue("hostname",null);
+ String portS = pluginConfiguration.getSimpleValue("port",null);
+ String user = pluginConfiguration.getSimpleValue("user",null);
+ String pass = pluginConfiguration.getSimpleValue("password",null);
+
+ if (hostname==null || portS==null) {
+ throw new InvalidPluginConfigurationException("Host and port must not be null");
+ }
+ int port = Integer.valueOf(portS);
+
+ ASConnection connection = new ASConnection(hostname,port, user,pass);
+ String productVersion = getServerAttribute(connection, "product-version");
+ String productName = getServerAttribute(connection,"product-name");
+ String releaseVersion = getServerAttribute(connection,"release-version");
+ if (productVersion == null)
+ productVersion = releaseVersion;
+ if (productName==null)
+ productName = "AS7";
+
+ String resourceKey = hostname + ":" + portS + ":" + productName;
+ String description;
+ if (productName.contains("EAP")) {
+ description = "Standalone JBoss Enterprise Application Platform server";
+ } else if (productName.contains("EDG")) {
+ description = "Standalone JBoss Enterprise DataGrid server";
+ }
+ else
+ description = context.getResourceType().getDescription();
+
+ pluginConfiguration.put(new PropertySimple("manuallyAdded",true));
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ context.getResourceType(),
+ resourceKey,
+ productName + " @ " + hostname + ":" + port,
+ productVersion,
+ description,
+ pluginConfiguration,
+ null
+ );
+
+ return detail;
+ }
+
+ private String getServerAttribute(ASConnection connection, String attributeName) {
+ Operation op = new ReadAttribute(null,attributeName);
+ Result res = connection.execute(op);
+ if (!res.isSuccess()) {
+ throw new InvalidPluginConfigurationException("Could not connect to remote server [" + res.getFailureDescription() + "]. Did you enable management?");
+ }
+ return (String) res.getResult();
+ }
+
+ private void fillUserPassFromFile(Configuration config, AS7Mode mode, String baseDir) {
+
+// String configDir = baseDir + File.separator + mode + File.separator + "configuration";
+ String realm = getManagementSecurtiyRealmFromHostXml();
+ String fileName = getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
- String configDir = baseDir + File.separator + mode + File.separator + "configuration";
- File file = new File(configDir, "mgmt-users.properties");
+ File file = new File(fileName);
if (!file.exists() || !file.canRead()) {
if (log.isDebugEnabled())
log.debug("No console user properties file found at [" + file.getAbsolutePath()
@@ -230,11 +309,11 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String user = line.substring(0, line.indexOf("="));
String pass = line.substring(line.indexOf("=") + 1);
config.put(new PropertySimple("user", user));
- config.put(new PropertySimple("password", pass));
+// config.put(new PropertySimple("password", pass)); // this is now hashed, so no point in supplying it
}
} catch (IOException e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e.getMessage());
} finally {
if (br != null)
try {
@@ -260,7 +339,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
is.close();
}
} catch (Exception e) {
- e.printStackTrace(); // TODO: Customise this generated block
+ log.error(e.getMessage());
}
if (hostName == null)
hostName = "local"; // Fallback to the installation default
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 581c4e1..34d849c 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -19,25 +19,43 @@
package org.rhq.modules.plugins.jbossas7;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.net.ConnectException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Properties;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.sasl.util.UsernamePasswordHashUtil;
+
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
import org.rhq.core.system.ProcessExecution;
import org.rhq.core.system.ProcessExecutionResults;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Base component for functionality that is common to Standalone AS and HostControllers
* @author Heiko W. Rupp
*/
-public class BaseServerComponent extends BaseComponent {
+public class BaseServerComponent extends BaseComponent implements MeasurementFacet {
private static final String SEPARATOR = "\n-----------------------\n";
final Log log = LogFactory.getLog(BaseServerComponent.class);
@@ -103,9 +121,13 @@ public class BaseServerComponent extends BaseComponent {
}
processExecution.setWorkingDirectory(baseDir);
processExecution.setCaptureOutput(true);
- processExecution.setWaitForCompletion(2000L); // 2 seconds // TODO: Should we wait longer than two seconds?
+ processExecution.setWaitForCompletion(15000L); // 15 seconds // TODO: Should we wait longer than 15 seconds?
processExecution.setKillOnTimeout(false);
+ String javaHomeDir = pluginConfiguration.getSimpleValue("javaHomePath",null);
+ if (javaHomeDir!=null) {
+ processExecution.getEnvironmentVariables().put("JAVA_HOME", javaHomeDir);
+ }
if (log.isDebugEnabled()) {
log.debug("About to execute the following process: [" + processExecution + "]");
@@ -114,6 +136,8 @@ public class BaseServerComponent extends BaseComponent {
logExecutionResults(results);
if (results.getError()!=null) {
operationResult.setErrorMessage(results.getError().getMessage());
+ } else if (results.getExitCode()!=null) {
+ operationResult.setErrorMessage("Start failed with error code " + results.getExitCode() + ":\n" + results.getCapturedOutput());
} else {
operationResult.setSimpleResult("Success");
}
@@ -137,6 +161,11 @@ public class BaseServerComponent extends BaseComponent {
*/
protected OperationResult postProcessResult(String name, Result res) {
OperationResult operationResult = new OperationResult();
+ if (res==null) {
+ operationResult.setErrorMessage("No result received from server");
+ return operationResult;
+ }
+
if (name.equals("shutdown") || name.equals("reload")) {
/*
* Shutdown needs a special treatment, because after sending the operation, if shutdown suceeds,
@@ -144,7 +173,7 @@ public class BaseServerComponent extends BaseComponent {
* reading, this is a good sign.
*/
if (!res.isSuccess()) {
- if (res.getThrowable()!=null && (res.getThrowable() instanceof ConnectException || res.getThrowable().getMessage().equals("Connection refused"))) {
+ if (res.getRhqThrowable()!=null && (res.getRhqThrowable() instanceof ConnectException || res.getRhqThrowable().getMessage().equals("Connection refused"))) {
operationResult.setSimpleResult("Success");
log.debug("Got a ConnectionRefused for operation " + name + " this is considered ok, as the remote server sometimes closes the communications channel before sending a reply");
}
@@ -168,4 +197,97 @@ public class BaseServerComponent extends BaseComponent {
return operationResult;
}
+ protected OperationResult installManagementUser(Configuration parameters, Configuration pluginConfig, AS7Mode mode) {
+ String user = parameters.getSimpleValue("user","");
+ String password = parameters.getSimpleValue("password","");
+
+ OperationResult result = new OperationResult();
+
+ PropertySimple remoteProp = pluginConfig.getSimple("manuallyAdded");
+ if (remoteProp!=null && remoteProp.getBooleanValue()!= null && remoteProp.getBooleanValue()) {
+ result.setErrorMessage("This is a manually added server. This operation can not be used to install a management used. Use the server's 'bin/add-user.sh'");
+ return result;
+ }
+
+ if (user.isEmpty() || password.isEmpty()) {
+ result.setErrorMessage("User and Password must not be empty");
+ return result;
+ }
+
+ String baseDir = pluginConfig.getSimpleValue("baseDir","");
+ if (baseDir.isEmpty()) {
+ result.setErrorMessage("No baseDir found, can not continue");
+ return result;
+ }
+ String standaloneXmlFile = pluginConfig.getSimpleValue("config",mode.getDefaultXmlFile());
+
+ String standaloneXml = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + standaloneXmlFile;
+
+ AbstractBaseDiscovery abd = new AbstractBaseDiscovery();
+ abd.readStandaloneOrHostXmlFromFile(standaloneXml);
+
+ String realm = pluginConfig.getSimpleValue("realm","ManagementRealm");
+ String propertiesFilePath = abd.getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
+
+
+ Properties p = new Properties();
+ try {
+ UsernamePasswordHashUtil util = new UsernamePasswordHashUtil();
+ String value = util.generateHashedHexURP(user, realm, password.toCharArray());
+
+
+ FileInputStream fis = new FileInputStream(propertiesFilePath);
+ p.load(fis);
+ fis.close();
+ p.setProperty(user,value);
+ FileOutputStream fos = new FileOutputStream(propertiesFilePath);
+ p.store(fos,null);
+ fos.flush();
+ fos.close();
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ result.setErrorMessage(e.getMessage());
+ } catch (NoSuchAlgorithmException nsae) {
+ log.error(nsae.getMessage());
+ result.setErrorMessage(nsae.getMessage());
+ }
+ result.setSimpleResult("User/Password set or updated");
+
+ return result;
+ }
+
+ public void getValues(MeasurementReport report, Set metrics) throws Exception {
+
+ Set<MeasurementScheduleRequest> requests = metrics;
+ Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size());
+
+ for (MeasurementScheduleRequest request: requests) {
+ if (request.getName().equals("startTime")) {
+ String path = getPath();
+ if (context.getResourceType().getName().contains("Host Controller")) {
+ if (path!=null)
+ path = "host=master," + path ; // TODO is the local controller always on host=master?? AS7-3678
+ else
+ path = "host=master";
+ }
+ Address address = new Address(path);
+ address.add("core-service","platform-mbean");
+ address.add("type","runtime");
+ Operation op = new ReadAttribute(address,"start-time");
+ Result res = getASConnection().execute(op);
+
+ if (res.isSuccess()) {
+ Long startTime= (Long) res.getResult();
+ MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString());
+ report.addData(data);
+ }
+ }
+ else {
+ leftovers.add(request);
+ }
+ }
+
+ super.getValues(report, leftovers);
+ }
+
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
index c844d78..4f72013 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
@@ -120,6 +120,15 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
operation = new ReadChildrenResources(address,type);
operation.addAdditionalProperty("recursive", "true");
}
+ else if (groupName.startsWith("child:")) {
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+ operation = new ReadResource(address1);
+ }
else {
throw new IllegalArgumentException("Unknown operation in group name [" + groupName + "]");
}
@@ -156,21 +165,25 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
* We may have a mismatch for groups where the <c:group name="children:*"> child is a list of maps
* but the result is actually the contained map
*/
- if (propDef instanceof PropertyDefinitionList && (propDef.getName().equals("*"))) {
+ String propertyName = propDef.getName();
+ if (propDef instanceof PropertyDefinitionList && (propertyName.startsWith("*"))) {
propDef = ((PropertyDefinitionList) propDef).getMemberDefinition();
+ String innerPropdefName = propDef.getName();
+
if (!(propDef instanceof PropertyDefinitionMap)) {
log.error("Embedded child is not a map");
return;
}
// Now we are at map level which matches the operations results
- PropertyList list = new PropertyList("*");
+ PropertyList list = new PropertyList(propertyName);
for (Map.Entry<String,Object> entry : results.entrySet()) {
Object val = entry.getValue();
+ String key = entry.getKey();
- PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, val);
+ PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, val, key);
if (propertyMap!=null)
list.add(propertyMap);
@@ -179,7 +192,6 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
config.put(list);
} else { // standard case
- String propertyName = propDef.getName();
Object valueObject = results.get(propertyName);
@@ -198,7 +210,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
config.put(propertyList);
}
else if (propDef instanceof PropertyDefinitionMap) {
- PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, valueObject);
+ PropertyMap propertyMap = loadHandlePropertyMap((PropertyDefinitionMap) propDef, valueObject, null);
if (propertyMap!=null)
config.put(propertyMap);
@@ -230,20 +242,35 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
/**
* Handle a Map of ...
+ *
* @param propDef Definition of the map
* @param valueObject the objects to put into the map
+ * @param optionalEntryName
* @return the populated map
*/
- PropertyMap loadHandlePropertyMap(PropertyDefinitionMap propDef, Object valueObject) {
+ PropertyMap loadHandlePropertyMap(PropertyDefinitionMap propDef, Object valueObject, String optionalEntryName) {
if (valueObject==null)
return null;
- PropertyMap propertyMap = new PropertyMap(propDef.getName());
+ String propDefName = propDef.getName();
+ PropertyMap propertyMap = new PropertyMap(propDefName);
+ String specialNameProp = null;
+ if (propDefName.startsWith("*:")) {
+ specialNameProp = propDefName.substring(2);
+ PropertySimple additionalNameProperty = new PropertySimple(specialNameProp,optionalEntryName);
+ propertyMap.put(additionalNameProperty);
+ }
Map<String, PropertyDefinition> memberDefMap = propDef.getPropertyDefinitions();
+
+
+
Map<String,Object> objects = (Map<String, Object>) valueObject;
for (Map.Entry<String, PropertyDefinition> maEntry : memberDefMap.entrySet()) {
String key = maEntry.getKey();
+ if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already.
+ continue;
+
// special case: if the key is "*", we just pick the first element
Object o ;
if (key.equals("*"))
@@ -257,9 +284,9 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
else if (value instanceof PropertyDefinitionList)
property = loadHandlePropertyList((PropertyDefinitionList) value, o);
else if (value instanceof PropertyDefinitionMap)
- property = loadHandlePropertyMap((PropertyDefinitionMap) value, o);
+ property = loadHandlePropertyMap((PropertyDefinitionMap) value, o,null);
else
- throw new IllegalArgumentException("Unknown property type in map property [" + propDef.getName() +"]");
+ throw new IllegalArgumentException("Unknown property type in map property [" + propDefName +"]");
if (property!=null)
propertyMap.put(property);
@@ -311,7 +338,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
Map<String,Object> map = (Map<String, Object>) obj;
PropertyMap propertyMap = loadHandlePropertyMap(
- (PropertyDefinitionMap) propDef.getMemberDefinition(), map);
+ (PropertyDefinitionMap) propDef.getMemberDefinition(), map, null);
if (propertyMap!=null)
propertyList.add(propertyMap);
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index e966ba3..fbf0509 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -43,6 +43,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
import org.rhq.modules.plugins.jbossas7.json.Result;
import org.rhq.modules.plugins.jbossas7.json.WriteAttribute;
@@ -50,11 +51,12 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
final Log log = LogFactory.getLog(this.getClass());
- private Address address;
+ private Address _address;
private ASConnection connection;
private ConfigurationDefinition configurationDefinition;
private String namePropLocator;
private String type;
+ private boolean addNewChildren;
/**
* Create a new configuration delegate, that reads the attributes for the resource at address.
@@ -65,7 +67,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
public ConfigurationWriteDelegate(ConfigurationDefinition configDef, ASConnection connection, Address address) {
this.configurationDefinition = configDef;
this.connection = connection;
- this.address = address;
+ this._address = address;
}
/**
@@ -89,7 +91,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
Configuration conf = report.getConfiguration();
- CompositeOperation cop = updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = updateGenerateOperationFromProperties(conf, _address);
Result result = connection.execute(cop);
if (!result.isSuccess()) {
@@ -103,21 +105,28 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf) {
+ protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf, Address address) {
CompositeOperation cop = new CompositeOperation();
for (PropertyDefinition propDef : configurationDefinition.getNonGroupedProperties()) {
- updateProperty(conf, cop, propDef);
+ updateProperty(conf, cop, propDef, address);
}
for (PropertyGroupDefinition pgd: configurationDefinition.getGroupDefinitions()) {
String groupName = pgd.getName();
namePropLocator = null;
- if (groupName.startsWith("children:")) {
+ if (groupName.startsWith("children:")) { // children, where the key in key=value from the path is known
type = groupName.substring("children:".length());
if (type.contains(":")) {
namePropLocator = type.substring(type.indexOf(":") + 1);
+ if (namePropLocator.endsWith("+")) { // ending in + -> we need to :add new entries
+ namePropLocator=namePropLocator.substring(0,namePropLocator.length()-1);
+ addNewChildren = true;
+ }
+ else {
+ addNewChildren = false;
+ }
type = type.substring(0, type.indexOf(":"));
}
else {
@@ -126,8 +135,21 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
for (PropertyDefinition def : definitions) {
- updateProperty(conf,cop,def);
+ updateProperty(conf,cop,def, address);
}
+ } if (groupName.startsWith("child:")) { // one named child resource
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+
+ List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
+ for (PropertyDefinition def : definitions) {
+ updateProperty(conf,cop,def, address1);
+ }
+
} // TODO handle attribute: case
}
@@ -135,58 +157,117 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return cop;
}
- private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef) {
+ private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef,
+ Address baseAddress) {
// Skip over read-only properties, the AS can not use them anyway
if (propDef.isReadOnly())
return;
// Handle the special case
- if (propDef instanceof PropertyDefinitionList && propDef.getName().equals("*")) {
+ String propDefName = propDef.getName();
+ if (propDef instanceof PropertyDefinitionList && propDefName.startsWith("*")) {
propDef = ((PropertyDefinitionList) propDef).getMemberDefinition();
- PropertyList pl = (PropertyList) conf.get("*"); // TODO loop over the list content
+ PropertyList pl = (PropertyList) conf.get(propDefName);
+
+ // check if we need to see if that property exists - get the current state of affairs from the AS
+ List<String> existingPropnames = new ArrayList<String>();
+ if (addNewChildren) {
+ Operation op = new ReadChildrenResources(baseAddress,type);
+ Result tmp = connection.execute(op);
+ if (tmp.isSuccess()) {
+ Map<String,Object> tmpResMap = (Map<String, Object>) tmp.getResult();
+ existingPropnames.addAll(tmpResMap.keySet());
+ }
+ }
+ // Loop over the list - i.e. the individual rows that come from the server
for (Property prop2 : pl.getList()) {
- updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef);
+ updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef, baseAddress,
+ existingPropnames);
+ }
+ // now check about removed properties
+ for (String existingName : existingPropnames ) {
+ boolean found=false;
+ for (Property prop2 : pl.getList()) {
+ PropertyMap propMap2 = (PropertyMap) prop2;
+ String itemName = propMap2.getSimple(namePropLocator).getStringValue();
+ if (itemName==null) {
+ throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
+ }
+ if (itemName.equals(existingName)) {
+ found=true;
+ break;
+ }
+ }
+
+ if (!found) {
+ Address tmpAddr = new Address(baseAddress);
+ tmpAddr.add(type, existingName);
+ Operation operation = new Operation("remove",tmpAddr);
+ cop.addStep(operation);
+ }
}
+
}
else {
// Normal cases
- Property prop = conf.get(propDef.getName());
+ Property prop = conf.get(propDefName);
if (prop instanceof PropertySimple) {
- updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef);
+ updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef, baseAddress);
}
else if (prop instanceof PropertyList) {
- updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef);
+ updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef, baseAddress);
}
else {
- updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef);
+ updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef, baseAddress);
}
}
}
- private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
Operation writeAttribute = new WriteAttribute(address,prop.getName(),results);
cop.addStep(writeAttribute);
}
- private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address, List<String> existingPropNames) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
String addrVal= ((PropertySimple)prop.get(namePropLocator)).getStringValue();
+
+
+ // determine key from map as propDefName
+ String key = prop.getSimpleValue(namePropLocator, null);
+ if (key==null) {
+ throw new IllegalArgumentException("Map contains no entry with name '" + namePropLocator + "'");
+ }
+
Address addr = new Address(address);
addr.add(type,addrVal);
for (Map.Entry<String,Object> entry : results.entrySet()) {
- Operation writeAttribute = new WriteAttribute(addr,entry.getKey(),entry.getValue());
- cop.addStep(writeAttribute);
+ Operation operation;
+ if (!addNewChildren || existingPropNames.contains(key))
+ operation = new WriteAttribute(addr,entry.getKey(),entry.getValue());
+ else {
+ Address tmpAddr = new Address(address);
+ tmpAddr.add(type, key);
+ operation = new Operation("add",tmpAddr);
+ operation.addAdditionalProperty("name",key);
+ operation.addAdditionalProperty("value",entry.getValue());
+ }
+ cop.addStep(operation);
}
+
}
- private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef) {
+ private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef,
+ Address address) {
PropertyDefinition memberDef = propDef.getMemberDefinition();
// We need to collect the list members, create an array and attach this to the cop
@@ -201,7 +282,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
if (memberDef instanceof PropertyDefinitionMap) {
- Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef);
+ Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef,
+ address);
values.add(mapResult);
}
}
@@ -210,7 +292,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple, PropertyDefinitionSimple propDef) {
+ private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple,
+ PropertyDefinitionSimple propDef, Address address) {
// If the property value is null and the property is optional, skip too
if (propertySimple.getStringValue()==null && !propDef.isRequired())
@@ -221,7 +304,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
cop.addStep(writeAttribute);
}
- private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef) {
+ private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef, Address address) {
Map<String,PropertyDefinition> memberDefinitions = mapDef.getPropertyDefinitions();
Map<String,Object> results = new HashMap<String,Object>();
@@ -246,4 +329,4 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return results;
}
-}
\ No newline at end of file
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
index 1a44230..0543b81 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -1,26 +1,29 @@
package org.rhq.modules.plugins.jbossas7;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Handle JDBC-driver related stuff
* @author Heiko W. Rupp
*/
-public class DatasourceComponent extends BaseComponent implements OperationFacet {
+public class DatasourceComponent extends BaseComponent implements OperationFacet, ConfigurationFacet {
private static final String NOTSET = "-notset-";
private final Log log = LogFactory.getLog(DatasourceComponent.class);
@@ -55,7 +58,6 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
op = new Operation("add",theAddress);
addRequiredToOp(op,parameters,"driver-name");
addRequiredToOp(op,parameters,"jndi-name");
- addRequiredToOp(op, parameters, "pool-name");
addRequiredToOp(op, parameters, "connection-url");
addOptionalToOp(op, parameters, "user-name");
addOptionalToOp(op,parameters,"password");
@@ -65,19 +67,41 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
Address theAddress = new Address(address);
theAddress.add("xa-data-source",name);
- op = new Operation("add",theAddress);
- addRequiredToOp(op,parameters,"driver-name");
- addRequiredToOp(op,parameters,"jndi-name");
- addRequiredToOp(op,parameters,"pool-name");
- addRequiredToOp(op,parameters,"connection-url");
- addOptionalToOp(op,parameters,"user-name");
- addOptionalToOp(op,parameters,"password");
- addRequiredToOp(op,parameters,"xa-data-source-class");
-
- Map<String,Object> props = new HashMap<String, Object>(); // TODO
- props.put("_foo","_bar"); // TODO AS7-1209
- op.addAdditionalProperty("xa-data-source-properties",props);
-
+ op = new CompositeOperation();
+ Operation step1 = new Operation("add",theAddress);
+ addRequiredToOp(step1,parameters,"driver-name");
+ addRequiredToOp(step1,parameters,"jndi-name");
+ addOptionalToOp(step1,parameters,"user-name");
+ addOptionalToOp(step1,parameters,"password");
+ addRequiredToOp(step1,parameters,"xa-datasource-class");
+
+ ((CompositeOperation)op).addStep(step1);
+
+ // handling of xa-properties -- this is now a subresource in AS7 and at least needs a connection url
+ String connectionUrl = parameters.getSimpleValue("connection-url",null);
+ if (connectionUrl==null || connectionUrl.isEmpty())
+ throw new IllegalArgumentException("Connection-url must not be empty");
+ Address cuAddress = new Address(theAddress);
+ cuAddress.add("xa-datasource-properties","connection-url");
+ Operation step2 = new Operation("add",cuAddress);
+ step2.addAdditionalProperty("value",connectionUrl);
+ ((CompositeOperation)op).addStep(step2);
+
+
+ PropertyList xaPropList = parameters.getList("xa-properties");
+ if (xaPropList != null) {
+ List<Property> xaProps = xaPropList.getList();
+ for (Property prop : xaProps) {
+ PropertyMap pMap = (PropertyMap) prop;
+ PropertySimple keyProp = pMap.getSimple("key");
+ PropertySimple valProp = pMap.getSimple("value");
+ Address propAddress = new Address(theAddress);
+ propAddress.add("xa-datasource-properties",keyProp.getStringValue());
+ Operation step = new Operation("add",propAddress);
+ step.addAdditionalProperty("value",valProp.getStringValue()); // TODO ??
+ ((CompositeOperation)op).addStep(step);
+ }
+ }
}
else {
/*
@@ -121,4 +145,22 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet
void addOptionalToOp(Operation op, Configuration parameters, String property) {
addAdditionalToOp(op,parameters,property,true);
}
+
+ @Override
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+
+ Operation op = new Operation("disable",getAddress());
+ Result res = getASConnection().execute(op);
+ if (!res.isSuccess()) {
+ report.setErrorMessage("Was not able to disable the datasource for config changes");
+ return;
+ }
+
+
+ super.updateResourceConfiguration(report); // TODO: Customise this generated block
+
+ op = new Operation("enable",getAddress());
+ res = getASConnection().execute(op);
+
+ }
}
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
new file mode 100644
index 0000000..c87b899
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -0,0 +1,212 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.codehaus.jackson.JsonNode;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.transfer.ContentResponseResult;
+import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse;
+import org.rhq.core.domain.content.transfer.DeployPackageStep;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.content.ContentFacet;
+import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenResources;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Deal with deployments
+ * @author Heiko W. Rupp
+ */
+public class DeploymentComponent extends BaseComponent implements OperationFacet, ContentFacet {
+
+ private boolean verbose = ASConnection.verbose;
+
+ @Override
+ public AvailabilityType getAvailability() {
+ Operation op = new ReadAttribute(getAddress(),"enabled");
+ Result res = getASConnection().execute(op);
+ if (!res.isSuccess())
+ return AvailabilityType.DOWN;
+
+ if (res.getResult()== null || !(Boolean)(res.getResult()))
+ return AvailabilityType.DOWN;
+
+ return AvailabilityType.UP;
+ }
+
+ @Override
+ public OperationResult invokeOperation(String name,
+ Configuration parameters) throws InterruptedException, Exception {
+
+ String action;
+ if (name.equals("enable")) {
+ action = "deploy";
+ } else if (name.equals("disable")) {
+ action = "undeploy";
+ } else {
+ return super.invokeOperation(name, parameters);
+ }
+
+ Operation op = new Operation(action,getAddress());
+ Result res = getASConnection().execute(op);
+ OperationResult result = new OperationResult();
+ if (res.isSuccess())
+ result.setSimpleResult("Success");
+ else
+ result.setErrorMessage(res.getFailureDescription());
+
+ return result;
+ }
+
+
+ @Override
+ public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) {
+ return new ArrayList<DeployPackageStep>();
+ }
+
+ @Override
+ public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages,
+ ContentServices contentServices) {
+
+ log.info("Starting deployment..");
+ DeployPackagesResponse response = new DeployPackagesResponse();
+
+ 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");
+ }
+
+ ResourcePackageDetails detail = packages.iterator().next();
+
+ ASUploadConnection uploadConnection = new ASUploadConnection(getASConnection());
+ OutputStream out = uploadConnection.getOutputStream(detail.getFileName());
+ ResourceType resourceType = context.getResourceType();
+
+ log.info("trying deployment of" + resourceType.getName() + ", key=" + detail.getKey() );
+
+ contentServices.downloadPackageBits(context.getContentContext(),
+ detail.getKey(), out, true);
+
+ JsonNode uploadResult = uploadConnection.finishUpload();
+ if (verbose)
+ log.info(uploadResult);
+
+ 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);
+
+ try {
+ redeployOnServer(detail.getKey().getName(), hash);
+ response.setOverallRequestResult(ContentResponseResult.SUCCESS);
+ DeployIndividualPackageResponse packageResponse = new DeployIndividualPackageResponse(detail.getKey(), ContentResponseResult.SUCCESS);
+ response.addPackageResponse(packageResponse);
+
+ }
+ catch (Exception e) {
+ response.setOverallRequestResult(ContentResponseResult.FAILURE);
+ }
+
+ log.info(".. result is " + response);
+
+ return response;
+ }
+
+ private void redeployOnServer(String name, String hash) throws Exception {
+
+ Operation op = new Operation("full-replace-deployment", new Address());
+ 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));
+ content.add(contentValues);
+ op.addAdditionalProperty("content",content);
+ Result result = getASConnection().execute(op);
+ if (result.isRolledBack())
+ throw new Exception(result.getFailureDescription());
+ }
+
+ @Override
+ public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) {
+ return null; // TODO: Customise this generated block
+ }
+
+ @Override
+ public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) {
+
+ Set<ResourcePackageDetails> details = new HashSet<ResourcePackageDetails>();
+
+ // PackageType = "Deployment"
+ Address address1 = getAddress().getParent();
+ Operation op = new ReadChildrenResources(address1,"deployment");
+ ComplexResult cres = getASConnection().executeComplex(op);
+
+ if (cres==null)
+ return details;
+
+ if (!cres.isSuccess())
+ return details;
+
+ Map<String,Object> deployments = cres.getResult();
+ for (String key : deployments.keySet()) {
+ Map<String,Object> deployment = (Map<String, Object>) deployments.get(key);
+ log.info("Discover package [" + key + "] for type [" + type + "]");
+
+ List<Map> contentList = (List<Map>) deployment.get("content"); // TODO deployments on SG or ManagedServer level have no hash
+ if (contentList!=null) {
+
+ Map<String,Map> hashMap = contentList.get(0);
+ Map<String,String> bvMap = hashMap.get("hash");
+ String content = bvMap.get("BYTES_VALUE");
+ PackageDetailsKey pdKey = new PackageDetailsKey(key,
+ content, // no way to obtain the user defined version from the server
+ type.getName(),
+ "noarch"
+ );
+ ResourcePackageDetails detail = new ResourcePackageDetails(pdKey);
+ detail.setSHA256(content);
+
+ details.add(detail);
+ }
+ }
+
+ return details;
+ }
+
+ @Override
+ public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) {
+ return null; // TODO: Customise this generated block
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
index df5362c..bc7d601 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
@@ -54,28 +54,47 @@ public class Domain2Descriptor {
private void run(String[] args) {
D2DMode mode = null;
+ String user = null;
+ String pass = null;
+
int pos = 0;
- if (args[0].startsWith("-")) {
- if (args[0].equals("-m"))
- mode = D2DMode.METRICS;
- else if (args[0].equals("-p"))
- mode = D2DMode.PROPERTIES;
- else if (args[0].equals("-o"))
- mode = D2DMode.OPERATION;
- else {
- usage();
- return;
+ boolean optionFound=false;
+
+ String arg;
+ do {
+ arg = args[pos];
+ if (arg.startsWith("-")) {
+ if (args[0].equals("-m"))
+ mode = D2DMode.METRICS;
+ else if (arg.equals("-p"))
+ mode = D2DMode.PROPERTIES;
+ else if (arg.equals("-o"))
+ mode = D2DMode.OPERATION;
+ else if (arg.startsWith("-U")) {
+ String tmp = arg.substring(2);
+ if (!tmp.contains(":"))
+ usage();
+ user = tmp.substring(0,tmp.indexOf(":"));
+ pass = tmp.substring(tmp.indexOf(":")+1);
+ }
+ else {
+ usage();
+ return;
+ }
+ pos++;
+ optionFound=true;
}
- pos++;
- }
+ else
+ optionFound=false;
+ }while(optionFound);
- String path = args[pos];
+ String path = arg;
path = path.replaceAll("/",","); // Allow path from jboss-admin.sh's pwd command
String childType = null;
if (args.length>pos+1)
childType = args[pos+1];
- ASConnection conn = new ASConnection("localhost",9990);
+ ASConnection conn = new ASConnection("localhost",9990, user, pass);
Address address = new Address(path);
Operation op = new Operation("read-resource-description",address);
@@ -87,6 +106,10 @@ public class Domain2Descriptor {
op.addAdditionalProperty("include-runtime",true);
ComplexResult res = conn.executeComplex(op);
+ if (res==null) {
+ System.err.println("Got no result");
+ return;
+ }
if (!res.isSuccess()) {
System.err.println("Failure: " + res.getFailureDescription());
return;
@@ -313,6 +336,8 @@ public class Domain2Descriptor {
typeString = "long"; break;
case BIG_DECIMAL:
typeString = "long"; break; // TODO better float or double?
+ case DOUBLE:
+ typeString = "long"; break; // TODO float or double?
case LIST:
typeString = "-list-";
break; // Handled below
@@ -412,6 +437,7 @@ public class Domain2Descriptor {
System.out.println(" -p create properties (default)");
System.out.println(" -m create metrics");
System.out.println(" -o create operations");
+ System.out.println(" -U<user>:<pass> - supply credentials to talk to AS7" );
}
public enum Type {
@@ -421,7 +447,8 @@ public class Domain2Descriptor {
LONG,
BIG_DECIMAL,
OBJECT,
- LIST
+ LIST,
+ DOUBLE
;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
new file mode 100644
index 0000000..8db86c7
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java
@@ -0,0 +1,23 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.ReadResource;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Handle domain deployments
+ * @author Heiko W. Rupp
+ */
+public class DomainDeploymentComponent extends DeploymentComponent{
+
+ @Override
+ public AvailabilityType getAvailability() {
+ // Domain deployments have no 'enabled' attribute
+
+ Operation op = new ReadResource(getAddress());
+ Result res = getASConnection().execute(op);
+
+ return (res!=null && res.isSuccess()) ? AvailabilityType.UP: AvailabilityType.DOWN;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index 6168dad..b46b108 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -39,6 +39,10 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
private final Log log = LogFactory.getLog(HostControllerComponent.class);
+ public Configuration getHCConfig() {
+ return pluginConfiguration;
+ }
+
@Override
public OperationResult invokeOperation(String name,
Configuration parameters) throws InterruptedException, Exception {
@@ -61,6 +65,10 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
return postProcessResult(name,res);
}
+ else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.HOST);
+ }
+
// Defer other stuff to the base component for now
return super.invokeOperation(name, parameters);
@@ -109,7 +117,7 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
else {
report.setErrorMessage(res.getFailureDescription());
report.setStatus(CreateResourceStatus.FAILURE);
- report.setException(res.getThrowable());
+ report.setException(res.getRhqThrowable());
}
return report;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java
new file mode 100644
index 0000000..aa870fb
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java
@@ -0,0 +1,53 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * Discovery component for special treatment of JVMs, which live below server=server-x for managed servers
+ * @author Heiko W. Rupp
+ */
+public class JVMDiscoveryComponent extends SubsystemDiscovery {
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(
+ ResourceDiscoveryContext<BaseComponent<?>> context) throws Exception {
+
+ ResourceContext parentContext = context.getParentResourceContext();
+
+
+ if (!parentContext.getResourceType().getName().equals("Managed Server"))
+ return super.discoverResources(context);
+
+ PropertySimple pathProp = parentContext.getPluginConfiguration().getSimple("path");
+ String path = pathProp.getStringValue();
+ path = path.replaceAll("server-config=","server=");
+ path = path + ",core-service=platform-mbean";
+
+ Configuration config = new Configuration();
+ PropertySimple ps = new PropertySimple("path",path);
+ config.getProperties().add(ps);
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ context.getResourceType(),
+ path,
+ path, // dname, todo
+ null,
+ context.getResourceType().getDescription(),
+ config,
+ null
+ );
+
+ Set<DiscoveredResourceDetails> discoveredResourceDetails = new HashSet<DiscoveredResourceDetails>();
+ discoveredResourceDetails.add(detail);
+ return discoveredResourceDetails;
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java
index ec51a16..99b1a92 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java
@@ -37,7 +37,6 @@ import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
/**
* Component class for the JMS subsystem
@@ -98,7 +97,7 @@ public class JmsComponent extends BaseComponent {
report.setResourceName(report.getUserSpecifiedResourceName());
}
- System.out.println(report);
+ log.info(report);
return report;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
index 77668dc..3873dfc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
@@ -18,13 +18,16 @@
*/
package org.rhq.modules.plugins.jbossas7;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.Date;
+import java.util.Set;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
import org.rhq.modules.plugins.jbossas7.json.Result;
@@ -44,13 +47,13 @@ public class ManagedASComponent extends BaseComponent {
@Override
public AvailabilityType getAvailability() {
- if (context.getResourceType().getName().equals("JBossAS-Managed")) {
+ if (context.getResourceType().getName().equals("Managed Server")) {
Address theAddress = new Address();
String host = pluginConfiguration.getSimpleValue("domainHost","local");
theAddress.add("host",host);
theAddress.add("server-config", myServerName);
Operation getStatus = new ReadAttribute(theAddress,"status");
- Result result = null;
+ Result result;
try {
result = connection.execute(getStatus);
} catch (Exception e) {
@@ -69,4 +72,32 @@ public class ManagedASComponent extends BaseComponent {
return super.getAvailability();
}
+
+
+ public void getValues(MeasurementReport report, Set metrics) throws Exception {
+
+ Set<MeasurementScheduleRequest> requests = metrics;
+
+ for (MeasurementScheduleRequest request: requests) {
+ if (request.getName().equals("startTime")) {
+ String path = getPath();
+ path = path.replace("server-config","server");
+ Address address = new Address(path);
+ address.add("core-service","platform-mbean");
+ address.add("type","runtime");
+ Operation op = new ReadAttribute(address,"start-time");
+ Result res = getASConnection().execute(op);
+
+ if (res.isSuccess()) {
+ Long startTime= (Long) res.getResult();
+ MeasurementDataTrait data = new MeasurementDataTrait(request,new Date(startTime).toString());
+ report.addData(data);
+ }
+
+ }
+ }
+
+ super.getValues(report, metrics);
+ }
+
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 585c2dc..050aef0 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -20,14 +20,11 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
@@ -35,196 +32,158 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.core.system.ProcessInfo;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.Operation;
-import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
+import org.rhq.modules.plugins.jbossas7.json.ReadAttribute;
+import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames;
import org.rhq.modules.plugins.jbossas7.json.ReadResource;
+import org.rhq.modules.plugins.jbossas7.json.Result;
/**
* Discovery class for managed AS 7 instances.
*
* @author Heiko W. Rupp
*/
-public class ManagedASDiscovery extends AbstractBaseDiscovery
+public class ManagedASDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
{
+ private HostControllerComponent parentComponent;
+
/**
* Run the auto-discovery
*/
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) throws Exception {
Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>();
- List<ProcessScanResult> scans = discoveryContext.getAutoDiscoveredProcesses();
+ parentComponent = (HostControllerComponent) discoveryContext.getParentResourceComponent();
+ Configuration hcConfig = parentComponent.getHCConfig();
+ String hostName = hcConfig.getSimpleValue("domainHost", "master"); // TODO good default?
+
+ HostInfo hostInfo = getHostInfo(hostName);
+ if (hostInfo==null)
+ return discoveredResources;
- for (ProcessScanResult psr : scans) {
+ try {
// get the HostController, as this is an indicator for managed AS
- String psName = psr.getProcessScan().getName();
- if (!psName.equals("HostController"))
- continue;
// Now we have the host controller, lets get the host.xml file
// and obtain the servers from there.
- ProcessInfo processInfo = psr.getProcessInfo();
- readStandaloneOrHostXml(processInfo, true);
- String hostName = findHostName();
- HostPort managementHostPort = getManagementPortFromHostXml(processInfo.getCommandLine());
- List<ServerInfo> serverNames = getServersFromHostXml();
+ List<ServerInfo> serverNames;
+ serverNames = getManagedServers(hostName);
for (ServerInfo serverInfo : serverNames) {
Configuration config = discoveryContext.getDefaultPluginConfiguration();
config.put(new PropertySimple("domainHost", hostName));
config.put(new PropertySimple("group", serverInfo.group));
- config.put(new PropertySimple("port", managementHostPort.port));
- config.put(new PropertySimple("hostname", managementHostPort.host));
if (serverInfo.bindingGroup != null) {
config.put(new PropertySimple("socket-binding-group", serverInfo.bindingGroup));
- config.put(new PropertySimple("socket-binding-port-offset", serverInfo.portOffset));
} else {
- HostPort dcHP = getDomainControllerFromHostXml();
- if (dcHP.port == 9999)
- dcHP.port = 9990; // TODO Hack until JBAS-9306 is solved
+ String group = resolveSocketBindingGroup(serverInfo.group);
+ config.put(new PropertySimple("socket-binding-group",group));
- ServerInfo dcInfo = getBindingsFromDC(dcHP, serverInfo.group);
- config.put(new PropertySimple("socket-binding-group", dcInfo.bindingGroup));
- config.put(new PropertySimple("socket-binding-port-offset", dcInfo.portOffset));
}
config.put(new PropertySimple("socket-binding-port-offset", serverInfo.portOffset));
String path = "host=" + hostName + ",server-config=" + serverInfo.name;
config.put(new PropertySimple("path", path));
- // TODO this fails for the downed servers.
// get from the domain or other place as soon as the domain provides it.
- String homeDir = getHomeDirFromCommandLine(processInfo.getCommandLine());
- initLogFile(scans, serverInfo.name, config, homeDir);
+ String serverLog = hcConfig.getSimpleValue("baseDir","/tmp")+File.separator+"domain/servers/"+serverInfo.name+"/log/server.log";
+ initLogEventSourcesConfigProp(serverLog,config);
- String version = determineServerVersionFromHomeDir(homeDir);
+ String version;
String resourceDescription;
String resourceName = serverInfo.name;
- if (homeDir.contains("eap")) {
- version = "EAP " + version;
+ if (hostInfo.productName.equalsIgnoreCase("eap")) {
+ version = "EAP " + hostInfo.productVersion;
resourceDescription = "Managed JBoss Enterprise Application Platform 6 server";
resourceName = "EAP " + resourceName;
}
+ else if (hostInfo.productName.equalsIgnoreCase("EDG")) {
+ version = "EDG " + hostInfo.productVersion;
+ resourceDescription = "Managed JBoss Enterprise Data Grid 6 server";
+ }
else {
resourceDescription = "Managed AS7 server";
+ version = hostInfo.releaseVersion;
}
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType
- hostName + "/" + serverInfo.name, // key
- resourceName, // Name
- version, // TODO get from Domain as soon as it is provided
+ hostName + "/" + serverInfo.name, // key
+ resourceName, // Name
+ version, // TODO get from Domain as soon as it is provided
resourceDescription, // Description
- config, null);
+ config, null);
// Add to return values
discoveredResources.add(detail);
log.info("Discovered new ... " + discoveryContext.getResourceType() + ", " + serverInfo);
}
+ } catch (Exception e) {
+ log.warn("Discovery for a " + discoveryContext.getResourceType() + " failed for process " + " :" + e.getMessage());
}
return discoveredResources;
}
- private ServerInfo getBindingsFromDC(HostPort domainController, String serverGroup) {
- ASConnection dcConnection = new ASConnection(domainController.host, domainController.port);
- List<PROPERTY_VALUE> address = new ArrayList<PROPERTY_VALUE>();
- Address theAddress = new Address("server-group", serverGroup);
- Operation op = new ReadResource(theAddress);
- ComplexResult res = (ComplexResult) dcConnection.execute(op, true);
- if (res.isSuccess()) {
- if (res.getResult().containsKey("socket-binding-group")) {
- String sbg = (String) res.getResult().get("socket-binding-group");
-
- ServerInfo serverInfo = new ServerInfo();
- serverInfo.bindingGroup = sbg;
- return serverInfo;
- }
- }
-
- return new ServerInfo();
+ private String resolveSocketBindingGroup(String serverGroup) {
+ Address address = new Address("server-group",serverGroup);
+ Operation operation = new ReadAttribute(address,"socket-binding-group");
+ Result result = parentComponent.getASConnection().execute(operation);
+ return (String) result.getResult();
}
- /**
- * Loop through the Process scans for ManagedAS and if found extract the logfile path.
- * @param scans process scan results
- * @param name server name to look for
- * @param config config to put the info in
- * @param basePath
- */
- private void initLogFile(List<ProcessScanResult> scans, String name, Configuration config, String basePath) {
-
- for (ProcessScanResult psr : scans) {
- if (!psr.getProcessScan().getName().equals("ManagedAS"))
- continue;
-
- String[] commandLine = psr.getProcessInfo().getCommandLine();
-
- //preload server.log file for event log monitoring
- String bootLogFile = getLogFileFromCommandLine(commandLine);
- String logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
-
- if (logFile.contains(name))
- initLogEventSourcesConfigProp(logFile, config);
+ private List<ServerInfo> getManagedServers(String domainHost) {
+ Address address = new Address("host",domainHost);
+ Operation operation = new ReadChildrenNames(address,"server-config");
+ ASConnection connection = parentComponent.getASConnection();
+ Result res = connection.execute(operation);
+ List<String> servers = (List<String>) res.getResult();
+ List<ServerInfo> ret = new ArrayList<ServerInfo>(servers.size());
+ for (String server : servers) {
+ ServerInfo info = new ServerInfo();
+ info.name = server;
+ ret.add(info);
+
+ address= new Address("host",domainHost);
+ address.add("server-config",server);
+ operation = new ReadResource(address);
+ ComplexResult cres = connection.executeComplex(operation);
+ Map<String,Object> map = cres.getResult();
+ info.group = (String) map.get("group");
+ info.autoStart = (Boolean)map.get("auto-start");
+ Integer offset = (Integer) map.get("socket-binding-port-offset");
+ if (offset!=null)
+ info.portOffset = offset;
+ info.bindingGroup = (String) map.get("socket-binding-group");
}
- }
- private List<ServerInfo> getServersFromHostXml() {
+ return ret;
+ }
- Element host = hostXml.getDocumentElement();
- NodeList serversElement = host.getElementsByTagName("servers");
- if (serversElement == null || serversElement.getLength() == 0) {
- log.warn("No <servers> found in host.xml");
- return Collections.emptyList();
- }
- NodeList servers = serversElement.item(0).getChildNodes();
- if (servers == null || servers.getLength() == 0) {
- log.warn("No <server> found in host.xml");
- return Collections.emptyList();
- }
- List<ServerInfo> result = new ArrayList<ServerInfo>();
- for (int i = 0; i < servers.getLength(); i++) {
- if (!(servers.item(i) instanceof Element))
- continue;
+ private HostInfo getHostInfo(String domainHost) {
+ Address address = new Address("host",domainHost);
+ Operation operation = new ReadResource(address);
+ HostInfo info = new HostInfo();
- ServerInfo info = new ServerInfo();
- Element server = (Element) servers.item(i);
- info.name = server.getAttribute("name");
- info.group = server.getAttribute("group");
- String autoStart = server.getAttribute("autoStart");
- if (autoStart == null || autoStart.isEmpty())
- autoStart = "false";
- info.autoStart = Boolean.getBoolean(autoStart);
-
- // Look for <socket-binding-group ref="standard-sockets" port-offset="250"/>
- NodeList sbgs = server.getChildNodes();
- if (sbgs != null) {
- for (int j = 0; j < sbgs.getLength(); j++) {
- if (!(sbgs.item(j) instanceof Element))
- continue;
-
- Element sbg = (Element) sbgs.item(j);
- if (!sbg.getNodeName().equals("socket-binding-group"))
- continue;
-
- info.bindingGroup = sbg.getAttribute("ref");
- String portOffset = sbg.getAttribute("port-offset");
- if (portOffset != null && !portOffset.isEmpty())
- info.portOffset = Integer.parseInt(portOffset);
+ ComplexResult cres = parentComponent.getASConnection().executeComplex(operation);
+ if (!cres.isSuccess())
+ return null;
- }
- }
- result.add(info);
- }
+ Map<String,Object> map = cres.getResult();
+ info.releaseCodeName = (String) map.get("release-codename");
+ info.releaseVersion = (String)map.get("release-version");
+ info.productName = (String) map.get("product-name");
+ info.productVersion = (String)map.get("product-version");
- return result;
+ return info;
}
private void initLogEventSourcesConfigProp(String fileName, Configuration pluginConfiguration) {
@@ -260,4 +219,11 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery
}
}
+ private static class HostInfo {
+ String name;
+ String productVersion;
+ String releaseVersion;
+ String productName;
+ String releaseCodeName;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java
new file mode 100644
index 0000000..e95c512
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java
@@ -0,0 +1,92 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.util.Map;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.Operation;
+import org.rhq.modules.plugins.jbossas7.json.Result;
+
+/**
+ * Component for the naming subsystem
+ * @author Heiko W. Rupp
+ */
+public class NamingComponent extends BaseComponent implements OperationFacet {
+
+ @Override
+ public OperationResult invokeOperation(String name,
+ Configuration parameters) throws InterruptedException, Exception {
+
+ OperationResult result = new OperationResult();
+
+ Operation operation;
+ if (name.equals("jndi-view")) {
+ Address address = new Address(path);
+ operation = new Operation("jndi-view",address);
+ Result res = getASConnection().execute(operation);
+
+ if (!res.isSuccess()) {
+ result.setErrorMessage(res.getFailureDescription());
+ return result;
+ }
+
+ Configuration config = result.getComplexResults();
+
+ Map<String,Map> contexts = (Map<String, Map>) res.getResult();
+
+ String entryName = "java: contexts";
+ Map<String,Map> javaContexts = contexts.get(entryName);
+ PropertyList javaContextsMap = fillMap(javaContexts, "java-contexts", false);
+ config.put(javaContextsMap);
+ entryName = "applications";
+ Map<String,Map> applications = contexts.get(entryName);
+ PropertyList applicationsMap = fillMap(applications, entryName, true);
+ config.put(applicationsMap);
+
+ return result;
+ }
+
+ return super.invokeOperation(name,parameters);
+ }
+
+ private PropertyList fillMap(Map<String, Map> contexts, String name, boolean isAppCtx) {
+ PropertyList pl = new PropertyList(name);
+ for (String entry : contexts.keySet() ) {
+ Map<String,Object> map = contexts.get(entry);
+ if (map==null)
+ continue;
+
+ for (String innerkey : map.keySet()) {
+ PropertyMap pm = new PropertyMap(name);
+ pm.put(new PropertySimple("context",entry));
+ pm.put(new PropertySimple("name",innerkey));
+ Object val = map.get(innerkey);
+ if (val!=null) {
+ if (isAppCtx) {
+ Map<String,Object> cvmap = (Map<String, Object>) val;
+ if (cvmap.containsKey("AppName")) {
+ Map<String,String> nameMap = (Map<String, String>) cvmap.get("AppName");
+ pm.put(new PropertySimple("value", nameMap.get("value")));
+ }
+ else
+ pm.put(new PropertySimple("value",val.toString() ));
+ }
+ else {
+ Map<String,String> cvmap = (Map<String, String>) val;
+ String clazz = cvmap.get("class-name");
+ String value = cvmap.get("value");
+ pm.put(new PropertySimple("value",clazz + "="+ value));
+ }
+ }
+ pl.add(pm);
+ }
+ }
+
+ return pl;
+ }
+}
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 c703635..c5a17a8 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
@@ -74,7 +74,7 @@ public class ServerGroupComponent extends ManagedASComponent implements ContentF
for (ResourcePackageDetails details : packages) {
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, super.managementUser, super.managementPassword);
String fileName = details.getFileName();
OutputStream out = uploadConnection.getOutputStream(fileName);
contentServices.downloadPackageBits(cctx, details.getKey(), out, false);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
index 11a0e4d..f3c3184 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
@@ -40,6 +40,8 @@ public class StandaloneASComponent extends BaseServerComponent implements Operat
} else if (name.equals("restart")) {
return restartServer(parameters, AS7Mode.STANDALONE);
+ } else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.STANDALONE);
}
// reload, shutdown go to the remote server
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
index c0a9196..ad0d6cf 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
@@ -83,11 +83,7 @@ public class Address {
if (tmp.contains("=")) {
// strip / from the start of the key if it happens to be there
- if (tmp.startsWith("/"))
- tmp = tmp.substring(1);
-
- String[] pair = tmp.split("=");
- PROPERTY_VALUE valuePair = new PROPERTY_VALUE(pair[0], pair[1]);
+ PROPERTY_VALUE valuePair = pathFromSegment(tmp);
this.path.add(valuePair);
}
}
@@ -95,6 +91,19 @@ public class Address {
}
/**
+ * Generates a path from a segment in the form of key=value.
+ * @param segment A segment in the form key=value
+ * @return A path
+ */
+ private PROPERTY_VALUE pathFromSegment(String segment) {
+ if (segment.startsWith("/"))
+ segment = segment.substring(1);
+
+ String[] pair = segment.split("=");
+ return new PROPERTY_VALUE(pair[0], pair[1]);
+ }
+
+ /**
* Add a key value pair to the path
* @param key Key part of this path element
* @param value Value part of this path element
@@ -103,6 +112,14 @@ public class Address {
path.add(new PROPERTY_VALUE(key,value));
}
+ public void addSegment(String segment) {
+ if (!segment.contains("="))
+ throw new IllegalArgumentException("Segment [" + segment + "] contains no '='");
+
+ PROPERTY_VALUE pv = pathFromSegment(segment);
+ path.add(pv);
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder( "Address{" +
@@ -178,4 +195,23 @@ public class Address {
PROPERTY_VALUE property_value = path.get(n);
return property_value.getKey() + "=" + property_value.getValue();
}
+
+ /**
+ * Return the parent Address of the current one. That is the address with one
+ * path segment less.
+ * If the current address is empty (the root), an empty address is returned.
+ * @return parent Address
+ */
+ public Address getParent() {
+ Address tmp = new Address();
+ int l = path.size();
+ if (l<1)
+ return tmp;
+
+ for (int i = 0; i < l-1 ; i++) {
+ tmp.path.add(path.get(i));
+ }
+
+ return tmp;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
index 0517ee1..23df1a5 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
@@ -47,10 +47,12 @@ public class Operation {
this.operation = operation;
this.address = new Address(addressKey,addressValue);
this._address = address.path;
+ additionalProperties = new HashMap<String, Object>();
}
public Operation(String operation, Address address) {
this.operation = operation;
+ additionalProperties = new HashMap<String, Object>();
if (address!=null && address.path!=null) {
this.address = address;
this._address = address.path;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
index 42ffee7..da08eb9 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java
@@ -40,10 +40,12 @@ public class Result {
private boolean success = false;
@JsonProperty("rolled-back")
private boolean rolledBack = false;
+ @JsonIgnore
+ private Throwable rhqThrowable;
/** Record throwsables during low level processing */
@JsonIgnore
- private Throwable throwable;
+ private Map<String,Object> throwable;
public Object getResponseHeaders() {
return responseHeaders;
@@ -98,14 +100,23 @@ public class Result {
this.rolledBack = rolledBack;
}
- public Throwable getThrowable() {
+ public Map<String, Object> getThrowable() {
return throwable;
}
- public void setThrowable(Throwable throwable) {
+ public void setThrowable(Map<String,Object> throwable) {
this.throwable = throwable;
}
+ @JsonIgnore
+ public Throwable getRhqThrowable() {
+ return rhqThrowable;
+ }
+
+ @JsonIgnore
+ public void setRhqThrowable(Throwable rhqThrowable) {
+ this.rhqThrowable = rhqThrowable;
+ }
@Override
public String toString() {
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index ffc40bd..94fe410 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -50,31 +50,11 @@
xmlns:c="urn:xmlns:rhq-configuration"
>
- <depends plugin="JMX" useClasses="true"/>
-
<!-- TODO I think we should introduce an abstract AS7 plugin that contains some base functionality and then
~~ additional 'Personalities' for the kinds of servers (PM, SM, Standalone AS, Managed AS)
-->
- <!-- TODO do we want to show the process controller at all? We have no benefit from it
- <server name="ProcessController"
- discovery="BaseProcessDiscovery"
- class="BaseComponent"
- description="Reaper process for other AS7 services"
- >
-
- <plugin-configuration>
- <c:simple-property name="hostname" default="localhost" required="true"/>
- <c:simple-property name="port" default="9990" type="integer" required="true"/>
-
- </plugin-configuration>
-
- <process-scan name="ProcessController" query="process|basename|match=^java.*,arg|org.jboss.as.process-controller|match=.*"/>
-
-
- </server>
- -->
<server name="JBossAS7 Host Controller"
discovery="BaseProcessDiscovery"
class="HostControllerComponent"
@@ -84,12 +64,16 @@
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true" description="Host name of the domain API"/>
<c:simple-property name="port" default="9990" type="integer" required="true" description="Port of the domain API"/>
- <c:simple-property name="user" type="string" description="Management user for a secured Host controller" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" type="string" default="rhqadmin" description="Management user for a secured Host controller" required="false"/>
+ <c:simple-property name="password" type="password" default="rhqadmin" description="Password for the management user" required="false"/>
<c:simple-property name="domainConfig" type="string" default="domain.xml" description="Running configuration (domain part)" displayName="Domain Configuration"/>
<c:simple-property name="hostConfig" type="string" default="host.xml" description="Running configuration (host part)" displayName="Host Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/domain.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
+ <c:simple-property name="javaHomePath" type="file" displayName="JAVA_HOME Path" required="false"
+ description="The absolute path to a JRE or JDK installation directory containing
+ the JVM that should be used to start and shutdown the HostController instance;
+ defaults to the home directory of the RHQ agent JRE."/>
<c:simple-property name="domainHost" type="string" readOnly="true" required="false" description="Host name within the AS7 domain"/>
&logSources;
@@ -157,7 +141,7 @@
<operation name="managed-server:remove" displayName="Remove managed server" description="Remove a managed server">
<parameters>
<c:simple-property name="servername" displayName="Name of the server to remove" required="true">
- <c:option-source target="resource" expression="type=JBossAS-Managed"/>
+ <c:option-source target="resource" expression="type=Managed Server"/>
</c:simple-property>
<c:simple-property name="hostname" displayName="Name of the host where the server is on" required="true">
<c:option-source target="resource" expression="type=^Host$ plugin=jboss-as-7"/>
@@ -179,6 +163,15 @@
<c:simple-property name="operationResult" description="Outcome of the stop operation"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -192,6 +185,12 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+ <metric property="product-name" dataType="trait" displayName="Name of the product"/>
+ <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
@@ -205,12 +204,33 @@
</c:list-property>
</c:group>
-->
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
- <c:group name="children:extension" displayName="Installed extensions">
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ <c:group name="children:extension:module" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -265,7 +285,9 @@
<operation name="server:add" displayName="Create server" description="Add a new server to this host.">
<parameters>
<c:simple-property name="name" description="Name of this new server" required="true"/>
- <c:simple-property name="group" displayName="Server Group" description="Server group to put this sever in" default="" required="false"/>
+ <c:simple-property name="group" displayName="Server Group" description="Server group to put this sever in" default="" required="true">
+ <c:option-source target="resource" expression="type=ServerGroup"/>
+ </c:simple-property>
<c:simple-property name="auto-start" displayName="Autostart" description="Should this server start at boot?" type="boolean" default="false" required="true"/>
</parameters>
<results>
@@ -274,16 +296,81 @@
</operation>
<operation name="server:remove" displayName="Delete server" description="Deletes a server on this host.">
<parameters>
- <c:simple-property name="name" description="Name of this new server" required="true"/>
+ <c:simple-property name="name" description="Name of the server to be removed" required="true"/>
</parameters>
<results>
<c:simple-property name="operationResult" description="Outcome of the delete server operation"/>
</results>
</operation>
+
+ <resource-configuration>
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+
+ </resource-configuration>
+ </server>
+
+ <server name="Managed Server"
+ discovery="ManagedASDiscovery"
+ class="ManagedASComponent"
+ >
+ <plugin-configuration>
+ <c:simple-property name="hostname" default="localhost" displayName="Management host" required="true"/>
+ <c:simple-property name="port" default="9990" type="integer" displayName="Management port" required="true"/>
+ <c:simple-property name="domainHost" readOnly="true" description="Hostname in the domain"/>
+ <c:simple-property name="group" readOnly="true" displayName="Server Group" description="Server Group this instance belongs to."/>
+ <c:simple-property name="socket-binding-group" readOnly="true" displayName="Socket binding group" description="Socket bindings to use" required="false"/>
+ <c:simple-property name="socket-binding-port-offset" readOnly="true" displayName="Port Offset" type="integer" default="0" description="Offset to the base ports"/>
+ <c:simple-property name="path" readOnly="true" />
+
+ &logSources;
+ </plugin-configuration>
+
+ <operation name="server:start" description="Start this server instance." displayName="Start">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="server:stop" description="Stop this server instance." displayName="Stop">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="server:restart" description="Restart this server instance." displayName="Restart">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
+ <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
+
+ <event name="logEntry" description="an entry in a log file"/>
+
</server>
<service name="DomainDeployment"
- class="BaseComponent"
+ class="DomainDeploymentComponent"
discovery="SubsystemDiscovery"
createDeletePolicy="both"
creationDataType="content">
@@ -323,28 +410,28 @@
</service>
</server>
- <server name="JBossAS7-Standalone"
+ <server name="JBossAS7 Standalone Server"
discovery="BaseProcessDiscovery"
class="StandaloneASComponent"
description="Standalone AS7 server"
+ supportsManualAdd="true"
>
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true"/>
<c:simple-property name="port" default="9990" type="integer" required="true"/>
- <c:simple-property name="user" type="string" description="Management user for a secured AS" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" default="rhqadmin" type="string" description="Management user for a secured AS" required="false"/>
+ <c:simple-property name="password" default="rhqadmin" type="password" description="Password for the management user" required="false"/>
<c:simple-property name="config" type="string" default="standalone.xml" description="Running configuration" displayName="Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/standalone.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
- <c:list-property name="system-properties">
- <c:map-property name="system-property">
- <c:simple-property name="key" readOnly="true"/>
- <c:simple-property name="value" readOnly="true"/>
- </c:map-property>
- </c:list-property>
+ <c:simple-property name="javaHomePath" type="file" displayName="JAVA_HOME Path" required="false"
+ description="The absolute path to a JRE or JDK installation directory containing
+ the JVM that should be used to start and shutdown the JBossAS instance;
+ defaults to the home directory of the RHQ agent JRE."/>
&logSources;
+<!--
<c:group name="event" displayName="Events">
<c:list-property name="logEventSources">
<c:map-property name="logEventSource">
@@ -379,6 +466,7 @@
</c:map-property>
</c:list-property>
</c:group>
+-->
</plugin-configuration>
<process-scan name="StandaloneAS" query="process|basename|match=^java.*,arg|org.jboss.as.standalone|match=.*"/>
@@ -404,6 +492,15 @@
<c:simple-property name="operationResult"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -416,26 +513,46 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+ <metric property="product-name" dataType="trait" displayName="Name of the product"/>
+ <metric property="product-version" dataType="trait" displayName="Version of the product" displayType="summary"/>
+ <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
-<!--
- <c:group name="attribute:schema-locations" displayName="Schema locations">
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
- <c:list-property name="schema-locations" displayName="Schema locations" readOnly="true" required="false">
- <c:map-property name="*">
- <c:simple-property name="*" readOnly="true" displayName="Schema name"/>
+ <c:group name="children:path:name+" displayName="Path">
+ <c:list-property name="*3" displayName="Path" required="false"
+ description="The standard paths provided by the system include: jboss.home - the root directory of the JBoss AS distribution; user.home - user's home directory; user.dir - user's current working directory; java.home - java installation directory; jboss.server.base.dir - root directory for an individual server instance; jboss.server.data.dir - directory the server will use for persistent data file storage; jboss.server.log.dir - directory the server will use for log file storage; jboss.server.tmp.dir - directory the server will use for temporary file storage; jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances">
+ <c:map-property name="*" displayName="Entry">
+ <c:simple-property name="name" required="true" type="string" readOnly="false"
+ description="The name of the path. Cannot be one of the standard fixed paths provided by the system"/>
+ <c:simple-property name="path" required="true" type="string" readOnly="false"
+ description="The actual filesystem path. Treated as an absolute path, unless the 'relative-to' attribute is specified, in which case the value is treated as relative to that path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false"
+ description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute."/>
</c:map-property>
</c:list-property>
</c:group>
--->
- <c:group name="children:extension" displayName="Installed extensions">
+ <c:group name="children:extension:module" displayName="Installed extensions" hiddenByDefault="true">
- <c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
+ <c:list-property name="*1" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -445,188 +562,188 @@
</server>
- <server name="JBossAS-Managed"
- discovery="ManagedASDiscovery"
- class="ManagedASComponent"
- >
- <plugin-configuration>
- <c:simple-property name="hostname" default="localhost" displayName="Management host" required="true"/>
- <c:simple-property name="port" default="9990" type="integer" displayName="Management port" required="true"/>
- <c:simple-property name="domainHost" readOnly="true" description="Hostname in the domain"/>
- <c:simple-property name="group" readOnly="true" displayName="Server Group" description="Server Group this instance belongs to."/>
- <c:simple-property name="socket-binding-group" readOnly="true" displayName="Socket binding group" description="Socket bindings to use"/>
- <c:simple-property name="socket-binding-port-offset" readOnly="true" displayName="Port Offset" type="integer" default="0" description="Offset to the base ports"/>
- <c:simple-property name="path" readOnly="true" />
- &logSources;
- <c:group name="event" displayName="Events">
- <c:list-property name="logEventSources">
- <c:map-property name="logEventSource">
- <c:simple-property name="logFilePath" type="file" summary="true"
- description="The absolute path to the source log file."/>
- <c:simple-property name="enabled" type="boolean" summary="true"
- description="A flag indicating whether of not this log Event source is currently
- enabled (i.e. whether the associated log file should be tailed for
- new entries)."/>
- <c:simple-property name="dateFormat" required="false"
- description="The date format to use when parsing the dates in log entries. The
- format must be in the syntax defined by the Java SimpleDateFormat
- class. If not specified, the three date formats that are predefined
- by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/>
- <c:simple-property name="includesPattern" required="false"
- description="A regular expression against which a log entry's detail is matched
- to determine if an Event should be fired for that entry. If not
- specified, no filtering of log entries will be done based on their
- detail."/>
- <c:simple-property name="minimumSeverity" required="false" default="error"
- description="The minimum severity of Events that should be collected for this
- source. If not specified, there is no minimum severity (i.e. all
- events will be collected).">
- <c:property-options>
- <c:option name="debug" value="debug"/>
- <c:option name="info" value="info"/>
- <c:option name="warn" value="warn"/>
- <c:option name="error" value="error"/>
- <c:option name="fatal" value="fatal"/>
- </c:property-options>
- </c:simple-property>
- </c:map-property>
- </c:list-property>
- </c:group>
+ <server name="JVM"
+ discovery="JVMDiscoveryComponent"
+ class="BaseComponent"
+ description="Information about the underlying JVM"
+ singleton="true">
+ <runs-inside>
+ <parent-resource-type name="Managed Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Host" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
+ </runs-inside>
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="core-service=platform-mbean"/>
</plugin-configuration>
- <!-- Scan for host controller is intentional -->
- <process-scan name="HostController" query="process|basename|match=^java.*,arg|org.jboss.as.host-controller|match=.*"/>
- <process-scan name="ManagedAS" query="process|basename|match=^java.*,arg|org.jboss.as.server|match=.*"/>
+ <service name="Operating System"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
- <operation name="server:start" description="Start this server instance." displayName="Start">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="server:stop" description="Stop this server instance." displayName="Stop">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="server:restart" description="Restart this server instance." displayName="Restart">
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=operating-system"/>
+ </plugin-configuration>
- <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
- displayType="summary"/>
+ <metric property="available-processors"
+ description="The number of processors available to the Java virtual machine."/>
+ <metric property="system-load-average"
+ description="The system load average for the last minute. The load average may not be available on some platforms; if the load average is not available, a negative value is returned."/>
+ </service>
- <event name="logEntry" description="an entry in a log file"/>
+ <service name="Runtime"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
- </server>
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=runtime"/>
+ </plugin-configuration>
+ <metric property="uptime" description="The uptime of the Java virtual machine in milliseconds."/>
+ </service>
- <server name="JBoss AS JVM"
- description="JVM of the JBossAS"
- sourcePlugin="JMX"
- sourceType="JMX Server"
- discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent"
- class="org.rhq.plugins.jmx.JMXServerComponent"
- singleton="true">
- <runs-inside>
- <parent-resource-type name="JBossAS-Managed" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
- </runs-inside>
- </server>
+ <service name="Threading"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ >
- <server name="Messaging"
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=threading"/>
+ </plugin-configuration>
+
+ <metric property="thread-count" description="The current number of live threads including both daemon and non-daemon threads."/>
+ <metric property="peak-thread-count" description="The peak live thread count since the Java virtual machine started or peak was reset."/>
+ <metric property="total-started-thread-count" description="The total number of threads created and also started since the Java virtual machine started."/>
+ <metric property="daemon-thread-count" description="The current number of live daemon threads."/>
+ <metric property="current-thread-cpu-time" description="The total CPU time for the current thread in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' undefined."/>
+ <metric property="current-thread-user-time" description="The CPU time that the current thread has executed in user mode in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' the result will be undefined "/>
+
+ <resource-configuration>
+ <c:simple-property name="thread-contention-monitoring-enabled" required="false" type="boolean" readOnly="false" description="Whether thread contention monitoring is enabled."/>
+ <c:simple-property name="thread-cpu-time-enabled" required="false" type="boolean" readOnly="false" description="Whether thread CPU time measurement is enabled."/>
+ <c:list-property name="all-thread-ids" description="All live thread IDs. If a security manager is installed and the caller does not have ManagementPermission('monitor'), the result will be undefined." readOnly="true">
+ <c:simple-property name="all-thread-ids" readOnly="true"/>
+ </c:list-property>
+ <c:simple-property name="thread-contention-monitoring-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports thread contention monitoring."/>
+ <c:simple-property name="thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine implementation supports CPU time measurement for any thread."/>
+ <c:simple-property name="current-thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports CPU time measurement for the current thread."/>
+ <c:simple-property name="object-monitor-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of object monitor usage."/>
+ <c:simple-property name="synchronizer-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of ownable synchronizer usage."/>
+ </resource-configuration>
+ </service>
+
+
+
+ </server>
+
+ <server name="Messaging-Provider"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="The HornetQ based messaging subsystem"
+ description="The messaging subsystems"
singleton="true"
>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=messaging"/>
</plugin-configuration>
- <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
- <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
- </c:list-property>
- <c:simple-property name="type" description="Type of Destination to create" default="Queue">
- <c:property-options>
- <c:option value="jms-queue" name="Queue"/>
- <c:option value="jms-topic" name="Topic"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
-
- <resource-configuration>
- <c:simple-property name="journal-min-files" />
- <c:simple-property name="journal-type" />
- </resource-configuration>
+ <server name="HornetQ"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The HornetQ based messaging subsystem"
+ >
- <service name="JMS Queue"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ <c:simple-property name="path" readOnly="true" default="hornetq-server"/>
</plugin-configuration>
+
+ <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
+ <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
+ </c:list-property>
+ <c:simple-property name="type" description="Type of Destination to create" default="Queue">
+ <c:property-options>
+ <c:option value="jms-queue" name="Queue"/>
+ <c:option value="jms-topic" name="Topic"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
<resource-configuration>
- <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
- description="Whether the queue is durable or not."/>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
- <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
- </resource-configuration>
- </service>
- <service name="JMS Topic"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-topic"/>
- </plugin-configuration>
- <resource-configuration>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
+ <c:simple-property name="journal-min-files" />
+ <c:simple-property name="journal-type" />
</resource-configuration>
- </service>
- <service name="Connection-Factory"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="both"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="connection-factory"/>
- </plugin-configuration>
- </service>
+ <service name="JMS Queue"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
+ description="Whether the queue is durable or not."/>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
+ </resource-configuration>
+ </service>
+ <service name="JMS Topic"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-topic"/>
+ </plugin-configuration>
+ <resource-configuration>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ <service name="Connection-Factory"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="both"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connection-factory"/>
+ </plugin-configuration>
+ </service>
+
+ </server>
</server>
<server name="JBossWeb"
@@ -637,7 +754,7 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -649,61 +766,64 @@
description="The web container's default virtual server."/>
<c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true"
description="Add the native initialization listener to the web container."/>
- <c:map-property name="configuration" description="The common web container configuration." >
- <c:map-property name="static-resources" description="Configuration for static resources" >
- <c:simple-property name="listings" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
+ <c:group name="child:configuration=static-resources" displayName="Static Resources" >
+ <c:simple-property name="listings" required="false" type="boolean" defaultValue="false"
description="Enable folder listings."/>
- <c:simple-property name="sendfile" required="false" type="integer" readOnly="true" defaultValue="49152"
+ <c:simple-property name="sendfile" required="false" type="integer" defaultValue="49152"
description="Enable sendfile if possible, for files bigger than the specified byte size."/>
- <c:simple-property name="read-only" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="file-encoding" required="false" description="Force a file encoding." type="string"/>
+ <c:simple-property name="read-only" required="false" type="boolean" defaultValue="true"
description="Allow write HTTP methods (PUT, DELETE)."/>
- <c:simple-property name="webdav" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="webdav" required="false" type="boolean" defaultValue="false"
description="Enable WebDAV functionality."/>
<c:simple-property name="secret" required="false" type="string" readOnly="true" description="Secret for WebDAV locking operations."/>
- <c:simple-property name="max-depth" required="false" type="integer" readOnly="true" defaultValue="3"
+ <c:simple-property name="max-depth" required="false" type="integer" defaultValue="3"
description="Maximum recursion for PROPFIND."/>
- <c:simple-property name="disabled" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
+ description="Enable the default Servlet mapping."/>
+ </c:group>
+ <c:group name="child:configuration=jsp-configuration" displayName="JSP Configuration">
+ <c:simple-property name="development" required="false" type="boolean" default="false"
+ description="Enable the development mode, which gives more information when an error occurs. And also enables automatic JSP recompiles."/>
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
description="Enable the JSP container."/>
- </c:map-property>
- <c:map-property name="jsp-configuration" description="JSP container configuration">
- <c:simple-property name="development" required="false" type="boolean" readOnly="true" defaultValue="false"
- description="Enable the development mode, which gives more information when an error occurs."/>
- <c:simple-property name="file-encoding" required="false" type="string" readOnly="true" description="Force a file encoding."/>
- <c:simple-property name="keep-generated" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="keep-generated" required="false" type="boolean" defaultValue="true"
description="Keep the generated Servlets."/>
<c:simple-property name="trim-spaces" required="false" type="boolean" readOnly="true" defaultValue="true"
- description="Trim some spaces from the generated Servlet."/>
- <c:simple-property name="tag-pooling" required="false" type="boolean" readOnly="true" defaultValue="true"
+ description="Trim some spaces from the generated Servlet."/> <!-- TODO make r/w when https://issues.jboss.org/browse/AS7-3097 is solved -->
+ <c:simple-property name="tag-pooling" required="false" type="boolean" defaultValue="true"
description="Enable tag pooling."/>
- <c:simple-property name="mapped-file" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="mapped-file" required="false" type="boolean" defaultValue="true"
description="Map to the JSP source."/>
- <c:simple-property name="check-interval" required="false" type="integer" readOnly="true" defaultValue="0"
- description="Check interval for JSP updates using a background thread."/>
- <c:simple-property name="modification-test-interval" required="false" type="integer" readOnly="true" defaultValue="4"
+ <c:simple-property name="check-interval" required="false" type="integer" defaultValue="60"
+ description="Check interval in seconds for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
+ <c:simple-property name="modification-test-interval" required="false" type="integer" defaultValue="4"
description="Minimum amount of time between two tests for updates, in seconds."/>
- <c:simple-property name="recompile-on-fail" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="recompile-on-fail" required="false" type="boolean" defaultValue="false"
description="Retry failed JSP compilations on each request."/>
- <c:simple-property name="smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="smap" required="false" type="boolean" defaultValue="false"
description="Enable SMAP."/>
- <c:simple-property name="dump-smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="dump-smap" required="false" type="boolean" defaultValue="false"
description="Write SMAP data to a file."/>
- <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean" readOnly="true"
+ <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean"
defaultValue="false"
description="Generate String constants as char arrays."/>
- <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" defaultValue="false"
description="Enable errors when using a bad class in useBean."/>
- <c:simple-property name="scratch-dir" required="false" type="string" readOnly="true" description="Specify a different work directory."/>
- <c:simple-property name="source-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="scratch-dir" required="false" type="string" description="Specify a different work directory."/>
+ <c:simple-property name="source-vm" required="false" type="string" defaultValue="1.5"
description="Source VM level for compilation."/>
- <c:simple-property name="target-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="target-vm" required="false" type="string" defaultValue="1.5"
description="Target VM level for compilation."/>
- <c:simple-property name="java-encoding" required="false" type="string" readOnly="true" defaultValue="UTF-8"
+ <c:simple-property name="java-encoding" required="false" type="string" defaultValue="UTF-8"
description="Specify the encoding used for Java sources."/>
- <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="x-powered-by" required="false" type="boolean" defaultValue="true"
description="Enable advertising the JSP engine in x-powered-by."/>
- <c:simple-property name="display-source-fragment" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="display-source-fragment" required="false" type="boolean" defaultValue="true"
description="When a runtime error occurs, attempts to display corresponding JSP source fragment."/>
- </c:map-property>
+ </c:group>
+ <!-- <c:group name="child:configuration=container" displayName="Container">
<c:list-property name="mime-mapping" description="A mime-mapping definition." >
<c:map-property name="mime-mapping" >
<c:simple-property name="name" description="A MIME mapping name"/>
@@ -713,8 +833,8 @@
<c:list-property name="welcome-file" description="A welcome file declaration." >
<c:simple-property name="welcome-file" />
</c:list-property>
- </c:map-property>
- </resource-configuration>
+ </c:group>
+--> </resource-configuration>
<service name="Connector"
discovery="SubsystemDiscovery"
@@ -726,41 +846,41 @@
</plugin-configuration>
- <metric property="bytesSent" measurementType="trendsup"/>
- <metric property="bytesReceived" measurementType="trendsup"/>
- <metric property="processingTime" measurementType="trendsup" units="milliseconds"/>
- <metric property="errorCount" measurementType="trendsup" displayType="summary"/>
- <metric property="maxTime" units="milliseconds"/>
- <metric property="requestCount" measurementType="trendsup" displayType="summary"/>
+ <metric property="bytesSent" measurementType="trendsup" description="Number of byte sent by the connector."/>
+ <metric property="bytesReceived" measurementType="trendsup" description="Number of byte received by the connector (POST data)."/>
+ <metric property="processingTime" measurementType="trendsup" units="milliseconds" description="Processing time used by the connector. Im milli-seconds."/>
+ <metric property="errorCount" measurementType="trendsup" displayType="summary" description="Number of error that occurs when processing requests by the connector."/>
+ <metric property="maxTime" units="milliseconds" description="Max time spent to process a requests."/>
+ <metric property="requestCount" measurementType="trendsup" displayType="summary" description="Number of the request processed by the connector."/>
<resource-configuration>
- <c:simple-property name="protocol" required="true" type="string" readOnly="true" description="The web connector protocol."/>
- <c:simple-property name="socket-binding" required="true" type="string" readOnly="true"
+ <c:simple-property name="protocol" required="true" type="string" description="The web connector protocol."/>
+ <c:simple-property name="socket-binding" required="true" type="string"
description="The web connector socket-binding reference, this connector should be bound to.">
<c:option-source target="configuration" expression="socket-binding=name:type=SocketBindingGroup"/> <!-- TODO different for Domain vs standalone -->
</c:simple-property>
- <c:simple-property name="scheme" type="string" readOnly="true" default="http" description="The web connector scheme." required="true"/>
- <c:simple-property name="executor" type="string" readOnly="true" required="false"
+ <c:simple-property name="scheme" type="string" default="http" description="The web connector scheme." required="true"/>
+ <c:simple-property name="executor" type="string" required="false"
description="The name of the executor that should be used for the processing threads of this connector. Defaults to using an internal pool."/>
- <c:simple-property name="enabled" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="enabled" type="boolean" default="true"
description="Defines whether the connector should be started on startup."/>
- <c:simple-property name="enable-lookups" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="enable-lookups" type="boolean" defaultValue="false"
description="Enable DNS lookups for Servlet API."/>
- <c:simple-property name="proxy-name" type="string" readOnly="true" required="false"
+ <c:simple-property name="proxy-name" type="string" required="false"
description="The host name that will be used when sending a redirect. The default value is null."/>
- <c:simple-property name="proxy-port" type="integer" readOnly="true" required="false"
+ <c:simple-property name="proxy-port" type="integer" required="false"
description="The port that will be used when sending a redirect."/>
- <c:simple-property name="max-post-size" type="integer" readOnly="true" defaultValue="2097152"
+ <c:simple-property name="max-post-size" type="integer" defaultValue="2097152"
description="Maximum size in bytes of a POST request that can be parsed by the container."/>
- <c:simple-property name="max-save-post-size" type="integer" readOnly="true" defaultValue="4096"
+ <c:simple-property name="max-save-post-size" type="integer" defaultValue="4096"
description="Maximum size in bytes of a POST request that will be saved during certain authentication schemes."/>
<c:simple-property name="secure" type="boolean" readOnly="true" defaultValue="false"
description="Indicates if content sent or recieved by the connector is secured from the user perspective."/>
<c:simple-property name="redirect-port" type="integer" readOnly="true" defaultValue="8443"
description="The port for redirection to a secure connector."/>
- <c:simple-property name="max-connections" type="integer" readOnly="true" required="false"
+ <c:simple-property name="max-connections" type="integer" required="false"
description="Amount of concurrent connections that can be processed by the connector with optimum performance. The default value depends on the connector used."/>
- <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." readOnly="true" required="false">
+ <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." required="false">
<c:simple-property name="virtual-server" />
</c:list-property>
<c:map-property name="ssl" description="The SSL configuration of the connector." readOnly="true" required="false">
@@ -795,10 +915,10 @@
</plugin-configuration>
<resource-configuration>
- <c:list-property name="alias" >
+ <c:list-property name="alias" description="The virtual server aliases" displayName="Virtual server aliases" >
<c:simple-property name="alias" />
</c:list-property>
- <c:simple-property name="default-web-module" type="string" readOnly="true" defaultValue="ROOT.war"
+ <c:simple-property name="default-web-module" type="string" defaultValue="ROOT.war"
description="The web module deployment name that will be mapped as the root webapp."/>
<c:map-property name="access-log" description="The access log configuration for this virtual server." >
<c:simple-property name="pattern" type="string" readOnly="true" defaultValue="common" required="false" description="The access log pattern."/>
@@ -825,7 +945,7 @@
</c:list-property>
</c:map-property>
</c:list-property>
- <c:simple-property name="enable-welcome-root" type="boolean" />
+ <c:simple-property name="enable-welcome-root" type="boolean" description="Whether or not the bundled welcome directory is used as the root web context."/>
</resource-configuration>
</service>
@@ -841,7 +961,7 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -877,7 +997,7 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -903,11 +1023,10 @@
<parameters>
<c:simple-property name="name" required="true" description="Name of the datasource"/>
<c:simple-property name="driver-name" required="true">
- <c:option-source target="resource" expression="type=^Deployment$" filter="sameHierarchy"/>
+ <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/>
</c:simple-property>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
<c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>
- <c:simple-property name="pool-name" description="Name of the pool" required="true"/>
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
</parameters>
@@ -920,15 +1039,14 @@
<parameters>
<c:simple-property name="name" required="true" description="Name of the datasource"/>
<c:simple-property name="driver-name" required="true">
- <c:option-source target="resource" expression="type=^Deployment$"/>
+ <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/>
</c:simple-property>
- <c:simple-property name="xa-data-source-class" required="true" description="xa-data-source-class"/>
+ <c:simple-property name="xa-datasource-class" required="true" description="xa-datasource-class"/>
+ <c:simple-property name="connection-url" required="true" description="Connection URL. Will be turned into an Xa-property)"/>
<c:simple-property name="jndi-name" description="JNDI-Name of the Datasource" required="true"/>
- <c:simple-property name="connection-url" description="URL for the connection to the database" required="true"/>
- <c:simple-property name="pool-name" description="Name of the pool" required="true"/>
<c:simple-property name="user-name" description="User name for DB-connections" required="false" />
<c:simple-property name="password" description="Password" type="password" required="false"/>
- <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties" required="false">
+ <c:list-property name="xa-properties" displayName="XA Properties" description="Additional XA Properties (connection url is set above)" required="false">
<c:map-property name="xa-properties">
<c:simple-property name="key" displayName="Key" description="Key of the property"/>
<c:simple-property name="value" displayName="Value" description="Value of the property"/>
@@ -994,17 +1112,13 @@
description="The number of times that statements from the cache were used"/>
<metric property="AverageBlockingTime" units="milliseconds"
description="The average time spent blocking for a connection"/>
- <metric property="MaxWaitTime" units="milliseconds"
- description="The maximum wait time for a connection" displayType="summary"/>
<metric property="ActiveCount"
description="The active count"/>
<metric property="CreatedCount" description="The created count" measurementType="trendsup"/>
<metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/>
- <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/>
<metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/>
<metric property="AvailableCount" description="The available count" units="milliseconds"/>
<metric property="MaxUsedCount" description="The maximum number of connections used"/>
- <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/>
<metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/>
<metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/>
<metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/>
@@ -1020,8 +1134,6 @@
description="Defines the JDBC driver the datasource should use with this format: driver-name>#major-version.minor-version where driver-name is the fully qualifed name of the JDBC driver class"/>
<c:simple-property name="new-connection-sql" type="string" readOnly="true" required="false"
description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/>
- <c:simple-property name="pool-name" type="string" readOnly="true"
- description="Specifies the pool name for the datasource used for management"/>
<c:simple-property name="url-delimiter" type="string" readOnly="true"
description="Specifies the delimeter for URLs in connection-url for HA datasources" required="false"/>
<c:simple-property name="url-selector-strategy-class-name" type="string" readOnly="true"
@@ -1165,11 +1277,10 @@
<metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/>
<resource-configuration>
- <c:simple-property name="xa-data-source-class" required="true" type="string" readOnly="true" description="The fully qualifed name of the javax.sql.XADataSource implementation"/>
+ <c:simple-property name="xa-datasource-class" required="true" type="string" readOnly="true" description="The fully qualifed name of the javax.sql.XADataSource implementation"/>
<c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/>
<c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"/>
<c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/>
- <c:simple-property name="pool-name" required="false" type="string" readOnly="true" description="Specifies the pool name for the datasource used for management"/>
<c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimeter for URLs in connection-url for HA datasources"/>
<c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/>
<c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/>
@@ -1178,7 +1289,7 @@
<c:simple-property name="min-pool-size" required="false" type="integer" readOnly="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/>
<c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/>
<c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" description="Define if the min-pool-size should be considered a strictly."/>
- <c:simple-property name="interliving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/>
+ <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/>
<c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/>
<c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/>
<c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/>
@@ -1245,6 +1356,16 @@
</c:map-property>
-->
<c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/>
+
+
+ <c:group name="children:xa-datasource-properties:key+" displayName="XA Datasource Properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="true">
+ <c:map-property name="*:key" displayName="Name" readOnly="true">
+ <c:simple-property name="key" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value" readOnly="true"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
</resource-configuration>
</service>
@@ -1293,7 +1414,7 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1310,7 +1431,7 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1634,7 +1755,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1669,7 +1790,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1699,7 +1820,7 @@ working area for individual server instances</li></ul>"/>
>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1747,7 +1868,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1805,7 +1926,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1859,7 +1980,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="Profile" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/> <!-- FAKE as "runs inside Profile" only does not work -->
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> <!-- FAKE as "runs inside Profile" only does not work -->
</runs-inside>
<plugin-configuration>
@@ -1882,28 +2003,34 @@ working area for individual server instances</li></ul>"/>
<server name="Naming"
discovery="SubsystemDiscovery"
- class="BaseComponent"
+ class="NamingComponent"
singleton="true"
>
<runs-inside>
<parent-resource-type name="Host" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=naming"/>
</plugin-configuration>
- <operation name="naming:jndi-view" displayName="JNDIView" description="Peek at the JNDI tree">
+ <operation name="jndi-view" displayName="JNDIView" description="Peek at the JNDI tree">
<results>
- <c:list-property name="operationResult">
- <c:list-property name="innerContext">
- <c:map-property name="innerContexts">
- <c:simple-property name="class-name"/>
- <c:simple-property name="value"/>
- </c:map-property>
- </c:list-property>
+ <c:list-property name="java-contexts">
+ <c:map-property name="context">
+ <c:simple-property name="context" />
+ <c:simple-property name="name"/>
+ <c:simple-property name="value"/>
+ </c:map-property>
+ </c:list-property>
+ <c:list-property name="applications">
+ <c:map-property name="context">
+ <c:simple-property name="context" />
+ <c:simple-property name="name"/>
+ <c:simple-property name="value"/>
+ </c:map-property>
</c:list-property>
</results>
</operation>
@@ -1918,7 +2045,7 @@ working area for individual server instances</li></ul>"/>
<runs-inside>
<parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/>
<parent-resource-type name="Host" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
@@ -1931,7 +2058,7 @@ working area for individual server instances</li></ul>"/>
class="BaseComponent"
>
<runs-inside>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
@@ -2012,24 +2139,35 @@ working area for individual server instances</li></ul>"/>
</service>
<service name="Deployment"
- class="BaseComponent"
+ class="DeploymentComponent"
discovery="SubsystemDiscovery"
createDeletePolicy="both"
creationDataType="content">
-
<runs-inside>
- <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/> <!-- TODO -->
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
+ <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> <!-- TODO -->
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="deployment" readOnly="true"/>
</plugin-configuration>
+ <operation name="enable">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="disable">
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
<content name="file" category="deployable" isCreationType="true" description="Deployments on this server group">
<configuration>
<c:group name="deployment" displayName="Deployment Options">
- <c:simple-property name="runtimeName" required="false"/>
+ <c:simple-property name="runtimeName" required="false" description="Runtime name of the uploaded file (e.g. 'my.war'). If not present, the file name is used."/>
</c:group>
</configuration>
</content>
@@ -2043,7 +2181,7 @@ working area for individual server instances</li></ul>"/>
singleton="true"
>
<runs-inside>
- <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/>
+ <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="subsystem=deployment-scanner" readOnly="true"/>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index 16c94f9..1af2f2f 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -18,6 +18,9 @@
*/
package org.rhq.modules.plugins.jbossas7;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URL;
import java.util.List;
@@ -28,7 +31,8 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
-import org.testng.annotations.BeforeSuite;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.ObjectNode;
import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser;
import org.rhq.core.clientapi.agent.metadata.InvalidPluginDescriptorException;
@@ -36,6 +40,7 @@ import org.rhq.core.clientapi.descriptor.DescriptorPackages;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
/**
@@ -87,6 +92,22 @@ public class AbstractConfigurationHandlingTest {
return null;
}
+ protected String loadJsonFromFile(String fileName) throws Exception {
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ try {
+ StringBuilder builder = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ }
+ return builder.toString();
+ }
+ finally {
+ reader.close();
+ }
+ }
+
/**
* Provide a fake connection, that will return the
* content we provide via #setContent
@@ -97,7 +118,7 @@ public class AbstractConfigurationHandlingTest {
JsonNode content;
public FakeConnection() {
- super("localhost", 1234);
+ super("localhost", 1234, "fake", "fake");
}
public void setContent(JsonNode content) {
@@ -108,6 +129,30 @@ public class AbstractConfigurationHandlingTest {
public JsonNode executeRaw(Operation operation) {
if (content==null)
throw new IllegalStateException("Content not yet set");
+
+ Address address = operation.getAddress();
+ if (address!=null && !address.isEmpty()) {
+ // we need to clone the content and then for the result find the right sub-content to put into result and
+ // return this one.
+
+ // find the sub-content we want
+ String[] parts = address.getPath().split("=");
+ String key = parts[0];
+ String val = parts[1];
+ JsonNode result = content.get("result");
+ JsonNode keyNode = result.get(key);
+ JsonNode valNode = keyNode.get(val);
+
+ // clone the original content
+ ObjectMapper tmpMapper = new ObjectMapper();
+ JsonNode tmp = tmpMapper.createObjectNode();
+ ((ObjectNode)tmp).putAll(((ObjectNode)content));
+
+ // replace the result with the sub-content
+ ((ObjectNode)tmp).put("result",valNode);
+
+ return tmp;
+ }
return content;
}
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index 0a46516..8e3704b 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -416,20 +417,50 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
}
- private String loadJsonFromFile(String fileName) throws Exception {
- InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- try {
- StringBuilder builder = new StringBuilder();
- String line;
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- return builder.toString();
- }
- finally {
- reader.close();
- }
+ public void test9() throws Exception {
+ String resultString = loadJsonFromFile("web.json");
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ FakeConnection connection = new FakeConnection();
+ connection.setContent(json);
+
+ ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
+ Configuration config = delegate.loadResourceConfiguration();
+ assert config!=null;
+ Collection<Property> properties = config.getProperties();
+ assert properties.size()==6 : "Got " + properties.size() + " props instead of 6: " + properties.toString();
+ PropertySimple simple = config.getSimple("check-interval");
+ assert simple !=null;
+ Integer integerValue = simple.getIntegerValue();
+ assert integerValue !=null : "check-interval was null";
+ assert integerValue ==17 : "check-interval was not 17 but " + integerValue;
+ PropertySimple disabled = config.getSimple("disabled");
+ assert disabled !=null : "disabled was null";
+ Boolean booleanValue = disabled.getBooleanValue();
+ assert booleanValue !=null;
+ assert booleanValue;
+ PropertySimple listings = config.getSimple("listings");
+ assert listings !=null;
+ Boolean booleanValue1 = listings.getBooleanValue();
+ assert booleanValue1 !=null;
+ assert !booleanValue1;
+ PropertySimple simple1 = config.getSimple("max-depth");
+ assert simple1 !=null;
+ Integer integerValue1 = simple1.getIntegerValue();
+ assert integerValue1 !=null;
+ assert integerValue1 ==3;
+ PropertySimple simple2 = config.getSimple("default-virtual-server");
+ assert simple2 !=null;
+ String stringValue = simple2.getStringValue();
+ assert stringValue !=null;
+ assert stringValue.equals("default-host");
+
+
+
}
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index d021ab2..703722a 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.util.List;
import java.util.Map;
+import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
import org.testng.annotations.BeforeSuite;
@@ -31,6 +32,8 @@ import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
+import org.rhq.modules.plugins.jbossas7.json.ComplexResult;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
@@ -62,7 +65,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(new PropertySimple("needed","test"));
conf.put(new PropertySimple("optional",null));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1;
Operation step1 = cop.step(0);
@@ -89,7 +92,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -120,7 +123,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -148,7 +151,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -176,7 +179,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -207,7 +210,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -240,7 +243,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -289,7 +292,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -317,4 +320,107 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step4.getAddress().get(0).equals("socket-binding=https");
assert step5.getAddress().get(0).equals("socket-binding=https");
}
+
+ public void test9() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ FakeConnection connection = new FakeConnection();
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ conf.put(new PropertySimple("default-virtual-server","hulla")); // this is read-only and must not show up in result
+ conf.put(new PropertySimple("test-prop","Heiko"));
+ conf.put(new PropertySimple("check-interval",23));
+ conf.put(new PropertySimple("disabled",true));
+ conf.put(new PropertySimple("listings",false));
+ conf.put(new PropertySimple("max-depth",17));
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+ Operation step4 = cop.step(3);
+ Operation step5 = cop.step(4);
+
+ assert step1.getAddress().isEmpty();
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step4.getAddress().size()==1;
+ assert step5.getAddress().size()==1;
+ assert step2.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step3.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step4.getAddress().get(0).equals("configuration=static-resources");
+ assert step5.getAddress().get(0).equals("configuration=static-resources");
+
+ assert step1.getAdditionalProperties().get("name").equals("test-prop");
+ assert step1.getAdditionalProperties().get("value").equals("Heiko");
+ assert step2.getAdditionalProperties().get("name").equals("check-interval");
+ assert step2.getAdditionalProperties().get("value").equals("23");
+
+ }
+
+ public void test10() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test10");
+
+ FakeConnection connection = new FakeConnection();
+ String resultString = loadJsonFromFile("system-props.json");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ connection.setContent(json);
+
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ // We have properties 'bar' and 'hello' on the server
+ // update 'bar', add 'hulla' and remove 'hello'
+
+ PropertyList propertyList = new PropertyList("*2");
+ PropertyMap propertyMap = new PropertyMap("*");
+ propertyMap.put(new PropertySimple("name","hulla"));
+ propertyMap.put(new PropertySimple("value","hopp"));
+ propertyList.add(propertyMap);
+ propertyMap = new PropertyMap("*");
+ propertyMap.put(new PropertySimple("name","bar"));
+ propertyMap.put(new PropertySimple("value","42!"));
+ propertyList.add(propertyMap);
+ conf.put(propertyList);
+
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+
+ assert step1.getAddress().size()==1;
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step1.getAddress().get(0).equals("system-property=hulla");
+ assert step2.getAddress().get(0).equals("system-property=bar");
+ assert step3.getAddress().get(0).equals("system-property=hello");
+ assert step1.getOperation().equals("add");
+ assert step2.getOperation().equals("write-attribute");
+ assert step3.getOperation().equals("remove");
+
+ assert step1.getAdditionalProperties().get("name").equals("hulla");
+ assert step1.getAdditionalProperties().get("value").equals("hopp");
+ assert step2.getAdditionalProperties().get("name").equals("value"); // This is the name of the property
+ assert step2.getAdditionalProperties().get("value").equals("42!");
+ assert step3.getAdditionalProperties().isEmpty();
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
index 354ab8d..2dcd49f 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
@@ -59,7 +59,8 @@ public class OperationJsonTest {
assert op!=null;
assert op.getOperation()!=null : "op.operation was null!";
assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation();
- assert op.getName().equals("socket-binding") : "attribute name is " + op.getName();
+ assert op.getName()!=null : "op.getName is null";
+ assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'";
assert op.getValue().equals("jndi") : "attribute value is " + op.getValue();
assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
index 113bc53..882d377 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java
@@ -60,4 +60,31 @@ public class PathHandlingTest {
assert a.size()==3 : "Size was not 3, but "+ a.size();
assert !a.isEmpty();
}
+
+ public void getParent1() throws Exception {
+ String path = "subsystem=jms,profile=default,queue=foo";
+ Address a = new Address(path);
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.size()==2;
+ assert b.get(0).equals("subsystem=jms");
+ assert b.get(1).equals("profile=default");
+ }
+
+ public void getParent2() throws Exception {
+ Address a = new Address();
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.isEmpty();
+ assert b.size()==0;
+ }
+
+ public void getParent3() throws Exception {
+ Address a = new Address("foo=bar");
+ Address b = a.getParent();
+ assert b!=null;
+ assert b.isEmpty();
+ assert b.size()==0;
+ }
+
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
new file mode 100644
index 0000000..2365d19
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
@@ -0,0 +1,133 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
+/**
+ * Test the ability to read information from the AS7 xml files (standalone.xml and so on)
+ * @author Heiko W. Rupp
+ */
+@Test
+public class XmlFileReadingTest {
+
+ public void hostPort70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ assert hp.host.equals("127.0.0.70") : "Host is " + hp.host;
+ assert hp.port==19990 : "Port is " + hp.port;
+ }
+
+ public void hostPort71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ // hp : HostPort{host='localhost', port=9990, isLocal=true}
+ assert hp.host.equals("127.0.0.71") : "Host is " + hp.host;
+ assert hp.port==29990 : "Port is " + hp.port;
+ }
+
+ public void domainController1() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host1.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert hp.isLocal : "DC is not local as expected: " + hp;
+
+ }
+
+ public void domainController2() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host2.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert "192.168.100.1".equals(hp.host) : "DC is at " + hp.host;
+ assert hp.port == 9559 : "DC port is at " + hp.port;
+ }
+
+
+
+ public void testXpath70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+/*
+ String realm = bd.obtainXmlPropertyViaXPath("/management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+*/
+
+ String pathExpr = "//management/management-interfaces/http-interface/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "19990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "//management/management-interfaces/http-interface/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.70}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+
+ public void testXpath71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+ String sbindingRef = bd.obtainXmlPropertyViaXPath(
+ ("//management/management-interfaces/http-interface/socket-binding/@http"));
+ assert "management-http".equals(sbindingRef): "Socketbinding was " + sbindingRef;
+
+ String pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "29990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.71}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+ public void testGetRealm() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+
+ String xpathExpression = "//management//security-realm[@name ='%s']/authentication/properties/@path";
+
+ String propsFileName = bd.obtainXmlPropertyViaXPath(String.format(xpathExpression,realm));
+ assert "mgmt-users.properties".equals(propsFileName) : "File name was " + propsFileName;
+
+ String propsFilePathRel = bd.obtainXmlPropertyViaXPath("//management//security-realm[@name ='" + realm + "']/authentication/properties/@relative-to");
+ assert "jboss.server.config.dir".equals(propsFilePathRel) : "Path was " + propsFileName;
+
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host1.xml b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
new file mode 100644
index 0000000..2e35b78
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
@@ -0,0 +1,92 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software 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
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <local/>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <!-- <remote host="192.168.100.1" port="9999"/> -->
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host2.xml b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
new file mode 100644
index 0000000..38ada1a
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
@@ -0,0 +1,91 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software 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
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <remote host="192.168.100.1" port="9559"/>
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
new file mode 100644
index 0000000..e07b9ef
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
@@ -0,0 +1,433 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software 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
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="PropertiesMgmtSecurityRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface interface="management" port="9999"/>
+ <http-interface interface="management" port="19990"/>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ </session-bean>
+
+ <default-stateful-access-timeout>5000</default-stateful-access-timeout>
+ <default-singleton-access-timeout>5000</default-singleton-access-timeout>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.0">
+ <orb name="JBoss" print-version="off" giop-minor-version="2">
+ <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/>
+ <naming root-context="JBoss/Naming/root" export-corbaloc="on"/>
+ </orb>
+ <poa monitoring="off" queue-wait="off">
+ <request-processors pool-size="2" max-threads="8"/>
+ </poa>
+ <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <journal-type>NIO</journal-type>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.0">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>localhost</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.70}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.70}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="jndi" port="1099"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ </socket-binding-group>
+
+</server>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
new file mode 100644
index 0000000..0de6d00
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
@@ -0,0 +1,453 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software 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
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.cmp"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxr"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jdr"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.pojo"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket-binding native="management-native"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket-binding http="management-http"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:cmp:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ <stateful default-access-timeout="5000"/>
+ <singleton default-access-timeout="5000"/>
+ </session-bean>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging-client"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput-client">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0" />
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.71}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.71}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="management-native" interface="management" port="9999"/>
+ <socket-binding name="management-http" interface="management" port="29990"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ <outbound-socket-binding name="messaging-client">
+ <local-destination socket-binding-ref="messaging"/>
+ </outbound-socket-binding>
+ <outbound-socket-binding name="messaging-throughput-client">
+ <local-destination socket-binding-ref="messaging-throughput"/>
+ </outbound-socket-binding>
+ </socket-binding-group>
+
+</server>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/system-props.json b/modules/plugins/jboss-as-7/src/test/resources/system-props.json
new file mode 100644
index 0000000..da211cc
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/system-props.json
@@ -0,0 +1,10 @@
+{
+ "outcome" : "success",
+ "result" :
+ {
+ "bar" :
+ {"value" : "44"},
+ "hello" :
+ {"value" : "world"}
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 69201e2..173d2be 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -89,6 +89,34 @@
</server>
+ <server class="foo" discovery="foo" name="test9">
+ <resource-configuration>
+ <c:simple-property name="default-virtual-server" type="string" readOnly="true"/>
+ <c:simple-property name="test-prop" type="string" required="true" defaultValue="Hello"/>
+ <c:group name="child:configuration=jsp-configuration">
+ <c:simple-property name="check-interval" type="integer" units="seconds" readOnly="false" default="1"/>
+ <c:simple-property name="disabled" type="boolean" default="false"/>
+ </c:group>
+ <c:group name="child:configuration=static-resources">
+ <c:simple-property name="listings" default="true" type="boolean"/>
+ <c:simple-property name="max-depth" default="9" type="integer" />
+ </c:group>
+ </resource-configuration>
+ </server>
+
+ <server class="foo" discovery="foo" name="test10">
+ <resource-configuration>
+ <c:group name="children:system-property:name+" displayName="System-properties">
+ <c:list-property name="*2" displayName="Properties" required="false" readOnly="false">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" displayName="Property-Name" readOnly="true"/>
+ <c:simple-property name="value" displayName="Value"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/web.json b/modules/plugins/jboss-as-7/src/test/resources/web.json
new file mode 100644
index 0000000..96f0565
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/web.json
@@ -0,0 +1,62 @@
+{
+ "outcome" : "success",
+ "result" :
+
+
+ {"default-virtual-server" : "default-host",
+ "native" : true,
+ "configuration" : {
+ "container" : {},
+ "static-resources" : {
+ "disabled" : false,
+ "listings" : false,
+ "max-depth" : 3,
+ "read-only" : true,
+ "sendfile" : 49152,
+ "webdav" : false},
+ "jsp-configuration" : {
+ "check-interval" : 17,
+ "development" : false,
+ "disabled" : true,
+ "display-source-fragment" : true,
+ "dump-smap" : false,
+ "error-on-use-bean-invalid-class-attribute" : false,
+ "generate-strings-as-char-arrays" : false,
+ "java-encoding" : "UTF-8",
+ "keep-generated" : true,
+ "mapped-file" : true,
+ "modification-test-interval" : "7",
+ "recompile-on-fail" : false,
+ "smap" : false,
+ "source-vm" : "1.5",
+ "tag-pooling" : true,
+ "target-vm" : "1.5",
+ "trim-spaces" : true,
+ "x-powered-by" : true}
+ },
+ "connector" : {
+ "http" : {
+ "enable-lookups" : true,
+ "enabled" : true,
+ "max-post-size" : 2097152,
+ "max-save-post-size" : 4096,
+ "protocol" : "HTTP/1.1",
+ "redirect-port" : 8443,
+ "scheme" : "http",
+ "secure" : false,
+ "socket-binding" : "http",
+ "ssl" : null,
+ "virtual-server" : null}
+ },
+
+ "virtual-server" : {
+ "default-host" : {
+ "access-log" : null,
+ "alias" : ["localhost","example.com"],
+ "default-web-module" : "ROOT.war",
+ "enable-welcome-root" : true,
+ "rewrite" : null,
+ "sso" : null}
+ }
+ }
+}
commit abb8746798455eeeefa989688c4a52169062ac95
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Feb 9 21:23:06 2012 +0100
Support for filtering in <c:option-source> elements.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 60550be..11750c1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -25,6 +25,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.ejb.EJB;
import javax.ejb.Stateless;
@@ -2511,6 +2513,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
PropertyOptionsSource pos = pds.getOptionsSource();
PropertyOptionsSource.TargetType tt = pos.getTargetType();
String expression = pos.getExpression();
+ String filter = pos.getFilter();
+ Pattern filterPattern = null;
+ if (filter!=null)
+ filterPattern = Pattern.compile(filter);
+
if (tt == PropertyOptionsSource.TargetType.RESOURCE || tt == PropertyOptionsSource.TargetType.CONFIGURATION) {
ResourceCriteria criteria = new ResourceCriteria();
@@ -2533,10 +2540,21 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (tt == PropertyOptionsSource.TargetType.RESOURCE) {
- PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(composite.getResource()
- .getName(), "" + composite.getResource().getName());
- // TODO filter -- or leave up to search expression??
+ String name = composite.getResource().getName();
+ // filter if the user provided a filter
+
+ if (filterPattern !=null ) {
+ Matcher m = filterPattern.matcher(name);
+ if (m.matches()) {
+ PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(name, "" + name);
pds.getEnumeratedValues().add(pde);
+ }
+ } else { // Filter is null -> none provided -> do not filter
+ PropertyDefinitionEnumeration pde = new PropertyDefinitionEnumeration(name, "" + name);
+ pds.getEnumeratedValues().add(pde);
+
+ }
+
} else if (tt == PropertyOptionsSource.TargetType.CONFIGURATION) {
// for configuration we need to drill down into the resource configuration
if (!handleConfigurationTarget(pds, expression, composite.getResource()))
commit a7a62147f4480566d358863946e1c22783f3247a
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Fri Feb 10 00:58:16 2012 -0500
development RHQ_4.2.0.JON.3.0.2-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 3167d39..0991c91 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1e93560..1370a4c 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 198d9bc..c41be24 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 972a5a2..0c28ff6 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 91f9d94..1b56b75 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 262a9f7..5388ea4 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 2f2f2b3..a228e4f 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 5442ad3..e834756 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index dbeb7ef..83a5f8d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ed95c9c..88e0649 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 848940f..3be4240 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index c741bd1..a693dbe 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 1c16c09..56fd6e6 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a8475ca..352de5e 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 1ce1e2c..81685e7 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 4aa616d..33d49ed 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index eaa3727..3e6ae6e 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 93a6f6b..2978ebb 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 24c2281..f845ef7 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index dca4aae..488c94f 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index be3e3a8..37fab92 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 7db2560..32b7c7c 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index a2ad386..114b7d1 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f1af689..9ffc883 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index b202e1f..15ebbec 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 3d1c787..2811c07 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 5def783..1c4c70c 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index d840e09..79ea577 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index dc59c86..c8b2614 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 638f32c..f83b2e6 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 57135c2..e2db1d4 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index ebb80cc..4c9f8c2 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5db71e7..5afc82a 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index a9be89d..4cd7b22 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 049e375..47bfa9d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index dbba668..8a25f9d 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 3ca78dc..d93e4bb 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 70427bf..c0f0d63 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 471d90c..469b489 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 69c1143..63cdc98 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 5179f25..a1ad5db 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 84f1702..e7b916b 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index aa5328b..2a51a08 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 878c288..87dcc35 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index c22ce1a..186aee8 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 452d62a..13c4903 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a30f495..a76e6c2 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6ffab76..e5c89a7 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 69f4c4b..ddc59eb 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 9ccda53..6fb795a 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index b1b56d0..3f706ad 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 6a7d56d..253c731 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 1282542..13c443a 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 7ddf833..d5774e5 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 47f753e..38e5268 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index cc629bf..a9a3f5a 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 5f5509f..f440701 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 733c73e..96044a9 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 57ec9b0..43d061c 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 492c91c..ada1b7e 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 253d03f..d7d85bf 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 4f5b853..cf08922 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index f67dc29..6e0b704 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index e2e545b..605aa69 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index b67cfb7..8977b4f 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index ca72b35..ab1c7ee 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 872737a..2acd0dc 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 1837a58..42c1dbe 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index fb0b291..d1d6a37 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index c7d0dce..5805b93 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 9902ea8..b042173 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index c5aeb57..62fca8f 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 0261e21..29dc323 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index c9bf1ce..85495c7 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 3cdb7de..84b13c6 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 26957d6..29c867e 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 704d2d1..838ec22 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 740a56f..000ca44 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index 7d9f485..246f1b6 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index eb342cf..4a259d2 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 488cf6b..7465cf4 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0344994..0561ce1 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 6c3464e..a97dbf6 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index a11d7ae..97d456c 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 0518035..930d7ca 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b19fc30..e39760b 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 4c61b27..ea3c6c9 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 35b0bd9..4a8de83 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 057ac66..6d1a653 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 8c46656..3337fb8 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index b1c024a..0c9dc76 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index d487017..33c5cdd 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 9a967d1..5d72e0a 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index bd67dd4..6717151 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 930af72..a3ea5b3 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 4bd81f0..aac7c8d 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index e466497..df9a4b2 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 04f2c6d..f326dce 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 3858a95..9e71b73 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 3a1120c..acfa6b6 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index dc08ac6..bc443af 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 56bdd06..6bfcb71 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index ee74e39..30a12a2 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 8dfbf66..3bb008e 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5fddda4..5558690 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9e1965c..89e3fc3 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 46abf88..0a77271 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 6935ffb..9c622f1 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 549daf1..acf1fab 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 05c6699..e960632 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 96fe70d..966a2c1 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 54ac7dc..4ba47d5 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index c0b4e13..3bd88e7 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 032969c..b3770b9 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 7673396..a6002a9 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 2add38e..be54b7e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 9116f34..cc7178f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 03323d1..a569592 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index c02a3a2..8f1f2b6 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 58001eb..919dc76 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index fc4cc67..749b647 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 0651f8c..0f1434d 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 0fcd691..5a92cac 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 60aabe3..c390e24 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 8f21c6f..13ac351 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ec51642..f790d7f 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f60d61..74705ea 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f99eff..774564f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
1
0
16 Feb '12
modules/cli-tests/pom.xml | 2 +-
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/drift/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/pom.xml | 2 +-
modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
128 files changed, 146 insertions(+), 146 deletions(-)
New commits:
commit fbca61155b83d118a289910e086b10b376705ba8
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Thu Feb 16 13:52:25 2012 -0500
tag RHQ_4_2_0_JON_3_0_1_GA
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 0991c91..3167d39 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1370a4c..1e93560 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index c41be24..198d9bc 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 0c28ff6..972a5a2 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 1b56b75..91f9d94 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 5388ea4..262a9f7 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index a228e4f..2f2f2b3 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index e834756..5442ad3 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 83a5f8d..dbeb7ef 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 88e0649..ed95c9c 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 3be4240..848940f 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index a693dbe..c741bd1 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 56fd6e6..1c16c09 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 352de5e..a8475ca 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 81685e7..1ce1e2c 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 33d49ed..4aa616d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 3e6ae6e..eaa3727 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 2978ebb..93a6f6b 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index f845ef7..24c2281 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 488c94f..dca4aae 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 37fab92..be3e3a8 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 32b7c7c..7db2560 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 114b7d1..a2ad386 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 9ffc883..f1af689 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 15ebbec..b202e1f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 2811c07..3d1c787 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 1c4c70c..5def783 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 79ea577..d840e09 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index c8b2614..dc59c86 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index f83b2e6..638f32c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index e2db1d4..57135c2 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 4c9f8c2..ebb80cc 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5afc82a..5db71e7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 4cd7b22..a9be89d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 47bfa9d..049e375 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 8a25f9d..dbba668 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index d93e4bb..3ca78dc 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index c0f0d63..70427bf 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 469b489..471d90c 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 63cdc98..69c1143 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index a1ad5db..5179f25 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index e7b916b..84f1702 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 2a51a08..aa5328b 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 87dcc35..878c288 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 186aee8..c22ce1a 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 13c4903..452d62a 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a76e6c2..a30f495 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e5c89a7..6ffab76 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index ddc59eb..69f4c4b 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 6fb795a..9ccda53 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 3f706ad..b1b56d0 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 253c731..6a7d56d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 13c443a..1282542 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index d5774e5..7ddf833 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 38e5268..47f753e 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index a9a3f5a..cc629bf 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index f440701..5f5509f 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 96044a9..733c73e 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 43d061c..57ec9b0 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index ada1b7e..492c91c 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index d7d85bf..253d03f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index cf08922..4f5b853 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 6e0b704..f67dc29 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 605aa69..e2e545b 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 8977b4f..b67cfb7 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index ab1c7ee..ca72b35 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 2acd0dc..872737a 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 42c1dbe..1837a58 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index d1d6a37..fb0b291 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 5805b93..c7d0dce 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index b042173..9902ea8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 62fca8f..c5aeb57 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 29dc323..0261e21 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 85495c7..c9bf1ce 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 84b13c6..3cdb7de 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 29c867e..26957d6 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 838ec22..704d2d1 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 000ca44..740a56f 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index 246f1b6..7d9f485 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 4a259d2..eb342cf 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 7465cf4..488cf6b 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0561ce1..0344994 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index a97dbf6..6c3464e 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 97d456c..a11d7ae 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 930d7ca..0518035 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index e39760b..b19fc30 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index ea3c6c9..4c61b27 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 4a8de83..35b0bd9 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 6d1a653..057ac66 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 3337fb8..8c46656 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 0c9dc76..b1c024a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 33c5cdd..d487017 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 5d72e0a..9a967d1 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 6717151..bd67dd4 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index a3ea5b3..930af72 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index aac7c8d..4bd81f0 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index df9a4b2..e466497 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index b9d54c7..9e48eb7 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 9e71b73..3858a95 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index acfa6b6..3a1120c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index bc443af..dc08ac6 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 6bfcb71..56bdd06 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 30a12a2..ee74e39 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 3bb008e..8dfbf66 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5558690..5fddda4 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 89e3fc3..9e1965c 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 0a77271..46abf88 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 9c622f1..6935ffb 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index acf1fab..549daf1 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index e960632..05c6699 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 966a2c1..96fe70d 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 4ba47d5..54ac7dc 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 3bd88e7..c0b4e13 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index b3770b9..032969c 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index a6002a9..7673396 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index be54b7e..2add38e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index cc7178f..9116f34 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index a569592..03323d1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 8f1f2b6..c02a3a2 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 919dc76..58001eb 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 749b647..fc4cc67 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 0f1434d..0651f8c 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 5a92cac..0fcd691 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index c390e24..60aabe3 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 13ac351..8f21c6f 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index f790d7f..ec51642 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 74705ea..5f60d61 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 774564f..3f99eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>pom</packaging>
<name>RHQ</name>
1
0
Rebased ref, commits from common ancestor:
1
0
modules/enterprise/agent/src/etc/rhq-agent.sh | 5 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 4
modules/enterprise/remoting/cli/src/etc/rhq-cli.sh | 45 ++++------
5 files changed, 33 insertions(+), 31 deletions(-)
New commits:
commit f85fcf0a1468679258b8ae835bf28266c9d399c4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Feb 16 12:45:35 2012 -0500
[BZ 771415] reset to page 0 after the user deletes or uninventories resources or groups to prevent an invalid PageControl from being sent to the server in the subsequent fetch call (https://bugzilla.redhat.com/show_bug.cgi?id=771415)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 1b8127f..146f1fe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -188,13 +188,13 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
resourceGroupManager.deleteResourceGroups(groupIds, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_deleteFailed(), caught);
+ refreshTableInfo();
}
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_inventory_groups_deleteSuccessful(), Severity.Info));
-
- ResourceGroupListView.this.refresh();
+ refresh(true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index e5ec18a..53c34f9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -118,7 +118,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
- // refresh the entire gui so it encompasses any relevant tree view. Don't call this.refresh()
+ refresh(true);
+ // refresh the entire gui so it encompasses any relevant tree view. Don't just call this.refresh(),
// because CoreGUI.refresh is more comprehensive.
CoreGUI.refresh();
}
@@ -220,7 +221,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
}
protected void onUninventorySuccess() {
- // refresh the entire gui so it encompasses any relevant tree view. Don't call this.refresh()
+ refresh(true);
+ // refresh the entire gui so it encompasses any relevant tree view. Don't just call this.refresh(),
// because CoreGUI.refresh is more comprehensive.
CoreGUI.refresh();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index a164620..b72b080 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -162,12 +162,12 @@ public class ResourceSearchView extends Table {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_uninventoryFailed(),
caught);
+ refreshTableInfo();
}
public void onSuccess(List<Integer> result) {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info));
-
onUninventorySuccess();
}
});
@@ -187,7 +187,7 @@ public class ResourceSearchView extends Table {
}
protected void onUninventorySuccess() {
- refresh();
+ refresh(true);
}
protected List<ListGridField> createFields() {
commit 4095bd85cc7744d596a874f148ad3a4e63e5f19b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 15 18:37:49 2012 -0500
minor improvement to debug logging
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index d7ee208..e80581d 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -116,8 +116,9 @@ debug_msg "RHQ_AGENT_HOME: $RHQ_AGENT_HOME"
if [ -z "$RHQ_AGENT_JAVA_EXE_FILE_PATH" ]; then
if [ -z "$RHQ_AGENT_JAVA_HOME" ]; then
RHQ_AGENT_JAVA_HOME="${RHQ_AGENT_HOME}/jre"
- debug_msg "Using the embedded JRE"
- if [ ! -d "$RHQ_AGENT_JAVA_HOME" ]; then
+ if [ -d "$RHQ_AGENT_JAVA_HOME" ]; then
+ debug_msg "Using the embedded JRE"
+ else
set_java_home
debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
RHQ_AGENT_JAVA_HOME="$JAVA_HOME"
commit 431fe0ab93790782d2a4d2ed683d0fb34f1fa161
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Feb 15 18:35:09 2012 -0500
[BZ 791009] use the -z and -n options to the 'test' builtin command to check if variable have non-zero values or not (https://bugzilla.redhat.com/show_bug.cgi?id=791009)
diff --git a/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh b/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
index 9791e37..93cf679 100644
--- a/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
+++ b/modules/enterprise/remoting/cli/src/etc/rhq-cli.sh
@@ -17,10 +17,8 @@
debug_msg ()
{
# if debug variable is set, it is assumed to be on, unless its value is false
- if [ "x$RHQ_CLI_DEBUG" != "x" ]; then
- if [ "$RHQ_CLI_DEBUG" != "false" ]; then
- echo "rhq-cli.sh: $1"
- fi
+ if [ -n "$RHQ_CLI_DEBUG" ] && [ "$RHQ_CLI_DEBUG" != "false" ]; then
+ echo "rhq-cli.sh: $1"
fi
}
@@ -51,11 +49,11 @@ else
debug_msg "No environment script found at: ${RHQ_CLI_BIN_DIR_PATH}/rhq-cli-env.sh"
fi
-if [ "x$RHQ_CLI_HOME" = "x" ]; then
+if [ -z "$RHQ_CLI_HOME" ]; then
cd "${RHQ_CLI_BIN_DIR_PATH}/.."
else
cd "${RHQ_CLI_HOME}" || {
- echo Cannot go to the RHQ_CLI_HOME directory: ${RHQ_CLI_HOME}
+ echo "Cannot go to the RHQ_CLI_HOME directory: ${RHQ_CLI_HOME}"
exit 1
}
fi
@@ -68,8 +66,8 @@ debug_msg "RHQ_CLI_HOME: $RHQ_CLI_HOME"
# If we are on a Mac and JAVA_HOME is not set, then set it to /usr
# as this is the default location.
# ----------------------------------------------------------------------
-if [ "x$JAVA_HOME" = "x" ]; then
- if [ "x$_DARWIN" != "x" ]; then
+if [ -z "$JAVA_HOME" ]; then
+ if [ -n "$_DARWIN" ]; then
debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr"
JAVA_HOME=/usr
fi
@@ -79,11 +77,12 @@ fi
# Find the Java executable and verify we have a VM available
# ----------------------------------------------------------------------
-if [ "x$RHQ_CLI_JAVA_EXE_FILE_PATH" = "x" ]; then
- if [ "x$RHQ_CLI_JAVA_HOME" = "x" ]; then
+if [ -z "$RHQ_CLI_JAVA_EXE_FILE_PATH" ]; then
+ if [ -z "$RHQ_CLI_JAVA_HOME" ]; then
RHQ_CLI_JAVA_HOME="${RHQ_CLI_HOME}/jre"
- debug_msg "Using the embedded JRE"
- if [ ! -d "$RHQ_CLI_JAVA_HOME" ]; then
+ if [ -d "$RHQ_CLI_JAVA_HOME" ]; then
+ debug_msg "Using the embedded JRE"
+ else
debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
RHQ_CLI_JAVA_HOME="$JAVA_HOME"
fi
@@ -94,8 +93,8 @@ fi
debug_msg "RHQ_CLI_JAVA_EXE_FILE_PATH: $RHQ_CLI_JAVA_EXE_FILE_PATH"
if [ ! -f "$RHQ_CLI_JAVA_EXE_FILE_PATH" ]; then
- echo There is no JVM available.
- echo Please set RHQ_CLI_JAVA_HOME or RHQ_CLI_JAVA_EXE_FILE_PATH appropriately.
+ echo "There is no JVM available."
+ echo "Please set RHQ_CLI_JAVA_HOME or RHQ_CLI_JAVA_EXE_FILE_PATH appropriately."
exit 1
fi
@@ -107,7 +106,7 @@ CLASSPATH="${RHQ_CLI_HOME}/conf"
_JAR_FILES=`cd "${RHQ_CLI_HOME}/lib";ls -1 *.jar`
for _JAR in $_JAR_FILES ; do
_JAR="${RHQ_CLI_HOME}/lib/${_JAR}"
- if [ "x$CLASSPATH" = "x" ]; then
+ if [ -z "$CLASSPATH" ]; then
CLASSPATH="${_JAR}"
else
CLASSPATH="${CLASSPATH}:${_JAR}"
@@ -122,7 +121,7 @@ debug_msg "CLASSPATH entry: $_JAR"
# Prepare the VM command line options to be passed in
# ----------------------------------------------------------------------
-if [ "x$RHQ_CLI_JAVA_OPTS" = "x" ]; then
+if [ -z "$RHQ_CLI_JAVA_OPTS" ]; then
RHQ_CLI_JAVA_OPTS="-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true"
fi
debug_msg "RHQ_CLI_JAVA_OPTS: $RHQ_CLI_JAVA_OPTS"
@@ -130,12 +129,12 @@ debug_msg "RHQ_CLI_JAVA_OPTS: $RHQ_CLI_JAVA_OPTS"
if [ "$RHQ_CLI_JAVA_ENDORSED_DIRS" = "none" ]; then
debug_msg "Not explicitly setting java.endorsed.dirs"
else
- if [ "x$RHQ_CLI_JAVA_ENDORSED_DIRS" = "x" ]; then
+ if [ -z "$RHQ_CLI_JAVA_ENDORSED_DIRS" ]; then
RHQ_CLI_JAVA_ENDORSED_DIRS="${RHQ_CLI_HOME}/lib/endorsed"
fi
# convert the path if on Windows
- if [ "x$_CYGWIN" != "x" ]; then
+ if [ -n "$_CYGWIN" ]; then
RHQ_CLI_JAVA_ENDORSED_DIRS=`cygpath --windows --path "$RHQ_CLI_JAVA_ENDORSED_DIRS"`
fi
debug_msg "RHQ_CLI_JAVA_ENDORSED_DIRS: $RHQ_CLI_JAVA_ENDORSED_DIRS"
@@ -145,12 +144,12 @@ fi
if [ "$RHQ_CLI_JAVA_LIBRARY_PATH" = "none" ]; then
debug_msg "Not explicitly setting java.library.path"
else
- if [ "x$RHQ_CLI_JAVA_LIBRARY_PATH" = "x" ]; then
+ if [ -z "$RHQ_CLI_JAVA_LIBRARY_PATH" ]; then
RHQ_CLI_JAVA_LIBRARY_PATH="${RHQ_CLI_HOME}/lib"
fi
# convert the path if on Windows
- if [ "x$_CYGWIN" != "x" ]; then
+ if [ -n "$_CYGWIN" ]; then
RHQ_CLI_JAVA_LIBRARY_PATH=`cygpath --windows --path "$RHQ_CLI_JAVA_LIBRARY_PATH"`
fi
debug_msg "RHQ_CLI_JAVA_LIBRARY_PATH: $RHQ_CLI_JAVA_LIBRARY_PATH"
@@ -166,7 +165,7 @@ debug_msg "RHQ_CLI_ADDITIONAL_JAVA_OPTS: $RHQ_CLI_ADDITIONAL_JAVA_OPTS"
_LOG_CONFIG=-Dlog4j.configuration=log4j.xml
# if debug is enabled, the log configuration is different
-if [ "x$RHQ_CLI_DEBUG" != "x" ]; then
+if [ -n "$RHQ_CLI_DEBUG" ]; then
if [ "$RHQ_CLI_DEBUG" != "false" ]; then
_LOG_CONFIG="-Dlog4j.configuration=log4j-debug.xml"
fi
@@ -178,7 +177,7 @@ if [ ! -d "${RHQ_CLI_HOME}/logs" ]; then
fi
# convert some of the paths if we are on Windows
-if [ "x$_CYGWIN" != "x" ]; then
+if [ -n "$_CYGWIN" ]; then
CLASSPATH=`cygpath --windows --path "$CLASSPATH"`
fi
@@ -190,7 +189,7 @@ fi
# would be already expanded and we'd therefore loose the ability to pass in
# quoted args.
debug_msg "Executing the CLI with this command line:"
-if [ "x$RHQ_CLI_CMDLINE_OPTS" = "x" ]; then
+if [ -z "$RHQ_CLI_CMDLINE_OPTS" ]; then
debug_msg "${RHQ_CLI_JAVA_EXE_FILE_PATH} ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp ${CLASSPATH} org.rhq.enterprise.client.ClientMain $@"
"${RHQ_CLI_JAVA_EXE_FILE_PATH}" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_CLI_JAVA_OPTS} ${RHQ_CLI_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp "${CLASSPATH}" org.rhq.enterprise.client.ClientMain "$@"
else
1
0