August 2012 - rhq-commits - Fedora Mailing-Lists

[rhq] Branch 'rhq-on-as7' - modules/enterprise

by Jay Shaughnessy

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java | 3 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 13 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) New commits: commit 05f02675f22b288f86f18834b79b9cb4e564eb1a Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Fri Aug 31 16:10:39 2012 -0400 The default MBean server for AS7 is the platform MBeanServer, not the "JBoss" MBeanServer. - Undeprecate CoreServer and CoreServerMBean and provide it with the new, proper MBeanServer. It's possible we may need to tweak the info provided given attributes provided by, and relevant to, AS7. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java index 58ed92f..e6f6c8c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java @@ -39,7 +39,7 @@ import org.rhq.core.domain.common.ProductInfo; import org.rhq.core.util.ObjectNameFactory; /** - * @deprecated use new management API to get things like install dir + * Get information about RHQ's underlying AS Server. */ public class CoreServer implements CoreServerMBean { private static final String PRODUCT_INFO_PROPERTIES_RESOURCE_PATH = diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java index b630aa2..fda3abf 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java @@ -24,8 +24,7 @@ import java.util.Date; import org.rhq.core.domain.common.ProductInfo; /** - * An MBean that exposes various core server global attributes (version, uptime, etc.). - * @deprecated use new management API to get things like install dir + * An MBean that exposes various global attributes of the underlying AS Server (version, uptime, etc.). */ public interface CoreServerMBean { /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index d690d1d..6c82e91 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.server.util; +import java.lang.management.ManagementFactory; + import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.naming.InitialContext; @@ -617,15 +619,16 @@ public final class LookupUtil { } public static CoreServerMBean getCoreServer() { - MBeanServer jBossMBeanServer = MBeanServerLocator.locateJBoss(); - CoreServerMBean jonServer; + // The default MBean server for AS7 is the platform MBeanServer + MBeanServer defaultMBeanServer = ManagementFactory.getPlatformMBeanServer(); + CoreServerMBean rhqServer; try { - jonServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, CoreServerMBean.OBJECT_NAME, - jBossMBeanServer); + rhqServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, CoreServerMBean.OBJECT_NAME, + defaultMBeanServer); } catch (MalformedObjectNameException e) { throw new RuntimeException(e); } - return jonServer; + return rhqServer; } public static PluginDeploymentScannerMBean getPluginDeploymentScanner() {

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'rhq-on-as7' - 22 commits - modules/core modules/enterprise modules/integration-tests modules/plugins

by Jay Shaughnessy

modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 25 + modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 45 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 116 ++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 6 modules/enterprise/server/appserver/pom.xml | 1 modules/enterprise/server/sars/services-sar/pom.xml | 7 modules/integration-tests/pom.xml | 24 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 31 + modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 27 + modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConnectorDiscoveryGroupValidatorComponent.java | 83 ++++ modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 43 ++ modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java | 27 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 7 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java | 32 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java | 11 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 56 ++- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TransactionsComponent.java | 62 +++ modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 175 ++++++---- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 21 - modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java | 3 modules/plugins/snmptrapd/pom.xml | 12 26 files changed, 575 insertions(+), 252 deletions(-) New commits: commit dbafd8efeb4837643d79d4f6cf30c3bb5956a78a Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Fri Aug 31 13:53:51 2012 -0400 Don't play with the rhq.ear deployment marker files. When building from the top we get an unwanted .dodeploy which messes up the initial server startup. It worked well when building the invidual module, but now the dev will likely need to manually rebuild or redeploy the ear. diff --git a/modules/enterprise/server/sars/services-sar/pom.xml b/modules/enterprise/server/sars/services-sar/pom.xml index 143982e..a66aa8a 100644 --- a/modules/enterprise/server/sars/services-sar/pom.xml +++ b/modules/enterprise/server/sars/services-sar/pom.xml @@ -81,13 +81,6 @@ <jar destfile="${deployment.dir}"> <fileset dir="target/${project.build.finalName}" /> </jar> - <property name="dodeploy.file" location="${deployment.dir}/../../${rhq.earName}.dodeploy" /> - <property name="skipdeploy.file" location="${deployment.dir}/../../${rhq.earName}.skipdeploy" /> - <property name="failed.file" location="${deployment.dir}/../../${rhq.earName}.failed" /> - <echo>*** Touching ${dodeploy.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${dodeploy.file}" /> - <delete file="${skipdeploy.file}" />  - <delete file="${failed.file}" />  </target> </configuration> <goals> commit 7bd638810c7bac3b3a779ea264ef17aca21fc6c4 Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Fri Aug 31 13:19:55 2012 -0400 A few more legacy hibernate3 deps removed. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 36a74a4..099e649 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -147,7 +147,6 @@ <property name="jboss-javassist.version" value="${jboss-javassist.version}" /> <property name="jsf-api.version" value="${jsf-api.version}" /> <property name="jsf-impl.version" value="${jsf-impl.version}" /> - <property name="hibernate3.version" value="${hibernate3.version}" /> <property name="quartz.version" value="${quartz.version}" /> <property name="xercesImpl.version" value="${xercesImpl.version}" /> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 82f32cd..3b00c78 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -31,30 +31,6 @@ <scope>provided</scope> </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> -  - </dependency> - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <profiles> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 46faaa9..ad78190 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -246,18 +246,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.1</version> commit f6b064194713feb1617baea52939acaa9739da6f Merge: d60bd46 e33404e Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Fri Aug 31 13:03:43 2012 -0400 Merge branch 'master' into rhq-on-as7 commit e33404e91d4b0cfc681e7816872e93c107b5d8f5 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Aug 31 13:02:07 2012 +0200 [BZ 773626 - Failed to load resource composite data error when refreshing Inventory page (Unavailable Servers, Servers, etc)] handling the exception on the client side and re-fetch the data diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 55271c6..383602b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -171,6 +171,12 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria if (caught.getMessage().contains("SearchExpressionException")) { Message message = new Message("Invalid search expression.", Message.Severity.Error); CoreGUI.getMessageCenter().notify(message); + } else if (caught.getMessage().contains("PageList was passed an empty collection")) { + // Because of bug 773626 + Log.warn(caught.getMessage()); + criteria.setPageControl(new PageControl(0, getDataPageSize())); + executeFetch(request, response, criteria); + return; } else { CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); } commit 1293a88ef64918b6401bd830a0739c8f22398fc9 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Thu Aug 30 16:11:28 2012 -0400 [BZ 840512] adding logic to defend against @PostLoad logic not being called after installation as expected. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java index 07b3467..bb00ef5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java @@ -122,6 +122,9 @@ public class ObfuscatedPropertySimple extends PropertySimple { */ @Override public String getStringValue() { + if (clearTextValue == null) { + initClearTextValue(); + } return clearTextValue; } commit 26941dd6fb00043842ad5d4e6786b1f5ed391382 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Aug 30 11:18:30 2012 -0400 [Bug 852561 - AlertCondition.name is null in database after JON 2.4 to 3.1 upgrade] fix merge issue diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 94fa46f..1443b80 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4010,20 +4010,22 @@  <schemaSpec version="2.122"> - <statement desc="Updating DOWN Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'DOWN' - </statement> - <statement desc="Updating UP Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'UP' - </statement> + <schema-directSQL> + <statement desc="Updating DOWN Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'DOWN' + </statement> + <statement desc="Updating UP Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'UP' + </statement> + </schema-directSQL> </schemaSpec>  commit 35c152e87e280d8a5cd93353892da39067883819 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Aug 29 15:39:00 2012 -0400 [Bug 852561 - AlertCondition.name is null in database after JON 2.4 to 3.1 upgrade] From an RHQ perspective this should have affected upgrades to RHQ 4.4. Add a db upgrade step to convert relevant alert condition rows to the new format. diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index d4b5505..eee04da 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -17,7 +17,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.122</db.schema.version> + <db.schema.version>2.123</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 2cee9f4..94fa46f 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4007,7 +4007,28 @@ <schema-javaTask className="ContentSourceConfigurationObfuscationUpgradeTask" /> </schemaSpec> - <schemaSpec version="2.122"> + + + <schemaSpec version="2.122"> + <statement desc="Updating DOWN Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'DOWN' + </statement> + <statement desc="Updating UP Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'UP' + </statement> + </schemaSpec> + + + + <schemaSpec version="2.123"> <schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MIN_ENTRIES" columnType="INTEGER"/> <schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MAX_ENTRIES" columnType="INTEGER"/> </schemaSpec> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java index 8a72244..0744199 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java @@ -427,7 +427,7 @@ public class AlertCondition implements Serializable { /** * The name of the condition whose semantics are different based on this condition's category: * - * AVAILABILITY: n/a (null) + * AVAILABILITY: The relevant Avail AlertConditionOperator name * THRESHOLD: the name of the metric (TODO: today its the display name, very bad for i18n purposes) * BASELINE: the name of the metric (TODO: today its the display name, very bad for i18n purposes) * CHANGE: the name of the metric (TODO: today its the display name, very bad for i18n purposes) commit 74704eda37bce26278fa089437d98bcd590b4317 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Aug 29 14:15:26 2012 +0200 [BZ 814305 - Dealing with singletons in inventory] Refresh button now takes into consideration the already created singletons and they are not populated in the create/import child combobox diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 2eea340..d539136 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -597,7 +597,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements } else { // menu action LocatableMenu menu = new LocatableMenu(tableAction.getLocatorId() + "Menu"); - final Map<String, ? extends Object> menuEntries = tableAction.getValueMap(); + final Map<String, Object> menuEntries = tableAction.getValueMap(); for (final String key : menuEntries.keySet()) { MenuItem item = new MenuItem(key); item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() { @@ -980,7 +980,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements * completion. Failure to do so may leave the widgets disabled. */ public void addTableAction(String locatorId, String title, String confirmation, - LinkedHashMap<String, ? extends Object> valueMap, TableAction tableAction) { + Map<String, Object> valueMap, TableAction tableAction) { // If the specified locator ID is qualified, strip off the ancestry prefix, so we can make sure its locator ID // extends the footer's locator ID as it should. int underscoreIndex = locatorId.lastIndexOf('_'); @@ -995,6 +995,37 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements tableActions.add(info); } + /** + * Updates the list of table's associated actions <code>tableActions</code>. + * It automatically updates the gui by calling <code>drawFooter()</code> provided the table has been initialized. + * + * Note: To prevent user action while a current action completes, all widgets on the footer are disabled + * when footer actions take place, typically a button click. It is up to the action to ensure the page + * (via refresh() or CoreGUI.refresh()) or footer (via refreshTableActions) are refreshed as needed at action + * completion. Failure to do so may leave the widgets disabled. + * + * @param title the title of a modified action + * @param valueMap the map containing the tuples with name of a select item and <code>actionValue</code> which is + * then passed to <code>tableAction.executeAction()</code>; use the <code>LinkedHashMap</code> if you want to + * preserve the order of map items + * @param tableAction the tableAction object (on this object the <code>executeAction()</code> is actually invoked) + */ + public void updateTableAction(String title, Map<String, Object> valueMap, + TableAction tableAction) { + if (title == null) { + return; + } + for (TableActionInfo info : tableActions) { + if (title.equals(info.getTitle())) { + if (valueMap != null) info.setValueMap(valueMap); + if (tableAction != null) info.setAction(tableAction); + // the action listeners have to be re-added + if (isInitialized()) drawFooter(); + break; + } + } + } + public void setListGridDoubleClickHandler(DoubleClickHandler handler) { doubleClickHandler = handler; } @@ -1247,12 +1278,12 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements private String locatorId; private String title; private String confirmMessage; - private LinkedHashMap<String, ? extends Object> valueMap; + private Map<String, Object> valueMap; private TableAction action; private Canvas actionCanvas; protected TableActionInfo(String locatorId, String title, String confirmMessage, - LinkedHashMap<String, ? extends Object> valueMap, TableAction action) { + Map<String, Object> valueMap, TableAction action) { this.locatorId = locatorId; this.title = title; this.confirmMessage = confirmMessage; @@ -1272,9 +1303,13 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements return confirmMessage; } - public LinkedHashMap<String, ? extends Object> getValueMap() { + public Map<String, Object> getValueMap() { return valueMap; } + + public void setValueMap(Map<String, Object> valueMap) { + this.valueMap = valueMap; + } public Canvas getActionCanvas() { return actionCanvas; 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 bb43f26..265778b 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 @@ -89,41 +89,49 @@ public class ResourceCompositeSearchView extends ResourceSearchView { super.onInit(); // To properly filter Create Child and Import menus we need existing singleton child resources. If the - // user has creat permission and the parent type has singleton child types and creatable or importable child + // user has create permission and the parent type has singleton child types and creatable or importable child // types, perform an async call to fetch the singleton children. If we make the async call don't declare this - // instance initialized until after it completesas we must have the children before the menu buttons can be drawn. + // instance initialized until after it completes as we must have the children before the menu buttons can be drawn. final Resource parentResource = parentResourceComposite.getResource(); ResourceType parentType = parentResource.getResourceType(); - creatableChildTypes = getCreatableChildTypes(parentType); importableChildTypes = getImportableChildTypes(parentType); hasCreatableTypes = !creatableChildTypes.isEmpty(); hasImportableTypes = !importableChildTypes.isEmpty(); - singletonChildren = new ArrayList(); // initialize to non-null + refreshSingletons(parentResource, null); + + } + + private void refreshSingletons(final Resource parentResource, final AsyncCallback<PageList<Resource>> callback) { + singletonChildren = new ArrayList<Resource>(); // initialize to non-null - Integer[] singletonChildTypes = getSingletonChildTypes(parentType); + Integer[] singletonChildTypes = getSingletonChildTypes(parentResource.getResourceType()); if (canCreate && singletonChildTypes.length > 0 && (hasCreatableTypes || hasImportableTypes)) { ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterParentResourceId(parentResource.getId()); criteria.addFilterResourceTypeIds(singletonChildTypes); - GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, - new AsyncCallback<PageList<Resource>>() { - - @Override - public void onSuccess(PageList<Resource> result) { - singletonChildren = result; - initialized = true; + GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { + + @Override + public void onSuccess(PageList<Resource> result) { + singletonChildren = result; + initialized = true; + if (callback != null) { + callback.onSuccess(result); } + } - @Override - public void onFailure(Throwable caught) { - Log.error("Failed to load child resources for [" + parentResource + "]", caught); - initialized = true; + @Override + public void onFailure(Throwable caught) { + Log.error("Failed to load child resources for [" + parentResource + "]", caught); + initialized = true; + if (callback != null) { + callback.onFailure(caught); } - }); - + } + }); } else { initialized = true; } @@ -196,34 +204,38 @@ public class ResourceCompositeSearchView extends ResourceSearchView { } }); - addImportAndCreateButtons(); + addImportAndCreateButtons(false); super.configureTable(); } @SuppressWarnings("unchecked") - private void addImportAndCreateButtons() { + private void addImportAndCreateButtons(boolean override) { final Resource parentResource = parentResourceComposite.getResource(); ResourceType parentType = parentResource.getResourceType(); // Create Child Menu and Manual Import Menu if (canCreate && (hasCreatableTypes || hasImportableTypes)) { - if (hasCreatableTypes) { Map<String, ResourceType> displayNameMap = getDisplayNames(creatableChildTypes); LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>( displayNameMap); removeExistingSingletons(singletonChildren, createTypeValueMap); - addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, - createTypeValueMap, new AbstractTableAction(TableActionEnablement.ALWAYS) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - ResourceFactoryCreateWizard.showCreateWizard(parentResource, (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(); - } - }); + AbstractTableAction createAction = new AbstractTableAction(TableActionEnablement.ALWAYS) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + ResourceFactoryCreateWizard.showCreateWizard(parentResource, (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(); + } + }; + if (override) { + updateTableAction(MSG.common_button_create_child(), createTypeValueMap, createAction); + } else { + addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, + createTypeValueMap, createAction); + } } if (hasImportableTypes) { @@ -231,18 +243,23 @@ public class ResourceCompositeSearchView extends ResourceSearchView { LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>( displayNameMap); removeExistingSingletons(singletonChildren, importTypeValueMap); - addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap, - new AbstractTableAction(TableActionEnablement.ALWAYS) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - ResourceFactoryImportWizard.showImportWizard(parentResource, (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(); - } - }); + AbstractTableAction importAction = new AbstractTableAction(TableActionEnablement.ALWAYS) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + ResourceFactoryImportWizard.showImportWizard(parentResource, (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(); + } + }; + if (override) { + updateTableAction(MSG.common_button_import(), importTypeValueMap, importAction); + } else { + addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap, + importAction); + } } - } else { + } else if (!override) { if (!canCreate && hasCreatableTypes) { addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), new AbstractTableAction(TableActionEnablement.NEVER) { @@ -261,6 +278,7 @@ public class ResourceCompositeSearchView extends ResourceSearchView { } } } + private void removeExistingSingletons(List<Resource> singletonChildren, Map<String, ResourceType> displayNameMap) { @@ -359,5 +377,23 @@ public class ResourceCompositeSearchView extends ResourceSearchView { return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new Criteria("parentId", String.valueOf(parentResourceComposite.getResource().getId())), MSG.view_tabs_common_child_resources()); } + + @Override + public void refresh() { + refreshSingletons(parentResourceComposite.getResource(), new AsyncCallback<PageList<Resource>>() { + + @Override + public void onSuccess(PageList<Resource> result) { + addImportAndCreateButtons(true); + ResourceCompositeSearchView.super.refresh(); + } + + @Override + public void onFailure(Throwable caught) { + ResourceCompositeSearchView.super.refresh(); + } + }); + + } } commit c6c1e7819fbd8f667649223e12355e66ddd33252 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 29 03:06:38 2012 -0500 [BZ 852632] Remove allow-direct-connections-only property from configuration to prevent sending the value to the application server. If this property is not left undefined, the configuration file for the server becomes invalid if the user attempts to use discovery-group-name. 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 01618e2..46b3084 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 @@ -4714,7 +4714,6 @@ <metric property="started" dataType="trait" description="Whether the cluster connection is started."/> <resource-configuration> - <c:simple-property name="allow-direct-connections-only" required="false" type="boolean" readOnly="true" defaultValue="false" description="Whether, if a node learns of the existence of a node that is more than 1 hop away, we do not create a bridge for direct cluster connection. Only relevant if 'static-connectors' is defined. The default value is false."/> <c:simple-property name="call-timeout" required="false" type="long" readOnly="true" defaultValue="30000" description="The timeout (in ms) for remote calls made by the cluster connection. The default value is 30000."/> <c:simple-property name="check-period" required="false" type="long" readOnly="true" defaultValue="30000" description="The period (in milliseconds) between client failure check. The default value is 30000."/> <c:simple-property name="cluster-connection-address" required="true" type="string" readOnly="true" description="Each cluster connection only applies to messages sent to an address that starts with this value."/> @@ -6843,7 +6842,6 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="allow-direct-connections-only" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether, if a node learns of the existence of a node that is more than 1 hop away, we do not create a bridge for direct cluster connection. Only relevant if 'static-connectors' is defined. The default value is false."/> <c:simple-property name="call-timeout" required="false" type="long" readOnly="false" defaultValue="30000" description="The timeout (in ms) for remote calls made by the cluster connection. The default value is 30000."/> <c:simple-property name="check-period" required="false" type="long" readOnly="false" defaultValue="30000" description="The period (in milliseconds) between client failure check. The default value is 30000."/> <c:simple-property name="cluster-connection-address" required="true" type="string" readOnly="false" description="Each cluster connection only applies to messages sent to an address that starts with this value."/> @@ -12948,7 +12946,6 @@ <metric property="started" dataType="trait" description="Whether the cluster connection is started."/> <resource-configuration> - <c:simple-property name="allow-direct-connections-only" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether, if a node learns of the existence of a node that is more than 1 hop away, we do not create a bridge for direct cluster connection. Only relevant if 'static-connectors' is defined. The default value is false."/> <c:simple-property name="call-timeout" required="false" type="long" readOnly="false" defaultValue="30000" description="The timeout (in ms) for remote calls made by the cluster connection. The default value is 30000."/> <c:simple-property name="check-period" required="false" type="long" readOnly="false" defaultValue="30000" description="The period (in milliseconds) between client failure check. The default value is 30000."/> <c:simple-property name="cluster-connection-address" required="true" type="string" readOnly="false" description="Each cluster connection only applies to messages sent to an address that starts with this value."/> commit 74aa0f7f9b0f2dd1044450d924f61b3faee78c27 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 29 02:52:42 2012 -0500 [BZ 852552] Updates to set correctly all the data-source and xa-data-source properties that do not support null values and cannot be undefined. While these properties look undefined in the server, they cannot undefined or set to null at any point in time. The application server makes use of the default value at all times. 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 a4efae1..5011120 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 @@ -13,6 +13,9 @@ 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.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.measurement.MeasurementDataNumeric; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; @@ -174,6 +177,27 @@ public class DatasourceComponent extends BaseComponent<BaseComponent<?>> impleme } } + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport report) { + Configuration config = report.getConfiguration(); + ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); + + //These properties cannot be undefined once set. + //Also the AS7 server does not accept null values even if the properties are still unset. + replaceWithDefaultIfNull("max-pool-size", config, configDef); + replaceWithDefaultIfNull("min-pool-size", config, configDef); + replaceWithDefaultIfNull("pool-prefill", config, configDef); + replaceWithDefaultIfNull("pool-use-strict-min", config, configDef); + replaceWithDefaultIfNull("blocking-timeout-wait-millis", config, configDef); + replaceWithDefaultIfNull("idle-timeout-minutes", config, configDef); + replaceWithDefaultIfNull("background-validation-millis", config, configDef); + replaceWithDefaultIfNull("background-validation-minutes", config, configDef); + replaceWithDefaultIfNull("background-validation", config, configDef); + + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), address); + delegate.updateResourceConfiguration(report); + } + private void getRCAsMetric(MeasurementReport report, MeasurementScheduleRequest request) { Operation op = new ReadAttribute(getAddress(), request.getName()); Result res = getASConnection().execute(op); @@ -204,4 +228,23 @@ public class DatasourceComponent extends BaseComponent<BaseComponent<?>> impleme return trait; } + + /** + * Replace the value configured by the user with the default value from the resource descriptor if + * the value to be sent to the server is null or empty. + * + * @param propertyName property name + * @param config configuration update + * @param configDef configuration definition + */ + private void replaceWithDefaultIfNull(String propertyName, Configuration config, ConfigurationDefinition configDef) { + PropertyDefinitionSimple propertyDefinition = configDef.getPropertyDefinitionSimple(propertyName); + + if (propertyDefinition != null) { + String propertyValue = config.getSimpleValue(propertyName); + if (propertyValue == null || propertyValue.isEmpty()) { + config.put(new PropertySimple(propertyName, propertyDefinition.getDefaultValue())); + } + } + } } 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 29ef057..01618e2 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 @@ -412,10 +412,10 @@ <c:simple-property name="use-java-context" type="boolean" readOnly="false" required="false" default="true" description="Setting this to false will bind the DataSource into global JNDI;"/> <c:simple-property name="enabled" type="boolean" readOnly="true" required="false" description="Specifies if the datasource should be enabled"/> <c:simple-property name="jta" type="boolean" readOnly="false" required="false" default="true" description="Enable JTA integration"/> - <c:simple-property name="max-pool-size" type="integer" readOnly="false" required="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> - <c:simple-property name="min-pool-size" type="integer" readOnly="false" required="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" type="boolean" readOnly="false" required="false" default="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" type="boolean" readOnly="false" required="false" default="false" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="max-pool-size" type="integer" readOnly="false" required="false" defaultValue="20" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" type="integer" readOnly="false" required="false" defaultValue="0" 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" type="boolean" readOnly="false" required="false" defaultValue="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" type="boolean" readOnly="false" required="false" defaultValue="false" description="Define if the min-pool-size should be considered a strictly."/> <c:simple-property name="security-domain" required="false" type="string" readOnly="false" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="false" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/>  - <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> - <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="false" defaultValue="10" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" defaultValue="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> <c:simple-property name="validate-on-match" required="false" type="boolean" readOnly="true" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> <c:simple-property name="xa-resource-timeout" required="false" type="integer" readOnly="true" description="Passed to XAResource.setTransactionTimeout() Default is zero which does not invoke the setter. In seconds"/> @@ -706,7 +706,7 @@ <c:option value="EntirePool"/> </c:property-options> </c:simple-property> - <c:simple-property name="prepared-statements-cacheSize" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="prepared-statements-cache-size" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> <c:simple-property name="share-prepared-statements" required="false" type="boolean" readOnly="true" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> <c:simple-property name="track-statements" required="false" type="string" readOnly="true" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> <c:simple-property name="allocation-retry" required="false" type="integer" readOnly="true" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> commit e6e91058f3ac76c6458847bd66a8ee5c9c24493e Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 29 02:20:24 2012 -0500 [BZ 847674] Updated all the wait methods for reload, shutdown, and restart to have the same design. All the methods now take into account possible exceptions for the test operation sent to the application server. 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 27b1133..98a46d2 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 @@ -241,25 +241,36 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend return startServer(); } - protected boolean waitUntilDown(OperationResult tmp) throws InterruptedException { + protected boolean waitUntilDown() throws InterruptedException { boolean down=false; int count=0; + while (!down) { Operation op = new ReadAttribute(new Address(),"release-version"); - Result res = getASConnection().execute(op); - if (!res.isSuccess()) { // If op succeeds, server is not down - down=true; - } else if (count > 20) { - tmp.setErrorMessage("Was not able to shut down the server"); - return true; + + try{ + Result res = getASConnection().execute(op); + if (!res.isSuccess()) { // If op succeeds, server is not down + down = true; + } else if (count > 20) { + break; + } + } catch (Exception e) { + down = true; } + if (!down) { - Thread.sleep(1000); // Wait 1s + try { + Thread.sleep(1000); // Wait 1s + } catch (InterruptedException e) { + // ignore + } } count++; } - log.debug("waitUntilDown: Used " + count + " delay round(s) to shut down"); - return false; + + log.debug("waitUntilDown: Used " + count + " delay round(s) to shut down. Server down=" + down); + return 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 565add2..7ea12b9 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 @@ -92,8 +92,11 @@ public class HostControllerComponent<T extends ResourceComponent<?>> extends Bas Result res = getASConnection().execute(op); operationResult = postProcessResult(name, res); - waitUntilDown(operationResult); - + if (waitUntilDown()) { + operationResult.setSimpleResult("Success"); + } else { + operationResult.setErrorMessage("Was not able to shut down the server."); + } } else if (name.equals("installRhqUser")) { operationResult = installManagementUser(parameters, pluginConfiguration); } else { 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 573742e..778d127 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 @@ -163,39 +163,59 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS OperationResult operationResult = postProcessResult(name, res); - if (name.equals("shutdown")) - waitUntilDown(operationResult); + if (name.equals("shutdown")) { + if (waitUntilDown()) { + operationResult.setSimpleResult("Success"); + } else { + operationResult.setErrorMessage("Was not able to shut down the server."); + } + } - if (name.equals("reload")) - waitUntilReloaded(operationResult); + if (name.equals("reload")) { + if (waitUntilReloaded()) { + operationResult.setSimpleResult("Success"); + } else { + operationResult.setErrorMessage("Was not able to reload the server."); + } + } context.getAvailabilityContext().requestAvailabilityCheck(); return operationResult; } - private void waitUntilReloaded(OperationResult operationResult) { + private boolean waitUntilReloaded() { boolean reloaded = false; int count = 0; + while (!reloaded) { - try { - Thread.sleep(2000); // Wait 2s - } catch (InterruptedException e) { - // Ignore + Operation op = new ReadAttribute(new Address(), "release-version"); + try{ + Result res = getASConnection().execute(op); + if (res.isSuccess() && !res.isReloadRequired()) { + reloaded = true; + } else if (count > 20) { + break; + } + } catch (Exception e) { + //do absolutely nothing + //if an exception is thrown that means the server is still reloading, so consider this + //a single failed attempt, equivalent to res.isSuccess == false } - Operation op = new ReadAttribute(new Address(), "release-version"); - Result res = getASConnection().execute(op); - if (res.isSuccess() && !res.isReloadRequired()) { - reloaded = true; - } else if (count > 20) { - operationResult.setErrorMessage("Was not able to reload the server"); - return; + if (!reloaded) { + try { + Thread.sleep(1000); // Wait 1s + } catch (InterruptedException e) { + // ignore + } } count++; } - log.debug("waitUntilReloaded: Used " + count + " delay round(s) to reload"); - return; + + log.debug("waitUntilReloaded: Used " + count + " delay round(s) to reload. Reload=" + reloaded); + + return reloaded; } @Override commit 96602db100b087e36016b1aa6a2e39780b583898 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 23:33:45 2012 -0500 [BZ 852552] Adding special validation for the transaction subsystem. The special case for this subsystem: If [process-id-uuid] == true then do not send updates for [process-id-socket-binding], this property will be undefined by the AS7 on the next reload/restart If [process-id-uuid] == false then allow AS7 to perform property validation * If [process-id-uuid] == false then send [process-id-socket-binding] value and allow AS7 to perform property validation diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TransactionsComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TransactionsComponent.java new file mode 100644 index 0000000..102118b --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TransactionsComponent.java @@ -0,0 +1,62 @@ +/* + * RHQ Management Platform + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.modules.plugins.jbossas7; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceComponent; + +/** + * Support for transactions subsystem configuration updates. + * + * The special case for this subsystem: + * + * If [process-id-uuid] == true then do not send updates for [process-id-socket-binding], this property + * will be undefined by the AS7 on the next server reload/restart + * + * If [process-id-uuid] == false then send [process-id-socket-binding] value and + * allow AS7 to perform property validation + * + * + * @author Stefan Negrea + */ +public class TransactionsComponent extends BaseComponent<ResourceComponent<?>> { + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport report) { + Configuration config = report.getConfiguration(); + ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); + + boolean processIdUuid = Boolean.valueOf(config.getSimpleValue("process-id-uuid")); + if (processIdUuid == true) { + //Do not even send the updates for [process-id-socket-binding] because the AS7 will + //undefine it during the next reload/restart. + //Also, sending null for [process-id-socket-binding] with [process-id-uuid] == true causes + //a validation error on the server. + configDef.getPropertyDefinitions().remove("process-id-socket-binding"); + config.remove("process-id-socket-binding"); + } + + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), address); + delegate.updateResourceConfiguration(report); + } +} 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 0f150a4..29ef057 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 @@ -8338,7 +8338,7 @@ <service name="Transactions Subsystem (Standalone)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="TransactionsComponent" singleton="true" description="The transactions subsystem."> @@ -8460,7 +8460,7 @@ <service name="Transactions Subsystem (Profile)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="TransactionsComponent" singleton="true" description="The transactions subsystem."> @@ -8516,7 +8516,7 @@ <service name="Transactions Subsystem (Managed)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="TransactionsComponent" singleton="true" description="The transactions subsystem."> commit b8d890aaf85b9d3f74eb60d1bad32af02d030759 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 23:01:08 2012 -0500 [BZ 852552] Add two resource types to the list of ignored resources for this integration test. Both of these resources have special requirements with regards to configuration updates. diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java index aad8739..824162a 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java @@ -86,6 +86,9 @@ public class ResourcesStandaloneServerTest extends AbstractJBossAS7PluginTest { //will revisit after BZ 826542 is resolved // ignoredResources.add("Authentication (Classic)"); + ignoredResources.add("Memory Pool"); + ignoredResources.add("Periodic Rotating File Handler"); + Resource platform = this.pluginContainer.getInventoryManager().getPlatform(); Resource server = getResourceByTypeAndKey(platform, StandaloneServerComponentTest.RESOURCE_TYPE, StandaloneServerComponentTest.RESOURCE_KEY); commit a31197fcd63548c6e49606525b9938c123e5ffb2 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 22:59:02 2012 -0500 [BZ 852552] Update socket binding group to not send at all port-offset for non-standalone servers. Just setting port-offset to null was not enough since now all the unset properties are sent to the AS7 server. The property and property definition are now removed from updates sent host controllers. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java index 00d28ca..573db2e 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java @@ -2,6 +2,7 @@ package org.rhq.modules.plugins.jbossas7; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; @@ -29,12 +30,14 @@ public class SocketBindingGroupComponent extends BaseComponent implements Config public void updateResourceConfiguration(ConfigurationUpdateReport report) { Configuration config = report.getConfiguration(); + ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); + if (!(context.getParentResourceComponent() instanceof StandaloneASComponent)) { // TODO what about managed servers - config.put(new PropertySimple("port-offset",null)); + configDef.getPropertyDefinitions().remove("port-offset"); + config.remove("port-offset"); } - super.updateResourceConfiguration(report); - - + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), address); + delegate.updateResourceConfiguration(report); } } commit 91aaaf71e585022ca85f62e371a7d63ae554ff6d Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 22:55:05 2012 -0500 [BZ 852552] Create a separate distributed cache definition because this resource contains addtional properties not available for invalidation and replicate caches. The diferrence between these caches was obvious only after the updates to always send unset properties. All these extra properties (which are null) were sent to the server causing failures for caches that do not have them in their definition. 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 81ddfe9..0f150a4 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 @@ -2002,7 +2002,7 @@ class="TemplatedComponent"> <plugin-configuration> - <c:simple-property name="path" readOnly="true" default="distributed-cache|invalidation-cache|replicated-cache"/> + <c:simple-property name="path" readOnly="true" default="invalidation-cache|replicated-cache"/> </plugin-configuration> <resource-configuration> @@ -2031,30 +2031,64 @@ <c:simple-property name="queue-flush-interval" required="false" type="long" readOnly="true" default="10" description="In ASYNC mode, this attribute controls how often the asynchronous thread used to flush the replication queue runs. This should be a positive integer which represents thread wakeup time in milliseconds."/> <c:simple-property name="remote-timeout" required="false" type="long" readOnly="true" default="17500" description="In SYNC mode, the timeout (in ms) used to wait for an acknowledgment when making a remote call, after which the call is aborted and an exception is thrown."/> <c:simple-property name="async-marshalling" required="false" type="boolean" readOnly="true" defaultValue="false" description="If enabled, this will cause marshalling of entries to be performed asynchronously. The default value is false."/> - <c:simple-property name="l1-lifespan" required="false" type="long" readOnly="true" defaultValue="600000" description="Maximum lifespan of an entry placed in the L1 cache. This element configures the L1 cache behavior in 'distributed' caches instances. In any other cache modes, this element is ignored. The default value is 600000."/> <c:simple-property name="module" required="false" type="string" readOnly="true" description="The module whose class loader should be used when building this cache's configuration."/> - <c:simple-property name="owners" required="false" type="integer" readOnly="true" defaultValue="2" description="Number of cluster-wide replicas for each cache entry. The default value is 2."/> - <c:simple-property name="virtual-nodes" required="false" type="integer" readOnly="true" defaultValue="1" description="Controls the number of virtual nodes per 'real' node. If numVirtualNodes is 1, then virtual nodes are disabled. The topology aware consistent hash must be used if you wish to take advantage of virtual nodes. A default of 1 is used. The default value is 1."/> - <c:simple-property name="__type" displayName="Type of cache" required="true" readOnly="true" default="local-cache" description="Type of cache"> + <c:simple-property name="__type" displayName="Type of cache" required="true" readOnly="true" default="invalidation-cache" description="Type of cache"> <c:property-options> <c:option value="invalidation-cache"/> - <c:option value="distributed-cache"/> <c:option value="replicated-cache"/> </c:property-options> </c:simple-property> <c:template name="Invalidation Cache" description="Invalidation Cache"> <c:simple-property name="__type" readOnly="true" default="invalidation-cache"/> </c:template> - <c:template name="Distributed Cache" description="Distributed Cache"> - <c:simple-property name="__type" readOnly="true" default="distributed-cache"/> - </c:template> <c:template name="Replicated Cache" description="Replicated Cache"> <c:simple-property name="__type" readOnly="true" default="replicated-cache"/> </c:template> </resource-configuration> </service> + <service name="Distributed Cache (Managed Server)" + discovery="SubsystemDiscovery" + class="BaseComponent"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="distributed-cache"/> + </plugin-configuration> + + <resource-configuration> + <c:simple-property name="start" required="false" type="string" readOnly="true" default="LAZY" description="The cache start mode, which can be EAGER (immediate start) or LAZY (on-demand start)."> + <c:property-options> + <c:option value="LAZY"/> + <c:option value="EAGER"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="batching" required="false" type="boolean" readOnly="true" default="false" description="If enabled, the invocation batching API will be made available for this cache."/> + <c:simple-property name="indexing" required="false" type="string" readOnly="true" default="NONE" description="If enabled, entries will be indexed when they are added to the cache. Indexes will be updated as entries change or are removed."> + <c:property-options> + <c:option value="NONE"/> + <c:option value="LOCAL"/> + <c:option value="ALL"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="jndi-name" required="false" type="string" readOnly="true" description="The jndi-name to which to bind this cache instance."/> + <c:simple-property name="mode" required="false" type="string" readOnly="true" default="SYNC" description="Sets the clustered cache mode, ASYNC for asynchronous operation, or SYNC for synchronous operation."> + <c:property-options> + <c:option value="SYNC"/> + <c:option value="ASYNC"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="queue-size" required="false" type="integer" readOnly="true" default="0" description="In ASYNC mode, this attribute can be used to trigger flushing of the queue when it reaches a specific threshold."/> + <c:simple-property name="queue-flush-interval" required="false" type="long" readOnly="true" default="10" description="In ASYNC mode, this attribute controls how often the asynchronous thread used to flush the replication queue runs. This should be a positive integer which represents thread wakeup time in milliseconds."/> + <c:simple-property name="remote-timeout" required="false" type="long" readOnly="true" default="17500" description="In SYNC mode, the timeout (in ms) used to wait for an acknowledgment when making a remote call, after which the call is aborted and an exception is thrown."/> + <c:simple-property name="async-marshalling" required="false" type="boolean" readOnly="true" defaultValue="false" description="If enabled, this will cause marshalling of entries to be performed asynchronously. The default value is false."/> + <c:simple-property name="l1-lifespan" required="false" type="long" readOnly="true" defaultValue="600000" description="Maximum lifespan of an entry placed in the L1 cache. This element configures the L1 cache behavior in 'distributed' caches instances. In any other cache modes, this element is ignored. The default value is 600000."/> + <c:simple-property name="module" required="false" type="string" readOnly="true" description="The module whose class loader should be used when building this cache's configuration."/> + <c:simple-property name="owners" required="false" type="integer" readOnly="true" defaultValue="2" description="Number of cluster-wide replicas for each cache entry. The default value is 2."/> + <c:simple-property name="virtual-nodes" required="false" type="integer" readOnly="true" defaultValue="1" description="Controls the number of virtual nodes per 'real' node. If numVirtualNodes is 1, then virtual nodes are disabled. The topology aware consistent hash must be used if you wish to take advantage of virtual nodes. A default of 1 is used. The default value is 1."/> + </resource-configuration> + </service> + <service name="Local Cache (Managed Server)" discovery="SubsystemDiscovery" class="BaseComponent" @@ -11331,7 +11365,7 @@ creationDataType="configuration"> <plugin-configuration> - <c:simple-property name="path" readOnly="true" default="distributed-cache|invalidation-cache|replicated-cache"/> + <c:simple-property name="path" readOnly="true" default="invalidation-cache|replicated-cache"/> </plugin-configuration> <resource-configuration> @@ -11360,30 +11394,66 @@ <c:simple-property name="queue-flush-interval" required="false" type="long" readOnly="false" default="10" description="In ASYNC mode, this attribute controls how often the asynchronous thread used to flush the replication queue runs. This should be a positive integer which represents thread wakeup time in milliseconds."/> <c:simple-property name="remote-timeout" required="false" type="long" readOnly="false" default="17500" description="In SYNC mode, the timeout (in ms) used to wait for an acknowledgment when making a remote call, after which the call is aborted and an exception is thrown."/> <c:simple-property name="async-marshalling" required="false" type="boolean" readOnly="false" defaultValue="false" description="If enabled, this will cause marshalling of entries to be performed asynchronously. The default value is false."/> - <c:simple-property name="l1-lifespan" required="false" type="long" readOnly="false" defaultValue="600000" description="Maximum lifespan of an entry placed in the L1 cache. This element configures the L1 cache behavior in 'distributed' caches instances. In any other cache modes, this element is ignored. The default value is 600000."/> <c:simple-property name="module" required="false" type="string" readOnly="false" description="The module whose class loader should be used when building this cache's configuration."/> - <c:simple-property name="owners" required="false" type="integer" readOnly="false" defaultValue="2" description="Number of cluster-wide replicas for each cache entry. The default value is 2."/> - <c:simple-property name="virtual-nodes" required="false" type="integer" readOnly="false" defaultValue="1" description="Controls the number of virtual nodes per 'real' node. If numVirtualNodes is 1, then virtual nodes are disabled. The topology aware consistent hash must be used if you wish to take advantage of virtual nodes. A default of 1 is used. The default value is 1."/> - <c:simple-property name="__type" displayName="Type of cache" required="true" readOnly="true" default="local-cache" description="Type of cache"> + <c:simple-property name="__type" displayName="Type of cache" required="true" readOnly="true" default="invalidation-cache" description="Type of cache"> <c:property-options> <c:option value="invalidation-cache"/> - <c:option value="distributed-cache"/> <c:option value="replicated-cache"/> </c:property-options> </c:simple-property> <c:template name="Invalidation Cache" description="Invalidation Cache"> <c:simple-property name="__type" readOnly="true" default="invalidation-cache"/> </c:template> - <c:template name="Distributed Cache" description="Distributed Cache"> - <c:simple-property name="__type" readOnly="true" default="distributed-cache"/> - </c:template> <c:template name="Replicated Cache" description="Replicated Cache"> <c:simple-property name="__type" readOnly="true" default="replicated-cache"/> </c:template> </resource-configuration> </service> + <service name="Distributed Cache" + discovery="SubsystemDiscovery" + class="BaseComponent" + createDeletePolicy="both" + creationDataType="configuration"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="distributed-cache"/> + </plugin-configuration> + + <resource-configuration> + <c:simple-property name="start" required="false" type="string" readOnly="false" default="LAZY" description="The cache start mode, which can be EAGER (immediate start) or LAZY (on-demand start)."> + <c:property-options> + <c:option value="LAZY"/> + <c:option value="EAGER"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="batching" required="false" type="boolean" readOnly="false" default="false" description="If enabled, the invocation batching API will be made available for this cache."/> + <c:simple-property name="indexing" required="false" type="string" readOnly="false" default="NONE" description="If enabled, entries will be indexed when they are added to the cache. Indexes will be updated as entries change or are removed."> + <c:property-options> + <c:option value="NONE"/> + <c:option value="LOCAL"/> + <c:option value="ALL"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="jndi-name" required="false" type="string" readOnly="false" description="The jndi-name to which to bind this cache instance."/> + <c:simple-property name="mode" required="true" type="string" readOnly="false" default="SYNC" defaultValue="SYNC" description="Sets the clustered cache mode, ASYNC for asynchronous operation, or SYNC for synchronous operation."> + <c:property-options> + <c:option value="SYNC"/> + <c:option value="ASYNC"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="queue-size" required="false" type="integer" readOnly="false" default="0" description="In ASYNC mode, this attribute can be used to trigger flushing of the queue when it reaches a specific threshold."/> + <c:simple-property name="queue-flush-interval" required="false" type="long" readOnly="false" default="10" description="In ASYNC mode, this attribute controls how often the asynchronous thread used to flush the replication queue runs. This should be a positive integer which represents thread wakeup time in milliseconds."/> + <c:simple-property name="remote-timeout" required="false" type="long" readOnly="false" default="17500" description="In SYNC mode, the timeout (in ms) used to wait for an acknowledgment when making a remote call, after which the call is aborted and an exception is thrown."/> + <c:simple-property name="async-marshalling" required="false" type="boolean" readOnly="false" defaultValue="false" description="If enabled, this will cause marshalling of entries to be performed asynchronously. The default value is false."/> + <c:simple-property name="l1-lifespan" required="false" type="long" readOnly="false" defaultValue="600000" description="Maximum lifespan of an entry placed in the L1 cache. This element configures the L1 cache behavior in 'distributed' caches instances. In any other cache modes, this element is ignored. The default value is 600000."/> + <c:simple-property name="module" required="false" type="string" readOnly="false" description="The module whose class loader should be used when building this cache's configuration."/> + <c:simple-property name="owners" required="false" type="integer" readOnly="false" defaultValue="2" description="Number of cluster-wide replicas for each cache entry. The default value is 2."/> + <c:simple-property name="virtual-nodes" required="false" type="integer" readOnly="false" defaultValue="1" description="Controls the number of virtual nodes per 'real' node. If numVirtualNodes is 1, then virtual nodes are disabled. The topology aware consistent hash must be used if you wish to take advantage of virtual nodes. A default of 1 is used. The default value is 1."/> + </resource-configuration> + </service> + <service name="Local Cache" discovery="SubsystemDiscovery" class="BaseComponent" commit 9320bfa050c332a5f89334fcf5606395e5ef9098 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 22:46:02 2012 -0500 [BZ 852552] Update mod-cluster property name to load-balancing-group. The "domain" alias no longer works for load-balancing-group causing configuration updates to fail with unknown domain property. 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 bef06ec..81ddfe9 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 @@ -168,7 +168,7 @@ <c:simple-property name="connector" required="true" type="string" readOnly="false" defaultValue="ajp" description="Name of the web connector used to communicate with the load balancer."> <c:option-source target="resource" expression="type=Connector plugin=&pluginName;"/> </c:simple-property> - <c:simple-property name="domain" required="false" type="string" readOnly="false" description="loadBalancingGroup name."/> + <c:simple-property name="load-balancing-group" required="false" type="string" readOnly="false" description="loadBalancingGroup name."/> </c:group> <c:group name="context" displayName="Web Context Options"> commit 9f82d413e980967ea3fae7ffe2579c44cc29cbb7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 22:44:05 2012 -0500 [BZ 852552] Removing properties from the Transport subresource because the resource definition no longer contains them. Because unset properties are now always sent to the AS7 server, all these removed Transport properties were sent to the AS7 causing an unknown property failure. 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 6f13412..bef06ec 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 @@ -2099,9 +2099,6 @@ <c:simple-property name="cluster" required="false" type="string" readOnly="true" description="The name of the group communication cluster"/> <c:simple-property name="executor" required="false" type="string" readOnly="true" description="The executor to use for the transport"/> <c:simple-property name="lock-timeout" required="false" type="long" readOnly="true" defaultValue="240000" description="The timeout for locks for the transport. The default value is 240000."/> - <c:simple-property name="machine" required="false" type="string" readOnly="true" description="A machine identifier for the transport"/> - <c:simple-property name="rack" required="false" type="string" readOnly="true" description="A rack identifier for the transport"/> - <c:simple-property name="site" required="false" type="string" readOnly="true" description="A site identifier for the transport"/> <c:simple-property name="stack" required="false" type="string" readOnly="true" description="The jgroups stack to use for the transport"/> </resource-configuration> </service> @@ -11431,9 +11428,6 @@ <c:simple-property name="cluster" required="false" type="string" readOnly="false" description="The name of the group communication cluster"/> <c:simple-property name="executor" required="false" type="string" readOnly="false" description="The executor to use for the transport"/> <c:simple-property name="lock-timeout" required="false" type="long" readOnly="false" defaultValue="240000" description="The timeout for locks for the transport. The default value is 240000."/> - <c:simple-property name="machine" required="false" type="string" readOnly="false" description="A machine identifier for the transport"/> - <c:simple-property name="rack" required="false" type="string" readOnly="false" description="A rack identifier for the transport"/> - <c:simple-property name="site" required="false" type="string" readOnly="false" description="A site identifier for the transport"/> <c:simple-property name="stack" required="false" type="string" readOnly="false" description="The jgroups stack to use for the transport"/> </resource-configuration> </service> commit c1655d4d576311b9034a31b505e75981b1d6e720 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 22:39:35 2012 -0500 [BZ 852552] Send unset properties to AS7 as null. Existing code was not sending updates for unset properties at all to AS7 making it impossible to unset (or set to empty) a property after it was set to something not null. 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 aad2105..f73ccf5 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 @@ -431,16 +431,25 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet { private void createWriteAttributePropertySimple(CompositeOperation cop, PropertySimple property, PropertyDefinitionSimple propertyDefinition, Address address) { - // If the property value is null and the property is optional, skip too - if (property.getStringValue() == null && !propertyDefinition.isRequired()) - return; - if (property.getName().endsWith(":ignore")) // Caller takes care return; if (propertyDefinition.isReadOnly() && !createChildRequested) return; + //If the property value is null and the property is optional, + //then send default value or null to the server + if (property.getStringValue() == null && !propertyDefinition.isRequired()) { + String name = property.getName(); + if (name.indexOf(':') != -1) { + name = name.substring(0, name.indexOf(":")); + } + + Operation writeAttribute = new WriteAttribute(address, name, null); + cop.addStep(writeAttribute); + return; + } + SimpleEntry<String, Object> entry = this.preparePropertySimple(property, propertyDefinition); Operation writeAttribute = new WriteAttribute(address, entry.getKey(), entry.getValue()); cop.addStep(writeAttribute); 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 21e3d5f..48b6783 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 @@ -59,7 +59,6 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest public void test1() throws Exception { ConfigurationDefinition definition = loadDescriptor("simple1"); - FakeConnection connection = new FakeConnection(); ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition, connection, null); @@ -70,12 +69,22 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address()); - assert cop.numberOfSteps() == 1; - Operation step1 = cop.step(0); - assert step1.getOperation().equals("write-attribute"); - Map<String, Object> props = step1.getAdditionalProperties(); - assert props.size() == 2; + Assert.assertEquals(cop.numberOfSteps(), 2); + for (int i = 0; i < cop.numberOfSteps(); i++) { + Operation step = cop.step(0); + Assert.assertEquals(step.getOperation(), "write-attribute"); + Map<String, Object> stepProps = step.getAdditionalProperties(); + Assert.assertEquals(stepProps.size(), 2); + + if (stepProps.get("name").equals("needed")) { + Assert.assertEquals(stepProps.get("value"), "test"); + } else if (stepProps.get("name").equals("optional")) { + Assert.assertEquals(stepProps.get("value"), null); + } else { + Assert.fail("Unexepected property found!"); + } + } } public void test2() throws Exception { commit e1d2190442ddcfe023696fa59b040f78929a27c6 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 20:14:08 2012 -0500 [BZ 846400] Add validation for components that rely connectors and discovery group name. A compoment should have either the connector or discovery group configured, but not both. This validation is handled by the AS7 server itself for new resource creation but the validation is missing for configuration updates. Without this validation code in place, the AS7 server accepts the commands, persists the configuration, but fails to reload or restart rendering the server unusable until the configuration file is manually edited. With this fix, the AS7 plugin will not send the configuration updates to the AS7 server unless they meet the descriptor requirements. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConnectorDiscoveryGroupValidatorComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConnectorDiscoveryGroupValidatorComponent.java new file mode 100644 index 0000000..fab342f --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConnectorDiscoveryGroupValidatorComponent.java @@ -0,0 +1,83 @@ +/* + * RHQ Management Platform + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.modules.plugins.jbossas7; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceComponent; + +/** + * @author Stefan Negrea + * + */ +public class ConnectorDiscoveryGroupValidatorComponent extends BaseComponent<ResourceComponent<?>> { + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport report) { + Configuration resourceConfiguration = report.getConfiguration(); + ResourceType resourceType = this.context.getResourceType(); + + // we need to check that a connector XOR a discovery-group-name is given + int configuredItemsFound = 0; + String errorMessage = ""; + + if (resourceType.getName().equals("Connection Factory") + || resourceType.getName().equals("Pooled Connection Factory")) { + + PropertyMap connector = resourceConfiguration.getMap("connector:collapsed"); + if (connector != null) { + String name = connector.getSimpleValue("name:0", ""); + if (!name.isEmpty()) { + configuredItemsFound++; + } + } + + errorMessage = "You need to provide either a connector name OR a discovery-group-name. "; + } else if (resourceType.getName().equals("Bridge") || resourceType.getName().equals("Cluster Connection")) { + + PropertyList staticConnectors = resourceConfiguration.getList("static-connectors:nullable"); + if (staticConnectors != null) { + if (!staticConnectors.getList().isEmpty()) { + configuredItemsFound++; + } + } + + errorMessage = "You need to provide either static connectors name OR a discovery-group-name. "; + } + + String discoveryGroup = resourceConfiguration.getSimpleValue("discovery-group-name", ""); + if (!discoveryGroup.isEmpty()) { + configuredItemsFound++; + } + + if (configuredItemsFound != 1) { + errorMessage += (configuredItemsFound == 0) ? "You provided none." : "You provided both."; + report.setErrorMessage(errorMessage); + report.setStatus(ConfigurationUpdateStatus.FAILURE); + } else { + super.updateResourceConfiguration(report); + } + } +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java index dad90bc..cd791fa 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java @@ -21,9 +21,7 @@ package org.rhq.modules.plugins.jbossas7; 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.resource.CreateResourceStatus; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.inventory.CreateResourceReport; /** @@ -43,31 +41,6 @@ public class HornetQComponent extends TemplatedSubResourcesComponent { return report; } - ResourceType resourceType = report.getResourceType(); - if (resourceType.getName().equals("Connection-Factory")) { - // we need to check that a connector XOR a discovery-group-name is given - int found = 0; - PropertyMap connector = resourceConfiguration.getMap("connector:collapsed"); - - if (connector != null) { - - String name = connector.getSimpleValue("name:0", ""); - if (!name.isEmpty()) - found++; - } - String discoveryGroup = resourceConfiguration.getSimpleValue("discovery-group-name", ""); - if (!discoveryGroup.isEmpty()) - found++; - - if (found == 0 || found == 2) { - String errorMessage = "You need to provide either a connector name OR a discovery-group-name. You provided "; - errorMessage += (found == 0) ? "none" : "both"; - report.setErrorMessage(errorMessage); - report.setStatus(CreateResourceStatus.FAILURE); - return report; - } - } - report = super.createResource(report); return report; } 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 8b6eb12..1ede55e 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 @@ -21,16 +21,13 @@ package org.rhq.modules.plugins.jbossas7; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertyList; -import org.rhq.core.domain.configuration.PropertyMap; -import org.rhq.core.domain.resource.CreateResourceStatus; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; /** * Component class for the JMS subsystem * @author Heiko W. Rupp */ -public class JmsComponent extends BaseComponent { +public class JmsComponent extends ConnectorDiscoveryGroupValidatorComponent { @Override public void updateResourceConfiguration(ConfigurationUpdateReport report) { @@ -43,31 +40,8 @@ public class JmsComponent extends BaseComponent { return; } - ResourceType resourceType = context.getResourceType(); - if (resourceType.getName().equals("Connection-Factory")) { - // we need to check that a connector XOR a discovery-group-name is given - int found = 0; - PropertyMap connector = resourceConfiguration.getMap("connector:collapsed"); - - if (connector != null) { - - String name = connector.getSimpleValue("name:0", ""); - if (!name.isEmpty()) - found++; - } - String discoveryGroup = resourceConfiguration.getSimpleValue("discovery-group-name", ""); - if (!discoveryGroup.isEmpty()) - found++; - - if (found == 0 || found == 2) { - String errorMessage = "You need to provide either a connector name OR a discovery-group-name. You provided "; - errorMessage += (found == 0) ? "none" : "both"; - report.setErrorMessage(errorMessage); - report.setStatus(ConfigurationUpdateStatus.FAILURE); - return; - } - } - + //defer the rest of the validation for connector and discovery group name to + //the base class super.updateResourceConfiguration(report); } } 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 8143d04..6f13412 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 @@ -4654,7 +4654,7 @@ <service name="Cluster Connection (Managed Server)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="neither"> <plugin-configuration> @@ -4784,7 +4784,7 @@ <service name="Bridge (Managed Server)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="neither"> <plugin-configuration> @@ -6804,7 +6804,7 @@ <service name="Cluster Connection (Profile)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="both"> <plugin-configuration> @@ -6893,7 +6893,7 @@ <service name="Bridge (Profile)" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="both"> <plugin-configuration> @@ -12855,7 +12855,7 @@ <service name="Cluster Connection" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="both"> <plugin-configuration> @@ -12985,7 +12985,7 @@ <service name="Bridge" discovery="SubsystemDiscovery" - class="BaseComponent" + class="ConnectorDiscoveryGroupValidatorComponent" createDeletePolicy="both"> <plugin-configuration> commit e96ce182758719f86364bdc7a2e73c287dddbe4c Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 28 15:22:40 2012 -0500 [BZ 852534] Collapsed maps with null keys should be set to null. Attempting to send maps with null values to the application server results in validation errors. 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 8286f17..aad2105 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 @@ -628,10 +628,14 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet { throw new IllegalArgumentException("Member names in a :collapsed map must end in :0 and :1"); } - Map<String, Object> resultMap = new HashMap<String, Object>(); - resultMap.put(key, value); + if (key != null) { + Map<String, Object> resultMap = new HashMap<String, Object>(); + resultMap.put(key, value); - return resultMap; + return resultMap; + } else { + return null; + } } commit 9fda60f21e354f3b33a1ecf85b81cae19e0af1af Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Aug 28 14:34:23 2012 +0200 [BZ 850818 - Globally uncaught exception on clicking OK button while adding CLI Script alert notification to the alert definition] Added the check whether the repository has been picked diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java index f63eb55..b212043 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java @@ -403,6 +403,11 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm { } private void validatePackage(final AsyncCallback<Void> callback) { + if (config.selectedRepo == null) { + repoSelector.setIcons(failureIcon); + callback.onFailure(null); + return; + } getConfiguration().put(new PropertySimple(PROP_REPO_ID, config.selectedRepo.getId())); if (packageSelector.getSelectedIndex() == 0) { commit f3f26d0a85bf71fad532424b6267a331bd048136 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Aug 27 14:42:26 2012 -0700 [BZ 848501] - IE8 rendering of resource measurement time overlaid on the actual metric name diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java index c27e626..8a0898d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java @@ -290,6 +290,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { StaticTextItem value = AbstractActivityView .newTextItem(convertedValue); value.setVAlign(VerticalAlignment.TOP); + value.setAlign(Alignment.RIGHT); row.setItems(graphContainer, link, value); row.setWidth100();

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'rhq-on-as7' - .classpath modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/jopr modules/plugins pom.xml

by Jay Shaughnessy

.classpath | 7 modules/common/pom.xml | 28 --- modules/core/arquillian-integration/container/pom.xml | 27 --- modules/core/client-api/pom.xml | 26 +-- modules/core/domain/pom.xml | 79 +--------- modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java | 9 - modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 15 - modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java | 13 + modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java | 31 ++- modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 30 +++ modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java | 2 modules/core/gui/pom.xml | 30 --- modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java | 3 modules/core/plugin-api/pom.xml | 16 -- modules/core/plugin-container/pom.xml | 16 -- modules/core/plugindoc/pom.xml | 13 - modules/enterprise/agent/pom.xml | 17 -- modules/enterprise/binding/pom.xml | 37 ++-- modules/enterprise/gui/content_http-war/pom.xml | 29 --- modules/enterprise/gui/coregui/pom.xml | 43 +---- modules/enterprise/gui/portal-war/pom.xml | 47 +---- modules/enterprise/gui/rest-war/pom.xml | 26 --- modules/enterprise/remoting/cli/pom.xml | 8 - modules/enterprise/remoting/client-api/pom.xml | 26 --- modules/enterprise/remoting/client-deps/pom.xml | 6 modules/enterprise/server/container/pom.xml | 2 modules/enterprise/server/itests/pom.xml | 34 ---- modules/enterprise/server/jar/pom.xml | 47 ++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 7 modules/enterprise/server/plugins/alert-sms/pom.xml | 21 -- modules/enterprise/server/plugins/ant-bundle/pom.xml | 17 -- modules/enterprise/server/plugins/drift-rhq/pom.xml | 19 -- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 19 -- modules/enterprise/server/plugins/pom.xml | 20 -- modules/enterprise/server/safe-invoker/pom.xml | 11 - modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java | 4 modules/enterprise/server/xml-schemas/pom.xml | 11 - modules/helpers/inventory-serializer/pom.xml | 22 -- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 37 ---- modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml | 15 - modules/plugins/jboss-as-5/testsuite/pom.xml | 20 -- pom.xml | 50 +++--- 43 files changed, 212 insertions(+), 732 deletions(-) New commits: commit d60bd462809923b5dd19d1a115abeac07c91ab34 Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Fri Aug 31 11:46:00 2012 -0400 First pass at Hibernate upgrade. We will try and leverage the Hibernate4 modules provided with AS7. - Changes to remove use of deprecated features that were removed in H4 - new mechanism for createBlob - new ElementCollection annotation - new mechanism to work with Connection - Dependency changes to new jar structure - Removal of legacy annotations and jpa deps for compile issues - Also leverage AS7 provided antlr jar, removing transitive deps pulling in multiple jars/versions diff --git a/.classpath b/.classpath index 5e879c9..5a1b13d 100644 --- a/.classpath +++ b/.classpath @@ -220,7 +220,6 @@ <classpathentry exported="true" kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-embeddable-ejb3/jboss-ejb3-all/1.0.0.Alpha9/jboss-ejb3-all-1.0.0.Alpha9.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jbpm/3.1.1/jbpm-3.1.1.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-embeddable-ejb3/hibernate-all/1.0.0.Alpha9/hibernate-all-1.0.0.Alpha9.jar" sourcepath="/M2_REPO/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/> @@ -252,7 +251,6 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.11/freemarker-2.3.11.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0.SP1/jboss-seam-2.1.0.SP1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-ui/2.1.0.SP1/jboss-seam-ui-2.1.0.SP1.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/net/sf/opencsv/opencsv/1.8/opencsv-1.8.jar"/> @@ -285,6 +283,11 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/com/google/code/morphia/morphia/0.99/morphia-0.99.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.5.6-Final/hibernate-annotations-3.5.6-Final.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/hibernate/hibernate-core/4.0.1.Final/hibernate-core-4.0.1.Final.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/4.0.1.Final/hibernate-entitymanager-4.0.1.Final.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/hibernate/hibernate-validator/4.2.0.Final/hibernate-validator-4.2.0.Final.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.1.Final/jboss-servlet-api_3.0_spec-1.0.1.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/msc/jboss-msc/1.0.2.GA/jboss-msc-1.0.2.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-dmr/1.1.1.Final/jboss-dmr-1.1.1.Final.jar"/> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index f364ae9..d9bad29 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -14,11 +14,6 @@ <name>RHQ Common Plugin Libraries</name> <description>parent POM for all RHQ common plugin libraries</description> - <properties> - <hibernate-all.version>1.0.0.Alpha9</hibernate-all.version> - <persistence-api.version>1.0</persistence-api.version> - </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -27,29 +22,6 @@ <scope>provided</scope>  </dependency> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>${persistence-api.version}</version> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>${hibernate-all.version}</version> - <scope>provided</scope>  - </dependency> - </dependencies> <modules> diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 16b7bdb..583047e 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -121,31 +121,8 @@ <artifactId>arquillian-testng-container</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>provided</scope> - </dependency> + </dependencies> + </project> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index c8cd401..819cbff 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -20,42 +20,32 @@ <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> + <artifactId>rhq-core-util</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>provided</scope>  </dependency> <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-comm-api</artifactId> + <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-common-drift</artifactId> + <artifactId>rhq-core-comm-api</artifactId> <version>${project.version}</version> - </dependency> - -  - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> <scope>provided</scope> -  </dependency> <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>jboss-ejb3-all</artifactId> - <version>1.0.0.Alpha9</version> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-common-drift</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 41e2cb9..4850a68 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -29,35 +29,25 @@ <version>${project.version}</version> </dependency> -  -  +  <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>provided</scope> </dependency> -  +  <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> -  - <scope>provided</scope>  + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> </dependency> +  <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -73,23 +63,6 @@ <scope>provided</scope>  </dependency> -  - -  -  -  -  <dependency> <groupId>${project.groupId}</groupId> @@ -151,28 +114,11 @@ <scope>test</scope> </dependency> - -  <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> - <version>2.7.7</version> <scope>test</scope> </dependency> @@ -344,6 +290,7 @@ Using it turned out not t be a current option since the instrumented class carries with it hibernate imports that we can't put in the domain jar since it's used on the Agent and in Remote Java Clients. But this worked, so here ya go... + (update: this may no longer work given the upgrade to H4, also, deps would have changed) <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> <classpath> <path refid="maven.runtime.classpath" /> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java index 17fa633..0f2d0b1 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java @@ -30,7 +30,6 @@ import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.JoinColumn; import javax.persistence.OneToMany; @Embeddable @@ -85,12 +84,12 @@ public class AlertDampening implements java.io.Serializable { @Enumerated(EnumType.ORDINAL) private TimeUnits periodUnits; - //@OneToMany(cascade = CascadeType.ALL) <-- used to be unidirectional, but that obfuscated AlertDampeningEvent queries - @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL) + // This is required for cascade behavior. We want to be able to cascade delete the AlertDampeningEvents when an + // AlertDefinition is removed from the db, due to deleting a Resource from inventory. + @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }) @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) - @JoinColumn(name = "ID") private Set<AlertDampeningEvent> alertDampeningEvents = new HashSet<AlertDampeningEvent>(); - + protected AlertDampening() { } // JPA diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 71ca46c..fecb7d1 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -24,7 +24,6 @@ package org.rhq.core.domain.alert; import java.io.Serializable; import java.util.ArrayList; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -294,6 +293,7 @@ public class AlertDefinition implements Serializable { // do not cascade remove - group removal will be detaching children alert defs from the group def, // and then letting the children be deleted slowly by existing alert def removal mechanisms + @SuppressWarnings("unused") @OneToMany(mappedBy = "groupAlertDefinition", fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST }) @OrderBy private Set<AlertDefinition> groupAlertDefinitionChildren = new LinkedHashSet<AlertDefinition>(); @@ -368,15 +368,6 @@ public class AlertDefinition implements Serializable { @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>(); - /* - * As of Sept 29, 2007 there is no reason to expose this at the java layer. However, this is required if we want to - * be able to cascade delete the AlertDampeningEvents when an AlertDefinition is removed from the db, due to - * deleting a Resource from inventory. - */ - @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }) - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) - private Set<AlertDampeningEvent> alertDampeningEvents = new HashSet<AlertDampeningEvent>(); - /** * NOTE: This field is currently not accessed, so we don't need cascading for PERSIST/MERGE/REFRESH. However, we * still need cascading for REMOVE, so we don't get FK constraint violations when an Alert is removed. @@ -725,11 +716,11 @@ public class AlertDefinition implements Serializable { } public Set<AlertDampeningEvent> getAlertDampeningEvents() { - return alertDampeningEvents; + return alertDampening.getAlertDampeningEvents(); } public boolean removeAlertDampeningEvent(AlertDampeningEvent event) { - return alertDampeningEvents.remove(event); + return alertDampening.getAlertDampeningEvents().remove(event); } public void calculateContext() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java index 842a1b4..e25c81b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java @@ -27,14 +27,17 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; +import javax.persistence.CollectionTable; import javax.persistence.Column; +import javax.persistence.ElementCollection; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -43,7 +46,6 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CollectionOfElements; import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.auth.Subject; @@ -119,10 +121,11 @@ public class Role implements Serializable { @ManyToMany(mappedBy = "roles") private Set<ResourceGroup> resourceGroups = new HashSet<org.rhq.core.domain.resource.group.ResourceGroup>(); + @ElementCollection(targetClass = Permission.class, fetch = FetchType.EAGER) + @CollectionTable(name = "RHQ_PERMISSION", joinColumns = { @JoinColumn(name = "ROLE_ID") }) + @JoinColumn(name = "OPERATION", nullable = false) + @Enumerated(EnumType.ORDINAL) @Cascade( { org.hibernate.annotations.CascadeType.ALL }) - @CollectionOfElements(fetch = FetchType.EAGER) - @Column(name = "operation") - @JoinTable(name = "RHQ_PERMISSION", joinColumns = @JoinColumn(name = "ROLE_ID")) private Set<Permission> permissions = new HashSet<Permission>(); public Role() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java b/modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java index 662d97c..f412549 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java @@ -41,8 +41,8 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.ejb.EntityManagerImpl; -import org.hibernate.engine.NamedQueryDefinition; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.spi.NamedQueryDefinition; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jmx.StatisticsService; import org.hibernate.stat.Statistics; import org.hibernate.type.CustomType; diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java index 50a061b..32014dc 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java @@ -1,5 +1,7 @@ package org.rhq.core.domain.drift; +import static org.apache.commons.io.IOUtils.toInputStream; + import java.io.BufferedInputStream; import java.io.BufferedWriter; import java.io.File; @@ -11,15 +13,15 @@ import java.sql.Blob; import java.util.ArrayList; import java.util.List; +import javax.persistence.EntityManager; + import org.apache.commons.io.IOUtils; -import org.hibernate.Hibernate; +import org.hibernate.Session; import org.testng.annotations.Test; import org.rhq.core.util.MessageDigestGenerator; import org.rhq.test.TransactionCallback; -import static org.apache.commons.io.IOUtils.toInputStream; - public class DriftFileTest extends DriftDataAccessTest { static private final MessageDigestGenerator digestGen = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); @@ -35,7 +37,9 @@ public class DriftFileTest extends DriftDataAccessTest { final JPADriftFileBits df1 = new JPADriftFileBits(); df1.setHashId(hashId); df1.setDataSize((long) content.length()); - df1.setData(Hibernate.createBlob(toInputStream(content), content.length())); + EntityManager em = getEntityManager(); + Session session = (Session) em.getDelegate(); + df1.setData(session.getLobHelper().createBlob(toInputStream(content), content.length())); executeInTransaction(new TransactionCallback() { @Override @@ -49,8 +53,10 @@ public class DriftFileTest extends DriftDataAccessTest { executeInTransaction(new TransactionCallback() { @Override public void execute() { - JPADriftFileBits df2 = getEntityManager().find(JPADriftFileBits.class, df1.getHashId()); - df2.setData(Hibernate.createBlob(toInputStream(newContent), newContent.length())); + EntityManager em = getEntityManager(); + Session session = (Session) em.getDelegate(); + JPADriftFileBits df2 = em.find(JPADriftFileBits.class, df1.getHashId()); + df2.setData(session.getLobHelper().createBlob(toInputStream(newContent), newContent.length())); getEntityManager().merge(df2); } }); @@ -87,7 +93,10 @@ public class DriftFileTest extends DriftDataAccessTest { final JPADriftFileBits driftFile = new JPADriftFileBits(); driftFile.setDataSize(dataFile.length()); driftFile.setHashId(digestGen.calcDigestString(dataFile)); - driftFile.setData(Hibernate.createBlob(new BufferedInputStream(new FileInputStream(dataFile)))); + EntityManager em = getEntityManager(); + Session session = (Session) em.getDelegate(); + driftFile.setData(session.getLobHelper().createBlob(new BufferedInputStream(new FileInputStream(dataFile)), + dataFile.length())); dataFile.delete(); executeInTransaction(new TransactionCallback() { @@ -105,7 +114,8 @@ public class DriftFileTest extends DriftDataAccessTest { executeInTransaction(new TransactionCallback() { @Override public void execute() { - JPADriftFileBits driftFileBits = getEntityManager().find(JPADriftFileBits.class, hashId); + EntityManager em = getEntityManager(); + JPADriftFileBits driftFileBits = em.find(JPADriftFileBits.class, hashId); blobs.add(driftFileBits.getBlob()); driftFiles.add(driftFileBits); } @@ -127,7 +137,10 @@ public class DriftFileTest extends DriftDataAccessTest { final JPADriftFileBits driftFile = new JPADriftFileBits(); driftFile.setDataSize(dataFile.length()); driftFile.setHashId(digestGen.calcDigestString(dataFile)); - driftFile.setData(Hibernate.createBlob(new BufferedInputStream(new FileInputStream(dataFile)))); + EntityManager em = getEntityManager(); + Session session = (Session) em.getDelegate(); + driftFile.setData(session.getLobHelper().createBlob(new BufferedInputStream(new FileInputStream(dataFile)), + dataFile.length())); dataFile.delete(); try { diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java index 82af5e0..394defa 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java @@ -22,8 +22,13 @@ */ package org.rhq.core.domain.test; +import static org.rhq.test.JPAUtils.lookupEntityManager; +import static org.rhq.test.JPAUtils.lookupTransactionManager; + import java.io.File; import java.net.URL; +import java.sql.Connection; +import java.sql.SQLException; import java.util.Date; import java.util.Hashtable; @@ -32,6 +37,8 @@ import javax.naming.NamingException; import javax.persistence.EntityManager; import javax.transaction.TransactionManager; +import org.hibernate.Session; +import org.hibernate.jdbc.Work; import org.testng.AssertJUnit; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; @@ -42,9 +49,6 @@ import org.jboss.ejb3.embedded.EJB3StandaloneDeployer; import org.rhq.test.JPAUtils; import org.rhq.test.TransactionCallback; -import static org.rhq.test.JPAUtils.lookupEntityManager; -import static org.rhq.test.JPAUtils.lookupTransactionManager; - public abstract class AbstractEJB3Test extends AssertJUnit { @BeforeSuite(groups = "integration.ejb3") @@ -101,8 +105,24 @@ public abstract class AbstractEJB3Test extends AssertJUnit { } public boolean isPostgres(EntityManager em) throws Exception { - return ((org.hibernate.ejb.EntityManagerImpl) em).getSession().connection().getMetaData() - .getDatabaseProductName().toLowerCase().indexOf("postgres") > -1; + Session session = (Session) em.getDelegate(); + ConnectionMetaData metaData = new ConnectionMetaData(); + session.doWork(metaData); + + return metaData.getDbProductName().indexOf("postgres") > -1; + } + + private static class ConnectionMetaData implements Work { + private String dbProductName; + + @Override + public void execute(Connection conn) throws SQLException { + dbProductName = conn.getMetaData().getDatabaseProductName().toLowerCase(); + } + + String getDbProductName() { + return dbProductName; + } } public InitialContext getInitialContext() { diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java index 754d331..5b30b26 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java @@ -36,7 +36,7 @@ import javax.persistence.Query; import javax.transaction.TransactionManager; import org.hibernate.Session; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metadata.ClassMetadata; import org.testng.annotations.Test; diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 936df5e..69bfec8 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -28,34 +28,23 @@ <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-client-api</artifactId> + <artifactId>rhq-core-util</artifactId> <version>${project.version}</version> <scope>provided</scope>  </dependency> <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> + <artifactId>rhq-core-client-api</artifactId> <version>${project.version}</version> - <scope>provided</scope>  + <scope>provided</scope>  </dependency> <dependency> <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-util</artifactId> + <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> - <scope>provided</scope>  - </dependency> - -  - -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> -  + <scope>provided</scope>  </dependency> <dependency> @@ -66,15 +55,6 @@  </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> -  - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> diff --git a/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java b/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java index 7a2cafb..650f667 100644 --- a/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java +++ b/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java @@ -36,7 +36,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jboss.seam.core.Manager; -import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.util.Strings; import org.rhq.core.util.exception.ThrowableUtil; @@ -168,7 +167,7 @@ public abstract class FacesContextUtility { //Because the detail therefore must not be empty, we must resort to an ugly hack here and put in a unicode //for non-breakable space: String detailToUse = Strings.isEmpty(detail) ? "\u00a0" : detail; - FacesMessages.instance().add(toSeverity(severity), null, null, summary, detailToUse); + //FacesMessages.instance().add(toSeverity(severity), null, null, summary, detailToUse); } else { getFacesContext().addMessage(null, new FacesMessage(severity, summary, (detail != null) ? detail : "")); } diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 5ba5465..049efd3 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -34,22 +34,6 @@  -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope>  -  - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index b9c19a4..a2ff73c 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -70,22 +70,6 @@  </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope>  -  - </dependency> - <dependency> <groupId>org.hyperic</groupId> <artifactId>sigar</artifactId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index c35c001..0f19a68 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -52,19 +52,6 @@ </dependency> <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>2.0.8</version> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 892a1c0..7c1ce7d 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -90,29 +90,12 @@ <artifactId>i18nlog</artifactId> </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>jboss</groupId> <artifactId>jboss-remoting</artifactId>  </dependency> - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <build> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 51b5af7..04080cb 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -23,15 +23,23 @@ <artifactId>rhq-scripting-api</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${project.version}</version> + <scope>provided</scope>  + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> +  <exclusions> <exclusion> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> </exclusion> </exclusions> </dependency> @@ -162,6 +170,10 @@ <artifactId>jboss-serialization</artifactId> </exclusion> <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> <groupId>org.antlr</groupId> <artifactId>antlr</artifactId> </exclusion> @@ -184,21 +196,6 @@ </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>${persistence-api.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${testng.version}</version> @@ -230,6 +227,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 795ac54..93f93aa 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -48,36 +48,11 @@  - <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  - </dependency> -  <dependency> - <groupId>hibernate-entitymanager</groupId> + <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> -  - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  + <scope>provided</scope> </dependency>  +  <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> <scope>provided</scope> -  </dependency> +  <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server</artifactId> <version>${project.version}</version> - <scope>provided</scope> -  + <scope>provided</scope> </dependency> +  <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-util</artifactId> <version>${project.version}</version> <scope>provided</scope> -  </dependency> -  <dependency> @@ -177,15 +176,6 @@  </dependency> -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> -  - </dependency> -  <dependency> <groupId>javax.servlet</groupId> @@ -195,31 +185,16 @@  </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> -  - </dependency> - -  <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-ejb3x</artifactId> -  - <scope>provided</scope> -  + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> </dependency> -  <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> -  + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> <scope>provided</scope> -  </dependency> <dependency> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index cd7fe4e..7b21a37 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -118,29 +118,14 @@ <version>1.1.4</version> </dependency> - <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  - </dependency> -  <dependency> - <groupId>hibernate-entitymanager</groupId> + <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId>  <scope>provided</scope>  </dependency> -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - <dependency> <groupId>i18nlog</groupId> <artifactId>i18nlog</artifactId> @@ -192,14 +177,6 @@ <scope>provided</scope>  </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> @@ -237,14 +214,6 @@ <scope>provided</scope>  </dependency> -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> -  - <scope>provided</scope>  - </dependency> -  <dependency> <groupId>junit</groupId> @@ -352,12 +321,26 @@ <groupId>struts</groupId> <artifactId>struts-el</artifactId> <version>1.2.9</version> + <exclusions> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> +  + </exclusion> + </exclusions> </dependency> <dependency> <groupId>struts-menu</groupId> <artifactId>struts-menu</artifactId> <version>2.3</version> + <exclusions> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> +  + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index abe1903..aab0638 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -57,32 +57,6 @@ <scope>provided</scope>  </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> -  - <scope>provided</scope>  - </dependency> - - </dependencies> <build> <finalName>rhq-rest</finalName> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index e2e07cb..adc27a1 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -13,13 +13,7 @@ <name>RHQ Enterprise Remote CLI</name> <description>RHQ Enterprise Remote Command Line Interface</description> - - <properties> - <persistence-api.version>1.0</persistence-api.version> - <hibernate-all.version>1.0.0.Alpha9</hibernate-all.version> - <opencsv.version>1.8</opencsv.version> - </properties> - + <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index a87907e..425467a 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -13,12 +13,7 @@ <name>RHQ Enterprise Remote Client API</name> <description>a set of client APIs used to connect to an RHQ Server and invoke methods on it</description> - - <properties> - <persistence-api.version>1.0</persistence-api.version> - <hibernate-all.version>1.0.0.Alpha9</hibernate-all.version> - </properties> - + <dependencies> <dependency> @@ -86,29 +81,12 @@ <groupId>javassist</groupId> <artifactId>javassist</artifactId> </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>${persistence-api.version}</version> - <exclusions> - <exclusion> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - </dependency> - </dependencies> <profiles> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index b8863d3..6d3ab5f 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -27,7 +27,11 @@ <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </exclusion> - <exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> <groupId>org.antlr</groupId> <artifactId>antlr</artifactId> </exclusion> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index c6fedfc..f59c1ea 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -167,7 +167,7 @@ <property name="jtds.version" value="${jtds.version}" /> <property name="jsf-api.version" value="${jsf-api.version}" /> <property name="jsf-impl.version" value="${jsf-impl.version}" /> - <property name="hibernate3.version" value="${hibernate3.version}" /> + <property name="hibernate.version" value="${hibernate.version}" /> <property name="quartz.version" value="${quartz.version}" /> <property name="xercesImpl.version" value="${xercesImpl.version}" /> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 43a14c8..379b29d 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -176,52 +176,18 @@ </dependency> <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4</version> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> <scope>provided</scope>  </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> -  - <scope>provided</scope>  - </dependency> -  <dependency> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 52eb316..f448206 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -156,13 +156,6 @@  <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.7</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId>  @@ -200,10 +193,27 @@  +  <dependency> <groupId>org.antlr</groupId> - <artifactId>antlr</artifactId> - <version>3.2</version> + <artifactId>antlr-runtime</artifactId> + <version>3.2</version> + <exclusions> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>org.antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <scope>provided</scope> </dependency>  @@ -255,24 +265,9 @@ </dependency> <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-entitymanager</groupId> + <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> -  - <scope>provided</scope>  + <scope>provided</scope> </dependency> <dependency> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index c985c1e..5d149a1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -46,7 +46,7 @@ import javax.persistence.Query; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.Hibernate; +import org.hibernate.Session; import org.rhq.common.drift.ChangeSetReader; import org.rhq.common.drift.ChangeSetReaderImpl; @@ -296,14 +296,15 @@ public class JPADriftServerBean implements JPADriftServerLocal { if (null == df) { throw new IllegalArgumentException("JPADriftFile not found [" + driftFile.getHashId() + "]"); } + Session session = (Session)entityManager.getDelegate(); df.setDataSize(numBytes); - df.setData(Hibernate.createBlob(new BufferedInputStream(data))); + df.setData(session.getLobHelper().createBlob(new BufferedInputStream(data), numBytes)); df.setStatus(LOADED); } // This facade does not start, or participate in, a transaction so that it can execute its work // in two new transactions. The first transaction ensures all new entities are committed to the - // database. The second transaction can then safely ackknowledge that the changeset is persisted + // database. The second transaction can then safely acknowledge that the changeset is persisted // and request drift file content, if necessary. @Override @TransactionAttribute(NOT_SUPPORTED) diff --git a/modules/enterprise/server/plugins/alert-sms/pom.xml b/modules/enterprise/server/plugins/alert-sms/pom.xml index 0d550db..9348ce1 100644 --- a/modules/enterprise/server/plugins/alert-sms/pom.xml +++ b/modules/enterprise/server/plugins/alert-sms/pom.xml @@ -27,26 +27,7 @@ <artifactId>rhq-enterprise-server</artifactId> <version>${project.version}</version> <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - + </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 3ef990a..e782c23 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -39,23 +39,6 @@  -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <build> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 4c7b8a5..23fd88f 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -33,25 +33,6 @@ <scope>provided</scope> </dependency> -  - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <build> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 873d66f..e05612b 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -39,25 +39,6 @@ <version>${project.version}</version> </dependency> -  - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <build> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 11f3b5c..c1b2ffe 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -32,25 +32,7 @@ <version>${project.version}</version> <type>ejb</type> </dependency> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> + </dependencies> <modules> <module>disk</module> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index f1cccf2..71775f9 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -17,14 +17,13 @@ <description>TODO: Remove this invoker and move HibernateDetachUtility</description> <dependencies> - + <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> </dependency> - + </dependencies> <profiles> diff --git a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java index 08c02e2..c012d90 100644 --- a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java +++ b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java @@ -471,10 +471,10 @@ public class HibernateDetachUtility { } } else { - if (fieldValue instanceof org.hibernate.collection.PersistentCollection) { + if (fieldValue instanceof org.hibernate.collection.spi.PersistentCollection) { // Replace hibernate specific collection types - if (!((org.hibernate.collection.PersistentCollection) fieldValue).wasInitialized()) { + if (!((org.hibernate.collection.spi.PersistentCollection) fieldValue).wasInitialized()) { field.set(object, null); } else { diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 8fce608..d034e2d 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -44,17 +44,6 @@  </dependency> -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> - </dependency> - </dependencies> <build> diff --git a/modules/helpers/inventory-serializer/pom.xml b/modules/helpers/inventory-serializer/pom.xml index ed18040..0d2cbae 100644 --- a/modules/helpers/inventory-serializer/pom.xml +++ b/modules/helpers/inventory-serializer/pom.xml @@ -13,32 +13,10 @@ <dependencies> <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>${hibernate-entitymanager.version}</version> - </dependency> - <dependency> <groupId>gnu-getopt</groupId> <artifactId>getopt</artifactId> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> - <version>${hibernate3.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${hibernate-annotations.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>jboss</groupId> <artifactId>jboss-archive-browsing</artifactId> <version>5.0.0alpha-200607201-119</version> 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 4351b11..4db1540 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -158,48 +158,11 @@ </dependency> <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4</version> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> -  - <scope>provided</scope>  - </dependency> -  <dependency> diff --git a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml index dbeec8f..ec95c4d 100644 --- a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml +++ b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml @@ -63,21 +63,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope>  - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> diff --git a/modules/plugins/jboss-as-5/testsuite/pom.xml b/modules/plugins/jboss-as-5/testsuite/pom.xml index e5e30f5..dd1949e 100644 --- a/modules/plugins/jboss-as-5/testsuite/pom.xml +++ b/modules/plugins/jboss-as-5/testsuite/pom.xml @@ -129,26 +129,6 @@ to load. Cactus will still run without this JAR. jdobies, Feb 16, 2007. --> </exclusions> </dependency> -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> -  - </dependency> - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> -  - </dependency> - </dependencies> <build> diff --git a/pom.xml b/pom.xml index eedd32b..e45231f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,9 +76,9 @@ <concurrent.version>1.3.4-jboss-update1</concurrent.version>  <findbugs.version>2.3.2</findbugs.version> <getopt.version>1.0.13</getopt.version> - <hibernate3.version>3.2.r14201-2</hibernate3.version> - <hibernate-annotations.version>3.2.1.GA</hibernate-annotations.version> - <hibernate-entitymanager.version>3.2.1.GA</hibernate-entitymanager.version> + <hibernate.version>4.0.1.Final</hibernate.version> + <hibernate-annotations.version>3.5.6-Final</hibernate-annotations.version> + <hibernate-jpa-2.0-api.version>1.0.1.Final</hibernate-jpa-2.0-api.version> <i18nlog.version>1.0.10</i18nlog.version> <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.9</jaxb-impl.version> @@ -112,6 +112,7 @@ <arquillian.version>1.0.1.Final</arquillian.version> <animal.sniffer.version>1.7</animal.sniffer.version> <xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version>  + <antlr.version>2.7.7</antlr.version> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> @@ -350,21 +351,33 @@ </dependency> <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> - <version>${hibernate3.version}</version> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>${hibernate-annotations.version}</version> </dependency> <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${hibernate-annotations.version}</version> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.version}</version> </dependency> <dependency> - <groupId>hibernate-entitymanager</groupId> + <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>${hibernate-entitymanager.version}</version> + <version>${hibernate.version}</version> + </dependency> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>${hibernate-jpa-2.0-api.version}</version> + </dependency> + + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>${antlr.version}</version> </dependency> <dependency> @@ -509,21 +522,6 @@ <scope>provided</scope> </dependency> -  -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>provided</scope> - </dependency>  <dependency> <groupId>javax.xml.bind</groupId>

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'release/jon3.1.x' - modules/core

by Simeon Pinder

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 0d0f22bd7f7e224945ac5daafb1ab025c461965c Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Thu Aug 30 16:11:28 2012 -0400 [BZ 840512] adding logic to defend against @PostLoad logic not being called after installation as expected. (cherry picked from commit 1293a88ef64918b6401bd830a0739c8f22398fc9) diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java index 07b3467..bb00ef5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java @@ -122,6 +122,9 @@ public class ObfuscatedPropertySimple extends PropertySimple { */ @Override public String getStringValue() { + if (clearTextValue == null) { + initClearTextValue(); + } return clearTextValue; }

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise

by lkrejci

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 18 +-------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 19 ---------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 5 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 4 +- 4 files changed, 7 insertions(+), 39 deletions(-) New commits: commit e23f9cea52ff4576546db93c546942ea95043ec6 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Aug 31 14:34:38 2012 +0200 Revert "[BZ 846623] - When creating the "child" alert definitions of group or template alert definitions, pass the real user that creates the alert def and circumvent authz." This reverts commit 97f5db48e4570c3cf8ee516de5bda7aff31c59a9. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java index 1bcd585..79fca41 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java @@ -196,23 +196,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, return results; } - @Override - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public int createDependentAlertDefinition(Subject subject, AlertDefinition alertDefinition, int resourceId) - throws InvalidAlertDefinitionException { - - return createAlertDefinitionInternal(subject, alertDefinition, resourceId, false); - } - - @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId) throws InvalidAlertDefinitionException { - - return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true); - } - - private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms) throws InvalidAlertDefinitionException { checkAlertDefinition(subject, alertDefinition, resourceId); // if this is an alert definition, set up the link to a resource @@ -226,7 +212,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, } // after the resource is set up (in the case of non-templates), we can use the checkPermission on it - if (checkPerms && checkPermission(subject, alertDefinition) == false) { + if (checkPermission(subject, alertDefinition) == false) { if (alertDefinition.getResourceType() != null) { throw new PermissionException("User [" + subject.getName() + "] does not have permission to create alert templates for type [" @@ -279,7 +265,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, return alertDefinition.getId(); } - + private void fixRecoveryId(AlertDefinition definition) { try { if (definition.getParentId() != 0 && definition.getRecoveryId() != 0) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java index 45b7252..03c8945 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java @@ -48,25 +48,6 @@ public interface AlertDefinitionManagerLocal { int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId) throws InvalidAlertDefinitionException; - /** - * This is exactly the same as {@link #createAlertDefinition(Subject, AlertDefinition, Integer)} but - * assumes the resource is part of a group (or has given resource type for templates) for which - * a group or template alert definition is being created. - * <p> - * This method assumes the caller already checked the subject has permissions to create a group or template alert - * definition on a group / resource type the resource is member of. - * <p> - * In another words this method is a helper to - * {@link GroupAlertDefinitionManagerLocal#createGroupAlertDefinitions(Subject, AlertDefinition, Integer)} and - * {@link AlertTemplateManagerLocal#createAlertTemplate(Subject, AlertDefinition, Integer)}. - * - * @param subject the user that is creating the group or template alert definition - * @param alertDefinition the alert definition on the resource - * @param resourceId the resource - * @return the id of the newly created alert definition - */ - int createDependentAlertDefinition(Subject subject, AlertDefinition alertDefinition, int resourceId); - boolean isEnabled(Integer definitionId); boolean isTemplate(Integer definitionId); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java index ff00dd6..94f1d35 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java @@ -128,6 +128,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal { + alertTemplate.toSimpleString(), t); } + Subject overlord = subjectManager.getOverlord(); Throwable firstThrowable = null; List<Integer> resourceIdsForType = getCommittedResourceIdsNeedingTemplateApplication(user, alertTemplateId, @@ -139,8 +140,8 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal { AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate); childAlertDefinition.setParentId(alertTemplate.getId()); - // persist the child as a dependent alert definition - alertDefinitionManager.createDependentAlertDefinition(user, childAlertDefinition, resourceId); + // persist the child using overlord + alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId); } catch (Throwable t) { // continue on error, create as many as possible if (firstThrowable == null) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java index 7df0c67..8974c30 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java @@ -137,7 +137,6 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana return list; } - @Override @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) public int createGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition, Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException { @@ -152,6 +151,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana + " with data " + groupAlertDefinition.toSimpleString(), t); } + Subject overlord = subjectManager.getOverlord(); Throwable firstThrowable = null; List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject, @@ -164,7 +164,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition); // persist the child - alertDefinitionManager.createDependentAlertDefinition(subject, childAlertDefinition, resourceId); + alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId); } catch (Throwable t) { // continue on error, create as many as possible if (firstThrowable == null) {

11 years, 8 months

1
0
0 / 0

[rhq] modules/enterprise

by Jiri Kremser

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit e33404e91d4b0cfc681e7816872e93c107b5d8f5 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Aug 31 13:02:07 2012 +0200 [BZ 773626 - Failed to load resource composite data error when refreshing Inventory page (Unavailable Servers, Servers, etc)] handling the exception on the client side and re-fetch the data diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 55271c6..383602b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -171,6 +171,12 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria if (caught.getMessage().contains("SearchExpressionException")) { Message message = new Message("Invalid search expression.", Message.Severity.Error); CoreGUI.getMessageCenter().notify(message); + } else if (caught.getMessage().contains("PageList was passed an empty collection")) { + // Because of bug 773626 + Log.warn(caught.getMessage()); + criteria.setPageControl(new PageControl(0, getDataPageSize())); + executeFetch(request, response, criteria); + return; } else { CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); }

11 years, 8 months

1
0
0 / 0

[rhq] modules/core

by Simeon Pinder

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 1293a88ef64918b6401bd830a0739c8f22398fc9 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Thu Aug 30 16:11:28 2012 -0400 [BZ 840512] adding logic to defend against @PostLoad logic not being called after installation as expected. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java index 07b3467..bb00ef5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java @@ -122,6 +122,9 @@ public class ObfuscatedPropertySimple extends PropertySimple { */ @Override public String getStringValue() { + if (clearTextValue == null) { + initClearTextValue(); + } return clearTextValue; }

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'release/jon3.1.x' - modules/core

by Jay Shaughnessy

modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 30 +++++----- 1 file changed, 16 insertions(+), 14 deletions(-) New commits: commit 4f97c15f5ecb8d7339ea98a849b8405d4fb32552 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Aug 30 11:23:42 2012 -0400 [Bug 852554 - AlertCondition.name is null in database after JON 2.4 to 3.1 upgrade] fix merge issue diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index f189c3d..65a7686 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4010,20 +4010,22 @@  <schemaSpec version="2.122"> - <statement desc="Updating DOWN Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'DOWN' - </statement> - <statement desc="Updating UP Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'UP' - </statement> + <schema-directSQL> + <statement desc="Updating DOWN Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'DOWN' + </statement> + <statement desc="Updating UP Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'UP' + </statement> + </schema-directSQL> </schemaSpec> </dbupgrade>

11 years, 8 months

1
0
0 / 0

[rhq] modules/core

by Jay Shaughnessy

modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 30 +++++----- 1 file changed, 16 insertions(+), 14 deletions(-) New commits: commit 26941dd6fb00043842ad5d4e6786b1f5ed391382 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Aug 30 11:18:30 2012 -0400 [Bug 852561 - AlertCondition.name is null in database after JON 2.4 to 3.1 upgrade] fix merge issue diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 94fa46f..1443b80 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4010,20 +4010,22 @@  <schemaSpec version="2.122"> - <statement desc="Updating DOWN Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'DOWN' - </statement> - <statement desc="Updating UP Alert Conditions to new format"> - UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' - AND NAME IS NULL - AND OPTION_STATUS = 'UP' - </statement> + <schema-directSQL> + <statement desc="Updating DOWN Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'DOWN' + </statement> + <statement desc="Updating UP Alert Conditions to new format"> + UPDATE RHQ_ALERT_CONDITION + SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL + WHERE TYPE = 'AVAILABILITY' + AND NAME IS NULL + AND OPTION_STATUS = 'UP' + </statement> + </schema-directSQL> </schemaSpec>

11 years, 8 months

1
0
0 / 0

[rhq] Branch 'rc/jon3.1.1.CR1' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

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/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/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-mongodb/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/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/jeeGen/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/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 +- 136 files changed, 153 insertions(+), 153 deletions(-) New commits: commit e8c45a075d86cb3ea663de16d33d3ed968582e16 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Wed Aug 29 17:56:14 2012 -0400 development RHQ_4.4.0.JON311-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 7a16c94..0f2b4a2 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 5e073da..5bc696d 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 4382c96..f3ab5cf 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 2b6daa3..6960d31 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 3edc5bd..db5a207 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ec1f518..19e6e60 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index 0a0a109..54fd8c6 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 4f02507..d6830f9 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 0ecbbdf..1aa6b62 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 1562752..619d08e 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index ba3e2e3..01a4798 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index a9c326f..9f6171f 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ff80fcc..8b5548a 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 4165dd9..96a76e1 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 9215c85..eb5572d 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 414137c..a839f3e 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index db5156e..8374ac7 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5d6a16a..b3cbeb4 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index e649079..afabb42 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 17cad7e..9f2839c 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 05d3958..fd4ef54 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index dee928f..73400dc 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 51e0109..6b11536 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index ca0fa57..30b5d95 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 1fc0dcd..490a946 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index cbf9d42..8593b5f 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 992bf27..f6857fd 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 059c91c..65a624c 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 0c2e49c..b577a02 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 92fd894..28afb49 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 3f9b969..592b93d 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index d6db806..5f5cc15 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 7fe1130..884dd66 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 9922270..2718943 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 85a2cb4..1016580 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 a5bc718..e9752b4 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0410f9b..da2f14b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 8363856..dc717d1 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 55dedc9..5520a7a 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 2742174..e035c0c 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 58c28df..13993be 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 5a68daf..0c20190 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 b5a6f22..5ec2d40 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 7657c1f..f11a522 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index d720c8e..022eeed 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 0083f57..eaa3875 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 5315251..240fa99 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index b906fd4..33cdb96 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 37c8dc2..18e6467 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 9ba32f5..cf7b42a 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 7216ec3..80d7fd8 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 3ba4ede..e95c1e8 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 d4b1789..a5acda8 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 cd16c88..e56a616 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 d5a3d7c..fab20a6 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 8717e7f..0073cd3 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 c0c7b5b..62b8bb2 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 db881fb..547e9d7 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 1681d8d..604f1d7 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 6ddb5c8..926933c 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 acf1367..385f158 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 2f7d24e..176366c 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 69205ff..c136a90 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 9407bef..9d1576f 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 68deee1..f0809a5 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 678c080..ffc65aa 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 7e3fb3d..c16faed 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 9942893..4503b40 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index b8dc3b5..f36d2e0 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 57364d6..f476e2b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 339bfc2..c7ff44f 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 1dd2e3b..b4709ef 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 829c797..45e1948 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 6ade901..01d48b0 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 a16a405..042c1fe 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index e65edfd..7e6a364 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 152b151..080805b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 79884f8..aa7b085 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index f1cfbcf..34f4222 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index a065e22..e19e745 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 7343a60..a5bb5e9 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index cac9b70..885e816 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 5361ee6..77dd6b6 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 75d960b..6866171 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 1996689..8f169aa 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 8e9d639..85c7d55 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 2a412f6..45358f7 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index c4590e5..f06d7fc 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 e2d9523..2dc27d8 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index ccef850..28601d2 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 9955599..c58aa31 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 193f6a8..9e0fae7 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 7b03473..876f11b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 012ce33..3f53b80 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index ccbc105..32645e9 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 13bf82f..6b82881 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 2e35982..6b2212c 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 5366322..06dd508 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 8b0239f..f3efa17 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 9338383..cc7c484 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index f71d012..f5560cd 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index a679779..f2b7183 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 1e9481b..10e3a19 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 6a29457..0602589 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 54e8db4..4713193 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 45bba24..ee6a9fb 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 65a112b..a4dc8ca 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 b056e75..22f6691 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 9028126..ecc2252 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index d54ea75..f0991dd 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 4809246..dd5bea5 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 9a8941d..a54b1f2 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index b1476f0..4f63ff9 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index b6b8df7..3f61a09 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 60a7458..87b1507 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index ab765a4..aa64e16 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 95b8568..b06a0c8 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index d0d2088..cbecaf2 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 6d38476..fcb4a97 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 36899df..417478b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 60bbbaf..28fac6b 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index a7f3318..e224079 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index ba6f3ba..e71114f 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 6ed48c6..a63ded1 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c959a08..5ca7584 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 683c77b..3e056cb 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index e4e3f2a..939a5b3 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 7129fe0..aedbc25 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 949602d..322346e 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index b624e8e..e533489 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 351f333..f6935f5 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-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 f74a10c..7fa4439 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 5ab3485..d33757a 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index a759f89..713ad3c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index e71a70c..a0f8e6f 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.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 0d2d650..24b6139 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311CR1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

11 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits August 2012