[rhq] Branch 'stefan/backingcontent' - .classpath modules/enterprise
by snegrea
.classpath | 6
modules/enterprise/server/jar/pom.xml | 15
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java | 457 ++++++++++
3 files changed, 478 insertions(+)
New commits:
commit 8b4e16c1b3ca24cb5fde16a425073dfee3a7226d
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Feb 1 16:29:01 2012 -0600
[BZ 771418] Adding unit tests for changed functionality around display version and existing package version selection.
diff --git a/.classpath b/.classpath
index fa0c6d8..ee87d32 100644
--- a/.classpath
+++ b/.classpath
@@ -124,6 +124,12 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.2.1.GA/resteasy-jaxrs-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jettison-provider/2.2.1.GA/resteasy-jettison-provider-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.2.1.GA/jaxrs-api-2.2.1.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-core/1.4.11/powermock-core-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index db286a1..fcf2bee 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -23,6 +23,7 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
<clean.db>true</clean.db>
+ <powermock.version>1.4.11</powermock.version>
</properties>
<dependencies>
@@ -494,6 +495,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
new file mode 100644
index 0000000..7ee018f
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java
@@ -0,0 +1,457 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.content.test;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+
+import junit.framework.Assert;
+
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.IObjectFactory;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.content.Architecture;
+import org.rhq.core.domain.content.Package;
+import org.rhq.core.domain.content.PackageBits;
+import org.rhq.core.domain.content.PackageBitsBlob;
+import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.content.PackageVersion;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.content.ContentManagerBean;
+import org.rhq.enterprise.server.content.ContentManagerHelper;
+import org.rhq.enterprise.server.content.ContentManagerLocal;
+import org.rhq.enterprise.server.plugin.pc.content.PackageTypeBehavior;
+
+(a)PrepareForTest(ContentManagerHelper.class)
+public class ContentManagerBeanMockTest {
+
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There are no existing package version objects in the database
+ * 2) A new package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = "PackageDisplayVersion";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+
+ Architecture mockArchitecture = mock(Architecture.class);
+ when(mockArchitecture.getName()).thenReturn("ArchitectureName");
+ when(mockEntityManager.find(eq(Architecture.class), anyInt())).thenReturn(mockArchitecture);
+
+ PackageType mockPackageType = mock(PackageType.class);
+ when(mockEntityManager.find(eq(PackageType.class), eq(1))).thenReturn(mockPackageType);
+
+ PackageTypeBehavior mockPackageTypeBehavior = mock(PackageTypeBehavior.class);
+ PowerMockito.mockStatic(ContentManagerHelper.class);
+ when(ContentManagerHelper.getPackageTypeBehavior(1)).thenReturn(mockPackageTypeBehavior);
+
+ when(mockEntityManager.createNamedQuery(eq(Architecture.QUERY_FIND_BY_NAME))).thenReturn(mockQuery);
+ when(mockEntityManager.createNamedQuery(eq(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID))).thenReturn(mockQuery);
+
+ ContentManagerLocal mockContentManager = mock(ContentManagerLocal.class);
+ Package mockPackage = mock(Package.class);
+ when(mockContentManager.persistPackage(isNotNull(Package.class))).thenReturn(mockPackage);
+
+ when(mockEntityManager.find(eq(Package.class), any())).thenReturn(mockPackage);
+ when(mockPackage.getPackageType()).thenReturn(mockPackageType);
+
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockContentManager.persistPackageVersion(isNotNull(PackageVersion.class)))
+ .thenReturn(mockPackageVersion);
+
+ when(mockEntityManager.find(eq(PackageVersion.class), anyInt())).thenReturn(mockPackageVersion);
+ when(mockPackageVersion.getGeneralPackage()).thenReturn(mockPackage);
+ when(mockPackageVersion.getArchitecture()).thenReturn(mockArchitecture);
+
+ PackageBitsBlob mockPackageBitsBlob = mock(PackageBitsBlob.class);
+ when(mockEntityManager.find(eq(PackageBitsBlob.class), anyInt())).thenReturn(mockPackageBitsBlob);
+
+ PackageBits mockBits = mock(PackageBits.class);
+ when(mockEntityManager.find(eq(PackageBits.class), anyInt())).thenReturn(mockBits);
+
+ DataSource mockDataSource = mock(DataSource.class);
+ Connection mockConnection = mock(Connection.class);
+ when(mockDataSource.getConnection()).thenReturn(mockConnection);
+ PreparedStatement mockPreparedStatement1 = mock(PreparedStatement.class);
+ when(mockConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement1);
+ ResultSet mockResultSet = mock(ResultSet.class);
+ when(mockPreparedStatement1.executeQuery()).thenReturn(mockResultSet);
+ when(mockResultSet.next()).thenReturn(true, false);
+ Blob mockBlob = mock(Blob.class);
+ when(mockResultSet.getBlob(anyInt())).thenReturn(mockBlob);
+ OutputStream mockOutputStream = mock(OutputStream.class);
+ when(mockBlob.setBinaryStream(anyLong())).thenReturn(mockOutputStream);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("contentManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockContentManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("dataSource")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockDataSource);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(2)).size();
+ verify(mockList, never()).get(anyInt());
+
+ verify(result, times(2)).setPackageBits(any(PackageBits.class));
+ MessageDigestGenerator digest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ verify(result).setSHA256(digest.calcDigestString(sampleContent));
+ verify(result).setFileSize((long) sampleContent.getBytes().length);
+ verify(result).setDisplayVersion(displayVersion);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is null.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackage() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = null;
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is empty after trimming.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackageEmptyDisplayVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = " ";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There are two existing package version objects stored in the database
+ * 2) Only the first package version is ever touched by this method
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) No updates required to the packageVersion retrieved because input display version is empty after trimming.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackagePickOnlyFirst() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = " ";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(2);
+ PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockList, never()).get(eq(1));
+
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+
+ /*
+ * Test createPackageVersionWithDisplayVersion with the following hypothesis:
+ * 1) There is an existing package
+ * 2) No package will be created because of (1)
+ * 3) Focal point of the test is the first 10 lines of the method.
+ * 4) Updates required to the packageVersion because display version needs to be updated.
+ */
+ @Test
+ @SuppressWarnings("rawtypes")
+ public void testCreatePackageVersionExistingPackageUpdateDisplayVersion() throws Exception {
+
+ //set all the method call arguments
+ Subject mockSubject = mock(Subject.class);
+ String packageName = "PackageName";
+ int packageTypeID = 1;
+ String version = "PackageVersion";
+ String displayVersion = "PackageDisplayVersion";
+ int architectureId = 2;
+ String sampleContent = "SampleContent";
+ InputStream packageBitStream = new ByteArrayInputStream(sampleContent.getBytes());
+
+ //tell the method story as it happens: mock dependencies and make them
+ //behave in a way to get the method under test to completion.
+ EntityManager mockEntityManager = mock(EntityManager.class);
+
+ Query mockQuery = mock(Query.class);
+ when(mockEntityManager.createNamedQuery(eq(PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH))).thenReturn(
+ mockQuery);
+ List mockList = mock(List.class);
+ when(mockQuery.getResultList()).thenReturn(mockList);
+ when(mockList.size()).thenReturn(1);
+ final PackageVersion mockPackageVersion = mock(PackageVersion.class);
+ when(mockList.get(eq(0))).thenReturn(mockPackageVersion);
+
+ when(mockPackageVersion.getId()).thenReturn(0);
+ ContentManagerLocal mockContentManager = mock(ContentManagerLocal.class);
+ when(mockContentManager.persistPackageVersion(any(PackageVersion.class))).thenAnswer(
+ new Answer<PackageVersion>() {
+ public PackageVersion answer(InvocationOnMock invocation) throws Throwable {
+ Object[] args = invocation.getArguments();
+ return (PackageVersion) args[0];
+ }
+ });
+
+ when(mockEntityManager.find(eq(PackageVersion.class), eq(0))).thenAnswer(new Answer<PackageVersion>() {
+ public PackageVersion answer(InvocationOnMock invocation) throws Throwable {
+ return mockPackageVersion;
+ }
+ });
+
+ Package mockPackage = mock(Package.class);
+ when(mockPackageVersion.getGeneralPackage()).thenReturn(mockPackage);
+ Architecture mockArchitecture = mock(Architecture.class);
+ when(mockPackageVersion.getArchitecture()).thenReturn(mockArchitecture);
+ when(mockPackageVersion.getExtraProperties()).thenReturn(null);
+
+ //create object to test and inject required dependencies
+ ContentManagerBean objectUnderTest = new ContentManagerBean();
+ Field[] fields = ContentManagerBean.class.getDeclaredFields();
+
+ for (Field field : fields) {
+ if (field.getName().equals("entityManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockEntityManager);
+ field.setAccessible(false);
+ }
+ else if (field.getName().equals("contentManager")) {
+ field.setAccessible(true);
+ field.set(objectUnderTest, mockContentManager);
+ field.setAccessible(false);
+ }
+ }
+
+ //run the code to be tested
+ PackageVersion result = objectUnderTest.createPackageVersionWithDisplayVersion(mockSubject, packageName,
+ packageTypeID, version, displayVersion, architectureId, packageBitStream);
+
+ //verify the results (Assert and Mock Verification)
+ verify(mockList, times(1)).size();
+ verify(mockList, times(1)).get(eq(0));
+ verify(mockEntityManager, times(1)).createNamedQuery(anyString());
+
+ verify(mockPackageVersion, times(1)).setDisplayVersion(displayVersion);
+
+ Assert.assertEquals(mockPackageVersion, result);
+ }
+}
12 years, 4 months
[rhq] Branch 'release/jon3.0.x' - 5 commits - modules/enterprise
by mazz
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 119 +-
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 9
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java | 8
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 80 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 30
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 14
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 58 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java | 19
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 538 ++++++++++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 22
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 11
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 128 +-
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java | 112 +-
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java | 107 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 28
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java | 137 --
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java | 75 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 35
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 37
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 22
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 35
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java | 214 +--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java | 55 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 53
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java | 12
26 files changed, 1292 insertions(+), 685 deletions(-)
New commits:
commit a2d31a6fe235423914045354efea4063208c3830
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 23 12:09:18 2012 -0500
[BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token.
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index c7e0cfc..805d280 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -2917,7 +2917,7 @@ public class AgentMain {
new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'),
new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'),
- new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'),
+ new LongOpt("fullcleanconfig", LongOpt.NO_ARGUMENT, null, 'L'),
new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'),
new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'),
new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'),
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index 6489401..0a3930f 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -614,7 +614,7 @@ public interface AgentI18NResourceKeys {
+ "\\ -h, --help Shows this help message (default)\\n\\\n"
+ "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n"
+ "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n"
- + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ + "\\ -L, --fullcleanconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n"
+ "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n"
+ "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 75c4d65..9afc3b9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -135,9 +135,11 @@ public class CoreServerServiceImpl implements CoreServerService {
if (agentByName != null) {
// the agent request provided a name that already is in use by an agent. However, the request
// provided a security token that was not assigned to any agent! How can this be? Something is fishy.
- String msg = "The agent asking for registration under the name [" + request.getName()
+ String msg = "The agent asking for registration under the name ["
+ + request.getName()
+ "] provided an invalid security token. This request will fail. "
- + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ + "Please consult an administrator to obtain the agent's proper security token "
+ + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\"";
throw new AgentRegistrationException(msg);
}
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
@@ -172,9 +174,11 @@ public class CoreServerServiceImpl implements CoreServerService {
+ " and same security token.";
throw new AgentRegistrationException(msg);
} else {
- String msg = "The agent [" + request.getName()
+ String msg = "The agent ["
+ + request.getName()
+ "] is attempting to re-register without a security token. "
- + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ + "Please consult an administrator to obtain the agent's proper security token "
+ + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\"";
throw new AgentRegistrationException(msg);
}
commit 8bcb3666b7baf41af741f9078a215b97b6c31884
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 19 13:06:11 2012 -0500
It seems we didn't really understand how testng was executing tests
when we submitted many test classes in a run. For example, when we
submit the server jar tests we assumed that the test classes would
be run sequentially, in perhaps some random order, and that each would
have its Before/AfterClass methods executed atthe start and end of each
test class execution.
That is not true.
Although testng seems to run most tests from a test class together, it does
not seem to make that guarantee. From latest traces it seems that the
test classes are, toa degree, pooled and:
1) you can not assume that all test methods for a test class will execute
before execution of test methods from another test class.
2) you can not assume that multiple BeforeClass methods will not execute
prior to an AfterClass. For example, this can happen:
Class1:BeforeClass
Class2:BeforeClass
Class1:AfterClass
Class2:AfterClass
Put another way: You can only assume that BeforeClass and AfterClass
execute in order, for a single test class. You can not predict the
execution order of all Before|AfterClass methods for all test classes.
3) The same rules as described in 2 apply to Before|AfterGroups
What this means is that you must be very careful with what is done in
Before|AfterClass and BeforeAfter|Groups. The work must not conflict
with work done in other test classes that will execute in the same test
suite.
This is very important when multiple test classes are sharing some sort
of test resource.
In general, it is much safer, although perhaps a bit slower, to use
@BeforeMethod() and @AfterMethod(alwaysRun=true).
This misunderstanding was particularly bad for us in the server jar tests,
where many test classes extend AbstractEJB3Test and utilize the jboss
mbean server under the covers, in the prepareXXX methods. This caused
clashes described above.
So, for server jar testing this reworks things to better share the mbean
server, even among tests in the same class. And migrates all
AbstractEJB3Test.prepare/unprepare calls from Before|AfterClass|Groups to
Before|After|Method.
also - remove/suppress IDE warnings from touched test classes
Conflicts:
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
index 375ec1e..9d1764d 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java
@@ -109,7 +109,8 @@ public class DriftServerTest extends AbstractEJB3Test {
private void shutDownDriftServer() throws Exception {
unprepareServerPluginService();
- driftServerPluginService.stopMasterPluginContainer();
+ //already done by the above call
+ //driftServerPluginService.stopMasterPluginContainer();
}
private void shutDownAgentServices() {
@@ -178,10 +179,9 @@ public class DriftServerTest extends AbstractEJB3Test {
protected void deleteEntity(Class<?> clazz, String name, EntityManager em) {
try {
- Object entity = em.createQuery(
- "select entity from " + clazz.getSimpleName() + " entity where entity.name = :name")
- .setParameter("name", name)
- .getSingleResult();
+ Object entity = em
+ .createQuery("select entity from " + clazz.getSimpleName() + " entity where entity.name = :name")
+ .setParameter("name", name).getSingleResult();
em.remove(entity);
} catch (NoResultException e) {
// we can ignore no results because this code will run when the db
@@ -208,13 +208,8 @@ public class DriftServerTest extends AbstractEJB3Test {
}
protected void initResource() {
- resource = new ResourceBuilder().createResource()
- .withId(0)
- .withName(RESOURCE_NAME)
- .withResourceKey(RESOURCE_NAME)
- .withRandomUuid()
- .withResourceType(resourceType)
- .build();
+ resource = new ResourceBuilder().createResource().withId(0).withName(RESOURCE_NAME)
+ .withResourceKey(RESOURCE_NAME).withRandomUuid().withResourceType(resourceType).build();
}
protected Subject getOverlord() {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
index 40a0168..587bdfb 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
@@ -37,9 +37,7 @@ import javax.persistence.Query;
import javax.transaction.TransactionManager;
import org.hibernate.LazyInitializationException;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -94,7 +92,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author John Mazzitelli
* @author Jay Shaughnessy
*/
-@SuppressWarnings( { "unused" })
+@SuppressWarnings({ "unused" })
@Test
public class BundleManagerBeanTest extends AbstractEJB3Test {
@@ -115,19 +113,11 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
private Subject overlord;
TestServerCommunicationsService agentServiceContainer;
- @BeforeClass
- public void beforeClass() {
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
agentServiceContainer = prepareForTestAgents();
agentServiceContainer.bundleService = new TestAgentClient(null, agentServiceContainer);
- }
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
- }
-
- @BeforeMethod
- public void beforeMethod() throws Exception {
this.ps = new TestBundleServerPluginService();
prepareCustomServerPluginService(this.ps);
bundleManager = LookupUtil.getBundleManager();
@@ -141,9 +131,14 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
@AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
- cleanupDatabase();
- unprepareServerPluginService();
- this.ps = null;
+ unprepareForTestAgents();
+
+ try {
+ this.ps = null;
+ cleanupDatabase();
+ } finally {
+ unprepareServerPluginService();
+ }
}
private void cleanupDatabase() {
@@ -189,8 +184,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
+ TEST_PREFIX + "%'");
doomed = q.getResultList();
for (Object removeMe : doomed) {
- em.remove(em
- .getReference(BundleResourceDeployment.class, ((BundleResourceDeployment) removeMe).getId()));
+ em.remove(em.getReference(BundleResourceDeployment.class, ((BundleResourceDeployment) removeMe).getId()));
}
// remove any orphaned bds
q = em.createQuery("SELECT bd FROM BundleDeployment bd WHERE bd.description LIKE '" + TEST_PREFIX + "%'");
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
index 6b95388..29e9e58 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -86,13 +85,6 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
servers = new ArrayList<Server>();
agents = new ArrayList<Agent>();
newAgents = new ArrayList<Agent>();
-
- prepareForTestAgents();
- }
-
- @AfterClass
- public void afterClass() throws Exception {
- this.unprepareForTestAgents();
}
@BeforeMethod
@@ -100,9 +92,11 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
servers.clear();
agents.clear();
newAgents.clear();
+
+ prepareForTestAgents();
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
try {
getTransactionManager().begin();
@@ -151,6 +145,8 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
}
throw e;
+ } finally {
+ this.unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
index 1dfd79a..3645d77 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
@@ -26,8 +26,6 @@ import java.util.Map;
import javax.persistence.EntityManager;
-import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -48,6 +46,7 @@ import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.discovery.MergeResourceResponse;
import org.rhq.core.domain.discovery.ResourceSyncInfo;
@@ -70,6 +69,7 @@ import org.rhq.enterprise.server.util.SessionTestHelper;
* Tests the configuration manager.
*/
@Test
+@SuppressWarnings("all")
public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
private static final boolean ENABLE_TESTS = true;
@@ -97,32 +97,27 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
configurationManager = LookupUtil.getConfigurationManager();
resourceManager = LookupUtil.getResourceManager();
overlord = LookupUtil.getSubjectManager().getOverlord();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- TestServices testServices = new TestServices();
- agentServiceContainer.configurationService = testServices;
- agentServiceContainer.discoveryService = testServices;
- }
-
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
prepareScheduler();
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ TestServices testServices = new TestServices();
+ agentServiceContainer.configurationService = testServices;
+ agentServiceContainer.discoveryService = testServices;
+
getTransactionManager().begin();
EntityManager em = getEntityManager();
try {
compatibleGroup = SessionTestHelper.createNewCompatibleGroupForRole(em, null, // no role necessary here
"compat");
- newResource1 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup, "res"
- + System.currentTimeMillis());
- newResource2 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup, "res"
- + System.currentTimeMillis());
+ newResource1 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup,
+ "res" + System.currentTimeMillis());
+ newResource2 = SessionTestHelper.createNewResourceForGroup(em, compatibleGroup,
+ "res" + System.currentTimeMillis());
// set one resource as the child of another, so that they don't both look like platforms under the agent
newResource1.addChildResource(newResource2);
@@ -145,7 +140,7 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
}
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
try {
// perform in-band and out-of-band work in quick succession
@@ -202,6 +197,7 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
} finally {
unprepareScheduler();
+ unprepareForTestAgents();
}
}
@@ -425,18 +421,18 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
configuration2.put(new PropertySimple("fail", "false"));
/* begin simple checks */
- PluginConfigurationUpdate update1 = configurationManager.updatePluginConfiguration(overlord, resource1
- .getId(), configuration1);
+ PluginConfigurationUpdate update1 = configurationManager.updatePluginConfiguration(overlord,
+ resource1.getId(), configuration1);
assert update1.getErrorMessage() == null : "We weren't expecting a failure here";
- PluginConfigurationUpdate update2 = configurationManager.updatePluginConfiguration(overlord, resource2
- .getId(), configuration2);
+ PluginConfigurationUpdate update2 = configurationManager.updatePluginConfiguration(overlord,
+ resource2.getId(), configuration2);
assert update2.getErrorMessage() == null : "We weren't expecting a failure here";
- Configuration updatedConfiguration1 = configurationManager.getPluginConfiguration(overlord, resource1
- .getId());
- Configuration updatedConfiguration2 = configurationManager.getPluginConfiguration(overlord, resource2
- .getId());
+ Configuration updatedConfiguration1 = configurationManager.getPluginConfiguration(overlord,
+ resource1.getId());
+ Configuration updatedConfiguration2 = configurationManager.getPluginConfiguration(overlord,
+ resource2.getId());
assert updatedConfiguration1.equals(configuration1) : "configuration1 was: " + updatedConfiguration1 + ", "
+ "expected was: " + configuration1;
@@ -487,8 +483,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
Map<Integer, Configuration> memberConfigs = new HashMap<Integer, Configuration>();
memberConfigs.put(resource1.getId(), configuration1);
memberConfigs.put(resource2.getId(), configuration2);
- int groupUpdateId = configurationManager.scheduleGroupPluginConfigurationUpdate(overlord, compatibleGroup
- .getId(), memberConfigs);
+ int groupUpdateId = configurationManager.scheduleGroupPluginConfigurationUpdate(overlord,
+ compatibleGroup.getId(), memberConfigs);
// instead of sleeping, let's directly execute what would normally be scheduled
//configurationManager.completeGroupPluginConfigurationUpdate(groupUpdateId);
@@ -713,8 +709,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
criteria.addFilterResourceIds(resource.getId());
criteria.fetchConfiguration(true);
criteria.addSortCreatedTime(PageOrdering.ASC);
- List<ResourceConfigurationUpdate> history =
- configurationManager.findResourceConfigurationUpdatesByCriteria(overlord, criteria);
+ List<ResourceConfigurationUpdate> history = configurationManager.findResourceConfigurationUpdatesByCriteria(
+ overlord, criteria);
assert history != null;
assert history.size() == 3;
@@ -1011,8 +1007,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
} else {
mybool.setErrorMessage(ThrowableUtil.getStackAsString(new IllegalArgumentException(
"Not a valid boolean")));
- response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(), request
- .getConfiguration(), new NullPointerException("This simulates a failed update"));
+ response = new ConfigurationUpdateResponse(request.getConfigurationUpdateId(),
+ request.getConfiguration(), new NullPointerException("This simulates a failed update"));
}
LookupUtil.getConfigurationManager().completeResourceConfigurationUpdate(response);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
index 6f75197..ea48c65 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -146,23 +145,15 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
contentManager = LookupUtil.getContentManager();
subjectManager = LookupUtil.getSubjectManager();
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.contentService = contentAgentService;
-
populateResponseSteps();
}
- @AfterClass
- public void teardownAfterClass() throws Exception {
- unprepareForTestAgents();
- }
-
@BeforeMethod
public void setupBeforeMethod() throws Exception {
setupTestEnvironment();
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDownAfterMethod() throws Exception {
tearDownTestEnvironment();
}
@@ -316,8 +307,8 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
report.addDeployedPackage(package3);
// Package where entire package does not exist
- PackageDetailsKey key4 = new PackageDetailsKey("PackageX", "1.0.0", packageType4.getName(), architecture1
- .getName());
+ PackageDetailsKey key4 = new PackageDetailsKey("PackageX", "1.0.0", packageType4.getName(),
+ architecture1.getName());
ResourcePackageDetails package4 = new ResourcePackageDetails(key4);
// Fully populate this version to make sure the translation from details -> domain model works
@@ -1385,6 +1376,9 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
// Private --------------------------------------------
private void setupTestEnvironment() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.contentService = contentAgentService;
+
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -1567,6 +1561,7 @@ public class ContentManagerBeanTest extends AbstractEJB3Test {
}
} finally {
em.close();
+ unprepareForTestAgents();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 5a702ff..8c356f1 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -29,8 +29,9 @@ import java.util.Properties;
import javax.management.MBeanServer;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.clientapi.server.core.AgentRegistrationException;
@@ -92,7 +93,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
// J. testAttemptToChangeAgentName
// 1) register agent "newName" but with Z's host/port/token. In effect, this is trying to change the agent's name. (REJECT - you are not allowed to rename agents)
-@Test
+@Test(groups = { "core.agent-registration" })
public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name";
@@ -109,6 +110,80 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final int B_PORT = 22222;
private static final String B_HOST = "hostB";
+ @AfterGroups(groups = { "core.agent-registration" })
+ public void afterGroup() throws Exception {
+ // clean up any agents we might have created
+ Query q = getEntityManager().createQuery(
+ "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
+ List<Agent> doomed = (List<Agent>) q.getResultList();
+ for (Agent deleteMe : doomed) {
+ LookupUtil.getAgentManager().deleteAgent(deleteMe);
+ }
+ }
+
+ @BeforeMethod
+ public void prepare() throws Exception {
+ // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
+ oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
+ String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
+
+ // mock up our core server MBean that provides information about where the jboss home dir is
+ MBeanServer mbs = getJBossMBeanServer();
+ DummyCoreServer mbean = new DummyCoreServer();
+ mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
+
+ // in order to register, we need to mock out the agent version file used by the server
+ // to determine the agent version it supports.
+ agentVersion = new AgentVersion("1.2.3", "12345");
+ File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
+ "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
+ agentVersionFile.getParentFile().mkdirs();
+ agentVersionFile.delete();
+ Properties agentVersionProps = new Properties();
+ agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
+ agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
+ FileOutputStream fos = new FileOutputStream(agentVersionFile);
+ try {
+ agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
+ } finally {
+ fos.close();
+ }
+
+ // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
+ prepareForTestAgents();
+
+ // mock our server
+ server = new Server();
+ server.setName(newServerNamePropertyValue);
+ server.setAddress("CoreServerServiceImplTest.localhost");
+ server.setPort(12345);
+ server.setSecurePort(12346);
+ server.setOperationMode(OperationMode.NORMAL);
+ int serverId = LookupUtil.getServerManager().create(server);
+ server.setId(serverId);
+ }
+
+ @AfterMethod
+ public void unprepare() throws Exception {
+
+ // cleanup our test server
+ LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
+ LookupUtil.getCloudManager().deleteServer(server.getId());
+
+ // shutdown our mock mbean server
+ MBeanServer mbs = getJBossMBeanServer();
+ mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+
+ unprepareForTestAgents();
+
+ // in case this was set before our tests, put it back the way it was
+ if (oldServerNamePropertyValue != null) {
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
+ }
+ }
+
+ @Test
public void testNewAgentRegistrationWithOldToken() throws Exception {
// this tests the case where someone purged an agent from the DB, but then
// changed their mind and want to re-run that agent and re-register it again.
@@ -125,6 +200,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
LookupUtil.getAgentManager().deleteAgent(agent);
}
+ @Test
public void testChangeAddressPort() throws Exception {
CoreServerServiceImpl service = new CoreServerServiceImpl();
AgentRegistrationRequest request;
@@ -379,75 +455,6 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
}
}
- @BeforeClass
- public void prepare() throws Exception {
- // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
- oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
- String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
- System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
-
- // mock up our core server MBean that provides information about where the jboss home dir is
- MBeanServer mbs = getJBossMBeanServer();
- DummyCoreServer mbean = new DummyCoreServer();
- mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
-
- // in order to register, we need to mock out the agent version file used by the server
- // to determine the agent version it supports.
- agentVersion = new AgentVersion("1.2.3", "12345");
- File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
- "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
- agentVersionFile.getParentFile().mkdirs();
- agentVersionFile.delete();
- Properties agentVersionProps = new Properties();
- agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
- agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
- FileOutputStream fos = new FileOutputStream(agentVersionFile);
- try {
- agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
- } finally {
- fos.close();
- }
-
- // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
- prepareForTestAgents();
-
- // mock our server
- server = new Server();
- server.setName(newServerNamePropertyValue);
- server.setAddress("CoreServerServiceImplTest.localhost");
- server.setPort(12345);
- server.setSecurePort(12346);
- server.setOperationMode(OperationMode.NORMAL);
- int serverId = LookupUtil.getServerManager().create(server);
- server.setId(serverId);
- }
-
- @AfterClass
- public void unprepare() throws Exception {
- // clean up any agents we might have created
- Query q = getEntityManager().createQuery(
- "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
- List<Agent> doomed = (List<Agent>) q.getResultList();
- for (Agent deleteMe : doomed) {
- LookupUtil.getAgentManager().deleteAgent(deleteMe);
- }
-
- // cleanup our test server
- LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
- LookupUtil.getCloudManager().deleteServer(server.getId());
-
- // shutdown our mock mbean server
- MBeanServer mbs = getJBossMBeanServer();
- mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
-
- unprepareForTestAgents();
-
- // in case this was set before our tests, put it back the way it was
- if (oldServerNamePropertyValue != null) {
- System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
- }
- }
-
interface DummyCoreServerMBean extends CoreServerMBean {
};
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 082bd6b..630b778 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -39,7 +39,7 @@ import org.dbunit.ext.oracle.Oracle10DataTypeFactory;
import org.dbunit.ext.oracle.OracleDataTypeFactory;
import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -74,20 +74,15 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
@BeforeClass
public void beforeClass() throws Exception {
discoveryBoss = LookupUtil.getDiscoveryBoss();
+ }
+ @BeforeMethod
+ public void setupTestData() throws Exception {
dummyJBossMBeanServer = MBeanServerFactory.createMBeanServer("jboss");
MBeanServerLocator.setJBoss(dummyJBossMBeanServer);
dummyJBossMBeanServer.registerMBean(new ServerCommunicationsService(),
- ServerCommunicationsServiceMBean.OBJECT_NAME);
- }
-
- @AfterClass
- public void afterClass() {
- MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- }
+ ServerCommunicationsServiceMBean.OBJECT_NAME);
- @BeforeMethod
- public void setupTestData() throws Exception {
initDB();
platformType = getEntityManager().find(ResourceType.class, 1);
serverType = getEntityManager().find(ResourceType.class, 2);
@@ -96,6 +91,11 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
agent = getEntityManager().find(Agent.class, 1);
}
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
+ MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+ }
+
@Test(groups = "integration.ejb3")
public void testBasicInventoryReport() throws Exception {
InventoryReport inventoryReport = new InventoryReport(agent);
@@ -211,7 +211,7 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
IDataSet getDataSet() throws Exception {
FlatXmlProducer xmlProducer = new FlatXmlProducer(new InputSource(getClass().getResourceAsStream(
- getDataSetFile())));
+ getDataSetFile())));
xmlProducer.setColumnSensing(true);
return new FlatXmlDataSet(xmlProducer);
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 5dabd97..e06329b 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -46,7 +46,6 @@ import org.rhq.core.clientapi.server.drift.DriftServerService;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria;
import org.rhq.core.domain.criteria.JPADriftChangeSetCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.drift.Drift;
@@ -109,19 +108,18 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
overlord = LookupUtil.getSubjectManager().getOverlord();
driftServerService = new DriftServerServiceImpl();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.driftService = new TestDefService();
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public void afterClass() {
driftServerService = null;
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.driftService = new TestDefService();
+
prepareScheduler();
deleteDriftFiles();
@@ -134,6 +132,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareForTestAgents();
unprepareScheduler();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
index f068ead..bce9bad 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
@@ -35,8 +35,8 @@ import org.testng.annotations.Test;
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.operation.CancelResults;
-import org.rhq.core.clientapi.agent.operation.OperationAgentService;
import org.rhq.core.clientapi.agent.operation.CancelResults.InterruptedState;
+import org.rhq.core.clientapi.agent.operation.OperationAgentService;
import org.rhq.core.clientapi.server.operation.OperationServerService;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.configuration.Configuration;
@@ -108,19 +108,18 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
overlord = LookupUtil.getSubjectManager().getOverlord();
operationServerService = new OperationServerServiceImpl();
-
- TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
- agentServiceContainer.operationService = new TestConfigService();
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public void afterClass() {
operationServerService = null;
- unprepareForTestAgents();
}
@BeforeMethod
public void beforeMethod() throws Exception {
+ TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
+ agentServiceContainer.operationService = new TestConfigService();
+
prepareScheduler();
simulatedOperation_Sleep = 500L;
@@ -137,6 +136,7 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
try {
deleteNewResource(newResource);
} finally {
+ unprepareForTestAgents();
unprepareScheduler();
}
}
@@ -226,8 +226,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
.getGroup().getId());
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// should be no resource histories that belong to it
@@ -290,8 +290,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert list.size() == 0;
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// should be no resource histories that belong to it
@@ -336,14 +336,14 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(9000L); // wait for it to be triggered and finish
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 1 : "Expected 1 result, but got " + results.size();
operationManager.deleteOperationHistory(overlord, results.get(0).getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// purging group history purges all resource histories that belong to it
@@ -375,8 +375,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -406,8 +406,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// cancel the group history - which cancels all the resource histories
operationManager.cancelOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
assert results.get(0).getStatus() == OperationRequestStatus.CANCELED : results.get(0);
@@ -426,8 +426,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// purge the group history
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -460,8 +460,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -474,8 +474,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// get the one resource history from the group
PageList<ResourceOperationHistory> results2;
- results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(), PageControl
- .getUnlimitedInstance());
+ results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(),
+ PageControl.getUnlimitedInstance());
assert results2.size() == 1 : "Should have had 1 resource history result: " + results2;
ResourceOperationHistory rHistory = results2.get(0);
@@ -485,28 +485,28 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// this doesn't actually cancel the FINISHED resource operation. This simulates the fact that
// the agent couldn't cancel the resource op since it already finished.
operationManager.cancelOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 1;
assert results.get(0).getStatus() == OperationRequestStatus.CANCELED : results.get(0);
- results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results.size() == 0;
// still pending - our operation wasn't really canceled - waiting for the agent to tell us its finished
results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
PageControl.getUnlimitedInstance());
assert results2.size() == 0;
- results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(), PageControl
- .getUnlimitedInstance());
+ results2 = operationManager.findPendingResourceOperationHistories(overlord, newResource.getId(),
+ PageControl.getUnlimitedInstance());
assert results2.size() == 1;
assert results2.get(0).getStatus() == OperationRequestStatus.INPROGRESS : results2.get(0);
// purge the group history (note we tell it to even purge those in progress)
operationManager.deleteOperationHistory(overlord, history.getId(), true);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -536,8 +536,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -573,8 +573,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -607,8 +607,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(8000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
// the group job executed twice
assert results != null;
@@ -663,8 +663,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
operationManager.deleteOperationHistory(overlord, history0.getId(), false);
operationManager.deleteOperationHistory(overlord, history1.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0 : results; // none left, we purged the two group histories
@@ -710,8 +710,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -742,8 +742,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
// parameters and results are lazily loaded in the paginated queries, but are eagerly individually
- rHistory = (ResourceOperationHistory) operationManager.getOperationHistoryByHistoryId(overlord, rHistory
- .getId());
+ rHistory = (ResourceOperationHistory) operationManager.getOperationHistoryByHistoryId(overlord,
+ rHistory.getId());
assert rHistory.getResults() != null;
assert rHistory.getResults().getSimple("param1echo") != null;
assert rHistory.getResults().getSimple("param1echo").getStringValue().equals("group-test");
@@ -751,8 +751,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getParameters().getId() != history.getParameters().getId() : "params should be copies - not shared";
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -781,8 +781,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1 : "Did not get 1 result back, but " + results.size();
GroupOperationHistory history = results.get(0);
@@ -810,8 +810,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -840,8 +840,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
Thread.sleep(4000L); // wait for it to finish, should be fast
PageList<GroupOperationHistory> results;
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
GroupOperationHistory history = results.get(0);
@@ -869,8 +869,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
operationManager.deleteOperationHistory(overlord, history.getId(), false);
- results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 0; // none left, we purged the only group history there was
@@ -1174,8 +1174,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -1233,8 +1233,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
// wait for it to be triggered so we get a history item
for (int i = 0; i < 5; i++) {
Thread.sleep(1000L);
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
if ((results != null) && (results.size() > 0)) {
break; // operation was triggered - got the history item
}
@@ -1254,8 +1254,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert results.size() == 0;
// still pending - our operation wasn't really canceled - waiting for the agent to tell us its finished
- results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(), PageControl
- .getUnlimitedInstance());
+ results = operationManager.findPendingResourceOperationHistories(overlord, resource.getId(),
+ PageControl.getUnlimitedInstance());
assert results != null;
assert results.size() == 1;
history = results.get(0);
@@ -1308,8 +1308,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert history.getSubjectName().equals(overlord.getName()) : history;
PageList<ResourceOperationLastCompletedComposite> list;
- list = operationManager.findRecentlyCompletedResourceOperations(overlord, null, PageControl
- .getUnlimitedInstance());
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
assert list.size() == 1;
assert list.get(0).getOperationHistoryId() == history.getId();
assert list.get(0).getResourceId() == resource.getId();
@@ -1322,8 +1322,8 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
assert results != null;
assert results.size() == 0;
- list = operationManager.findRecentlyCompletedResourceOperations(overlord, null, PageControl
- .getUnlimitedInstance());
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
assert list.size() == 0;
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
index d0beddc..dd72437 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.testng.annotations.AfterMethod;
@@ -121,58 +120,60 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
@AfterMethod
public void tearDownAfterMethod() throws Exception {
- // Transactional stuff
- TransactionManager tx = getTransactionManager();
- tx.begin();
- EntityManager entityManager = getEntityManager();
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
- Subject overlord = subjectManager.getOverlord();
-
- // Delete the repo relationships
- entityManager.createNamedQuery(RepoRepoRelationship.DELETE_BY_REPO_ID).setParameter("repoId", repoId)
- .executeUpdate();
-
- entityManager.createNamedQuery(RepoRelationship.DELETE_BY_RELATED_REPO_ID).setParameter("relatedRepoId",
- relatedRepoId).executeUpdate();
+ try {
+ // Transactional stuff
+ TransactionManager tx = getTransactionManager();
+ tx.begin();
+ EntityManager entityManager = getEntityManager();
- // Delete any repos that were created in this test
- for (Integer repoId : reposToDelete) {
- repoManager.deleteRepo(overlord, repoId);
- }
- reposToDelete.clear();
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ Subject overlord = subjectManager.getOverlord();
- // Delete any repo groups that were created in this test
- for (Integer repoGroupId : repoGroupsToDelete) {
- repoManager.deleteRepoGroup(overlord, repoGroupId);
+ // Delete the repo relationships
+ entityManager.createNamedQuery(RepoRepoRelationship.DELETE_BY_REPO_ID).setParameter("repoId", repoId)
+ .executeUpdate();
+
+ entityManager.createNamedQuery(RepoRelationship.DELETE_BY_RELATED_REPO_ID)
+ .setParameter("relatedRepoId", relatedRepoId).executeUpdate();
+
+ // Delete any repos that were created in this test
+ for (Integer repoId : reposToDelete) {
+ repoManager.deleteRepo(overlord, repoId);
+ }
+ reposToDelete.clear();
+
+ // Delete any repo groups that were created in this test
+ for (Integer repoGroupId : repoGroupsToDelete) {
+ repoManager.deleteRepoGroup(overlord, repoGroupId);
+ }
+ repoGroupsToDelete.clear();
+
+ // First disassociate packages from the content source
+ entityManager.createNamedQuery(PackageVersionContentSource.DELETE_BY_CONTENT_SOURCE_ID)
+ .setParameter("contentSourceId", syncSource.getId()).executeUpdate();
+
+ // Delete the existing repos
+ nonCandidateOnOtherSource = entityManager.find(Repo.class, nonCandidateOnOtherSource.getId());
+ entityManager.remove(nonCandidateOnOtherSource);
+
+ // Delete the source that was created
+ syncSource = entityManager.find(ContentSource.class, syncSource.getId());
+ entityManager.remove(syncSource);
+
+ nonSyncSource = entityManager.find(ContentSource.class, nonSyncSource.getId());
+ entityManager.remove(nonSyncSource);
+
+ // Delete the fake source type
+ testSourceType = entityManager.find(ContentSourceType.class, testSourceType.getId());
+ entityManager.remove(testSourceType);
+
+ tx.commit();
+ } finally {
+ // Plugin service teardown
+ unprepareServerPluginService();
+ unprepareScheduler();
}
- repoGroupsToDelete.clear();
-
- // First disassociate packages from the content source
- entityManager.createNamedQuery(PackageVersionContentSource.DELETE_BY_CONTENT_SOURCE_ID).setParameter(
- "contentSourceId", syncSource.getId()).executeUpdate();
-
- // Delete the existing repos
- nonCandidateOnOtherSource = entityManager.find(Repo.class, nonCandidateOnOtherSource.getId());
- entityManager.remove(nonCandidateOnOtherSource);
-
- // Delete the source that was created
- syncSource = entityManager.find(ContentSource.class, syncSource.getId());
- entityManager.remove(syncSource);
-
- nonSyncSource = entityManager.find(ContentSource.class, nonSyncSource.getId());
- entityManager.remove(nonSyncSource);
-
- // Delete the fake source type
- testSourceType = entityManager.find(ContentSourceType.class, testSourceType.getId());
- entityManager.remove(testSourceType);
-
- tx.commit();
-
- // Plugin service teardown
- unprepareServerPluginService();
- unprepareScheduler();
}
@Test
@@ -210,12 +211,13 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
previousRepo.addContentSource(syncSource);
repoManager.createRepo(overlord, previousRepo);
- // Test
- // --------------------------------------------
- // TestContentProviderManager providerManager = new TestContentProviderManager();
+ // Test
+ // --------------------------------------------
+ // TestContentProviderManager providerManager = new TestContentProviderManager();
pluginService.getContentProviderManager().testConnection(syncSource.getId());
- boolean completed = pluginService.getContentProviderManager().synchronizeContentProvider(syncSource.getId());
+ boolean completed = pluginService.getContentProviderManager()
+ .synchronizeContentProvider(syncSource.getId());
assert completed;
// Verify RepoGroups
@@ -303,7 +305,7 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T
assert retrievedRepos.size() == 0;
getTransactionManager().commit();
- } catch(Throwable t) {
+ } catch (Throwable t) {
getTransactionManager().rollback();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
index 22d65e2..65154bb 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java
@@ -167,76 +167,79 @@ public class ContentProviderManagerSyncRepoTest extends AbstractEJB3Test {
@AfterMethod
public void tearDownAfterMethod() throws Exception {
+ try {
- TransactionManager tx = getTransactionManager();
- tx.begin();
- EntityManager entityManager = getEntityManager();
+ TransactionManager tx = getTransactionManager();
+ tx.begin();
+ EntityManager entityManager = getEntityManager();
- Query query;
+ Query query;
- ContentSourceManagerLocal contentSourceManagerLocal = LookupUtil.getContentSourceManager();
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- DistributionManagerLocal distroManager = LookupUtil.getDistributionManagerLocal();
- SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
- Subject overlord = subjectManager.getOverlord();
+ ContentSourceManagerLocal contentSourceManagerLocal = LookupUtil.getContentSourceManager();
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ DistributionManagerLocal distroManager = LookupUtil.getDistributionManagerLocal();
+ SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ Subject overlord = subjectManager.getOverlord();
- // Delete all distributions
- distroManager.deleteDistributionMappingsForRepo(overlord, repoToSync.getId());
+ // Delete all distributions
+ distroManager.deleteDistributionMappingsForRepo(overlord, repoToSync.getId());
- for (String distroLabel : TestContentProvider.DISTRIBUTIONS.keySet()) {
- Distribution distro = distroManager.getDistributionByLabel(distroLabel);
- if (distro != null) {
- // Delete the files
- query = entityManager.createNamedQuery(DistributionFile.DELETE_BY_DIST_ID);
- query.setParameter("distId", distro.getId());
- query.executeUpdate();
+ for (String distroLabel : TestContentProvider.DISTRIBUTIONS.keySet()) {
+ Distribution distro = distroManager.getDistributionByLabel(distroLabel);
+ if (distro != null) {
+ // Delete the files
+ query = entityManager.createNamedQuery(DistributionFile.DELETE_BY_DIST_ID);
+ query.setParameter("distId", distro.getId());
+ query.executeUpdate();
- // Delete the actual distro
- distroManager.deleteDistributionByDistId(overlord, distro.getId());
+ // Delete the actual distro
+ distroManager.deleteDistributionByDistId(overlord, distro.getId());
+ }
}
- }
- // Delete all package version <-> content source mappings
- for (ContentSource source : repoContentSources) {
- contentSourceManagerLocal.deleteContentSource(overlord, source.getId());
- }
- repoContentSources.clear();
+ // Delete all package version <-> content source mappings
+ for (ContentSource source : repoContentSources) {
+ contentSourceManagerLocal.deleteContentSource(overlord, source.getId());
+ }
+ repoContentSources.clear();
- // Delete the repo
- repoManager.deleteRepo(overlord, repoToSync.getId());
+ // Delete the repo
+ repoManager.deleteRepo(overlord, repoToSync.getId());
- // Delete any packages that were created
- for (ContentProviderPackageDetails details : TestContentProvider.PACKAGES.values()) {
- String packageName = details.getContentProviderPackageDetailsKey().getName();
+ // Delete any packages that were created
+ for (ContentProviderPackageDetails details : TestContentProvider.PACKAGES.values()) {
+ String packageName = details.getContentProviderPackageDetailsKey().getName();
- query = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID);
- query.setParameter("name", packageName);
- query.setParameter("packageTypeId", packageType.getId());
+ query = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID);
+ query.setParameter("name", packageName);
+ query.setParameter("packageTypeId", packageType.getId());
- Package p = (Package) query.getSingleResult();
- entityManager.remove(p);
- }
+ Package p = (Package) query.getSingleResult();
+ entityManager.remove(p);
+ }
- // Delete the package type
- packageType = entityManager.find(PackageType.class, packageType.getId());
- entityManager.remove(packageType);
+ // Delete the package type
+ packageType = entityManager.find(PackageType.class, packageType.getId());
+ entityManager.remove(packageType);
- resourceType = entityManager.find(ResourceType.class, resourceType.getId());
- entityManager.remove(resourceType);
+ resourceType = entityManager.find(ResourceType.class, resourceType.getId());
+ entityManager.remove(resourceType);
- // Delete the content source type
- contentSourceType = entityManager.find(ContentSourceType.class, contentSourceType.getId());
- entityManager.remove(contentSourceType);
+ // Delete the content source type
+ contentSourceType = entityManager.find(ContentSourceType.class, contentSourceType.getId());
+ entityManager.remove(contentSourceType);
- tx.commit();
+ tx.commit();
- // Cleanup providers between tests
- contentProvider1.reset();
- contentProvider2.reset();
+ // Cleanup providers between tests
+ contentProvider1.reset();
+ contentProvider2.reset();
- // Plugin service teardown
- unprepareServerPluginService();
- unprepareScheduler();
+ } finally {
+ // Plugin service teardown
+ unprepareServerPluginService();
+ unprepareScheduler();
+ }
}
@Test(enabled = TESTS_ENABLED)
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
index c4cfca5..78d23e8 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
@@ -25,8 +25,9 @@ import java.util.Properties;
import javax.persistence.Query;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.common.SystemConfiguration;
@@ -65,6 +66,7 @@ import org.rhq.test.TransactionCallback;
* @author loleary
*
*/
+@SuppressWarnings("deprecation")
public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
/**
@@ -95,7 +97,7 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
private LdapGroupManagerLocal ldapGroupManager = null;
private SystemManagerLocal systemManager = null;
private TestServerPluginService testServerPluginService = null;
-
+
// private Subject overlord = null;
@BeforeClass
@@ -104,12 +106,15 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
// overlord = LookupUtil.getSubjectManager().getOverlord();
systemManager = LookupUtil.getSystemManager();
ldapGroupManager = LookupUtil.getLdapGroupManager();
+ }
+ @BeforeMethod
+ public void beforeMethod() throws Exception {
//we need this because the drift plugins are referenced from the system settings that we use in our tests
testServerPluginService = new TestServerPluginService();
prepareCustomServerPluginService(testServerPluginService);
testServerPluginService.startMasterPluginContainer();
-
+
// get our Maven properties for LDAP testing
java.net.URL url = LdapGroupManagerBeanTest.class.getClassLoader().getResource("test-ldap.properties");
Properties mvnProps = new Properties();
@@ -146,12 +151,11 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
this.setLdapGroupMemberAttribute("member");
}
- @AfterClass
- public void tearDown() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
}
-
+
/**
* Test {@link LdapGroupManagerBean#findAvailableGroupsFor(String)} method
* using a user who does not exist in the test LDAP instance.
@@ -485,21 +489,21 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test {
private void setLdapCtxFactory(final String name) throws Exception {
//this is a readonly system property that we are trying to override, so we
//need to be a little bit more persuasive...
- executeInTransaction(new TransactionCallback() {
+ executeInTransaction(new TransactionCallback() {
@Override
public void execute() throws Exception {
Query q = getEntityManager().createNamedQuery(SystemConfiguration.FIND_PROPERTY_BY_KEY);
q.setParameter("key", SystemSetting.LDAP_NAMING_FACTORY.getInternalName());
-
+
SystemConfiguration config = (SystemConfiguration) q.getSingleResult();
config.setPropertyValue(name);
-
+
getEntityManager().merge(config);
-
+
getEntityManager().flush();
}
});
-
+
//reload the system settings cache so that the new value is reflected there immediately
systemManager.loadSystemConfigurationCache();
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
index 07d320e..712606d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
@@ -1,7 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Arrays;
-import java.util.Collections;
+import static java.util.Arrays.asList;
+import static java.util.Collections.EMPTY_LIST;
import org.testng.annotations.Test;
@@ -10,62 +10,43 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.resource.ResourceType;
-import static java.util.Arrays.asList;
-import static java.util.Collections.EMPTY_LIST;
-
public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = {"plugin.metadata", "Content.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.NewPlugin" })
public void registerContentPlugin() throws Exception {
createPlugin("content-test-plugin", "1.0", "plugin_v1.xml");
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnGroups = {"Content.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnGroups = { "Content.NewPlugin" })
public void upgradeContentPlugin() throws Exception {
createPlugin("content-test-plugin", "2.0", "plugin_v2.xml");
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addPackageTypes() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer1",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer1.Content.1", "ContentServer1.Content.2")
- );
- }
-
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ assertResourceTypeAssociationEquals("ContentServer1", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer1.Content.1", "ContentServer1.Content.2"));
+ }
+
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deletePackageTypes() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer2",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- EMPTY_LIST
- );
+ assertResourceTypeAssociationEquals("ContentServer2", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ EMPTY_LIST);
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deletePackageTypesThatExistsInOldResourceTypeButNotInNewResourceType() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer3",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer3.Content.2", "ContentServer3.Content.3")
- );
+ assertResourceTypeAssociationEquals("ContentServer3", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer3.Content.2", "ContentServer3.Content.3"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addPackageThatAreAddedInNewResourceType() throws Exception {
- assertResourceTypeAssociationEquals(
- "ContentServer4",
- "ContentMetadataManagerBeanTestPlugin",
- "packageTypes",
- asList("ContentServer4.Content.1", "ContentServer4.Content.2")
- );
+ assertResourceTypeAssociationEquals("ContentServer4", "ContentMetadataManagerBeanTestPlugin", "packageTypes",
+ asList("ContentServer4.Content.1", "ContentServer4.Content.2"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addNewDeploymentConfigurationDefinition() throws Exception {
PackageType packageType = loadPackageType("ContentServer", "ContentMetadataManagerBeanTestPlugin",
"ContentServer.Content.1");
@@ -74,67 +55,49 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
assertNotNull(
"Failed to create new deployment configuration definition for package type that previously did not have one",
- deploymentConfigDef
- );
- assertEquals(
- "Expected to find 1 property definition in new deployment configuration definition",
- 1,
- deploymentConfigDef.getPropertyDefinitions().size()
- );
- assertNotNull(
- "Expected to find 1 property definition, <version>, in new deployment configuration definition",
- deploymentConfigDef.get("version")
- );
+ deploymentConfigDef);
+ assertEquals("Expected to find 1 property definition in new deployment configuration definition", 1,
+ deploymentConfigDef.getPropertyDefinitions().size());
+ assertNotNull("Expected to find 1 property definition, <version>, in new deployment configuration definition",
+ deploymentConfigDef.get("version"));
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void updateDeploymentConfigDefThatExistsInOldAndNewResourceType() throws Exception {
PackageType packageType = loadPackageType("ContentServer5", "ContentMetadataManagerBeanTestPlugin",
"ContentServer5.Content.1");
ConfigurationDefinition deploymentConfigDef = packageType.getDeploymentConfigurationDefinition();
assertNotNull("Failed to update deployment configuration definition for package type", deploymentConfigDef);
- assertEquals(
- "Expected to find 2 property definitions in updated deployment configuration definition",
- 2,
- deploymentConfigDef.getPropertyDefinitions().size()
- );
- assertNotNull(
- "Expected existing property definition to be retained across update",
- deploymentConfigDef.get("x")
- );
- assertNotNull(
- "Expected new property definition to be added during update",
- deploymentConfigDef.get("y")
- );
- }
+ assertEquals("Expected to find 2 property definitions in updated deployment configuration definition", 2,
+ deploymentConfigDef.getPropertyDefinitions().size());
+ assertNotNull("Expected existing property definition to be retained across update",
+ deploymentConfigDef.get("x"));
+ assertNotNull("Expected new property definition to be added during update", deploymentConfigDef.get("y"));
+ }
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void deleteDeploymentConfigDefThatIsRemovedInNewResourceType() {
PackageType packageType = loadPackageType("ContentServer5", "ContentMetadataManagerBeanTestPlugin",
"ContentServer5.Content.2");
assertNull(
"Expected deployment configuration definition to be removed since it was removed from new resource type",
- packageType.getDeploymentConfigurationDefinition()
- );
+ packageType.getDeploymentConfigurationDefinition());
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void updateBundleType() {
ResourceType resourceType = loadResourceTypeWithBundleType("ContentServer7",
"ContentMetadataManagerBeanTestPlugin");
BundleType bundleType = resourceType.getBundleType();
assertNotNull("Failed to upgrade bundle type", bundleType);
- assertEquals(
- "Failed to upgrade bundle type correctly. The bundle type name is wrong",
- "ContentServer.Bundle.2",
- bundleType.getName()
- );
+ assertEquals("Failed to upgrade bundle type correctly. The bundle type name is wrong",
+ "ContentServer.Bundle.2", bundleType.getName());
}
- @Test(groups = {"plugin.metadata", "Content.UpgradePlugin"}, dependsOnMethods = {"upgradeContentPlugin"})
+ @Test(groups = { "plugin.metadata", "Content.UpgradePlugin" }, dependsOnMethods = { "upgradeContentPlugin" })
public void addBundleTypeThatOnlyExistsInNewResourceType() {
ResourceType resourceType = loadResourceTypeWithBundleType("ContentServer6",
"ContentMetadataManagerBeanTestPlugin");
@@ -146,23 +109,19 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
}
PackageType loadPackageType(String resourceType, String plugin, String packageType) {
- return (PackageType) getEntityManager().createQuery(
- "from PackageType p left join fetch p.deploymentConfigurationDefinition " +
- "where p.name = :packageType and " +
- "p.resourceType.name = :resourceType and " +
- "p.resourceType.plugin = :plugin")
- .setParameter("packageType", packageType)
- .setParameter("plugin", plugin)
- .setParameter("resourceType", resourceType)
- .getSingleResult();
+ return (PackageType) getEntityManager()
+ .createQuery(
+ "from PackageType p left join fetch p.deploymentConfigurationDefinition "
+ + "where p.name = :packageType and " + "p.resourceType.name = :resourceType and "
+ + "p.resourceType.plugin = :plugin").setParameter("packageType", packageType)
+ .setParameter("plugin", plugin).setParameter("resourceType", resourceType).getSingleResult();
}
ResourceType loadResourceTypeWithBundleType(String resourceType, String plugin) {
- return (ResourceType) getEntityManager().createQuery(
- "from ResourceType t left join fetch t.bundleType where t.name = :resourceType and t.plugin = :plugin")
- .setParameter("resourceType", resourceType)
- .setParameter("plugin", plugin)
- .getSingleResult();
- }
+ return (ResourceType) getEntityManager()
+ .createQuery(
+ "from ResourceType t left join fetch t.bundleType where t.name = :resourceType and t.plugin = :plugin")
+ .setParameter("resourceType", resourceType).setParameter("plugin", plugin).getSingleResult();
+ }
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
index a8bb5e4..99e1e22 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
@@ -1,33 +1,26 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Arrays;
-import java.util.Collections;
+import static java.util.Arrays.asList;
+import static java.util.Collections.EMPTY_LIST;
import org.testng.annotations.Test;
import org.rhq.core.domain.event.EventDefinition;
-import static java.util.Arrays.asList;
-import static java.util.Collections.EMPTY_LIST;
-
public class EventMetadataManagerBeanTest extends MetadataBeanTest {
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" })
public void registerEventsPlugin() throws Exception {
createPlugin("event-test-plugin", "1.0", "plugin_v1.xml");
}
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"}, dependsOnMethods = {"registerEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" }, dependsOnMethods = { "registerEventsPlugin" })
public void persistNewEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer1",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer1", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.NewPlugin"}, dependsOnMethods = {"persistNewEventDefs"})
+ @Test(groups = { "plugin.metadata", "Events.NewPlugin" }, dependsOnMethods = { "persistNewEventDefs" })
public void persistNewEventDefProperties() {
EventDefinition eventDef = loadEventDef("event1", "EventServer1");
@@ -35,60 +28,42 @@ public class EventMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("Failed to set EventDefinition.description", "Event 1", eventDef.getDescription());
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnGroups = {"Events.NewPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnGroups = { "Events.NewPlugin" })
public void upgradeEventsPlugin() throws Exception {
createPlugin("event-test-plugin", "2.0", "plugin_v2.xml");
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void retainEventDefsOfTypeThatIsNotChangedDuringUpgrade() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer1",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer1", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void addNewEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer2",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event2")
- );
+ assertResourceTypeAssociationEquals("EventServer2", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event2"));
}
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void deleteEventDefsThatHaveBeenRemovedInUpgradedType() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer3",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- EMPTY_LIST
- );
- }
-
- @Test(groups = {"plugin.metadata", "Events.UpgradePlugin"}, dependsOnMethods = {"upgradeEventsPlugin"})
+ assertResourceTypeAssociationEquals("EventServer3", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ EMPTY_LIST);
+ }
+
+ @Test(groups = { "plugin.metadata", "Events.UpgradePlugin" }, dependsOnMethods = { "upgradeEventsPlugin" })
public void updateExistingEventDefs() throws Exception {
- assertResourceTypeAssociationEquals(
- "EventServer4",
- "EventMetadataManagerBeanTestPlugin",
- "eventDefinitions",
- asList("event1", "event3")
- );
+ assertResourceTypeAssociationEquals("EventServer4", "EventMetadataManagerBeanTestPlugin", "eventDefinitions",
+ asList("event1", "event3"));
EventDefinition eventDef = loadEventDef("event1", "EventServer4");
assertEquals("The description property should have been updated", "EVENT ONE", eventDef.getDescription());
}
EventDefinition loadEventDef(String name, String resourceType) {
- return (EventDefinition) getEntityManager().createQuery(
- "from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
- .setParameter("name", name)
- .setParameter("resourceType", resourceType)
- .getSingleResult();
+ return (EventDefinition) getEntityManager()
+ .createQuery("from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
+ .setParameter("name", name).setParameter("resourceType", resourceType).getSingleResult();
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index 7ffacbf..fac9251 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -1,5 +1,7 @@
package org.rhq.enterprise.server.resource.metadata;
+import static org.rhq.core.clientapi.shared.PluginDescriptorUtil.loadPluginDescriptor;
+
import java.io.File;
import java.net.URL;
import java.sql.Connection;
@@ -23,7 +25,9 @@ import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.BeforeMethod;
import org.xml.sax.InputSource;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -37,8 +41,6 @@ import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
-import static org.rhq.core.clientapi.shared.PluginDescriptorUtil.loadPluginDescriptor;
-
public class MetadataBeanTest extends AbstractEJB3Test {
private static List<String> plugins = new ArrayList<String>();
@@ -49,9 +51,25 @@ public class MetadataBeanTest extends AbstractEJB3Test {
}
@BeforeGroups(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- public void startMBeanServer() throws Exception {
+ public void beforeGroups() throws Exception {
setupDB();
+ }
+ /**
+ * Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests look
+ * at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
+ * however removes the generated plugin files during each test run.
+ */
+ @AfterGroups(alwaysRun = true, groups = { "plugin.metadata" })
+ void afterGroups() throws Exception {
+ getTransactionManager().begin();
+ getEntityManager().createQuery("delete from Plugin p where p.name in (:plugins)")
+ .setParameter("plugins", plugins).executeUpdate();
+ getTransactionManager().commit();
+ }
+
+ @BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
+ public void beforeMethod() throws Exception {
TestBundleServerPluginService bundleService = new TestBundleServerPluginService();
prepareCustomServerPluginService(bundleService);
bundleService.startMasterPluginContainerWithoutSchedulingJobs();
@@ -63,14 +81,10 @@ public class MetadataBeanTest extends AbstractEJB3Test {
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
- @AfterGroups(groups = { "plugin.metadata" })
- void removePluginsFromDB() throws Exception {
+ @AfterMethod(alwaysRun = true, groups = { "plugin.metadata" })
+ void afterMethod() throws Exception {
+ unprepareServerPluginService();
unprepareScheduler();
-
- getTransactionManager().begin();
- getEntityManager().createQuery("delete from Plugin p where p.name in (:plugins)").setParameter("plugins",
- plugins).executeUpdate();
- getTransactionManager().commit();
}
protected void setupDB() throws Exception {
@@ -145,6 +159,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
return getClass().getResource(dir + "/" + descriptor);
}
+ @SuppressWarnings("unused")
private String getPluginWorkDir() throws Exception {
return getCurrentWorkingDir() + "/work";
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 535fd06..f381318 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -37,7 +37,7 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService;
@@ -77,8 +77,18 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected static ResourceTypeManagerLocal resourceTypeManager;
protected static ResourceManagerLocal resourceManager;
+ @AfterClass
+ public void afterClass() throws Exception {
+ cleanupTest();
+ }
+
@BeforeMethod
protected void init() {
+ agentServiceContainer = prepareForTestAgents();
+ prepareMockAgentServiceContainer();
+
+ prepareScheduler();
+
try {
pluginMgr = LookupUtil.getPluginManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
@@ -91,25 +101,16 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
}
}
- @BeforeClass
- public void beforeClass() {
- agentServiceContainer = prepareForTestAgents();
- prepareMockAgentServiceContainer();
-
- prepareScheduler();
+ @AfterMethod(alwaysRun = true)
+ public void afterMethod() throws Exception {
+ unprepareForTestAgents();
+ unprepareScheduler();
}
protected void prepareMockAgentServiceContainer() {
agentServiceContainer.measurementService = new MockMeasurementAgentService();
}
- @AfterClass
- public void afterClass() throws Exception {
- unprepareForTestAgents();
- unprepareScheduler();
- cleanupTest();
- }
-
protected ResourceType getResourceType(String typeName) {
return getResourceType(typeName, PLUGIN_NAME);
}
@@ -225,8 +226,8 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected int getPluginId(EntityManager entityManager) throws NoResultException {
Plugin existingPlugin;
try {
- existingPlugin = (Plugin) entityManager.createNamedQuery(Plugin.QUERY_FIND_BY_NAME).setParameter("name",
- PLUGIN_NAME).getSingleResult();
+ existingPlugin = (Plugin) entityManager.createNamedQuery(Plugin.QUERY_FIND_BY_NAME)
+ .setParameter("name", PLUGIN_NAME).getSingleResult();
int plugin1Id = existingPlugin.getId();
return plugin1Id;
} catch (NoResultException nre) {
@@ -247,8 +248,8 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
protected Agent getAgent(EntityManager entityManager) throws NoResultException {
Agent existingAgent;
try {
- existingAgent = (Agent) entityManager.createNamedQuery(Agent.QUERY_FIND_BY_NAME).setParameter("name",
- AGENT_NAME).getSingleResult();
+ existingAgent = (Agent) entityManager.createNamedQuery(Agent.QUERY_FIND_BY_NAME)
+ .setParameter("name", AGENT_NAME).getSingleResult();
return existingAgent;
} catch (NoResultException nre) {
throw nre;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
index f38c1a4..fdb6607 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java
@@ -26,9 +26,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -68,8 +65,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
// Attributes --------------------------------------------
- private final Log log = LogFactory.getLog(ResourceFactoryManagerBeanTest.class);
-
private ResourceFactoryManagerLocal resourceFactoryManager;
private ResourceManagerLocal resourceManager;
private Subject overlord;
@@ -89,7 +84,10 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
resourceFactoryManager = LookupUtil.getResourceFactoryManager();
resourceManager = LookupUtil.getResourceManager();
overlord = LookupUtil.getSubjectManager().getOverlord();
+ }
+ @BeforeMethod
+ public void setupBeforeMethod() throws Exception {
prepareScheduler();
TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
agentServiceContainer.resourceFactoryService = mockAgentService;
@@ -98,22 +96,16 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test {
StandardServerPluginService serverPluginService = new StandardServerPluginService();
prepareCustomServerPluginService(serverPluginService);
serverPluginService.startMasterPluginContainer();
+
+ setupResourceEnvironment();
}
- @AfterClass
- public void teardownAfterClass() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void teardownAfterMethod() throws Exception {
unprepareForTestAgents();
unprepareScheduler();
unprepareServerPluginService();
- }
- @BeforeMethod
- public void setupBeforeMethod() throws Exception {
- setupResourceEnvironment();
- }
-
- @AfterMethod
- public void teardownAfterMethod() throws Exception {
teardownResourceEnvironment();
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
index e3f52f5..7506aaa 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
@@ -36,9 +36,7 @@ import javax.transaction.SystemException;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.JobListener;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -94,27 +92,19 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class DataPurgeJobTest extends AbstractEJB3Test {
private Resource newResource;
+ @SuppressWarnings("unused")
private int agentId;
private int resourceTypeId;
private TestServerPluginService testServerPluginService;
-
- @BeforeClass
- public void setup() {
- //we need this because the drift plugins are referenced from the system settings that we use in our tests
- testServerPluginService = new TestServerPluginService();
- prepareCustomServerPluginService(testServerPluginService);
- testServerPluginService.startMasterPluginContainer();
- }
- @AfterClass
- public void tearDown() throws Exception {
- unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
- }
-
@BeforeMethod
public void beforeMethod() throws Throwable {
try {
+ //we need this because the drift plugins are referenced from the system settings that we use in our tests
+ testServerPluginService = new TestServerPluginService();
+ prepareCustomServerPluginService(testServerPluginService);
+ testServerPluginService.startMasterPluginContainer();
+
prepareScheduler();
TestServerCommunicationsService agentContainer = prepareForTestAgents();
newResource = createNewResource();
@@ -125,12 +115,13 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
}
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void afterMethod() throws Throwable {
try {
deleteNewResource(newResource);
unprepareForTestAgents();
unprepareScheduler();
+ unprepareServerPluginService();
} catch (Throwable t) {
System.err.println("Cannot unprepare test: " + t);
t.printStackTrace();
@@ -369,8 +360,8 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
}
mgr.addTraitData(dataset);
- List<MeasurementDataTrait> persistedTraits = mgr.findTraits(LookupUtil.getSubjectManager().getOverlord(), res
- .getId(), traitSchedule.getDefinition().getId());
+ List<MeasurementDataTrait> persistedTraits = mgr.findTraits(LookupUtil.getSubjectManager().getOverlord(),
+ res.getId(), traitSchedule.getDefinition().getId());
assert persistedTraits.size() == count : "did not persist trait data:" + persistedTraits.size() + ":"
+ persistedTraits;
}
@@ -424,9 +415,9 @@ public class DataPurgeJobTest extends AbstractEJB3Test {
mgr.addEventData(eventMap);
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
- PageList<EventComposite> persistedEvents = mgr.findEventComposites(overlord, EntityContext.forResource(res
- .getId()), timestamp - 1L, timestamp + count + 1L, new EventSeverity[] { EventSeverity.DEBUG }, null, null,
- new PageControl());
+ PageList<EventComposite> persistedEvents = mgr.findEventComposites(overlord,
+ EntityContext.forResource(res.getId()), timestamp - 1L, timestamp + count + 1L,
+ new EventSeverity[] { EventSeverity.DEBUG }, null, null, new PageControl());
assert persistedEvents.getTotalSize() == count : "did not persist all events, only persisted: "
+ persistedEvents.getTotalSize();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
index 41f9a56..1f5d0b9 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
@@ -132,12 +132,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public static boolean importerConfigured;
public static boolean importValidatorsObtainedAfterConfiguration;
-
+
public static void reset() {
importerConfigured = false;
importValidatorsObtainedAfterConfiguration = false;
}
-
+
@Override
public void initialize(Subject subject, EntityManager entityManager) {
}
@@ -150,13 +150,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public ExportingIterator<String> getExportingIterator() {
return new ExportingIterator<String>() {
boolean ran = false;
-
+
@Override
public boolean hasNext() {
if (ran) {
return false;
}
-
+
ran = true;
return true;
}
@@ -181,7 +181,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String getNotes() {
return null;
}
-
+
};
}
@@ -189,7 +189,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String getNotes() {
return null;
}
-
+
};
}
@@ -215,20 +215,20 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
@Override
public Set<EntityValidator<String>> getEntityValidators() {
EntityValidator<String> v = new EntityValidator<String>() {
-
+
@Override
public void validateExportedEntity(String entity) throws ValidationException {
}
-
+
@Override
public void initialize(Subject subject, EntityManager entityManager) {
}
};
-
+
if (importerConfigured) {
importValidatorsObtainedAfterConfiguration = true;
}
-
+
return Collections.singleton(v);
}
@@ -245,7 +245,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public String finishImport() throws Exception {
return null;
}
-
+
};
}
@@ -253,9 +253,9 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
public Set<ConsistencyValidator> getRequiredValidators() {
return Collections.emptySet();
}
-
+
}
-
+
private TestData testData;
//I just don't get why this can't be a @BeforeTest
@@ -270,9 +270,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//add our new metric template that we are going to perform the tests with
testData.fakeType = new ResourceType(RESOURCE_TYPE_NAME, PLUGIN_NAME, ResourceCategory.PLATFORM, null);
- MeasurementDefinition mdef =
- new MeasurementDefinition(METRIC_NAME, MeasurementCategory.PERFORMANCE, MeasurementUnits.NONE,
- DataType.MEASUREMENT, true, 600000, DisplayType.SUMMARY);
+ MeasurementDefinition mdef = new MeasurementDefinition(METRIC_NAME, MeasurementCategory.PERFORMANCE,
+ MeasurementUnits.NONE, DataType.MEASUREMENT, true, 600000, DisplayType.SUMMARY);
testData.fakeType.addMetricDefinition(mdef);
em.persist(testData.fakeType);
@@ -310,43 +309,46 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
systemManager.loadSystemConfigurationCache();
testData.systemSettings = systemManager.getSystemConfiguration(freshUser());
-
+
if (createExport) {
export = synchronizationManager.exportAllSubsystems(freshUser());
}
}
private void tearDown() throws Exception {
- getTransactionManager().begin();
try {
- LookupUtil.getSystemManager().setSystemConfiguration(freshUser(), testData.systemSettings, true);
-
- EntityManager em = getEntityManager();
+ getTransactionManager().begin();
+ try {
+ LookupUtil.getSystemManager().setSystemConfiguration(freshUser(), testData.systemSettings, true);
- MeasurementSchedule sched =
- em.find(MeasurementSchedule.class, testData.fakePlatform.getSchedules().iterator().next().getId());
- em.remove(sched);
+ EntityManager em = getEntityManager();
- Resource attachedPlatform = em.find(Resource.class, testData.fakePlatform.getId());
- em.remove(attachedPlatform);
+ MeasurementSchedule sched = em.find(MeasurementSchedule.class, testData.fakePlatform.getSchedules()
+ .iterator().next().getId());
+ em.remove(sched);
- ResourceType attachedType = em.find(ResourceType.class, testData.fakeType.getId());
- em.remove(attachedType);
+ Resource attachedPlatform = em.find(Resource.class, testData.fakePlatform.getId());
+ em.remove(attachedPlatform);
- em.flush();
+ ResourceType attachedType = em.find(ResourceType.class, testData.fakeType.getId());
+ em.remove(attachedType);
- getTransactionManager().commit();
- } catch (Exception e) {
- getTransactionManager().rollback();
- throw e;
- }
+ em.flush();
- unprepareServerPluginService();
- testData.testServerPluginService.stopMasterPluginContainer();
+ getTransactionManager().commit();
+ } catch (Exception e) {
+ getTransactionManager().rollback();
+ throw e;
+ }
+ } finally {
+ unprepareServerPluginService();
+ //unnecessary, done by above method
+ //testData.testServerPluginService.stopMasterPluginContainer();
- export = null;
- testData = null;
- synchronizationManager = null;
+ export = null;
+ testData = null;
+ synchronizationManager = null;
+ }
}
public void testExport() throws Exception {
@@ -364,16 +366,16 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
try {
SystemManagerLocal systemManager = LookupUtil.getSystemManager();
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
Properties beforeSystemSettings = systemManager.getSystemConfiguration(freshUser());
MeasurementDefinitionCriteria criteria = new MeasurementDefinitionCriteria();
criteria.setPageControl(PageControl.getUnlimitedInstance());
criteria.fetchResourceType(true);
- List<MeasurementDefinition> beforeMeasurementDefinitions =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), criteria);
+ List<MeasurementDefinition> beforeMeasurementDefinitions = measurementDefinitionManager
+ .findMeasurementDefinitionsByCriteria(freshUser(), criteria);
synchronizationManager.importAllSubsystems(freshUser(), export.getExportFile(), null);
@@ -381,16 +383,16 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
systemManager.loadSystemConfigurationCache();
Properties afterSystemSettings = systemManager.getSystemConfiguration(freshUser());
- List<MeasurementDefinition> afterMeasurementDefinitions =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), criteria);
+ List<MeasurementDefinition> afterMeasurementDefinitions = measurementDefinitionManager
+ .findMeasurementDefinitionsByCriteria(freshUser(), criteria);
assertEquals("System settings unexpectedly differ", beforeSystemSettings, afterSystemSettings);
//make sure we don't fail on simple order differences, which are not important here..
- Set<MeasurementDefinition> beforeDefsToCheck =
- new HashSet<MeasurementDefinition>(beforeMeasurementDefinitions);
- Set<MeasurementDefinition> afterDefsToCheck =
- new HashSet<MeasurementDefinition>(afterMeasurementDefinitions);
+ Set<MeasurementDefinition> beforeDefsToCheck = new HashSet<MeasurementDefinition>(
+ beforeMeasurementDefinitions);
+ Set<MeasurementDefinition> afterDefsToCheck = new HashSet<MeasurementDefinition>(
+ afterMeasurementDefinitions);
assertEquals("Measurement definitions unexpectedly differ", beforeDefsToCheck, afterDefsToCheck);
} finally {
tearDown();
@@ -420,13 +422,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
assertEquals(settings.getProperty("CAM_BASE_URL"), "http://testing.domain:7080");
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
MeasurementDefinitionCriteria crit = new MeasurementDefinitionCriteria();
crit.addFilterResourceTypeName(RESOURCE_TYPE_NAME);
crit.addFilterName(METRIC_NAME);
- MeasurementDefinition mdef =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), crit).get(0);
+ MeasurementDefinition mdef = measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(),
+ crit).get(0);
assertEquals("The " + METRIC_NAME + " metric should have been updated with default interval of 30s",
Long.valueOf(30000), new Long(mdef.getDefaultInterval()));
@@ -445,9 +447,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//now find the schedule for the measurement
MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager();
- List<MeasurementSchedule> schedules =
- measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(freshUser(), platformResourceId,
- new int[] { mdef.getId() });
+ List<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(
+ freshUser(), platformResourceId, new int[] { mdef.getId() });
assertEquals("Unexpected number of '" + METRIC_NAME + "' schedules found.", 1, schedules.size());
@@ -469,13 +470,13 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
String originalBaseUrl = settings.getProperty("CAM_BASE_URL");
- MeasurementDefinitionManagerLocal measurementDefinitionManager =
- LookupUtil.getMeasurementDefinitionManager();
+ MeasurementDefinitionManagerLocal measurementDefinitionManager = LookupUtil
+ .getMeasurementDefinitionManager();
MeasurementDefinitionCriteria crit = new MeasurementDefinitionCriteria();
crit.addFilterResourceTypeName(RESOURCE_TYPE_NAME);
crit.addFilterName(METRIC_NAME);
- MeasurementDefinition distroNameDef =
- measurementDefinitionManager.findMeasurementDefinitionsByCriteria(freshUser(), crit).get(0);
+ MeasurementDefinition distroNameDef = measurementDefinitionManager.findMeasurementDefinitionsByCriteria(
+ freshUser(), crit).get(0);
long originalInterval = distroNameDef.getDefaultInterval();
@@ -489,12 +490,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//let's just use the default configs so that we don't apply the changes suggested in
//the changed default configs created above
- ImportConfiguration systemSettingsConfiguration =
- new ImportConfiguration(SystemSettingsSynchronizer.class.getName(), new SystemSettingsSynchronizer()
- .getImporter().getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
- ImportConfiguration metricTemplatesConfiguration =
- new ImportConfiguration(MetricTemplateSynchronizer.class.getName(), new MetricTemplateSynchronizer()
- .getImporter().getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
+ ImportConfiguration systemSettingsConfiguration = new ImportConfiguration(
+ SystemSettingsSynchronizer.class.getName(), new SystemSettingsSynchronizer().getImporter()
+ .getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
+ ImportConfiguration metricTemplatesConfiguration = new ImportConfiguration(
+ MetricTemplateSynchronizer.class.getName(), new MetricTemplateSynchronizer().getImporter()
+ .getImportConfigurationDefinition().getDefaultTemplate().createConfiguration());
try {
synchronizationManager.importAllSubsystems(freshUser(), exportData,
@@ -529,9 +530,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
//now find the schedule for the measurement
MeasurementScheduleManagerLocal measurementScheduleManager = LookupUtil.getMeasurementScheduleManager();
- List<MeasurementSchedule> schedules =
- measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(freshUser(), platformResourceId,
- new int[] { distroNameDef.getId() });
+ List<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByResourceIdAndDefinitionIds(
+ freshUser(), platformResourceId, new int[] { distroNameDef.getId() });
assertEquals("Unexpected number of '" + METRIC_NAME + "' schedules found.", 1, schedules.size());
@@ -549,43 +549,42 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
try {
String export = getExportData();
- Document xml =
- DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse(new InputSource(new StringReader(export)));
-
+ Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+ .parse(new InputSource(new StringReader(export)));
+
Element unknownValidator = xml.createElement("validator");
unknownValidator.setAttribute(SynchronizationConstants.CLASS_ATTRIBUTE, "org.nothing.UnknownValidator");
-
+
xml.getDocumentElement().insertBefore(unknownValidator, xml.getDocumentElement().getFirstChild());
-
+
export = documentToString(xml);
-
+
InputStream exportStream = createCompressedStream(export);
-
+
synchronizationManager.importAllSubsystems(freshUser(), exportStream, null);
} finally {
tearDown();
}
}
- public void testImporterConfiguredBeforeValidatorsObtained() throws Exception {
+ public void testImporterConfiguredBeforeValidatorsObtained() throws Exception {
setup(false);
-
+
try {
ImportConfigurationCheckingSynchronizer.reset();
-
+
synchronizationManager.setSynchronizerFactory(new SynchronizerFactory() {
@Override
public Set<Synchronizer<?, ?>> getAllSynchronizers() {
- return Collections.<Synchronizer<?, ?>>singleton(new ImportConfigurationCheckingSynchronizer());
+ return Collections.<Synchronizer<?, ?>> singleton(new ImportConfigurationCheckingSynchronizer());
}
});
-
+
export = synchronizationManager.exportAllSubsystems(freshUser());
-
+
//and import it back again, so that we actually invoke the import validation
synchronizationManager.importAllSubsystems(freshUser(), export.getExportFile(), null);
-
+
assertTrue(ImportConfigurationCheckingSynchronizer.importerConfigured);
assertTrue(ImportConfigurationCheckingSynchronizer.importValidatorsObtainedAfterConfiguration);
} finally {
@@ -596,8 +595,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
}
private String getExportData() throws IOException {
- InputStreamReader str =
- new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(export.getExportFile())), "UTF-8");
+ InputStreamReader str = new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(
+ export.getExportFile())), "UTF-8");
try {
char[] buf = new char[32768];
StringBuilder bld = new StringBuilder();
@@ -634,17 +633,14 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
XPath xpath = XPathFactory.newInstance().newXPath();
xpath.setNamespaceContext(SynchronizationConstants.createConfigurationExportNamespaceContext());
- XPathExpression systemSettingsConfigurationPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:default-configuration/ci:simple-property[@name='propertiesToImport']");
+ XPathExpression systemSettingsConfigurationPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:default-configuration/ci:simple-property[@name='propertiesToImport']");
- XPathExpression baseUrlSettingPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:entity/:data/systemSettings/entry[@key='CAM_BASE_URL']");
+ XPathExpression baseUrlSettingPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.SystemSettingsSynchronizer']/:entity/:data/systemSettings/entry[@key='CAM_BASE_URL']");
- Element systemSettingsConfiguration =
- (Element) systemSettingsConfigurationPath.evaluate(new InputSource(new StringReader(exportXML)),
- XPathConstants.NODE);
+ Element systemSettingsConfiguration = (Element) systemSettingsConfigurationPath.evaluate(new InputSource(
+ new StringReader(exportXML)), XPathConstants.NODE);
String propsToImport = systemSettingsConfiguration.getAttribute("value");
propsToImport += ", CAM_BASE_URL";
@@ -653,8 +649,8 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
exportXML = documentToString(systemSettingsConfiguration.getOwnerDocument());
- Element baseUrlSetting =
- (Element) baseUrlSettingPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element baseUrlSetting = (Element) baseUrlSettingPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
baseUrlSetting.setTextContent("http://testing.domain:7080");
@@ -665,12 +661,11 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
XPath xpath = XPathFactory.newInstance().newXPath();
xpath.setNamespaceContext(SynchronizationConstants.createConfigurationExportNamespaceContext());
- XPathExpression overridesPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:default-configuration/ci:list-property[@name='metricUpdateOverrides']");
+ XPathExpression overridesPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:default-configuration/ci:list-property[@name='metricUpdateOverrides']");
- Element overrides =
- (Element) overridesPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element overrides = (Element) overridesPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
Document doc = overrides.getOwnerDocument();
@@ -691,13 +686,12 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
exportXML = documentToString(doc);
//now redefine the collection interval of the above metric so that we can see the change after the import
- XPathExpression distroNameMetricPath =
- xpath
- .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:entity/:data/metricTemplate[@metricName='"
- + METRIC_NAME + "']");
+ XPathExpression distroNameMetricPath = xpath
+ .compile("/:configuration-export/:entities[@id='org.rhq.enterprise.server.sync.MetricTemplateSynchronizer']/:entity/:data/metricTemplate[@metricName='"
+ + METRIC_NAME + "']");
- Element metric =
- (Element) distroNameMetricPath.evaluate(new InputSource(new StringReader(exportXML)), XPathConstants.NODE);
+ Element metric = (Element) distroNameMetricPath.evaluate(new InputSource(new StringReader(exportXML)),
+ XPathConstants.NODE);
doc = metric.getOwnerDocument();
@@ -730,7 +724,7 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
user = subjectManager.getOverlord();
return user;
}
-
+
private InputStream createCompressedStream(String exportData) throws UnsupportedEncodingException, IOException {
ByteArrayOutputStream compressed = new ByteArrayOutputStream();
OutputStreamWriter wrt = new OutputStreamWriter(new GZIPOutputStream(compressed), "UTF-8");
@@ -740,6 +734,6 @@ public class SynchronizationManagerBeanTest extends AbstractEJB3Test {
wrt.close();
}
- return new ByteArrayInputStream(compressed.toByteArray());
+ return new ByteArrayInputStream(compressed.toByteArray());
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
index 8d27267..ede29a4 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.server.system;
import java.util.Properties;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -43,24 +43,25 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
@BeforeClass
public void setupServer() {
systemManager = LookupUtil.getSystemManager();
-
+ }
+
+ @BeforeMethod
+ public void beforeMethod() {
+ // do this each method so it doesn't expire
+ overlord = LookupUtil.getSubjectManager().getOverlord();
+
//we need this because the drift plugins are referenced from the system settings that we use in our tests
testServerPluginService = new TestServerPluginService();
prepareCustomServerPluginService(testServerPluginService);
testServerPluginService.startMasterPluginContainer();
}
- @AfterClass
+ @AfterMethod(alwaysRun = true)
public void tearDownServer() throws Exception {
unprepareServerPluginService();
- testServerPluginService.stopMasterPluginContainer();
- }
-
- @BeforeMethod
- public void beforeMethod() {
- overlord = LookupUtil.getSubjectManager().getOverlord();
}
+ @SuppressWarnings("deprecation")
public void testGetSystemConfiguration() {
assert null != systemManager.getSystemConfiguration(overlord);
}
@@ -88,7 +89,7 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
public void testVacuumAppdef() {
systemManager.vacuumAppdef(overlord);
}
-
+
@SuppressWarnings("deprecation")
public void testLegacySystemSettingsInCorrectFormat() throws Exception {
//some of the properties are represented differently
@@ -96,45 +97,45 @@ public class SystemManagerBeanTest extends AbstractEJB3Test {
//settings (and consequently database).
//These two still co-exist together in the codebase
//so let's make sure the values correspond to each other.
-
+
SystemSettings settings = systemManager.getSystemSettings(overlord);
Properties config = systemManager.getSystemConfiguration(overlord);
-
+
SystemSettings origSettings = new SystemSettings(settings);
-
+
try {
//let's make sure the values are the same
checkFormats(settings, config);
-
+
boolean currentJaasProvider = Boolean.valueOf(settings.get(SystemSetting.LDAP_BASED_JAAS_PROVIDER));
settings.put(SystemSetting.LDAP_BASED_JAAS_PROVIDER, Boolean.toString(!currentJaasProvider));
-
+
boolean currentUseSslForLdap = Boolean.valueOf(settings.get(SystemSetting.USE_SSL_FOR_LDAP));
settings.put(SystemSetting.USE_SSL_FOR_LDAP, Boolean.toString(!currentUseSslForLdap));
-
+
systemManager.setSystemSettings(overlord, settings);
-
+
settings = systemManager.getSystemSettings(overlord);
config = systemManager.getSystemConfiguration(overlord);
-
+
checkFormats(settings, config);
} finally {
systemManager.setSystemSettings(overlord, origSettings);
}
}
-
- private void checkFormats(SystemSettings settings, Properties config) {
+
+ private void checkFormats(SystemSettings settings, Properties config) {
assert settings.size() == config.size() : "The old and new style system settings differ in size";
-
- for(String name : config.stringPropertyNames()) {
+
+ for (String name : config.stringPropertyNames()) {
SystemSetting setting = SystemSetting.getByInternalName(name);
-
- String oldStyleValue = config.getProperty(name);
+
+ String oldStyleValue = config.getProperty(name);
String newStyleValue = settings.get(setting);
-
+
assert setting != null : "Could not find a system setting called '" + name + "'.";
-
- switch(setting) {
+
+ switch (setting) {
case USE_SSL_FOR_LDAP:
if (RHQConstants.LDAP_PROTOCOL_SECURED.equals(oldStyleValue)) {
assert Boolean.valueOf(newStyleValue) : "Secured LDAP protocol should be represented by a 'true' in new style settings.";
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 45bda40..566bc21 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -72,6 +72,7 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
private static EJB3StandaloneDeployer deployer;
private static Statistics stats;
+ @SuppressWarnings("unused")
private static long start; // see endTest() if you want to output this
private SchedulerService schedulerService;
private ServerPluginService serverPluginService;
@@ -257,6 +258,13 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
return dummyJBossMBeanServer;
}
+ public void releaseJBossMBeanServer() {
+ if (dummyJBossMBeanServer != null) {
+ MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+ dummyJBossMBeanServer = null;
+ }
+ }
+
/**
* If you need to test round trips from server to agent and back, you first must install the server communications
* service that houses all the agent clients. Call this method and add your test agent services to the public fields
@@ -285,10 +293,18 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
* {@link #prepareForTestAgents()}.
*/
public void unprepareForTestAgents() {
+ unprepareForTestAgents(false);
+ }
+
+ public void unprepareForTestAgents(boolean beanOnly) {
try {
- MBeanServer mbs = getJBossMBeanServer();
- if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
- mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(ServerCommunicationsServiceMBean.OBJECT_NAME)) {
+ mbs.unregisterMBean(ServerCommunicationsServiceMBean.OBJECT_NAME);
+ }
+ } else {
+ releaseJBossMBeanServer();
}
} catch (Exception e) {
throw new RuntimeException(e);
@@ -317,10 +333,25 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
public void unprepareServerPluginService() throws Exception {
+ unprepareServerPluginService(false);
+ }
+
+ public void unprepareServerPluginService(boolean beanOnly) throws Exception {
if (serverPluginService != null) {
serverPluginService.stopMasterPluginContainer();
serverPluginService.stop();
- getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(ServerPluginService.OBJECT_NAME)) {
+ getJBossMBeanServer().unregisterMBean(ServerPluginService.OBJECT_NAME);
+ }
+ if (mbs.isRegistered(ServerPluginServiceManagement.OBJECT_NAME)) {
+ getJBossMBeanServer().unregisterMBean(ServerPluginServiceManagement.OBJECT_NAME);
+ }
+
+ } else {
+ releaseJBossMBeanServer();
+ }
serverPluginService = null;
}
}
@@ -351,9 +382,21 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
public void unprepareScheduler() throws Exception {
+ unprepareScheduler(false);
+ }
+
+ public void unprepareScheduler(boolean beanOnly) throws Exception {
if (schedulerService != null) {
schedulerService.stop();
- getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
+ if (beanOnly) {
+ MBeanServer mbs = getJBossMBeanServer();
+ if (mbs.isRegistered(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME)) {
+ getJBossMBeanServer().unregisterMBean(SchedulerServiceMBean.SCHEDULER_MBEAN_NAME);
+ }
+ } else {
+ releaseJBossMBeanServer();
+ }
+
schedulerService = null;
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
index 1fd16a9..cbafd46 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java
@@ -25,8 +25,9 @@ import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.transaction.TransactionManager;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
@@ -86,20 +87,23 @@ public abstract class LargeGroupTestBase extends AbstractEJB3Test {
* Prepares things for the entire test class.
*/
@BeforeClass
- public void beforeClass() {
+ public void beforeClassBase() {
configurationManager = LookupUtil.getConfigurationManager();
resourceManager = LookupUtil.getResourceManager();
resourceGroupManager = LookupUtil.getResourceGroupManager();
subjectManager = LookupUtil.getSubjectManager();
+ }
+ @BeforeMethod
+ public void beforeMethodBase() throws Exception {
TestServerCommunicationsService agentServiceContainer = prepareForTestAgents();
setupMockAgentServices(agentServiceContainer);
prepareScheduler();
}
- @AfterClass(alwaysRun = true)
- public void afterClass() throws Exception {
+ @AfterMethod(alwaysRun = true)
+ public void afterMethodBase() throws Exception {
try {
unprepareForTestAgents();
} finally {
commit 1b40790c2c5deb8db9ec87ccfc3d56a235eb5b00
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jan 18 17:19:58 2012 -0500
[BZ 782612][BZ 772318] the agent registration now requires a token. null tokens are rejected unless its a new agent.
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index 5359c3c..c7e0cfc 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -751,8 +751,8 @@ public class AgentMain {
try {
shutdownPluginContainer();
} catch (Throwable ignore) {
- LOG.warn(AgentI18NResourceKeys.FAILED_TO_SHUTDOWN_COMPONENT, "Plugin Container", ThrowableUtil
- .getAllMessages(ignore));
+ LOG.warn(AgentI18NResourceKeys.FAILED_TO_SHUTDOWN_COMPONENT, "Plugin Container",
+ ThrowableUtil.getAllMessages(ignore));
}
///////
@@ -984,8 +984,8 @@ public class AgentMain {
LOG.debug(AgentI18NResourceKeys.FAILOVER_LIST_LOADED, failoverListFile, list.size());
} catch (Exception e) {
list = new FailoverListComposite(new ArrayList<ServerEntry>());
- LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_LOADED, failoverListFile, ThrowableUtil
- .getAllMessages(e));
+ LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_LOADED, failoverListFile,
+ ThrowableUtil.getAllMessages(e));
}
}
@@ -1191,8 +1191,10 @@ public class AgentMain {
// store is the default value.
// But first we need to backup these original preferences in case the config file fails to load -
// we'll restore the original values in that case.
-
+ // Note that we squirrel away any security token we already have - we need to preserve this when we can
+ // because otherwise the agent will not be able to re-register with any previous name is was registered with.
Preferences preferencesNode = getPreferencesNode();
+ String securityToken = preferencesNode.get(AgentConfigurationConstants.AGENT_SECURITY_TOKEN, null);
ByteArrayOutputStream backup = new ByteArrayOutputStream();
preferencesNode.exportSubtree(backup);
preferencesNode.clear();
@@ -1213,10 +1215,26 @@ public class AgentMain {
ByteArrayInputStream new_config_input_stream = new ByteArrayInputStream(new_config.getBytes());
Preferences.importPreferences(new_config_input_stream);
- if (new AgentConfiguration(preferencesNode).getAgentConfigurationVersion() == 0) {
+ AgentConfiguration newAgentConfig = new AgentConfiguration(preferencesNode);
+ if (newAgentConfig.getAgentConfigurationVersion() == 0) {
throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_NODE_NAME_IN_CONFIG_FILE,
file_name, m_agentPreferencesNodeName));
}
+
+ // If we had a security token, restore it so we can maintain our known registration with the server.
+ // Note that if the configuration file already had a security token defined, it will be used and the old
+ // token we had will be thrown away.
+ if (securityToken != null) {
+ if (newAgentConfig.getAgentSecurityToken() == null) {
+ LOG.debug(AgentI18NResourceKeys.RESTORING_SECURITY_TOKEN);
+ newAgentConfig.setAgentSecurityToken(securityToken);
+ } else {
+ LOG.info(AgentI18NResourceKeys.NOT_RESTORING_SECURITY_TOKEN);
+ }
+ }
+
+ preferencesNode.flush();
+
} catch (Exception e) {
// a problem occurred importing the config file; let's restore our original values
try {
@@ -2297,8 +2315,8 @@ public class AgentMain {
*/
private void prepareAutoDiscoveryListener() throws Exception {
if (m_configuration.isServerAutoDetectionEnabled()) {
- ServiceContainerConfiguration comm_config = new ServiceContainerConfiguration(m_configuration
- .getPreferences());
+ ServiceContainerConfiguration comm_config = new ServiceContainerConfiguration(
+ m_configuration.getPreferences());
if (comm_config.isMulticastDetectorEnabled()) {
m_autoDiscoveryListener = new AgentAutoDiscoveryListener(this, createServerRemoteCommunicator(null,
false, false));
@@ -2469,8 +2487,8 @@ public class AgentMain {
if (wait > 0) {
long now = System.currentTimeMillis();
if ((started + wait) < now) {
- throw new RuntimeException(MSG
- .getMsg(AgentI18NResourceKeys.CANNOT_WAIT_TO_BE_REGISTERED_ANY_LONGER));
+ throw new RuntimeException(
+ MSG.getMsg(AgentI18NResourceKeys.CANNOT_WAIT_TO_BE_REGISTERED_ANY_LONGER));
}
}
@@ -2570,27 +2588,27 @@ public class AgentMain {
Map<String, String> config = new HashMap<String, String>();
if (SecurityUtil.isTransportSecure(uri)) {
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, m_configuration
- .getClientSenderSecurityKeystoreFile());
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM, m_configuration
- .getClientSenderSecurityKeystoreAlgorithm());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH,
+ m_configuration.getClientSenderSecurityKeystoreFile());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_ALGORITHM,
+ m_configuration.getClientSenderSecurityKeystoreAlgorithm());
config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, m_configuration.getClientSenderSecurityKeystoreType());
- config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, m_configuration
- .getClientSenderSecurityKeystorePassword());
- config.put(SSLSocketBuilder.REMOTING_KEY_PASSWORD, m_configuration
- .getClientSenderSecurityKeystoreKeyPassword());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, m_configuration
- .getClientSenderSecurityTruststoreFile());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM, m_configuration
- .getClientSenderSecurityTruststoreAlgorithm());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, m_configuration
- .getClientSenderSecurityTruststoreType());
- config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, m_configuration
- .getClientSenderSecurityTruststorePassword());
+ config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD,
+ m_configuration.getClientSenderSecurityKeystorePassword());
+ config.put(SSLSocketBuilder.REMOTING_KEY_PASSWORD,
+ m_configuration.getClientSenderSecurityKeystoreKeyPassword());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH,
+ m_configuration.getClientSenderSecurityTruststoreFile());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM,
+ m_configuration.getClientSenderSecurityTruststoreAlgorithm());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE,
+ m_configuration.getClientSenderSecurityTruststoreType());
+ config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD,
+ m_configuration.getClientSenderSecurityTruststorePassword());
config.put(SSLSocketBuilder.REMOTING_SSL_PROTOCOL, m_configuration.getClientSenderSecuritySocketProtocol());
config.put(SSLSocketBuilder.REMOTING_KEY_ALIAS, m_configuration.getClientSenderSecurityKeystoreAlias());
- config.put(SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE, Boolean.toString(m_configuration
- .isClientSenderSecurityServerAuthMode()));
+ config.put(SSLSocketBuilder.REMOTING_SERVER_AUTH_MODE,
+ Boolean.toString(m_configuration.isClientSenderSecurityServerAuthMode()));
config.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
// since we do not know the server's client-auth mode, assume we need a keystore and let's make sure we have one
@@ -2600,10 +2618,10 @@ public class AgentMain {
dummy_sslbuilder.setKeyStoreURL(m_configuration.getClientSenderSecurityKeystoreFile());
} catch (Exception e) {
// this probably is due to the fact that the keystore doesn't exist yet - let's prepare one now
- SecurityUtil.createKeyStore(m_configuration.getClientSenderSecurityKeystoreFile(), m_configuration
- .getClientSenderSecurityKeystoreAlias(), "CN=RHQ, OU=RedHat, O=redhat.com, C=US", m_configuration
- .getClientSenderSecurityKeystorePassword(), m_configuration
- .getClientSenderSecurityKeystoreKeyPassword(), "DSA", 36500);
+ SecurityUtil.createKeyStore(m_configuration.getClientSenderSecurityKeystoreFile(),
+ m_configuration.getClientSenderSecurityKeystoreAlias(), "CN=RHQ, OU=RedHat, O=redhat.com, C=US",
+ m_configuration.getClientSenderSecurityKeystorePassword(),
+ m_configuration.getClientSenderSecurityKeystoreKeyPassword(), "DSA", 36500);
// now try to set it again, if an exception is still thrown, it's an unrecoverable error
dummy_sslbuilder.setKeyStoreURL(m_configuration.getClientSenderSecurityKeystoreFile());
@@ -2702,8 +2720,8 @@ public class AgentMain {
StreamUtil.copy(byteStream, fileStream, true);
LOG.debug(AgentI18NResourceKeys.FAILOVER_LIST_PERSISTED, failoverListFile);
} catch (Exception e) {
- LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile, ThrowableUtil
- .getAllMessages(e));
+ LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile,
+ ThrowableUtil.getAllMessages(e));
}
// let's be kind to the user - if any server address is "localhost" or "127.0.0.#"
@@ -2773,8 +2791,8 @@ public class AgentMain {
break;
}
} catch (Throwable t) {
- m_output.println(MSG.getMsg(AgentI18NResourceKeys.COMMAND_FAILURE, cmd, ThrowableUtil
- .getAllMessages(t)));
+ m_output.println(MSG.getMsg(AgentI18NResourceKeys.COMMAND_FAILURE, cmd,
+ ThrowableUtil.getAllMessages(t)));
LOG.debug(t, AgentI18NResourceKeys.COMMAND_FAILURE_STACK_TRACE);
}
}
@@ -2890,7 +2908,7 @@ public class AgentMain {
* @throws HelpException if help was requested and the agent should not be created
*/
private void processArguments(String[] args) throws Exception {
- String sopts = "-:hdlasntguD:i:o:c:p:e:";
+ String sopts = "-:hdlLasntguD:i:o:c:p:e:";
LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'),
new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'),
@@ -2899,6 +2917,7 @@ public class AgentMain {
new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'),
new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'),
+ new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'),
new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'),
new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'),
new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'),
@@ -2908,6 +2927,7 @@ public class AgentMain {
String config_file_name = null;
boolean clean_config = false;
+ boolean clean_token = false; // only used if clean_config = true
boolean purge_data = false;
boolean purge_plugins = false;
AgentInputReaderFactory.ConsoleType console_type = null;
@@ -2967,6 +2987,13 @@ public class AgentMain {
break;
}
+ case 'L': {
+ clean_config = true;
+ purge_data = true;
+ clean_token = true;
+ break;
+ }
+
case 'u': {
purge_data = true;
break;
@@ -3051,7 +3078,21 @@ public class AgentMain {
// now that all the arguments were processed, let's load in our config (this allows the -p to come after -c)
if (clean_config) {
- getPreferencesNode().removeNode();
+ Preferences prefsNode = getPreferencesNode();
+ if (clean_token) {
+ prefsNode.removeNode();
+ } else {
+ // remove everything EXCEPT the security token
+ String[] prefKeys = prefsNode.keys();
+ if (prefKeys != null && prefKeys.length > 0) {
+ for (String prefKey : prefKeys) {
+ if (!prefKey.equals(AgentConfigurationConstants.AGENT_SECURITY_TOKEN)) {
+ prefsNode.remove(prefKey);
+ }
+ }
+ }
+ }
+ prefsNode.flush();
}
if (config_file_name != null) {
@@ -3260,6 +3301,8 @@ public class AgentMain {
preferencesNode.put(ServiceContainerConfigurationConstants.DATA_DIRECTORY, data_dir);
}
+ prefs.flush();
+
LOG.debug(AgentI18NResourceKeys.CONFIGURATION, agent_configuration);
return;
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index b0608c2..6489401 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -613,7 +613,8 @@ public interface AgentI18NResourceKeys {
+ "\\ -g, --purgeplugins Deletes all plugins, forcing the agent to re-download all of them\\n\\\n"
+ "\\ -h, --help Shows this help message (default)\\n\\\n"
+ "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n"
- + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ + "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n"
+ + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
+ "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n"
+ "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n"
+ "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n"
@@ -2104,4 +2105,10 @@ public interface AgentI18NResourceKeys {
@I18NMessage("Restarting the plugin container due to previous failure to merge the upgrade results with the server.")
String RESTARTING_PLUGIN_CONTAINER_AFTER_UPGRADE_MERGE_FAILURE = "AgentMain.pc-conditional-restart";
+
+ @I18NMessage("Restoring the original security token.")
+ String RESTORING_SECURITY_TOKEN = "AgentMain.restoring-security-token";
+
+ @I18NMessage("The config file already has a security token defined. The original security token will be thrown away.")
+ String NOT_RESTORING_SECURITY_TOKEN = "AgentMain.not-restoring-security-token";
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
index fd2286c..90d7042 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
@@ -56,6 +56,9 @@ public class ViewAgentUIBean extends PagedDataTableUIBean {
hasPermission();
int agentId = FacesContextUtility.getRequiredRequestParameter("agentId", Integer.class);
agent = agentManager.getAgentByID(agentId);
+ if (!hasPermissionToViewSecurityToken()) {
+ agent.setAgentToken("******");
+ }
}
return agent;
}
@@ -94,4 +97,9 @@ public class ViewAgentUIBean extends PagedDataTableUIBean {
+ "] does not have the proper permissions to view or manage agents");
}
}
+
+ private boolean hasPermissionToViewSecurityToken() {
+ Subject subject = EnterpriseFacesContextUtility.getSubject();
+ return LookupUtil.getAuthorizationManager().hasGlobalPermission(subject, Permission.MANAGE_SECURITY);
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index e380b6e..75c4d65 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -104,14 +104,10 @@ public class CoreServerServiceImpl implements CoreServerService {
* something else".
*
* If there is no original token with the request, this is either a brand new agent never before registered, or it
- * is an agent that has been registered before but for some reason lost its token. In this case, we will look at
- * this registration's host/port of this new agent. If it matches the host/port of another agent but the
- * existing name and the new agent's name don't match, the server will abort and tell the agent, "You don't know
- * who you are, but I know there is already an agent with the host and port you are trying to register with
- * under a different name - so I'm going to trust this original agent and not allow you to register that name
- * under a different host/port. If you are that original agent, then you need to register with that original
- * name". When the agent registers again, this time with the correct name, the agent will be given its token.
- * This usually will occur if you reinstall the agent and try to register it under a different name.
+ * is an agent that has been registered before but for some reason lost its token.
+ * In this case, if there is no agent with the name being requested, we register this as a new agent.
+ * If, however, the agent name is already in use, we abort the request. An agent cannot register with an
+ * existing agent without sending that agent's security token.
*/
if (request.getOriginalToken() != null) {
@@ -140,19 +136,24 @@ public class CoreServerServiceImpl implements CoreServerService {
// the agent request provided a name that already is in use by an agent. However, the request
// provided a security token that was not assigned to any agent! How can this be? Something is fishy.
String msg = "The agent asking for registration under the name [" + request.getName()
- + "] provided an invalid security token. This request will fail.";
+ + "] provided an invalid security token. This request will fail. "
+ + "Please consult an administrator to reconfigure this agent with its proper security token.";
throw new AgentRegistrationException(msg);
}
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
request.getPort());
if (agentByAddressPort != null) {
- // the agent request provided a security token but it is an unknown/unused/bogus token.
+ // The agent is requesting to register an unused agent name - so this is considered a new agent.
+ // It provided a security token but it is an unknown/obsolete/bogus token (usually due to the
+ // fact that someone purged the platform/agent from the server database but the old agent is
+ // still around with its old token).
// However, the IP/port it wants to use is already in-use. This sounds fishy. If we let this
// go through, this agent with an unknown/bogus token will essentially hijack this IP/port
// belonging to an existing agent. If the agent wants to reuse an IP/port already in existence, it should
// already know its security token associated with that IP/port. Thus, we will abort this request.
String msg = "The agent asking for registration under the name [" + request.getName()
- + "] is attempting to authenticate using an unknown security token. This request will fail.";
+ + "] is attempting to take another agent's address/port [" + request.getAddress() + ":"
+ + request.getPort() + "] with an unknown security token. This request will fail.";
throw new AgentRegistrationException(msg);
}
}
@@ -167,23 +168,25 @@ public class CoreServerServiceImpl implements CoreServerService {
+ request.getPort()
+ "] that is already registered under a different name ["
+ agentByAddressPort.getName()
- + "]; if this new agent is actually the same as the original, then re-register with the same name";
+ + "]; if this new agent is actually the same as the original, then re-register with the same name"
+ + " and same security token.";
throw new AgentRegistrationException(msg);
+ } else {
+ String msg = "The agent [" + request.getName()
+ + "] is attempting to re-register without a security token. "
+ + "Please consult an administrator to reconfigure this agent with its proper security token.";
+ throw new AgentRegistrationException(msg);
+
}
} else {
if (agentByName != null) {
- // the name being registered already exists, however, the agent request is trying to set it
- // to some unknown IP/port combination and there is no security token to authenticate this request!
+ // the name being registered already exists - but there is no security token to authenticate this request!
// Therefore, because this agent name is already registered and because this current request
// cannot authenticate itself with the proper security token, we fail.
String msg = "An agent is trying to register with an existing agent name ["
+ request.getName()
- + "]. The registration request is attempting to assign the agent an unknown address/port ["
- + request.getAddress()
- + ":"
- + request.getPort()
+ "] without providing a valid security token. If you are attempting to re-register this agent, "
- + "make sure you register with its prior address/port.";
+ + "please consult an administrator to reconfigure this agent with its proper security token.";
throw new AgentRegistrationException(msg);
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index a3dda5e..5a702ff 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -41,12 +41,57 @@ import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
/**
+ * This tests the core server service. This includes agent registration.
+ *
* @author John Mazzitelli
*/
+
+// These are the agent registration unit test cases.
+// (allowed) means the registration should succeed.
+// (REJECT) means the server should reject that agent registration request.
+// ---
+// A. testNewAgentRegistrationWithOldToken
+// 1) register a new agent with a non-null, unknown security token (allowed)
+// B. testChangeAddressPort
+// 1) register a new agent Z with null security token (allowed)
+// 2) re-register agent Z with its token but change its host (allowed)
+// 3) re-register agent Z with its token but change its port (allowed)
+// 4) re-register agent Z with its token but change its host and port (allowed)
+// 5) re-register agent Z with its token but change nothing (allowed)
+// 6) re-register agent Z with NO token but change its host (REJECT)
+// 7) re-register agent Z with NO token but change its port (REJECT)
+// 8) re-register agent Z with NO token but change its host and port (REJECT)
+// 9) re-register agent Z with NO token but change nothing (REJECT)
+// C. testNormalAgentRegistration
+// 1) register a new agent A with a null security token (allowed, same as B.1)
+// D. testHijackExistingAgentAddressPort
+// 1) register a new agent B with null security token but using A's host/port (REJECT)
+// E. testHijackExistingAgentName
+// 1) register an agent using an already-existing agent name A, and using A's host but a different port with a null token (REJECT - missing the token)
+// 2) register an agent using an already-existing agent name A, and using A's port but a different host with a null token (REJECT - missing the token)
+// 3) register an agent using an already-existing agent name A, and using a different port and host with a null token (REJECT - missing the token)
+// F. testHijackExistingAgentAddressPortWithBogusToken
+// 1) register a new agent B with A's host and port but with a bogus token (REJECT)
+// G. testHijackExistingAgentNameWithBogusToken
+// 1) re-register agent A with its original host and port but with a bogus token (REJECT)
+// 2) re-register agent A with its original host, different port but with bogus token (REJECT)
+// 3) re-register agent A with different host, original port but with bogus token (REJECT)
+// 4) re-register agent A with different host and port but with bogus token (REJECT)
+// H. testHijackExistingAgentNameWithAnotherAgentToken
+// 1) re-register agent A with its original host and port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 2) re-register agent A with different host and original port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 3) re-register agent A with original host and different port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// 4) re-register agent A with different host and port but with Z's security token (REJECT - you cannot authenticate using another agent's token)
+// I. testAgentHijackingAnotherAgentAddressPort
+// 1) re-register agent A using A's correct security token but with Z's host and Z's port (REJECT - one agent cannot steal another agent's host/port endpoint) NOTE: this is not D.1 because in D.1, the request doesn't have a token. This I.1 test has a token and it really authenticates the agent A making the request. This also isn't F.1 because F.1, while it has a token, it is not a valid token, thus its agent is not authentic.
+// J. testAttemptToChangeAgentName
+// 1) register agent "newName" but with Z's host/port/token. In effect, this is trying to change the agent's name. (REJECT - you are not allowed to rename agents)
+
@Test
public class CoreServerServiceImplTest extends AbstractEJB3Test {
private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
@@ -67,7 +112,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
public void testNewAgentRegistrationWithOldToken() throws Exception {
// this tests the case where someone purged an agent from the DB, but then
// changed their mind and want to re-run that agent and re-register it again.
- // In this case, the agent (if not using --cleanconfig) would still have the old token.
+ // In this case, the agent (if not using --cleanallconfig) would still have the old token.
// The agent should still be allowed to register again.
CoreServerServiceImpl service = new CoreServerServiceImpl();
AgentRegistrationRequest request = createRequest(prefixName("old"), "hostOld", 12345, "oldtoken");
@@ -128,18 +173,40 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
assert agent.getAddress().equals("hostZdoubleprime");
assert agent.getPort() == 55552;
- // now don't change Z's host/port but re-register everything the same, but with no token
- request = createRequest(zName, "hostZdoubleprime", 55552, null);
- results = service.registerAgent(request);
- assert results != null;
- agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
- assert agent.getName().equals(zName);
- assert agent.getAddress().equals("hostZdoubleprime");
- assert agent.getPort() == 55552;
-
// remember this agent so our later tests can use it
zReq = request;
zResults = results;
+
+ // Try to re-register changes to host and/or port but do not send any token.
+ // Because there is no token, these should fail.
+ request = createRequest(zName, B_HOST, zReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "(1) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, zReq.getAddress(), B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "(2) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, B_HOST, B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "(3) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
+ request = createRequest(zName, zReq.getAddress(), zReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "(4) Should not have been able to register without a token";
+ } catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
+ }
}
@Test(dependsOnMethods = "testChangeAddressPort")
@@ -159,6 +226,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used host/port with new agent name";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -171,18 +239,21 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), null);
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, null);
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name without a token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -195,6 +266,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used host/port with new agent name and invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -207,24 +279,28 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, "badtoken");
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack a used agent name with an invalid token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -237,24 +313,28 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
request = createRequest(aReq.getName(), B_HOST, B_PORT, zResults.getAgentToken());
try {
service.registerAgent(request);
assert false : "Should not have been able to hijack agent A using Z's token";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -267,6 +347,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "An agent should not have been able to hijack another agent's host/port";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -279,6 +360,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
service.registerAgent(request);
assert false : "An agent should not be able to change its name";
} catch (AgentRegistrationException ok) {
+ debugPrintThrowable(ok);
}
}
@@ -291,6 +373,12 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
return TEST_AGENT_NAME_PREFIX + name;
}
+ private void debugPrintThrowable(Throwable t) {
+ if (true) {
+ System.out.println(ThrowableUtil.getAllMessages(t));
+ }
+ }
+
@BeforeClass
public void prepare() throws Exception {
// mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
commit a51904cf0250d43f5c9f27f42521352f47750052
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 17 14:48:11 2012 -0500
[BZ 772318] forgot to test the most obvious and most common scenario - re-starting the agent. My original fix broke that. This fixes it back again and adds a unit test for it.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 85aa364..e380b6e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -125,7 +125,7 @@ public class CoreServerServiceImpl implements CoreServerService {
} else {
Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
request.getPort());
- if (agentByAddressPort != null) {
+ if (agentByAddressPort != null && !agentByAddressPort.getName().equals(request.getName())) {
// the agent request provided information about an authentic agent but it is trying to
// steal another agent's host/port. Thus, we will abort this request.
String msg = "The agent asking for registration [" + request.getName()
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 0abbbeb..a3dda5e 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -119,6 +119,15 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
assert agent.getAddress().equals("hostZdoubleprime");
assert agent.getPort() == 55552;
+ // now don't change Z's host/port but re-register everything the same with its token
+ request = createRequest(zName, "hostZdoubleprime", 55552, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
// now don't change Z's host/port but re-register everything the same, but with no token
request = createRequest(zName, "hostZdoubleprime", 55552, null);
results = service.registerAgent(request);
@@ -343,6 +352,8 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
MBeanServer mbs = getJBossMBeanServer();
mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+ unprepareForTestAgents();
+
// in case this was set before our tests, put it back the way it was
if (oldServerNamePropertyValue != null) {
System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
commit c9ad8035f689423b5c06b1818d16b9574442b30e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 17 12:04:00 2012 -0500
[BZ 772318] the agent registration process was lax and allowed somethings that it shouldn't have. This closes the known holes and adds unit tests to check that all known use-cases are handled properly.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
index 3b5ecc7..85aa364 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java
@@ -94,9 +94,6 @@ public class CoreServerServiceImpl implements CoreServerService {
// If not, no point in continuing - the server won't be able to talk to the agent anyway.
pingEndpoint(request.getRemoteEndpoint());
- // TODO (ghinkle): Check platform limit - do we still care about this?
- //getPlatformManager().enforceLicenseLimit(args.getCpuCount());
-
Agent agentByName = getAgentManager().getAgentByName(request.getName());
/*
@@ -125,6 +122,38 @@ public class CoreServerServiceImpl implements CoreServerService {
String msg = "The agent asking for registration is already registered with the name ["
+ agentByToken.getName() + "], it cannot change its name to [" + request.getName() + "]";
throw new AgentRegistrationException(msg);
+ } else {
+ Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
+ request.getPort());
+ if (agentByAddressPort != null) {
+ // the agent request provided information about an authentic agent but it is trying to
+ // steal another agent's host/port. Thus, we will abort this request.
+ String msg = "The agent asking for registration [" + request.getName()
+ + "] is trying to register the same address/port [" + request.getAddress() + ":"
+ + request.getPort() + "] that is already registered under a different name ["
+ + agentByAddressPort.getName() + "]";
+ throw new AgentRegistrationException(msg);
+ }
+ }
+ } else {
+ if (agentByName != null) {
+ // the agent request provided a name that already is in use by an agent. However, the request
+ // provided a security token that was not assigned to any agent! How can this be? Something is fishy.
+ String msg = "The agent asking for registration under the name [" + request.getName()
+ + "] provided an invalid security token. This request will fail.";
+ throw new AgentRegistrationException(msg);
+ }
+ Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(),
+ request.getPort());
+ if (agentByAddressPort != null) {
+ // the agent request provided a security token but it is an unknown/unused/bogus token.
+ // However, the IP/port it wants to use is already in-use. This sounds fishy. If we let this
+ // go through, this agent with an unknown/bogus token will essentially hijack this IP/port
+ // belonging to an existing agent. If the agent wants to reuse an IP/port already in existence, it should
+ // already know its security token associated with that IP/port. Thus, we will abort this request.
+ String msg = "The agent asking for registration under the name [" + request.getName()
+ + "] is attempting to authenticate using an unknown security token. This request will fail.";
+ throw new AgentRegistrationException(msg);
}
}
} else {
@@ -141,6 +170,22 @@ public class CoreServerServiceImpl implements CoreServerService {
+ "]; if this new agent is actually the same as the original, then re-register with the same name";
throw new AgentRegistrationException(msg);
}
+ } else {
+ if (agentByName != null) {
+ // the name being registered already exists, however, the agent request is trying to set it
+ // to some unknown IP/port combination and there is no security token to authenticate this request!
+ // Therefore, because this agent name is already registered and because this current request
+ // cannot authenticate itself with the proper security token, we fail.
+ String msg = "An agent is trying to register with an existing agent name ["
+ + request.getName()
+ + "]. The registration request is attempting to assign the agent an unknown address/port ["
+ + request.getAddress()
+ + ":"
+ + request.getPort()
+ + "] without providing a valid security token. If you are attempting to re-register this agent, "
+ + "make sure you register with its prior address/port.";
+ throw new AgentRegistrationException(msg);
+ }
}
}
@@ -196,8 +241,8 @@ public class CoreServerServiceImpl implements CoreServerService {
// the agent does not yet exist, we need to create it
try {
- agentByName = new Agent(request.getName(), request.getAddress(), request.getPort(), request
- .getRemoteEndpoint(), generateAgentToken());
+ agentByName = new Agent(request.getName(), request.getAddress(), request.getPort(),
+ request.getRemoteEndpoint(), generateAgentToken());
agentByName.setServer(registeringServer);
agentManager.createAgent(agentByName);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
new file mode 100644
index 0000000..0abbbeb
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -0,0 +1,432 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.core;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+import javax.persistence.Query;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.server.core.AgentRegistrationException;
+import org.rhq.core.clientapi.server.core.AgentRegistrationRequest;
+import org.rhq.core.clientapi.server.core.AgentRegistrationResults;
+import org.rhq.core.clientapi.server.core.AgentVersion;
+import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.common.ProductInfo;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+/**
+ * @author John Mazzitelli
+ */
+@Test
+public class CoreServerServiceImplTest extends AbstractEJB3Test {
+ private static final String TEST_AGENT_NAME_PREFIX = "CoreServerServiceImplTest.Agent";
+ private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name";
+ private AgentVersion agentVersion;
+ private Server server;
+ private String oldServerNamePropertyValue = null;
+ private AgentRegistrationRequest aReq = null;
+ private AgentRegistrationResults aResults = null;
+ private AgentRegistrationRequest zReq = null;
+ private AgentRegistrationResults zResults = null;
+
+ private static final int A_PORT = 11111;
+ private static final String A_HOST = "hostA";
+ private static final int B_PORT = 22222;
+ private static final String B_HOST = "hostB";
+
+ public void testNewAgentRegistrationWithOldToken() throws Exception {
+ // this tests the case where someone purged an agent from the DB, but then
+ // changed their mind and want to re-run that agent and re-register it again.
+ // In this case, the agent (if not using --cleanconfig) would still have the old token.
+ // The agent should still be allowed to register again.
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request = createRequest(prefixName("old"), "hostOld", 12345, "oldtoken");
+ AgentRegistrationResults results = service.registerAgent(request);
+ assert results != null : "cannot re-register an old agent";
+ Agent agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(request.getName());
+ assert agent.getAddress().equals(request.getAddress());
+ assert agent.getPort() == request.getPort();
+ LookupUtil.getAgentManager().deleteAgent(agent);
+ }
+
+ public void testChangeAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ AgentRegistrationResults results;
+
+ String zName = prefixName("Z");
+
+ // create a new agent Z with host/port of hostZ/55550
+ request = createRequest(zName, "hostZ", 55550, null);
+ results = service.registerAgent(request);
+ assert results != null : "got null results";
+
+ // now change Z's host to hostZprime
+ request = createRequest(zName, "hostZprime", 55550, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ Agent agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZprime");
+ assert agent.getPort() == 55550;
+
+ // now change Z's port to 55551
+ request = createRequest(zName, "hostZprime", 55551, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZprime");
+ assert agent.getPort() == 55551;
+
+ // now change Z's host/port to hostZdoubleprime/55552
+ request = createRequest(zName, "hostZdoubleprime", 55552, results.getAgentToken());
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
+ // now don't change Z's host/port but re-register everything the same, but with no token
+ request = createRequest(zName, "hostZdoubleprime", 55552, null);
+ results = service.registerAgent(request);
+ assert results != null;
+ agent = LookupUtil.getAgentManager().getAgentByAgentToken(results.getAgentToken());
+ assert agent.getName().equals(zName);
+ assert agent.getAddress().equals("hostZdoubleprime");
+ assert agent.getPort() == 55552;
+
+ // remember this agent so our later tests can use it
+ zReq = request;
+ zResults = results;
+ }
+
+ @Test(dependsOnMethods = "testChangeAddressPort")
+ public void testNormalAgentRegistration() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ aReq = createRequest(prefixName("A"), A_HOST, A_PORT, null);
+ aResults = service.registerAgent(aReq);
+ assert aResults != null : "got null results";
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("B"), aReq.getAddress(), aReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used host/port with new agent name";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentName() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, null);
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name without a token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentAddressPortWithBogusToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("B"), aReq.getAddress(), aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used host/port with new agent name and invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentNameWithBogusToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, "badtoken");
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack a used agent name with an invalid token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testHijackExistingAgentNameWithAnotherAgentToken() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), aReq.getAddress(), aReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, aReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), aReq.getAddress(), B_PORT, zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ request = createRequest(aReq.getName(), B_HOST, B_PORT, zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "Should not have been able to hijack agent A using Z's token";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testAgentHijackingAnotherAgentAddressPort() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(aReq.getName(), zReq.getAddress(), zReq.getPort(), aResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "An agent should not have been able to hijack another agent's host/port";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ @Test(dependsOnMethods = "testNormalAgentRegistration")
+ public void testAttemptToChangeAgentName() throws Exception {
+ CoreServerServiceImpl service = new CoreServerServiceImpl();
+ AgentRegistrationRequest request;
+ request = createRequest(prefixName("newName"), zReq.getAddress(), zReq.getPort(), zResults.getAgentToken());
+ try {
+ service.registerAgent(request);
+ assert false : "An agent should not be able to change its name";
+ } catch (AgentRegistrationException ok) {
+ }
+ }
+
+ private AgentRegistrationRequest createRequest(String name, String address, int port, String token) {
+ return new AgentRegistrationRequest(name, address, port, "socket://" + address + ":" + port
+ + "/?rhq.communications.connector.rhqtype=agent", true, token, agentVersion);
+ }
+
+ private String prefixName(String name) {
+ return TEST_AGENT_NAME_PREFIX + name;
+ }
+
+ @BeforeClass
+ public void prepare() throws Exception {
+ // mock the name of our server via the sysprop (in production, this is normally set in rhq-server.properties)
+ oldServerNamePropertyValue = System.getProperty(RHQ_SERVER_NAME_PROPERTY);
+ String newServerNamePropertyValue = "CoreServerServiceImplTest.Server";
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, newServerNamePropertyValue);
+
+ // mock up our core server MBean that provides information about where the jboss home dir is
+ MBeanServer mbs = getJBossMBeanServer();
+ DummyCoreServer mbean = new DummyCoreServer();
+ mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
+
+ // in order to register, we need to mock out the agent version file used by the server
+ // to determine the agent version it supports.
+ agentVersion = new AgentVersion("1.2.3", "12345");
+ File agentVersionFile = new File(mbean.getJBossServerHomeDir(),
+ "deploy/rhq.ear/rhq-downloads/rhq-agent/rhq-server-agent-versions.properties");
+ agentVersionFile.getParentFile().mkdirs();
+ agentVersionFile.delete();
+ Properties agentVersionProps = new Properties();
+ agentVersionProps.put("rhq-agent.latest.version", agentVersion.getVersion());
+ agentVersionProps.put("rhq-agent.latest.build-number", agentVersion.getBuild());
+ FileOutputStream fos = new FileOutputStream(agentVersionFile);
+ try {
+ agentVersionProps.store(fos, "This file was created by " + CoreServerServiceImplTest.class.getName());
+ } finally {
+ fos.close();
+ }
+
+ // this mocks out the endpoint ping - the server will think the agent that is registering is up and pingable
+ prepareForTestAgents();
+
+ // mock our server
+ server = new Server();
+ server.setName(newServerNamePropertyValue);
+ server.setAddress("CoreServerServiceImplTest.localhost");
+ server.setPort(12345);
+ server.setSecurePort(12346);
+ server.setOperationMode(OperationMode.NORMAL);
+ int serverId = LookupUtil.getServerManager().create(server);
+ server.setId(serverId);
+ }
+
+ @AfterClass
+ public void unprepare() throws Exception {
+ // clean up any agents we might have created
+ Query q = getEntityManager().createQuery(
+ "select a from Agent a where name like '" + TEST_AGENT_NAME_PREFIX + "%'");
+ List<Agent> doomed = (List<Agent>) q.getResultList();
+ for (Agent deleteMe : doomed) {
+ LookupUtil.getAgentManager().deleteAgent(deleteMe);
+ }
+
+ // cleanup our test server
+ LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
+ LookupUtil.getCloudManager().deleteServer(server.getId());
+
+ // shutdown our mock mbean server
+ MBeanServer mbs = getJBossMBeanServer();
+ mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+
+ // in case this was set before our tests, put it back the way it was
+ if (oldServerNamePropertyValue != null) {
+ System.setProperty(RHQ_SERVER_NAME_PROPERTY, oldServerNamePropertyValue);
+ }
+ }
+
+ interface DummyCoreServerMBean extends CoreServerMBean {
+ };
+
+ class DummyCoreServer implements DummyCoreServerMBean {
+
+ @Override
+ public String getName() {
+ return "CoreServer";
+ }
+
+ @Override
+ public int getState() {
+ return 0;
+ }
+
+ @Override
+ public String getStateString() {
+ return "";
+ }
+
+ @Override
+ public void jbossInternalLifecycle(String arg0) throws Exception {
+ }
+
+ @Override
+ public void create() throws Exception {
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public void start() throws Exception {
+ }
+
+ @Override
+ public void stop() {
+ }
+
+ @Override
+ public String getVersion() {
+ return null;
+ }
+
+ @Override
+ public String getBuildNumber() {
+ return null;
+ }
+
+ @Override
+ public Date getBootTime() {
+ return null;
+ }
+
+ @Override
+ public File getInstallDir() {
+ return null;
+ }
+
+ @Override
+ public File getJBossServerHomeDir() {
+ return new File(System.getProperty("java.io.tmpdir"), "CoreServerServiceImplTest");
+ }
+
+ @Override
+ public File getJBossServerDataDir() {
+ return null;
+ }
+
+ @Override
+ public File getJBossServerTempDir() {
+ return null;
+ }
+
+ @Override
+ public ProductInfo getProductInfo() {
+ return null;
+ }
+ }
+}
12 years, 4 months
[rhq] Branch 'rc/jon3.0.1.GA' - 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/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 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 +-
126 files changed, 144 insertions(+), 144 deletions(-)
New commits:
commit 9c40d8d71feb0bdd719c9a91af2483cb771af7b7
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Wed Feb 1 16:32:08 2012 -0500
development RHQ_4.2.0.JON.3.0.2-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 3167d39..0991c91 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1e93560..1370a4c 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 198d9bc..c41be24 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 972a5a2..0c28ff6 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 91f9d94..1b56b75 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 262a9f7..5388ea4 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 2f2f2b3..a228e4f 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 5442ad3..e834756 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index dbeb7ef..83a5f8d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ed95c9c..88e0649 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 848940f..3be4240 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index c741bd1..a693dbe 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 1c16c09..56fd6e6 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a8475ca..352de5e 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 1ce1e2c..81685e7 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 4aa616d..33d49ed 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index eaa3727..3e6ae6e 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 93a6f6b..2978ebb 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 24c2281..f845ef7 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 4182380..f081555 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index be3e3a8..37fab92 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 7db2560..32b7c7c 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index a2ad386..114b7d1 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f1af689..9ffc883 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index b202e1f..15ebbec 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 3d1c787..2811c07 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 5def783..1c4c70c 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index d840e09..79ea577 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index dc59c86..c8b2614 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 638f32c..f83b2e6 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 0050184..2ff61d6 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index ebb80cc..4c9f8c2 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5db71e7..5afc82a 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index a9be89d..4cd7b22 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 049e375..47bfa9d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index e8a1e84..9ab21c7 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index e7612ee..a6c07ae 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 70427bf..c0f0d63 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 8f44df2..9deb192 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index b7cfdcf..47517a2 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 61fe184..20da9cc 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 84f1702..e7b916b 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index aa5328b..2a51a08 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 878c288..87dcc35 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index c22ce1a..186aee8 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 452d62a..13c4903 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a30f495..a76e6c2 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6ffab76..e5c89a7 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 69f4c4b..ddc59eb 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 9ccda53..6fb795a 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index b1b56d0..3f706ad 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 6a7d56d..253c731 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 1282542..13c443a 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 5815d72..5cdd385 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 47f753e..38e5268 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index cc629bf..a9a3f5a 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 5f5509f..f440701 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 733c73e..96044a9 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 57ec9b0..43d061c 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 492c91c..ada1b7e 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 253d03f..d7d85bf 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 364d1c5..4ba3acb 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 2c0a623..c9a0f90 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index f67dc29..6e0b704 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 999bb39..0f8c56f 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index b67cfb7..8977b4f 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 5212bac..ae13209 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 872737a..2acd0dc 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 1837a58..42c1dbe 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index fb0b291..d1d6a37 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index c7d0dce..5805b93 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 9902ea8..b042173 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index c5aeb57..62fca8f 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 0261e21..29dc323 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index c9bf1ce..85495c7 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 3cdb7de..84b13c6 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 26957d6..29c867e 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index b177e34..019bd6e 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 488cf6b..7465cf4 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0344994..0561ce1 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 6c3464e..a97dbf6 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index a11d7ae..97d456c 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 0518035..930d7ca 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b19fc30..e39760b 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 4c61b27..ea3c6c9 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 35b0bd9..4a8de83 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 057ac66..6d1a653 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 8c46656..3337fb8 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index b1c024a..0c9dc76 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index d487017..33c5cdd 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 9a967d1..5d72e0a 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index bd67dd4..6717151 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 930af72..a3ea5b3 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 4bd81f0..aac7c8d 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 0fff9eb..8b459d5 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 04f2c6d..f326dce 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 3035090..95dbd68 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 3a1120c..acfa6b6 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index dc08ac6..bc443af 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 56bdd06..6bfcb71 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index ee74e39..30a12a2 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 8dfbf66..3bb008e 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5fddda4..5558690 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9e1965c..89e3fc3 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 46abf88..0a77271 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 6935ffb..9c622f1 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 549daf1..acf1fab 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 05c6699..e960632 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 96fe70d..966a2c1 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 54ac7dc..4ba47d5 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index c0b4e13..3bd88e7 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 032969c..b3770b9 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 7673396..a6002a9 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 2add38e..be54b7e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 9116f34..cc7178f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 03323d1..a569592 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index c02a3a2..8f1f2b6 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 58001eb..919dc76 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index fc4cc67..749b647 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 287e029..d4c6ba5 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 0fcd691..5a92cac 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 60aabe3..c390e24 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 8f21c6f..13ac351 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ec51642..f790d7f 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f60d61..74705ea 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f99eff..774564f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
12 years, 4 months
[rhq] Branch 'refs/tags/RHQ_4_2_0_JON_3_0_1_GA' - 25 commits - modules/core modules/enterprise modules/plugins
by rhqci
modules/core/dbutils/pom.xml | 8
modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java | 23
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 197 ++++-
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 12
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java | 7
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java | 61 +
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java | 160 ++--
modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 3
modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java | 7
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java | 27
modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 388 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 45 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 9
modules/enterprise/remoting/cli/pom.xml | 8
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 26
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java | 8
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java | 49 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 38
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 41 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 43 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java | 18
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java | 46 -
34 files changed, 837 insertions(+), 546 deletions(-)
New commits:
commit 859b9142241b8262b13c44a141c80ca4c45242a4
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Wed Feb 1 16:30:57 2012 -0500
tag RHQ_4_2_0_JON_3_0_1_GA
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index ab99195..3167d39 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 220a98c..1e93560 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index a9feac0..198d9bc 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 9eedad5..972a5a2 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 26e1cdc..91f9d94 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 0e962fa..262a9f7 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 93a1639..2f2f2b3 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 73212d2..5442ad3 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 04ce359..dbeb7ef 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 2103f84..ed95c9c 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index afe9c89..848940f 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 7ca6e93..c741bd1 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 4a0de0e..1c16c09 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index e951b80..a8475ca 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index da6acda..1ce1e2c 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 29644f0..4aa616d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 3335f88..eaa3727 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 9d863f7..93a6f6b 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 43e309b..24c2281 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 6731f5b..4182380 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 613ea49..be3e3a8 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 4ee4e30..7db2560 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 4d7ba82..a2ad386 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f18e4f8..f1af689 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 7fceba9..b202e1f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index c6bef48..3d1c787 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index aa7e09e..5def783 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 26a5e78..d840e09 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index c4a3a0c..dc59c86 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 6016352..638f32c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 218aea1..0050184 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 3827b41..ebb80cc 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 7008072..5db71e7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index b074322..a9be89d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index bbcf6d8..049e375 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 2256028..e8a1e84 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 3cb73a3..e7612ee 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index cac1f0d..70427bf 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 65b08d1..8f44df2 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 821fa76..b7cfdcf 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 67254f5..61fe184 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 2890d4f..84f1702 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 7be793c..aa5328b 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index c3dfac4..878c288 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index eb5465a..c22ce1a 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 4c62251..452d62a 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index f1cccee..a30f495 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 01b24f3..6ffab76 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 8e80a11..69f4c4b 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 44bacb8..9ccda53 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 3a60731..b1b56d0 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index e26a76f..6a7d56d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 36c376b..1282542 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index c80c517..5815d72 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 9c05951..47f753e 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 506701b..cc629bf 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 704c9d7..5f5509f 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 8e861bb..733c73e 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 02e95b4..57ec9b0 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index ddfc97f..492c91c 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 00570be..253d03f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 5ceffeb..364d1c5 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 7fe0007..2c0a623 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index e7d38d2..f67dc29 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 9b4f371..999bb39 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 7fef94f..b67cfb7 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 5ed59ab..5212bac 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index f4daf69..872737a 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 180153e..1837a58 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 86176d3..fb0b291 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 14f1af3..c7d0dce 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index bdc8fb8..9902ea8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 121eb84..c5aeb57 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 1e1fc8b..0261e21 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index aa11ee5..c9bf1ce 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index c2d92bb..3cdb7de 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 85d8db9..26957d6 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index af5afda..b177e34 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 3187560..488cf6b 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 168e602..0344994 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 105313b..6c3464e 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 459145e..a11d7ae 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 2a763d7..0518035 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b2ee37b..b19fc30 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 5e45df5..4c61b27 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index aaf41d9..35b0bd9 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 035a549..057ac66 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index d419f5c..8c46656 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index a5f251b..b1c024a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 894a486..d487017 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 869c1d4..9a967d1 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 105b759..bd67dd4 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index fd6c214..930af72 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index e961cba..4bd81f0 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 64a5224..0fff9eb 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index e22ab0d..04f2c6d 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index ec76d69..3035090 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 24177f9..3a1120c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 6c1e3bf..dc08ac6 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index fb3d651..56bdd06 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 699c361..ee74e39 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index a6e8df7..8dfbf66 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index f6115d4..5fddda4 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index e9a3825..9e1965c 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 9b321c9..46abf88 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 3a58b73..6935ffb 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 5301544..549daf1 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 470d1b5..05c6699 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 39362b4..96fe70d 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index fc0f246..54ac7dc 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 4a0ef91..c0b4e13 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index bf10a67..032969c 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index d80ddad..7673396 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 60f52e9..2add38e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index ddd89ae..9116f34 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 7360008..03323d1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 2ac3880..c02a3a2 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index e827a6f..58001eb 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index c3f9556..fc4cc67 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index e6f3fa9..287e029 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index ddfa15b..0fcd691 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index ba8ee84..60aabe3 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 6c36e70..8f21c6f 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ce2901c..ec51642 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index ed35f94..5f60d61 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index ee58b36..3f99eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>pom</packaging>
<name>RHQ</name>
commit 6aa861d99b836c576370ad1b0695b95d53eb0faf
Merge: dc1deaf 20221ed
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Feb 1 13:48:04 2012 -0500
Merge branch 'release/jon3.0.x' into rc/jon3.0.1.GA
commit 20221edea965c18481e54b97d2b60ceb50bb1cea
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 17:12:36 2012 -0500
[BZ 784678] prevent NPE from occurring if -f option is not passed to CLI record command - instead throw a command line
parse exception with an informative error message (https://bugzilla.redhat.com/show_bug.cgi?id=784678)
(cherry picked from commit 55a89fae4b11ca5a8fecb668b87dbcef2bc04cf9)
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
index e1244ae..f3363aa 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -98,8 +98,12 @@ public class RecordCommand implements ClientCommand {
code = getopt.getopt();
}
+ if (recordArgs.file == null) {
+ throw new CommandLineParseException("The file option must be specified.");
+ }
+
if (recordArgs.recordState == null) {
- throw new CommandLineParseException("Either the start or stop option must be specified");
+ throw new CommandLineParseException("Either the start or stop option must be specified.");
}
return recordArgs;
commit 05fa50e1833a66f2e12dd59bd55839c2b258e765
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:43:11 2012 -0500
[BZ 785218] fix so -v/--version option does not print redundant info
(https://bugzilla.redhat.com/show_bug.cgi?id=785218)
(cherry picked from commit 3c0e9542e0ddfa60828ea44c37af715a79bfcc6b)
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
index 191c537..d4444fe 100755
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2009 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -82,6 +82,7 @@ public class ClientMain {
private String user;
private String pass;
private ArrayList<String> notes = new ArrayList<String>();
+ private boolean showDetailedVersion;
// reference to the webservice reference factory
private RemoteClient remoteClient;
@@ -403,7 +404,7 @@ public class ClientMain {
}
private void displayUsage() {
- outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-f file]|[-c command]");
+ outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
}
void processArguments(String[] args) throws IllegalArgumentException, IOException {
@@ -478,10 +479,10 @@ public class ClientMain {
setHost(getopt.getOptarg());
break;
}
- case 'r': {
- setTransport(getopt.getOptarg());
- break;
- }
+ case 'r': {
+ setTransport(getopt.getOptarg());
+ break;
+ }
case 't': {
String portArg = getopt.getOptarg();
try {
@@ -492,15 +493,20 @@ public class ClientMain {
break;
}
case 'v': {
- String versionString = Version.getProductNameAndVersionBuildInfo();
- outputWriter.println(versionString);
+ showDetailedVersion = true;
break;
}
}
}
if (interactiveMode) {
- outputWriter.println(Version.getProductNameAndVersion());
+ String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() :
+ Version.getProductNameAndVersion();
+ outputWriter.println(version);
+ if (showDetailedVersion && args.length == 1) {
+ // If -v was the only option specified, exit after printing the version.
+ System.exit(0);
+ }
}
if (user != null && pass != null) {
@@ -516,7 +522,7 @@ public class ClientMain {
}
if (!interactiveMode) {
- commands.get("exec").execute(this, execCmdLine.toArray(new String[] {}));
+ commands.get("exec").execute(this, execCmdLine.toArray(new String[execCmdLine.size()]));
}
}
commit a4a6b535f5431652372af02cf77483e8d5f6ae03
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 31 16:08:05 2012 -0500
[BZ 784983] fix output of CLI version command (https://bugzilla.redhat.com/show_bug.cgi?id=784983)
(cherry picked from commit 43f016c9d9da95d2f5ea1bed4d1ee7fdbf9e07c3)
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index d94c40b..8ed89b5 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -178,14 +178,6 @@
</includes>
<archive>
<index>true</index>
- <manifestEntries>
- <Implementation-Title>${rhq.product.name} - ${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Vendor>org.jboss</Specification-Vendor>
- <Specification-Title>JBossWS</Specification-Title>
- <Specification-Version>${jbossws-native-dist.version}</Specification-Version>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
</archive>
</configuration>
</plugin>
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
index d27c3f3..2df0b72 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,10 @@
package org.rhq.enterprise.client.commands;
import java.util.Properties;
+import java.util.jar.Attributes;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
import org.rhq.enterprise.client.ClientMain;
import org.rhq.enterprise.client.Version;
@@ -35,26 +38,56 @@ public class VersionCommand implements ClientCommand {
}
public boolean execute(ClientMain client, String[] args) {
- if (args.length <= 1) {
+ VersionArgs versionArgs = parseArgs(args);
+ if (versionArgs.verbose) {
client.getPrintWriter().println(Version.getVersionPropertiesAsString());
} else {
Properties props = Version.getVersionProperties();
- for (int i = 1; i < args.length; i++) {
- client.getPrintWriter().println(args[i] + "=" + props.getProperty(args[i], "<unknown>"));
- }
+ String version = props.getProperty(Attributes.Name.IMPLEMENTATION_VERSION.toString());
+ client.getPrintWriter().println(version);
}
+
return true;
}
public String getSyntax() {
- return "version [prop name]...";
+ return getPromptCommandString() + " [-v | --verbose]";
}
public String getHelp() {
- return "Show version information and properties";
+ return "Show CLI version information";
}
public String getDetailedHelp() {
- return getHelp();
+ return getHelp() + ". If no arguments are specified, the CLI's version is printed. If the verbose option is "
+ + "specified, the values of the main attributes from the CLI jar's MANIFEST.MF are printed.";
+ }
+
+ private VersionArgs parseArgs(String[] args) {
+ String shortOpts = "-:v";
+ LongOpt[] longOpts = {
+ new LongOpt("verbose", LongOpt.OPTIONAL_ARGUMENT, null, 'v')
+ };
+ Getopt getopt = new Getopt("exec", args, shortOpts, longOpts);
+
+ VersionArgs versionArgs = new VersionArgs();
+
+ int code = getopt.getopt();
+ while (code != -1) {
+ switch (code) {
+ case ':':
+ throw new IllegalArgumentException("Illegal option.");
+ case 'v':
+ versionArgs.verbose = true;
+ break;
+ }
+ code = getopt.getopt();
+ }
+
+ return versionArgs;
+ }
+
+ private static class VersionArgs {
+ boolean verbose;
}
}
\ No newline at end of file
commit d44638c22a94b4997fd3a5af9f27b642bed97ef0
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 15:20:14 2012 -0500
[Bug 773435 - Enabled event sources cause initial resource component start to time out]
lazily access sigar on the first polling, which happens after container
initialization.
Conflicts:
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
index bcc42de..30cd3e5 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
@@ -46,28 +46,21 @@ import org.rhq.core.pluginapi.event.EventPoller;
*
* @author Ian Springer
*/
-public class LogFileEventPoller implements EventPoller {
+public class LogFileEventPoller implements EventPoller {
private final Log log = LogFactory.getLog(this.getClass());
private String eventType;
private File logFile;
private FileInfo logFileInfo;
private LogEntryProcessor entryProcessor;
+ private EventContext eventContext;
- public LogFileEventPoller(EventContext eventContext, String eventType, File logFile, LogEntryProcessor entryProcessor) {
- SigarProxy sigar = eventContext.getSigar();
+ public LogFileEventPoller(EventContext eventContext, String eventType, File logFile,
+ LogEntryProcessor entryProcessor) {
this.eventType = eventType;
this.logFile = logFile;
- if (sigar != null) {
- try {
- this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
- } catch (SigarException e) {
- throw new RuntimeException("Failed to obtain file info for log file [" + this.logFile + "].", e);
- }
- } else {
- log.warn("SIGAR is unavailable - cannot poll log file [" + this.logFile + "] for events.");
- }
this.entryProcessor = entryProcessor;
+ this.eventContext = eventContext;
}
@NotNull
@@ -80,11 +73,26 @@ public class LogFileEventPoller implements EventPoller {
return this.logFile.getPath();
}
+ // we can't get the FileInfo in the constructor because pollers are constructed during pc initialization, and
+ // at that time the eventManager is not available (and so we can't get sigar).
+ private FileInfo getFileInfo() {
+ if (null == this.logFileInfo) {
+ try {
+ SigarProxy sigar = eventContext.getSigar();
+ this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
+ // once we have the file info we can let go of the event context, just in case that's useful
+ this.eventContext = null;
+
+ } catch (SigarException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return this.logFileInfo;
+ }
+
@Nullable
public Set<Event> poll() {
- if (this.logFileInfo == null) {
- return null;
- }
if (!this.logFile.exists()) {
log.warn("Log file [" + this.logFile + "] being polled does not exist.");
return null;
@@ -93,23 +101,25 @@ public class LogFileEventPoller implements EventPoller {
log.error("Log file [" + this.logFile + "] being polled is a directory, not a regular file.");
return null;
}
+ FileInfo fileInfo;
try {
- if (!this.logFileInfo.changed()) {
+ fileInfo = getFileInfo();
+ if (!fileInfo.changed()) {
return null;
}
} catch (SigarException e) {
throw new RuntimeException(e);
}
- return processNewLines();
+ return processNewLines(fileInfo);
}
- private Set<Event> processNewLines() {
+ private Set<Event> processNewLines(FileInfo fileInfo) {
Set<Event> events = null;
Reader reader = null;
try {
reader = new FileReader(this.logFile);
- long offset = getOffset();
+ long offset = getOffset(fileInfo);
if (offset > 0) {
reader.skip(offset);
@@ -130,24 +140,24 @@ public class LogFileEventPoller implements EventPoller {
return events;
}
- private long getOffset() {
- FileInfo previousFileInfo = this.logFileInfo.getPreviousInfo();
+ private long getOffset(FileInfo fileInfo) {
+ FileInfo previousFileInfo = fileInfo.getPreviousInfo();
if (previousFileInfo == null) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": first stat");
}
- return this.logFileInfo.getSize();
+ return fileInfo.getSize();
}
- if (this.logFileInfo.getInode() != previousFileInfo.getInode()) {
+ if (fileInfo.getInode() != previousFileInfo.getInode()) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": file inode changed");
}
return -1;
}
- if (this.logFileInfo.getSize() < previousFileInfo.getSize()) {
+ if (fileInfo.getSize() < previousFileInfo.getSize()) {
if (log.isDebugEnabled()) {
log.debug(this.logFile + ": file truncated");
}
@@ -155,7 +165,7 @@ public class LogFileEventPoller implements EventPoller {
}
if (log.isDebugEnabled()) {
- long diff = this.logFileInfo.getSize() - previousFileInfo.getSize();
+ long diff = fileInfo.getSize() - previousFileInfo.getSize();
log.debug(this.logFile + ": " + diff + " new bytes");
}
commit db02533c122d00f11bcfdda3531db5567558a144
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 15:05:24 2012 -0500
[Bug 785022 - Server upgrade fails if db-uprade.xml task is unable to created index when index already exists]
Applying suggested fix from loleary. Could not apply patch successfully
so manually reapplied the fix, which is to protect create/drop index
stmts with ignoreErrors="true".
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 7dd68d4..2ffdfe5 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -296,7 +296,7 @@
</schema-directSQL>
<schema-alterColumn table="RHQ_SERVER" column="OPERATION_MODE" nullable="FALSE" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_SERVER unique constraint on NAME">
CREATE UNIQUE INDEX rhq_server_name_unique ON rhq_server (name)
</statement>
@@ -853,7 +853,7 @@
</schemaSpec>
<schemaSpec version="2.24">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_MEASUREMENT_BLINE index on SCHEDULE_ID">
CREATE INDEX rhq_meas_baseline_sid_idx ON rhq_measurement_bline (schedule_id)
</statement>
@@ -1078,7 +1078,7 @@
</schemaSpec>
<schemaSpec version="2.36">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique constraint on RHQ_MEASUREMENT_DEF">
DROP INDEX RHQ_METRIC_DEF_KEY_IDX
</statement>
@@ -1093,7 +1093,7 @@
WHERE NUMERIC_TYPE = 0
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RHQ_MEASUREMENT_DEF (RESOURCE_TYPE_ID, NAME, RAW_NUMERIC_TYPE)">
CREATE UNIQUE INDEX RHQ_METRIC_DEF_KEY_IDX ON RHQ_MEASUREMENT_DEF (RESOURCE_TYPE_ID, NAME, RAW_NUMERIC_TYPE)
</statement>
@@ -1193,49 +1193,77 @@
<!-- RHQ 1448 -->
<schemaSpec version="2.44">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R00 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R00_SID_IDX ON RHQ_MEAS_DATA_NUM_R00 (schedule_id)
- </statement>
+ </statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R01 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R01_SID_IDX ON RHQ_MEAS_DATA_NUM_R01 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R02 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R02_SID_IDX ON RHQ_MEAS_DATA_NUM_R02 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R03 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R03_SID_IDX ON RHQ_MEAS_DATA_NUM_R03 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R04 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R04_SID_IDX ON RHQ_MEAS_DATA_NUM_R04 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R05 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R05_SID_IDX ON RHQ_MEAS_DATA_NUM_R05 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R06 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R06_SID_IDX ON RHQ_MEAS_DATA_NUM_R06 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R07 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R07_SID_IDX ON RHQ_MEAS_DATA_NUM_R07 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R08 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R08_SID_IDX ON RHQ_MEAS_DATA_NUM_R08 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R09 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R09_SID_IDX ON RHQ_MEAS_DATA_NUM_R09 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R10 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R10_SID_IDX ON RHQ_MEAS_DATA_NUM_R10 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R11 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R11_SID_IDX ON RHQ_MEAS_DATA_NUM_R11 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R12 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R12_SID_IDX ON RHQ_MEAS_DATA_NUM_R12 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R13 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R13_SID_IDX ON RHQ_MEAS_DATA_NUM_R13 (schedule_id)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R14 (SCHEDULE_ID)">
CREATE INDEX RHQ_MEAS_DATA_R14_SID_IDX ON RHQ_MEAS_DATA_NUM_R14 (schedule_id)
</statement>
@@ -1300,7 +1328,7 @@
</schemaSpec>
<schemaSpec version="2.50">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_RESOURCE_ERROR.RESOURCE_ID">
CREATE INDEX RHQ_RES_ERROR_IDX_RES_ID ON RHQ_RESOURCE_ERROR (RESOURCE_ID)
</statement>
@@ -1313,12 +1341,12 @@
</schemaSpec>
<schemaSpec version="2.52">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique name constraint on RHQ_RESOURCE_GROUP">
DROP INDEX RHQ_RES_GROUP_NAME
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Deleting unique name constraint on RHQ_RESOURCE_GROUP">
CREATE INDEX RHQ_RES_GROUP_NAME ON RHQ_RESOURCE_GROUP (name)
</statement>
@@ -1348,57 +1376,87 @@
</schemaSpec>
<schemaSpec version="2.55">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on TIME_STAMP column of RHQ_MEASUREMENT_DATA_NUM_1H">
CREATE INDEX RHQ_MEAS_DATA_1H_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_1H(TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on TIME_STAMP column of RHQ_MEASUREMENT_DATA_NUM_6H">
CREATE INDEX RHQ_MEAS_DATA_6H_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_6H(TIME_STAMP)
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R00 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R00_TS_IDX ON RHQ_MEAS_DATA_NUM_R00 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R01 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R01_TS_IDX ON RHQ_MEAS_DATA_NUM_R01 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R02 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R02_TS_IDX ON RHQ_MEAS_DATA_NUM_R02 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R03 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R03_TS_IDX ON RHQ_MEAS_DATA_NUM_R03 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R04 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R04_TS_IDX ON RHQ_MEAS_DATA_NUM_R04 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R05 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R05_TS_IDX ON RHQ_MEAS_DATA_NUM_R05 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R06 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R06_TS_IDX ON RHQ_MEAS_DATA_NUM_R06 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R07 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R07_TS_IDX ON RHQ_MEAS_DATA_NUM_R07 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R08 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R08_TS_IDX ON RHQ_MEAS_DATA_NUM_R08 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R09 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R09_TS_IDX ON RHQ_MEAS_DATA_NUM_R09 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R10 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R10_TS_IDX ON RHQ_MEAS_DATA_NUM_R10 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R11 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R11_TS_IDX ON RHQ_MEAS_DATA_NUM_R11 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R12 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R12_TS_IDX ON RHQ_MEAS_DATA_NUM_R12 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R13 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R13_TS_IDX ON RHQ_MEAS_DATA_NUM_R13 (TIME_STAMP)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating index on RHQ_MEAS_DATA_NUM_R14 (TIME_STAMP)">
CREATE INDEX RHQ_MEAS_DATA_R14_TS_IDX ON RHQ_MEAS_DATA_NUM_R14 (TIME_STAMP)
</statement>
@@ -1406,49 +1464,77 @@
</schemaSpec>
<schemaSpec version="2.56">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R00_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R00_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R01_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R01_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R02_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R02_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R03_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R03_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R04_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R04_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R05_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R05_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R06_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R06_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R07_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R07_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R08_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R08_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R09_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R09_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R10_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R10_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R11_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R11_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R12_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R12_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R13_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R13_SID_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping index on RHQ_MEAS_DATA_R14_SID_IDX">
DROP INDEX RHQ_MEAS_DATA_R14_SID_IDX
</statement>
@@ -1456,7 +1542,7 @@
</schemaSpec>
<schemaSpec version="2.57">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Create index on RHQ_CONFIG_PROPERTY(PARENT_LIST_ID)">
CREATE INDEX RHQ_CONFIG_PROP_idx_list_key ON RHQ_CONFIG_PROPERTY(PARENT_LIST_ID)
</statement>
@@ -1683,6 +1769,8 @@
FOREIGN KEY ( REPO_GROUP_TYPE_ID )
REFERENCES RHQ_REPO_GROUP_TYPE ( ID )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_REPO_GROUP_IDX
ON RHQ_REPO_GROUP ( NAME, REPO_GROUP_TYPE_ID )
@@ -1842,7 +1930,7 @@
<schema-alterColumn table="RHQ_DISTRIBUTION" column="BASE_PATH" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_DISTRIBUTION" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_DISTRIBUTION_IDX ON RHQ_DISTRIBUTION ( LABEL, BASE_PATH )
</statement>
@@ -1947,6 +2035,8 @@
FOREIGN KEY (DISTRIBUTION_ID)
REFERENCES RHQ_DISTRIBUTION ( ID )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_DISTRIBUTION_FILE_IDX
ON RHQ_DISTRIBUTION_FILE ( DISTRIBUTION_ID, RELATIVE_FILENAME )
@@ -2019,7 +2109,7 @@
</schema-directSQL>
<!-- Fix bug:538157 -->
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE INDEX RHQ_REPO_PKG_VER_MAP_IDX
ON RHQ_REPO_PKG_VERSION_MAP ( PACKAGE_VERSION_ID )
@@ -2040,10 +2130,12 @@
<schemaSpec version="2.69.2">
<!-- plugin names must be unique only if they are deployed on the same side (agent vs. server) -->
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping unique index on RHQ_PLUGIN (NAME)">
DROP INDEX RHQ_PLUGIN_NAME_IDX
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RHQ_PLUGIN (NAME, DEPLOYMENT) so server plugin names need not be unique with agent plugins">
CREATE UNIQUE INDEX RHQ_PLUGIN_NAME_DEPLOY_IDX ON RHQ_PLUGIN (NAME, DEPLOYMENT)
</statement>
@@ -2086,7 +2178,7 @@
<schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="MESSAGE" columnType="VARCHAR2" precision="4000" />
</schemaSpec>
<schemaSpec version="2.70.3">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Dropping unique index RHQ_ALERT_IDX_ALERT">
DROP INDEX RHQ_ALERT_IDX_ALERT
</statement>
@@ -2127,7 +2219,7 @@
<schema-deleteColumn table="RHQ_ALERT" column="triggered_operation" />
</schemaSpec>
<schemaSpec version="2.70.7">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Recreating RHQ_ALERT_IDX_ALERT as non-unique index">
CREATE INDEX RHQ_ALERT_IDX_ALERT ON RHQ_ALERT_NOTIF_LOG (alert_id)
</statement>
@@ -2168,13 +2260,17 @@
<schema-addColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_NAME_UQ ON RHQ_ADVISORY ( ADVISORY_NAME )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_UQ ON RHQ_ADVISORY ( ADVISORY )
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE INDEX RHQ_ADVISORY_UDATE_IDX ON RHQ_ADVISORY (UPDATE_DATE )
</statement>
@@ -2193,7 +2289,7 @@
<schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="PACKAGE_VERSION_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_PACKAGE" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_PACKAGE_IDX ON RHQ_ADVISORY_PACKAGE ( ADVISORY_ID, PACKAGE_VERSION_ID )
</statement>
@@ -2234,7 +2330,7 @@
<schema-alterColumn table="RHQ_ADVISORY_CVE" column="CVE_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_CVE" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_CVE_IDX ON RHQ_ADVISORY_CVE ( ADVISORY_ID, CVE_ID )
</statement>
@@ -2266,7 +2362,7 @@
<schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="BUG_ID" nullable="false" />
<schema-addColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" columnType="LONG" />
<schema-alterColumn table="RHQ_ADVISORY_BUGLIST" column="LAST_MODIFIED" nullable="false" />
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ADVISORY_BUG_IDX ON RHQ_ADVISORY_BUGLIST ( ADVISORY_ID, BUG_ID )
</statement>
@@ -2365,6 +2461,8 @@
FOREIGN KEY (RESOURCE_TYPE_ID)
REFERENCES RHQ_RESOURCE_TYPE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_TYPE unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_TYPE_UNIQUE ON RHQ_BUNDLE_TYPE (name)
</statement>
@@ -2406,6 +2504,8 @@
FOREIGN KEY (PACKAGE_TYPE_ID)
REFERENCES RHQ_PACKAGE_TYPE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_UNIQUE ON RHQ_BUNDLE (bundle_type_id, name)
</statement>
@@ -2444,6 +2544,8 @@
FOREIGN KEY (CONFIG_DEF_ID)
REFERENCES RHQ_CONFIG_DEF (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_VERSION unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_VERSION_UNIQUE ON RHQ_BUNDLE_VERSION (bundle_id, name, version)
</statement>
@@ -2539,6 +2641,8 @@
FOREIGN KEY (GROUP_ID)
REFERENCES RHQ_RESOURCE_GROUP (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_DESTINATION unique constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_DESTINATION_UNIQUE
ON RHQ_BUNDLE_DESTINATION (bundle_id, group_id, deploy_dir)
@@ -2630,6 +2734,8 @@
FOREIGN KEY (RESOURCE_ID)
REFERENCES RHQ_RESOURCE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_BUNDLE_RES_DEPLOY unique constraint on dep-resource mapping">
CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_IDX
ON RHQ_BUNDLE_RES_DEPLOY (BUNDLE_DEPLOYMENT_ID, RESOURCE_ID)
@@ -2788,6 +2894,8 @@
FOREIGN KEY ( ROLE_ID )
REFERENCES RHQ_ROLE (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement>
CREATE UNIQUE INDEX RHQ_ROLE_LDAP_GROUP_IDX
ON RHQ_ROLE_LDAP_GROUP ( ROLE_ID, LDAP_GROUP_NAME )
@@ -2996,10 +3104,12 @@
</schemaSpec>
<schemaSpec version="2.87">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Drop non-unique RHQ_RES_TYPE_IDX_PLG_NAME index">
DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as unique">
CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin)
</statement>
@@ -3007,10 +3117,12 @@
</schemaSpec>
<schemaSpec version="2.88">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add end time index on call time data to speed up purges">
CREATE INDEX RHQ_CT_DA_VA_END_TIM_IDX ON RHQ_CALLTIME_DATA_VALUE (end_time)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add index on measurement definition numeric type">
CREATE INDEX RHQ_METRIC_DEF_NT_IDX ON RHQ_MEASUREMENT_DEF (numeric_type)
</statement>
@@ -3131,7 +3243,7 @@
</schemaSpec>
<schemaSpec version="2.92.4">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Add index on measurement data 1d table timestamp">
CREATE INDEX RHQ_MEAS_DATA_1D_TIME_IDX ON RHQ_MEASUREMENT_DATA_NUM_1D (time_stamp)
</statement>
@@ -3294,6 +3406,8 @@
<statement desc="Changing primary key of RHQ_OPERATION_SCHEDULE to ID. Step2/3...">
ALTER TABLE RHQ_OPERATION_SCHEDULE ADD PRIMARY KEY (ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Changing primary key of RHQ_OPERATION_SCHEDULE to ID. Step3/3...">
CREATE UNIQUE INDEX RHQ_OPERATION_SCHEDULE_KEY_IDX ON RHQ_OPERATION_SCHEDULE (JOB_NAME, JOB_GROUP)
</statement>
@@ -3607,10 +3721,12 @@
</schemaSpec>
<schemaSpec version="2.113">
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_ALERT_CONDITION_LOG index on CONDITION_ID">
CREATE INDEX RHQ_ALERT_COND_LOG_COND_IDX ON RHQ_ALERT_CONDITION_LOG (CONDITION_ID)
</statement>
+ </schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating RHQ_MEASUREMENT_SCHED index on RESOURCE_ID">
CREATE INDEX RHQ_MEAS_SCHED_RESID_IDX ON RHQ_MEASUREMENT_SCHED (RESOURCE_ID)
</statement>
@@ -3667,7 +3783,7 @@
REFERENCES RHQ_CONFIG (ID)
</statement>
</schema-directSQL>
- <schema-directSQL>
+ <schema-directSQL ignoreError="true">
<statement desc="Creating unique index on RESOURCE_TYPE_ID and NAME columns">
CREATE UNIQUE INDEX RHQ_TYPE_DEF_NAME ON RHQ_DRIFT_DEF_TEMPLATE ( RESOURCE_TYPE_ID, NAME )
</statement>
commit 72bb3d37c84b3af4250c5daee87438be9d9fbb26
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 11 10:57:33 2011 -0500
log message reporting invalid numeric metrics at DEBUG, rather than WARN,
to avoid flooding the agent log with repetitive messages
(cherry picked from commit 542a30ca6d0eaebbee5365c756955255ba367e4e)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java
index 5cee6a6..a9136d1 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java
@@ -90,15 +90,34 @@ public class MeasurementSenderRunner implements Callable<MeasurementReport>, Run
Iterator<MeasurementDataNumeric> iter = report.getNumericData().iterator();
while (iter.hasNext()) {
MeasurementDataNumeric numeric = iter.next();
- Double v = numeric.getValue();
- if (v == null || v.isInfinite() || v.isNaN()) {
- LOG.warn("Numeric " + numeric.getName() + " with id " + numeric.getScheduleId()
- + " is invalid, value was '" + v + "'");
+ Double value = numeric.getValue();
+ if (value == null || value.isInfinite() || value.isNaN()) {
+ if (LOG.isDebugEnabled()) {
+ String stringValue = getStringValue(value);
+ LOG.debug("Numeric metric [" + numeric.getName() + "] with schedule id [" + numeric.getScheduleId()
+ + "] is invalid - value is [" + stringValue + "].");
+ }
iter.remove();
}
}
}
+ private String getStringValue(Double value) {
+ String stringValue;
+ if (value == null) {
+ stringValue = "null";
+ } else if (value.isNaN()) {
+ stringValue = "Double.NaN";
+ } else if (value == Double.POSITIVE_INFINITY) {
+ stringValue = "Double.POSITIVE_INFINITY";
+ } else if (value == Double.NEGATIVE_INFINITY) {
+ stringValue = "Double.NEGATIVE_INFINITY";
+ } else {
+ stringValue = value.toString();
+ }
+ return stringValue;
+ }
+
public void run() {
try {
call();
commit b9ccebed287c8cc86ad4e601b3ceb23ec0520770
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 13:32:08 2012 -0500
[Bug 772771 - Agent not syncing updated plugin config at startup]
The resource mtime was not being properly updated when completing the
plugin config sync. If the agent was down at update time it would not
know to sync the resource on startup, or at any point until perhaps
the resource was modified in some other way, or the plugin config was
changed when the agent was up.
Also, in general Resource.setAgentSynchronizationNeeded() should be called
by any code performing an update that requires agent sync. The
Resource.setMtime() method should not be called for this purpose, but
rather only when manual mtime manipulation is required.
- fixed plugin config update
- converted setMtime calls to be setAgentSynchronizationNeeded() where appropriate
- added a missing call to setAgentSynchronizationNeeded() in DiscoveryBossBean
- trivial
-- fixed a method name typo
-- fixed some compiler warnings
-- removed some dead code
Conflicts:
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index dd5da1b..c90ed4e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -83,7 +83,7 @@ import org.rhq.core.domain.util.Summary;
* Represents an RHQ managed resource (i.e. a platform, server, or service).
*/
@Entity
-@NamedQueries( {
+@NamedQueries({
@NamedQuery(name = Resource.QUERY_FIND_PROBLEM_RESOURCES_ALERT_ADMIN, query = "" //
+ " SELECT DISTINCT new org.rhq.core.domain.resource.composite.ProblemResourceComposite"
+ " ( "
@@ -1302,6 +1302,12 @@ public class Resource implements Comparable<Resource>, Serializable {
return this.mtime;
}
+ /**
+ * Call this directly only when needing manual manipulation of the mtime. Otherwise, you probably want to
+ * call {@link #setAgentSynchronizationNeeded()}.
+ *
+ * @param mtime
+ */
public void setMtime(long mtime) {
this.mtime = mtime;
}
@@ -1336,8 +1342,6 @@ public class Resource implements Comparable<Resource>, Serializable {
*
* For a list of changes that the agent cares about, see InventoryManager.mergeResource(Resource, Resource)
*/
-
- // @PreUpdate
public void setAgentSynchronizationNeeded() {
this.mtime = System.currentTimeMillis();
}
@@ -1434,7 +1438,7 @@ public class Resource implements Comparable<Resource>, Serializable {
return schedules;
}
- public void setSchendules(Set<MeasurementSchedule> schedules) {
+ public void setSchedules(Set<MeasurementSchedule> schedules) {
this.schedules = schedules;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 5b88fe5..60550be 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -136,7 +136,6 @@ import org.rhq.enterprise.server.util.QuartzUtil;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings({ "UnnecessaryLocalVariable", "UnnecessaryReturnStatement" })
@Stateless
@XmlType(namespace = ServerVersion.namespace)
public class ConfigurationManagerBean implements ConfigurationManagerLocal, ConfigurationManagerRemote {
@@ -220,6 +219,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
Resource resource = update.getResource();
// link to the newer, persisted configuration object -- regardless of errors
+ resource.setAgentSynchronizationNeeded();
resource.setPluginConfiguration(update.getConfiguration());
if (response.getStatus() == ConfigurationUpdateStatus.SUCCESS) {
@@ -1242,17 +1242,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return configService.validate(configuration, resourceId, isStructured);
}
- private boolean isRawSupported(int resourceId) {
- Resource resource = entityManager.find(Resource.class, resourceId);
- ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
- if (configDef == null) {
- return false;
- }
-
- return (ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
- .getConfigurationFormat()));
- }
-
private boolean isStructuredAndRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
@@ -1691,7 +1680,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public Configuration getConfiguration(Subject subject, int configurationId) {
- @SuppressWarnings({ "UnnecessaryLocalVariable" })
Configuration configuration = getConfigurationById(configurationId);
return configuration;
}
@@ -2337,7 +2325,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return out;
}
- @SuppressWarnings("unchecked")
public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(Subject subject,
ResourceConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2346,8 +2333,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
"resource", subject.getId());
}
- CriteriaQueryRunner<ResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<ResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner<ResourceConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<ResourceConfigurationUpdate> updates = queryRunner.execute();
@@ -2371,7 +2358,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<PluginConfigurationUpdate> findPluginConfigurationUpdatesByCriteria(Subject subject,
PluginConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2380,8 +2366,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
"resource", subject.getId());
}
- CriteriaQueryRunner<PluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<PluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner<PluginConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<PluginConfigurationUpdate> updates = queryRunner.execute();
@@ -2405,7 +2391,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<GroupResourceConfigurationUpdate> findGroupResourceConfigurationUpdatesByCriteria(Subject subject,
GroupResourceConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2414,8 +2399,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
subject.getId());
}
- CriteriaQueryRunner<GroupResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria,
- generator, entityManager);
+ CriteriaQueryRunner<GroupResourceConfigurationUpdate> queryRunner = new CriteriaQueryRunner<GroupResourceConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<GroupResourceConfigurationUpdate> updates = queryRunner.execute();
@@ -2438,7 +2423,6 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return updates;
}
- @SuppressWarnings("unchecked")
public PageList<GroupPluginConfigurationUpdate> findGroupPluginConfigurationUpdatesByCriteria(Subject subject,
GroupPluginConfigurationUpdateCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2447,8 +2431,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
subject.getId());
}
- CriteriaQueryRunner<GroupPluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<GroupPluginConfigurationUpdate> queryRunner = new CriteriaQueryRunner<GroupPluginConfigurationUpdate>(
+ criteria, generator, entityManager);
PageList<GroupPluginConfigurationUpdate> updates = queryRunner.execute();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 2ea6234..7609492 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.discovery;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import java.util.Date;
import javax.ejb.EJB;
import javax.ejb.Stateless;
@@ -44,12 +44,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
+
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException;
import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest;
@@ -314,16 +314,15 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
final String randomSuffix = UUID.randomUUID().toString();
final String triggerName = TRIGGER_PREFIX + " - " + randomSuffix;
- SimpleTrigger trigger = new SimpleTrigger(triggerName, DEFAULT_JOB_GROUP,
- new Date());
+ SimpleTrigger trigger = new SimpleTrigger(triggerName, DEFAULT_JOB_GROUP, new Date());
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put(AgentInventoryStatusUpdateJob.KEY_TRIGGER_NAME, triggerName);
jobDataMap.put(AgentInventoryStatusUpdateJob.KEY_TRIGGER_GROUP_NAME, DEFAULT_JOB_GROUP);
AgentInventoryStatusUpdateJob.externalizeJobValues(jobDataMap,
- AgentInventoryStatusUpdateJob.PLATFORMS_COMMA_LIST, platforms);
+ AgentInventoryStatusUpdateJob.PLATFORMS_COMMA_LIST, platforms);
AgentInventoryStatusUpdateJob.externalizeJobValues(jobDataMap,
- AgentInventoryStatusUpdateJob.SERVERS_COMMA_LIST, servers);
+ AgentInventoryStatusUpdateJob.SERVERS_COMMA_LIST, servers);
trigger.setJobName(DEFAULT_JOB_NAME);
trigger.setJobGroup(DEFAULT_JOB_GROUP);
@@ -333,7 +332,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
scheduler.scheduleJob(trigger);
} else {
JobDetail jobDetail = new JobDetail(DEFAULT_JOB_NAME, DEFAULT_JOB_GROUP,
- AgentInventoryStatusUpdateJob.class);
+ AgentInventoryStatusUpdateJob.class);
scheduler.scheduleJob(jobDetail, trigger);
}
} catch (SchedulerException e) {
@@ -357,10 +356,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
AgentClient agentClient = agentManager.getAgentClient(platform.getAgent());
try {
agentClient.getDiscoveryAgentService().synchronizeInventory(
- entityManager.find(ResourceSyncInfo.class, platform.getId()));
+ entityManager.find(ResourceSyncInfo.class, platform.getId()));
} catch (Exception e) {
log.warn("Could not perform commit synchronization with agent for platform [" + platform.getName()
- + "]", e);
+ + "]", e);
}
}
for (Resource server : servers) {
@@ -369,10 +368,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
AgentClient agentClient = agentManager.getAgentClient(server.getAgent());
try {
agentClient.getDiscoveryAgentService().synchronizeInventory(
- entityManager.find(ResourceSyncInfo.class, server.getId()));
+ entityManager.find(ResourceSyncInfo.class, server.getId()));
} catch (Exception e) {
log.warn("Could not perform commit synchronization with agent for server [" + server.getName()
- + "]", e);
+ + "]", e);
}
}
}
@@ -511,6 +510,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
}
+ @SuppressWarnings("deprecation")
public Set<ResourceUpgradeResponse> upgradeResources(Set<ResourceUpgradeRequest> upgradeRequests) {
Set<ResourceUpgradeResponse> result = new HashSet<ResourceUpgradeResponse>();
@@ -588,8 +588,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
private ResourceUpgradeResponse upgradeResource(@NotNull Resource resource, ResourceUpgradeRequest upgradeRequest,
boolean allowGenericPropertiesUpgrade) {
if (upgradeRequest.getUpgradeErrorMessage() != null) {
- ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE, upgradeRequest
- .getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(), upgradeRequest.getTimestamp());
+ ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE,
+ upgradeRequest.getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(),
+ upgradeRequest.getTimestamp());
resourceManager.addResourceError(error);
return null;
}
@@ -767,8 +768,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
continue;
}
}
- existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent, resource
- .getResourceKey(), resourceType.getPlugin(), resourceType.getName());
+ existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent,
+ resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName());
}
if (existingResource != null) {
@@ -871,6 +872,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
if (existingResource.getInventoryStatus() == InventoryStatus.DELETED) {
existingResource.setInventoryStatus(InventoryStatus.COMMITTED);
existingResource.setPluginConfiguration(updatedResource.getPluginConfiguration());
+ existingResource.setAgentSynchronizationNeeded();
}
for (Resource childResource : updatedResource.getChildResources()) {
@@ -1021,14 +1023,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// Do one query per 1000 Resource id's to prevent Oracle from failing because of an IN clause with more
// than 1000 items.
- List<Resource> resources = new ArrayList(resourceIds.length);
+ List<Resource> resources = new ArrayList<Resource>(resourceIds.length);
fromIndex = 0;
while (fromIndex < resourceIds.length) {
int toIndex = (resourceIds.length < (fromIndex + 1000)) ? resourceIds.length : (fromIndex + 1000);
int[] resourceIdSubArray = Arrays.copyOfRange(resourceIds, fromIndex, toIndex);
PageList<Resource> batchResources = resourceManager.findResourceByIds(subject, resourceIdSubArray, false,
- PageControl.getUnlimitedInstance());
+ PageControl.getUnlimitedInstance());
resources.addAll(batchResources);
fromIndex = toIndex;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
index c899487..964d84c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java
@@ -160,7 +160,7 @@ class WsResourceListWrapper extends Resource {
destination.setProductVersion(source.getProductVersion());
destination.setResourceConfiguration(source.getResourceConfiguration());
destination.setResourceConfigurationUpdates(source.getResourceConfigurationUpdates());
- destination.setSchendules(source.getSchedules());
+ destination.setSchedules(source.getSchedules());
destination.setUuid(source.getUuid());
//handle the problematic references that would cause cycles if used by storing only ids.
if (source.getParentResource() != null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
index 20d1c95..3c74f06 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java
@@ -116,7 +116,7 @@ class WsResource extends Resource {
destination.setProductVersion(source.getProductVersion());
destination.setResourceConfiguration(source.getResourceConfiguration());
destination.setResourceConfigurationUpdates(source.getResourceConfigurationUpdates());
- destination.setSchendules(source.getSchedules());
+ destination.setSchedules(source.getSchedules());
destination.setUuid(source.getUuid());
//handle the problematic references that would cause cycles if used by storing only ids.
if (source.getParentResource() != null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
index 8a21886..fba8a68 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java
@@ -74,8 +74,6 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
* @param def the MeasuremendDefinition to delete
*/
public void removeMeasurementDefinition(MeasurementDefinition def) {
- long now = System.currentTimeMillis();
-
// First remove the schedules and associated OOBs.
List<MeasurementSchedule> schedules = def.getSchedules();
Iterator<MeasurementSchedule> schedIter = schedules.iterator();
@@ -86,8 +84,7 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
sched.setBaseline(null);
}
oobManager.removeOOBsForSchedule(subjectManager.getOverlord(), sched);
- // IMPORTANT: Update the mtime to tell the Agent this Resource needs to be synced.
- sched.getResource().setMtime(now);
+ sched.getResource().setAgentSynchronizationNeeded();
entityManager.remove(sched);
schedIter.remove();
}
@@ -134,14 +131,13 @@ public class MeasurementDefinitionManagerBean implements MeasurementDefinitionMa
return results;
}
- @SuppressWarnings("unchecked")
public PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(Subject subject,
MeasurementDefinitionCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
;
- CriteriaQueryRunner<MeasurementDefinition> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager);
+ CriteriaQueryRunner<MeasurementDefinition> queryRunner = new CriteriaQueryRunner<MeasurementDefinition>(
+ criteria, generator, entityManager);
return queryRunner.execute();
}
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
index e5df592..bbc2a1d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
@@ -23,21 +23,14 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Date;
import java.util.UUID;
-import org.quartz.Trigger;
-import org.quartz.Scheduler;
-import org.quartz.JobDetail;
-import org.quartz.JobDataMap;
-import org.quartz.SimpleTrigger;
-import org.quartz.SchedulerException;
-
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
@@ -51,6 +44,12 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
import org.jboss.annotation.IgnoreDependency;
@@ -317,13 +316,13 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
return;
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllDefaultCollections(Subject subject) {
entityManager.createNamedQuery(MeasurementDefinition.DISABLE_ALL).executeUpdate();
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllSchedules(Subject subject) {
entityManager.createNamedQuery(MeasurementSchedule.DISABLE_ALL).executeUpdate();
@@ -331,11 +330,10 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
}
public void createSchedulesForExistingResources(ResourceType type, MeasurementDefinition newDefinition) {
- long now = System.currentTimeMillis();
List<Resource> resources = type.getResources();
if (resources != null) {
for (Resource res : resources) {
- res.setMtime(now); // changing MTime tells the agent this resource needs to be synced
+ res.setAgentSynchronizationNeeded();
MeasurementSchedule sched = new MeasurementSchedule(newDefinition, res);
sched.setInterval(newDefinition.getDefaultInterval());
entityManager.persist(sched);
@@ -648,16 +646,10 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
final String randomSuffix = UUID.randomUUID().toString();
final String jobName = DEFAULT_AGENT_JOB + " - " + randomSuffix;
- JobDetail jobDetail = new JobDetail(
- jobName,
- DEFAULT_AGENT_GROUP,
- NotifyAgentsOfScheduleUpdatesJob.class);
+ JobDetail jobDetail = new JobDetail(jobName, DEFAULT_AGENT_GROUP, NotifyAgentsOfScheduleUpdatesJob.class);
final String triggerName = DEFAULT_AGENT_TRIGGER + " - " + randomSuffix;
- SimpleTrigger simpleTrigger = new SimpleTrigger(
- triggerName,
- DEFAULT_AGENT_GROUP,
- new Date());
+ SimpleTrigger simpleTrigger = new SimpleTrigger(triggerName, DEFAULT_AGENT_GROUP, new Date());
JobDataMap jobDataMap = simpleTrigger.getJobDataMap();
jobDataMap.put(TRIGGER_NAME, triggerName);
@@ -1235,8 +1227,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
// first get all the resources, which is needed to get the agent mappings
Subject overlord = subjectManager.getOverlord();
- PageList<Resource> resources = resourceManager.findResourceByIds(overlord, resourceIds, false, PageControl
- .getUnlimitedInstance());
+ PageList<Resource> resources = resourceManager.findResourceByIds(overlord, resourceIds, false,
+ PageControl.getUnlimitedInstance());
// then get all the requests
Set<ResourceMeasurementScheduleRequest> requests = findSchedulesForResourceAndItsDescendants(resourceIds, false);
@@ -1482,8 +1474,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
;
if (authorizationManager.isInventoryManager(subject) == false) {
- generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE, subject
- .getId());
+ generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE,
+ subject.getId());
}
CriteriaQueryRunner<MeasurementSchedule> queryRunner = new CriteriaQueryRunner(criteria, generator,
@@ -1522,4 +1514,3 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
// }
}
-
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 4cbc3d1..fcc6638 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -238,8 +238,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
persistedResource.setLocation(resource.getLocation());
persistedResource.setDescription(resource.getDescription());
- // NOTE: Updating the mtime will tell the Agent it needs to sync this Resource.
- persistedResource.setMtime(System.currentTimeMillis());
+ persistedResource.setAgentSynchronizationNeeded();
persistedResource.setModifiedBy(user.getName());
return entityManager.merge(persistedResource);
@@ -614,7 +613,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
private void updateInventoryStatus(Resource resource, InventoryStatus newStatus, long now) {
resource.setInventoryStatus(newStatus);
resource.setItime(now);
- resource.setMtime(now);
+ resource.setAgentSynchronizationNeeded();
}
@SuppressWarnings("unchecked")
@@ -757,8 +756,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
// Build up a list of composite Resources for the ancestry that includes which ancestors, if any, should be
// locked from view.
boolean isInventoryManager = authorizationManager.isInventoryManager(subject);
- List<ResourceLineageComposite> resourceLineage = new ArrayList<ResourceLineageComposite>(rawResourceLineage
- .size());
+ List<ResourceLineageComposite> resourceLineage = new ArrayList<ResourceLineageComposite>(
+ rawResourceLineage.size());
for (Resource resource : rawResourceLineage) {
boolean isLocked = !(isInventoryManager || authorizationManager.canViewResource(subject, resource.getId()));
ResourceLineageComposite composite = new ResourceLineageComposite(resource, isLocked);
@@ -776,8 +775,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
// If the ancestor is not locked, include viewable children.
if (!ancestor.isLocked() || ancestor.getResource() == parent) {
// Get all viewable committed children.
- PageList<Resource> children = findChildResourcesByCategoryAndInventoryStatus(subject, ancestor
- .getResource(), null, InventoryStatus.COMMITTED, PageControl.getUnlimitedInstance());
+ PageList<Resource> children = findChildResourcesByCategoryAndInventoryStatus(subject,
+ ancestor.getResource(), null, InventoryStatus.COMMITTED, PageControl.getUnlimitedInstance());
// Remove any that are in the lineage to avoid repeated handling.
children.removeAll(rawResourceLineage);
for (Resource child : children) {
@@ -1384,7 +1383,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return result;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public List<AutoGroupComposite> findResourcesAutoGroups(Subject subject, int[] resourceIds) {
List<AutoGroupComposite> results = new ArrayList<AutoGroupComposite>();
List<Integer> ids = ArrayUtils.wrapInList(resourceIds);
@@ -1484,6 +1483,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
query.setParameter("inventoryStatus", InventoryStatus.COMMITTED);
List<Object[]> objs = query.getResultList();
+ @SuppressWarnings("rawtypes")
List results = new ArrayList<ResourceWithAvailability>(objs.size());
for (Object[] ob : objs) {
Resource r = (Resource) ob[0];
@@ -1814,7 +1814,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -1847,7 +1847,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -1890,7 +1890,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
List<Resource> resources = query.getResultList();
- return new PageList(resources, (int) count, pageControl);
+ return new PageList<Resource>(resources, (int) count, pageControl);
}
@SuppressWarnings("unchecked")
@@ -2396,7 +2396,6 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return results;
}
- @SuppressWarnings("unchecked")
public PageList<ResourceComposite> findResourceCompositesByCriteria(Subject subject, ResourceCriteria criteria) {
boolean isInventoryManager = authorizationManager.isInventoryManager(subject);
@@ -2440,8 +2439,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
subject.getId());
}
- CriteriaQueryRunner<ResourceComposite> queryRunner = new CriteriaQueryRunner(criteria, generator,
- entityManager, false); // don't auto-init bags, we're returning composites not entities
+ CriteriaQueryRunner<ResourceComposite> queryRunner = new CriteriaQueryRunner<ResourceComposite>(criteria,
+ generator, entityManager, false); // don't auto-init bags, we're returning composites not entities
PageList<ResourceComposite> results = queryRunner.execute();
for (ResourceComposite nextComposite : results) {
@@ -2456,7 +2455,6 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
return results;
}
- @SuppressWarnings("unchecked")
public PageList<Resource> findResourcesByCriteria(Subject subject, ResourceCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2470,7 +2468,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
subject.getId());
}
- CriteriaQueryRunner<Resource> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager);
+ CriteriaQueryRunner<Resource> queryRunner = new CriteriaQueryRunner<Resource>(criteria, generator,
+ entityManager);
PageList<Resource> results = queryRunner.execute();
return results;
}
@@ -2521,8 +2520,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
public <T> List<DisambiguationReport<T>> disambiguate(List<T> results, IntExtractor<? super T> extractor,
DisambiguationUpdateStrategy updateStrategy) {
- return Disambiguator.disambiguate(results, updateStrategy, extractor, entityManager, typeManager
- .getDuplicateTypeNames());
+ return Disambiguator.disambiguate(results, updateStrategy, extractor, entityManager,
+ typeManager.getDuplicateTypeNames());
}
public void updateAncestry(Subject subject, int resourceId) {
@@ -2545,13 +2544,13 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
@SuppressWarnings("unchecked")
public List<Integer> findIdsByTypeIds(List<Integer> resourceTypeIds) {
- return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS).setParameter("resourceTypeIds",
- resourceTypeIds).getResultList();
+ return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS)
+ .setParameter("resourceTypeIds", resourceTypeIds).getResultList();
}
@Override
public Integer getResourceCount(List<Integer> resourceTypeIds) {
- return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES).setParameter(
- "resourceTypeIds", resourceTypeIds).getSingleResult();
+ return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES)
+ .setParameter("resourceTypeIds", resourceTypeIds).getSingleResult();
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
index 3963f9d..841fe03 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java
@@ -1,6 +1,5 @@
package org.rhq.enterprise.server.resource.metadata;
-import java.util.Date;
import java.util.List;
import javax.ejb.EJB;
@@ -58,8 +57,8 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
// all new
if (existingConfigurationDefinition == null) {
if (log.isDebugEnabled()) {
- log.debug(existingType + " currently does not have a plugin configuration definition. Adding " +
- "new plugin configuration.");
+ log.debug(existingType + " currently does not have a plugin configuration definition. Adding "
+ + "new plugin configuration.");
}
entityMgr.persist(newType.getPluginConfigurationDefinition());
existingType.setPluginConfigurationDefinition(newType.getPluginConfigurationDefinition());
@@ -72,8 +71,8 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
.updateConfigurationDefinition(newType.getPluginConfigurationDefinition(),
existingConfigurationDefinition);
- if (updateReport.getNewPropertyDefinitions().size() > 0 ||
- updateReport.getUpdatedPropertyDefinitions().size() > 0) {
+ if (updateReport.getNewPropertyDefinitions().size() > 0
+ || updateReport.getUpdatedPropertyDefinitions().size() > 0) {
Subject overlord = subjectMgr.getOverlord();
ResourceCriteria criteria = new ResourceCriteria();
criteria.addFilterResourceTypeId(existingType.getId());
@@ -99,6 +98,7 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
private void updateResourcePluginConfiguration(Resource resource, ConfigurationDefinitionUpdateReport updateReport) {
Configuration pluginConfiguration = resource.getPluginConfiguration();
boolean modified = false;
+ @SuppressWarnings("unused")
int numberOfProperties = pluginConfiguration.getProperties().size();
ConfigurationTemplate template = updateReport.getConfigurationDefinition().getDefaultTemplate();
Configuration templateConfiguration = template.getConfiguration();
@@ -106,10 +106,10 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
for (PropertyDefinition propertyDef : updateReport.getNewPropertyDefinitions()) {
if (propertyDef.isRequired()) {
Property templateProperty = templateConfiguration.get(propertyDef.getName());
- if (templateProperty==null) {
+ if (templateProperty == null) {
throw new IllegalArgumentException("The property [" + propertyDef.getName()
- + "] marked as required in the configuration definition of [" + propertyDef.getConfigurationDefinition().getName()
- + "] has no attribute 'default'");
+ + "] marked as required in the configuration definition of ["
+ + propertyDef.getConfigurationDefinition().getName() + "] has no attribute 'default'");
} else {
pluginConfiguration.put(templateProperty.deepCopy(false));
modified = true;
@@ -129,7 +129,7 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati
}
if (modified) {
- resource.setMtime(new Date().getTime());
+ resource.setAgentSynchronizationNeeded();
}
}
}
commit e80294f5775b38e4e99c242aef4cbfcc01fd2c45
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 13:15:04 2012 -0500
Add a demarcation comment for JON 3.0.1
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 f005ff0..7dd68d4 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3828,6 +3828,8 @@
</schema-directSQL>
</schemaSpec>
+<!-- JON 3.0.1 RELEASE uses DB Schema 2.118 -->
+
</dbupgrade>
</target>
</project>
commit b7faba1d8d376f32407fa306db7c0a5df4d63585
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 13:16:59 2011 -0500
Supporting check-in for [Bug 768031 - Pin template failure on upgraded dbs]
- Fix a long standing issue in dbupgrade due to Oracle throwing exceptions
when trying to set nullable to the current value. In other words, the
upgrade would fail on oracle if you tried to set nullable false on a
column that was already nullable false. (same for nullable true). This
caused issues when you can't guarantee the current state, you just know
what you need it to be. Now, catch the relevant exceptions and toss
them as needed.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
index afd9ed9..ad038b0 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java
@@ -25,6 +25,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import mazz.i18n.Logger;
+
/**
* Superclass of all versions of the Oracle database.
*
@@ -32,6 +34,8 @@ import java.util.List;
*
*/
public abstract class OracleDatabaseType extends DatabaseType {
+ private static final Logger LOG = DbUtilsI18NFactory.getLogger(OracleDatabaseType.class);
+
/**
* The vendor name for all Oracle databases.
*/
@@ -156,7 +160,24 @@ public abstract class OracleDatabaseType extends DatabaseType {
sql += ")";
- executeSql(conn, sql);
+ try {
+ executeSql(conn, sql);
+ } catch (SQLException e) {
+ // Oracle throws an exception if you try to set nullable to its current setting. Ignore errors
+ // generated when a nullable setting is already the way we want it to be.
+ // ORA-01442: column to be modified to NOT NULL is already NOT NULL
+ // ORA-01451: column to be modified to NULL cannot be modified to NULL
+ if (nullable != null) {
+ String msg = e.getMessage();
+ if (msg.contains("ORA-01442") || msg.contains("ORA-01451")) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Ignoring exception, column already set to nullable=" + nullable, e);
+ }
+ } else {
+ throw e;
+ }
+ }
+ }
if ((reindex != null) && reindex.booleanValue()) {
reindexTable(conn, table);
commit 8667a4c591e4ef6f803d0b485e3e7cfda76f3440
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 15 13:18:32 2011 -0500
[Bug 768031 - Pin template failure on upgraded dbs]
Set RHQ_DRIFT_CHANGE_SET.DRIFT_DEFINITION_ID nullable in the db upgrade.
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 b77d98a..f005ff0 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3813,7 +3813,10 @@
<schemaSpec version="2.117">
<!-- Remove an obsolete drift table that may be hanging around -->
- <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+ <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+
+ <!-- Remove an unwanted null consraint -->
+ <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_DEFINITION_ID" nullable="TRUE" />
</schemaSpec>
<schemaSpec version="2.118">
commit 8b8ce32cf7bc2ab04c28d9717911007878ba895a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 9 15:45:21 2012 -0500
[Bug 772742 - DB upgrade gives "All Resources Role" an unintended permission]
Fix the upgrade step that grants the bad permission. And add a new
step to revoke it if it exists.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index f08d22d..f58d07d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -15,7 +15,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.117</db.schema.version>
+ <db.schema.version>2.118</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
<rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url>
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 c690317..b77d98a 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3370,12 +3370,12 @@
</statement>
</schema-directSQL>
- <!-- Now add modify the permissions to give all the roles with MANAGE_INVENTORY
- the new MANAGE_REPOSITORIES privilege so that people's privs remain unchanged. -->
+ <!-- Now modify the permissions to give all the roles with MANAGE_INVENTORY, except for
+ all-resources-role, the new MANAGE_REPOSITORIES privilege so that privs remain unchanged. -->
<schema-directSQL>
<statement>
INSERT INTO RHQ_PERMISSION (role_id, operation)
- SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1
+ SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1 AND NOT role_id = 2
</statement>
</schema-directSQL>
</schemaSpec>
@@ -3815,6 +3815,15 @@
<!-- Remove an obsolete drift table that may be hanging around -->
<schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
</schemaSpec>
+
+ <schemaSpec version="2.118">
+ <!-- Correct an earlier upgrade issue where 'All Resources Role' was granted MANAGE_REPOSITORIES. -->
+ <schema-directSQL>
+ <statement>
+ DELETE FROM RHQ_PERMISSION WHERE role_id = 2 AND operation = 15
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
</dbupgrade>
</target>
commit fb7177edccdd59a8f33cdc1253d6d02428ea51b5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jan 31 12:21:44 2012 -0500
Add 2.117 to remove an obsolete drift table that may exist after upgrades.
Conflicts:
modules/core/dbutils/pom.xml
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index b298636..f08d22d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -14,14 +14,8 @@
<name>RHQ Database Utilities</name>
<description>Database schema setup, upgrade and other utilities</description>
- <scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core/dbutils</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core/dbutils</developerConnection>
- </scm>
-
<properties>
- <scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.116</db.schema.version>
+ <db.schema.version>2.117</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
<rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url>
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 fb2ed85..c690317 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3809,6 +3809,13 @@
<schema-alterColumn table="RHQ_PRD_VER" column="VERSION" columnType="VARCHAR2" precision="100" />
</schemaSpec>
+<!-- JON 3.0 RELEASE uses DB Schema 2.116 -->
+
+ <schemaSpec version="2.117">
+ <!-- Remove an obsolete drift table that may be hanging around -->
+ <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" />
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
commit 22da9591737868d71ccc70474fe3701434ec8385
Merge: 371ed2f f808b1f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 30 22:27:20 2012 -0500
Merge branch 'release/jon3.0.x' of ssh://git.fedorahosted.org/git/rhq/rhq into release/jon3.0.x
commit 371ed2faefd38ca58d514bb95793978de4a4fa46
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 30 22:25:35 2012 -0500
[BZ 785026] if log file event sources are enabled, but SIGAR is disabled or unavailable, log a warning, rather than
silently failing (https://bugzilla.redhat.com/show_bug.cgi?id=785026)
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
index f9bb654..8651272 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java
@@ -22,6 +22,7 @@
*/
package org.rhq.core.pluginapi.event;
+import com.sun.istack.Nullable;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
@@ -90,10 +91,10 @@ public interface EventContext {
/**
* Gets an instance of Sigar. Plugins that need to use Sigar, should use this method to get an instance, rather than
- * instantiating Sigar themselves.
+ * instantiating Sigar themselves. Returns null if the native layer is unavailable or has been disabled.
*
- * @return an instance of Sigar
+ * @return an instance of Sigar, or null if the native layer is unavailable or has been disabled
*/
- @NotNull
+ @Nullable
SigarProxy getSigar();
}
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
index d936522..bcc42de 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java
@@ -1,6 +1,6 @@
- /*
+/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -55,13 +55,17 @@ public class LogFileEventPoller implements EventPoller {
private LogEntryProcessor entryProcessor;
public LogFileEventPoller(EventContext eventContext, String eventType, File logFile, LogEntryProcessor entryProcessor) {
+ SigarProxy sigar = eventContext.getSigar();
this.eventType = eventType;
this.logFile = logFile;
- SigarProxy sigar = eventContext.getSigar();
- try {
- this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
- } catch (SigarException e) {
- throw new RuntimeException(e);
+ if (sigar != null) {
+ try {
+ this.logFileInfo = new LogFileInfo(sigar.getFileInfo(logFile.getPath()));
+ } catch (SigarException e) {
+ throw new RuntimeException("Failed to obtain file info for log file [" + this.logFile + "].", e);
+ }
+ } else {
+ log.warn("SIGAR is unavailable - cannot poll log file [" + this.logFile + "] for events.");
}
this.entryProcessor = entryProcessor;
}
@@ -78,12 +82,15 @@ public class LogFileEventPoller implements EventPoller {
@Nullable
public Set<Event> poll() {
+ if (this.logFileInfo == null) {
+ return null;
+ }
if (!this.logFile.exists()) {
- log.warn("Log file [" + this.logFile + "' being polled does not exist.");
+ log.warn("Log file [" + this.logFile + "] being polled does not exist.");
return null;
}
if (this.logFile.isDirectory()) {
- log.error("Log file [" + this.logFile + "' being polled is a directory, not a regular file.");
+ log.error("Log file [" + this.logFile + "] being polled is a directory, not a regular file.");
return null;
}
try {
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
index 962764a..d134638 100644
--- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,9 @@ package org.rhq.core.pluginapi.event.log;
import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -32,10 +35,12 @@ 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.event.EventSeverity;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.event.EventContext;
import org.rhq.core.pluginapi.event.EventPoller;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.system.SystemInfoFactory;
/**
* @author Ian Springer
@@ -47,83 +52,132 @@ public class LogFileEventResourceComponentHelper {
public static final String LOG_EVENT_SOURCE_CONFIG_PROP = "logEventSource";
public abstract static class LogEventSourcePropertyNames {
- public static final String LOG_FILE_PATH = "logFilePath";
- public static final String ENABLED = "enabled";
- public static final String DATE_FORMAT = "dateFormat";
- public static final String INCLUDES_PATTERN = "includesPattern";
- public static final String MINIMUM_SEVERITY = "minimumSeverity";
+ public static final String LOG_FILE_PATH = "logFilePath"; // required
+ public static final String ENABLED = "enabled"; // required
+ public static final String DATE_FORMAT = "dateFormat"; // optional
+ public static final String INCLUDES_PATTERN = "includesPattern"; // optional
+ public static final String MINIMUM_SEVERITY = "minimumSeverity"; // optional
}
+ // TODO: Make this configurable via a plugin config prop.
+ private static final int POLLING_INTERVAL_IN_SECONDS = 60;
+
private final Log log = LogFactory.getLog(this.getClass());
private ResourceContext<?> resourceContext;
+ private List<PropertyMap> startedEventSources = new ArrayList<PropertyMap>();
public LogFileEventResourceComponentHelper(ResourceContext<?> resourceContext) {
this.resourceContext = resourceContext;
}
public void startLogFileEventPollers() {
+ // Grab the list-o-maps of event sources from the plugin config.
Configuration pluginConfig = this.resourceContext.getPluginConfiguration();
PropertyList logEventSources = pluginConfig.getList(LOG_EVENT_SOURCES_CONFIG_PROP);
+
+ // Build a new list containing the event sources that are enabled.
+ List<PropertyMap> enabledEventSources = new ArrayList<PropertyMap>();
for (Property prop : logEventSources.getList()) {
PropertyMap logEventSource = (PropertyMap) prop;
- Boolean enabled = Boolean.valueOf(logEventSource.getSimpleValue(LogEventSourcePropertyNames.ENABLED, null));
- if (enabled) {
- String logFilePathname = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
- if (logFilePathname == null) {
- log.info("LOGFILE: No logfile path given, can not watch this event log.");
- return;
- }
- File logFile = new File(logFilePathname);
- if (!logFile.exists() || !logFile.canRead()) {
- log.error("LOGFILE: Logfile at location " + logFilePathname
- + " does not exist or is not readable. Can not start watching the event log.");
- return;
- }
+ String enabled = logEventSource.getSimpleValue(LogEventSourcePropertyNames.ENABLED, null);
+ if (enabled == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.ENABLED
+ + "] is not defined in map.");
+ }
+ if (Boolean.valueOf(enabled)) {
+ enabledEventSources.add(logEventSource);
+ }
+ }
- Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(LOG_ENTRY_EVENT_TYPE, logFile);
- String dateFormatString = logEventSource.getSimpleValue(LogEventSourcePropertyNames.DATE_FORMAT, null);
- if (dateFormatString != null) {
- try {
- DateFormat dateFormat = new SimpleDateFormat(dateFormatString); // TODO locale specific ?
- processor.setDateFormat(dateFormat);
- } catch (IllegalArgumentException e) {
- throw new InvalidPluginConfigurationException("Date format [" + dateFormatString
- + "] is not a valid simple date format.");
- }
- }
- String includesPatternString = logEventSource.getSimpleValue(
- LogEventSourcePropertyNames.INCLUDES_PATTERN, null);
- if (includesPatternString != null) {
- try {
- Pattern includesPattern = Pattern.compile(includesPatternString);
- processor.setIncludesPattern(includesPattern);
- } catch (PatternSyntaxException e) {
- throw new InvalidPluginConfigurationException("Includes pattern [" + includesPatternString
- + "] is not a valid regular expression.");
- }
+ // Log a warning then return if SIGAR isn't available, since LogFileEventPoller depends on it. We only log this
+ // warning if at least one event source is enabled, since otherwise the user probably doesn't care.
+ boolean sigarAvailable = this.resourceContext.getSystemInformation().isNative();
+ if (!sigarAvailable && !enabledEventSources.isEmpty()) {
+ boolean nativeSystemInfoDisabled = SystemInfoFactory.isNativeSystemInfoDisabled();
+ ResourceType resourceType = this.resourceContext.getResourceType();
+ List<String> logFilePaths = getLogFilePaths(enabledEventSources);
+ log.warn("Log files " + logFilePaths + " for [" + resourceType.getPlugin() + ":"
+ + resourceType.getName() + "] Resource with key [" + this.resourceContext.getResourceKey()
+ + "] cannot be polled, because log file polling requires RHQ native support, which "
+ + ((nativeSystemInfoDisabled) ? "has been disabled for this Agent" : "is not available on this platform") + ".");
+ return;
+ }
+
+ // Start up log file pollers for each of the enabled event sources.
+ for (PropertyMap logEventSource : enabledEventSources) {
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ if (logFilePath == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.LOG_FILE_PATH
+ + "] is not defined in map.");
+ }
+ File logFile = new File(logFilePath);
+ if (!logFile.canRead()) {
+ log.error("LOGFILE: Logfile at location " + logFilePath
+ + " does not exist or is not readable. Can not start watching the event log.");
+ continue;
+ }
+
+ Log4JLogEntryProcessor processor = new Log4JLogEntryProcessor(LOG_ENTRY_EVENT_TYPE, logFile);
+ String dateFormatString = logEventSource.getSimpleValue(LogEventSourcePropertyNames.DATE_FORMAT, null);
+ if (dateFormatString != null) {
+ try {
+ DateFormat dateFormat = new SimpleDateFormat(dateFormatString); // TODO locale specific ?
+ processor.setDateFormat(dateFormat);
+ } catch (IllegalArgumentException e) {
+ throw new InvalidPluginConfigurationException("Date format [" + dateFormatString
+ + "] is not a valid simple date format.");
}
- String minimumSeverityString = logEventSource.getSimpleValue(
- LogEventSourcePropertyNames.MINIMUM_SEVERITY, null);
- if (minimumSeverityString != null) {
- EventSeverity minimumSeverity = EventSeverity.valueOf(minimumSeverityString.toUpperCase());
- processor.setMinimumSeverity(minimumSeverity);
+ }
+ String includesPatternString = logEventSource.getSimpleValue(
+ LogEventSourcePropertyNames.INCLUDES_PATTERN, null);
+ if (includesPatternString != null) {
+ try {
+ Pattern includesPattern = Pattern.compile(includesPatternString);
+ processor.setIncludesPattern(includesPattern);
+ } catch (PatternSyntaxException e) {
+ throw new InvalidPluginConfigurationException("Includes pattern [" + includesPatternString
+ + "] is not a valid regular expression.");
}
- EventContext eventContext = this.resourceContext.getEventContext();
- EventPoller poller = new LogFileEventPoller(eventContext, LOG_ENTRY_EVENT_TYPE, logFile, processor);
- eventContext.registerEventPoller(poller, 60, logFile.getPath());
}
+ String minimumSeverityString = logEventSource.getSimpleValue(
+ LogEventSourcePropertyNames.MINIMUM_SEVERITY, null);
+ if (minimumSeverityString != null) {
+ EventSeverity minimumSeverity = EventSeverity.valueOf(minimumSeverityString.toUpperCase());
+ processor.setMinimumSeverity(minimumSeverity);
+ }
+ EventContext eventContext = this.resourceContext.getEventContext();
+ EventPoller poller = new LogFileEventPoller(eventContext, LOG_ENTRY_EVENT_TYPE, logFile, processor);
+ eventContext.registerEventPoller(poller, POLLING_INTERVAL_IN_SECONDS, logFile.getPath());
+ this.startedEventSources.add(logEventSource);
}
}
public void stopLogFileEventPollers() {
- Configuration pluginConfig = this.resourceContext.getPluginConfiguration();
- PropertyList logEventSources = pluginConfig.getList(LOG_EVENT_SOURCES_CONFIG_PROP);
- for (Property prop : logEventSources.getList()) {
- PropertyMap logEventSource = (PropertyMap) prop;
- String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ boolean sigarAvailable = this.resourceContext.getSystemInformation().isNative();
+ if (!sigarAvailable) {
+ return;
+ }
+
+ for (Iterator<PropertyMap> iterator = this.startedEventSources.iterator(); iterator.hasNext(); ) {
+ PropertyMap logEventSource = iterator.next();
EventContext eventContext = this.resourceContext.getEventContext();
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
eventContext.unregisterEventPoller(LOG_ENTRY_EVENT_TYPE, logFilePath);
+ iterator.remove();
+ }
+ }
+
+ private List<String> getLogFilePaths(List<PropertyMap> enabledEventSources) {
+ List<String> logFilePaths = new ArrayList<String>(enabledEventSources.size());
+ for (PropertyMap logEventSource : enabledEventSources) {
+ String logFilePath = logEventSource.getSimpleValue(LogEventSourcePropertyNames.LOG_FILE_PATH, null);
+ if (logFilePath == null) {
+ throw new IllegalStateException("Required property [" + LogEventSourcePropertyNames.LOG_FILE_PATH
+ + "] is not defined in map.");
+ }
+ logFilePaths.add(logFilePath);
}
+ return logFilePaths;
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
index b0b37ec..1735aff 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java
@@ -24,6 +24,7 @@ package org.rhq.core.pc.event;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.rhq.core.domain.event.Event;
import org.rhq.core.domain.event.EventDefinition;
import org.rhq.core.domain.resource.Resource;
@@ -99,7 +100,7 @@ public class EventContextImpl implements EventContext {
unregisterEventPollerInternal(eventType, sourceLocation);
}
- @NotNull
+ @Nullable
public SigarProxy getSigar() {
return getEventManager().getSigar();
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
index 4ad5c50..87b9bd7 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java
@@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.hyperic.sigar.SigarProxy;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.rhq.core.domain.event.Event;
import org.rhq.core.domain.event.EventDefinition;
import org.rhq.core.domain.event.EventSource;
@@ -44,6 +45,7 @@ import org.rhq.core.pc.PluginContainerConfiguration;
import org.rhq.core.pc.util.LoggingThreadFactory;
import org.rhq.core.pluginapi.event.EventPoller;
import org.rhq.core.system.SigarAccess;
+import org.rhq.core.system.SystemInfoException;
/**
* Manager for the Plugin Container's Event subsystem.
@@ -113,9 +115,12 @@ public class EventManager implements ContainerService {
}
}
+ @Nullable
SigarProxy getSigar() {
if (this.sigar == null) {
- this.sigar = SigarAccess.getSigar();
+ if (SigarAccess.isSigarAvailable()) {
+ this.sigar = SigarAccess.getSigar();
+ }
}
return this.sigar;
}
commit f808b1f8c4837661862825538dd497afc1b671be
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Jan 26 17:37:21 2012 -0500
BZ[784873] fixing issue displaying LDAP registration screen with clean browser cache.
i)Can't count on CoreGUI to be loaded in this case as the user may not have logged in before.
ii)Some refactoring to embed asynchronous call.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 74d11e3..50c87a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -103,6 +103,7 @@ public class LoginView extends LocatableCanvas {
private static final String DEPARTMENT = "department";
private static final String SESSIONID = "ldap.sessionid";
static final String PASSWORD = "ldap.password";
+ private ProductInfo productInfo;
public void showLoginDialog(String message) {
showLoginDialog();
@@ -206,195 +207,232 @@ public class LoginView extends LocatableCanvas {
if (!loginShowing) {
loginShowing = true;
- ProductInfo productInfo = CoreGUI.get().getProductInfo();
-
- int fieldWidth = 120;
-
- LocatableVLayout column = new LocatableVLayout(extendLocatorId("NewLdapRegistration"));
- column.setMargin(25);
- HeaderItem header = new HeaderItem();
- header.setValue(MSG.view_login_welcomeMsg(productInfo.getName()));
- header.setWidth("100%");
- //build ui elements for registration screen
- first = new TextItem(FIRST, MSG.dataSource_users_field_firstName());
- {
- first.setRequired(true);
- first.setWrapTitle(false);
- first.setWidth(fieldWidth);
- }
- last = new TextItem(LAST, MSG.dataSource_users_field_lastName());
- {
- last.setWrapTitle(false);
- last.setWidth(fieldWidth);
- last.setRequired(true);
- }
- final TextItem username = new TextItem(USERNAME, MSG.dataSource_users_field_name());
- {
- username.setValue(user);
- username.setDisabled(true);
- username.setWidth(fieldWidth);
- }
- email = new TextItem(EMAIL, MSG.dataSource_users_field_emailAddress());
- email.setRequired(true);
- email.setWidth(fieldWidth);
- email.setWrapTitle(false);
- phone = new TextItem(PHONE, MSG.dataSource_users_field_phoneNumber());
- phone.setWidth(fieldWidth);
- phone.setWrapTitle(false);
- department = new TextItem(DEPARTMENT, MSG.dataSource_users_field_department());
- department.setWidth(fieldWidth);
- SpacerItem space = new SpacerItem();
- space.setColSpan(1);
-
- inputForm = new LocatableDynamicForm(extendLocatorId("LdapUserRegistrationInput"));
- inputForm.setAutoFocus(true);
- inputForm.setErrorOrientation(FormErrorOrientation.LEFT);
- inputForm.setNumCols(4);
- //moving header to it's own container for proper display. Didn't display right in production mode
- inputForm.setFields(username, first, last, email, phone, department);
- loadValidators(inputForm);
- inputForm.setValidateOnExit(true);
- DynamicForm headerWrapper = new DynamicForm();
- headerWrapper.setFields(header);
- column.addMember(headerWrapper);
- column.addMember(inputForm);
-
- HTMLFlow hr = new HTMLFlow("<br/><hr/><br/><br/>");
- hr.setWidth(620);
- hr.setAlign(Alignment.CENTER);
- column.addMember(hr);
-
- HStack row = new HStack();
- row.setMembersMargin(5);
- row.setAlign(VerticalAlignment.CENTER);
- IButton okButton = new LocatableIButton(inputForm.extendLocatorId("OK"), MSG.common_button_ok());
- okButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
-
- //F5 refresh check? If they've reloaded the form for some reason then bail.
- boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
- .trim().isEmpty()));
- //check for session timeout
- if (UserSessionManager.isLoggedOut() || (credentialsEmpty)) {
- resetLogin(LoginView.this.extendLocatorId("Register"));
- return;
+ //BZ:784873. To fix issue with users logging in by LDAP integration with clean browser cache.
+ if (CoreGUI.get().getProductInfo() == null) {
+ //We need to explicitly retrieve product info here as can't count on CoreGui to load it
+ //during LDAP registration. After registration CoreGui is loaded as usual.
+ GWTServiceLookup.getSystemService().getProductInfo(new AsyncCallback<ProductInfo>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_aboutBox_failedToLoad(), caught);
+ productInfo = null;
+ Log.trace("ProductInfo could not be retrieved for some reason. Proceeding anyway.");
+ buildRegistrationWindow(user, sessionId, password, callback);
}
- //validation
- if (inputForm.validate()) {
- Log.trace("Successfully validated all data for user registration.");
- //populate form
- if (first.getValue() != null)
- inputForm.setValue(FIRST, String.valueOf(first.getValue()));
- if (last.getValue() != null)
- inputForm.setValue(LAST, String.valueOf(last.getValue()));
- inputForm.setValue(USERNAME, String.valueOf(username.getValue()));
- if (email.getValue() != null)
- inputForm.setValue(EMAIL, String.valueOf(email.getValue()));
- if (phone.getValue() != null)
- inputForm.setValue(PHONE, String.valueOf(phone.getValue()));
- if (department.getValue() != null)
- inputForm.setValue(DEPARTMENT, String.valueOf(department.getValue()));
- inputForm.setValue(SESSIONID, sessionId);
- inputForm.setValue(PASSWORD, password);
- registerLdapUser(LoginView.this.extendLocatorId("RegisterLdap"), inputForm, callback);
+ public void onSuccess(ProductInfo result) {
+ productInfo = result;
+ Log.trace("ProductInfo has been retrieved for LDAP registration.");
+ buildRegistrationWindow(user, sessionId, password, callback);
}
- }
+ });
+ } else {//if productInfo has already been loaded, save a gwt call.
+ productInfo = CoreGUI.get().getProductInfo();
+ buildRegistrationWindow(user, sessionId, password, callback);
+ }
+ }
+ }
- });
- row.addMember(okButton);
- //send request to LDAP server to grab user details for this user. Already sure ldap user exists
- GWTServiceLookup.getLdapService().getLdapDetailsFor(user, new AsyncCallback<Map<String, String>>() {
- public void onSuccess(final Map<String, String> ldapUserDetails) {
- //now prepopulate UI fields if they exist
- for (String key : ldapUserDetails.keySet()) {
- String value;
- if (key.equalsIgnoreCase("givenName")) {//aka first name
- value = ldapUserDetails.get(key);
- first.setValue(value);
- } else if (key.equalsIgnoreCase("sn")) {//aka Surname
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- last.setValue(value);
- }
- } else if (key.equalsIgnoreCase("telephoneNumber")) {
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- phone.setValue(value);
- }
- } else if (key.equalsIgnoreCase("mail")) {
- value = ldapUserDetails.get(key);
- if ((value != null) && (!value.isEmpty())) {
- email.setValue(value);
- }
- }
- }
+ /** Duplicate modal Login mechanism to now show last registration screen before launching
+ * core gui.
+ *
+ * @param user prepopulate username field for LDAP registration
+ * @param sessionId pass in valid session id for LDAP registration steps.
+ * @param callback pass in callback reference to indicate success and launch of coreGUI
+ */
+ private void buildRegistrationWindow(final String user, final String sessionId, final String password,
+ final AsyncCallback<Subject> callback) {
+ int fieldWidth = 120;
+
+ //Build registration window.
+ LocatableVLayout column = new LocatableVLayout(extendLocatorId("NewLdapRegistration"));
+ column.setMargin(25);
+ HeaderItem header = new HeaderItem();
+ //Locate product info for registration screen.
+ if (productInfo != null) {
+ header.setValue(MSG.view_login_welcomeMsg(productInfo.getName()));
+ } else {//if not available, let registration continue. Errors already logged and no functionality lost.
+ header.setValue(MSG.view_login_welcomeMsg(""));
+ }
+ header.setWidth("100%");
+ //build ui elements for registration screen
+ first = new TextItem(FIRST, MSG.dataSource_users_field_firstName());
+ {
+ first.setRequired(true);
+ first.setWrapTitle(false);
+ first.setWidth(fieldWidth);
+ }
+ last = new TextItem(LAST, MSG.dataSource_users_field_lastName());
+ {
+ last.setWrapTitle(false);
+ last.setWidth(fieldWidth);
+ last.setRequired(true);
+ }
+ final TextItem username = new TextItem(USERNAME, MSG.dataSource_users_field_name());
+ {
+ username.setValue(user);
+ username.setDisabled(true);
+ username.setWidth(fieldWidth);
+ }
+ email = new TextItem(EMAIL, MSG.dataSource_users_field_emailAddress());
+ email.setRequired(true);
+ email.setWidth(fieldWidth);
+ email.setWrapTitle(false);
+ phone = new TextItem(PHONE, MSG.dataSource_users_field_phoneNumber());
+ phone.setWidth(fieldWidth);
+ phone.setWrapTitle(false);
+ department = new TextItem(DEPARTMENT, MSG.dataSource_users_field_department());
+ department.setWidth(fieldWidth);
+ SpacerItem space = new SpacerItem();
+ space.setColSpan(1);
+
+ inputForm = new LocatableDynamicForm(extendLocatorId("LdapUserRegistrationInput"));
+ inputForm.setAutoFocus(true);
+ inputForm.setErrorOrientation(FormErrorOrientation.LEFT);
+ inputForm.setNumCols(4);
+ //moving header to it's own container for proper display. Didn't display right in production mode
+ inputForm.setFields(username, first, last, email, phone, department);
+ loadValidators(inputForm);
+ inputForm.setValidateOnExit(true);
+ DynamicForm headerWrapper = new DynamicForm();
+ headerWrapper.setFields(header);
+ column.addMember(headerWrapper);
+ column.addMember(inputForm);
+
+ HTMLFlow hr = new HTMLFlow("<br/><hr/><br/><br/>");
+ hr.setWidth(620);
+ hr.setAlign(Alignment.CENTER);
+ column.addMember(hr);
+
+ HStack row = new HStack();
+ row.setMembersMargin(5);
+ row.setAlign(VerticalAlignment.CENTER);
+ IButton okButton = new LocatableIButton(inputForm.extendLocatorId("OK"), MSG.common_button_ok());
+ okButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+
+ //F5 refresh check? If they've reloaded the form for some reason then bail.
+ boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
+ .trim().isEmpty()));
+ //check for session timeout
+ if (UserSessionManager.isLoggedOut() || (credentialsEmpty)) {
+ resetLogin(LoginView.this.extendLocatorId("Register"));
+ return;
}
- public void onFailure(Throwable caught) {
- inputForm.setFieldErrors(FIRST, MSG.view_login_noLdap(), true);
- Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur.");
+ //validation
+ if (inputForm.validate()) {
+ Log.trace("Successfully validated all data for user registration.");
+ //populate form
+ if (first.getValue() != null)
+ inputForm.setValue(FIRST, String.valueOf(first.getValue()));
+ if (last.getValue() != null)
+ inputForm.setValue(LAST, String.valueOf(last.getValue()));
+ inputForm.setValue(USERNAME, String.valueOf(username.getValue()));
+ if (email.getValue() != null)
+ inputForm.setValue(EMAIL, String.valueOf(email.getValue()));
+ if (phone.getValue() != null)
+ inputForm.setValue(PHONE, String.valueOf(phone.getValue()));
+ if (department.getValue() != null)
+ inputForm.setValue(DEPARTMENT, String.valueOf(department.getValue()));
+ inputForm.setValue(SESSIONID, sessionId);
+ inputForm.setValue(PASSWORD, password);
+ registerLdapUser(LoginView.this.extendLocatorId("RegisterLdap"), inputForm, callback);
}
- });
-
- IButton resetButton = new LocatableIButton(inputForm.extendLocatorId("Reset"), MSG.common_button_reset());
- resetButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- //F5 refresh check? If they've reloaded the form for some reason then bail.
- boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
- .trim().isEmpty()));
- if (UserSessionManager.isLoggedOut() || credentialsEmpty) {
- resetLogin(LoginView.this.extendLocatorId("Reset"));
- return;
- }
+ }
- //clear out all validation messages.
- {
- String empty = " ";
- first.setValue(empty);
- last.setValue(empty);
- email.setValue("test(a)test.com");
- inputForm.validate();
+ });
+ row.addMember(okButton);
+ //send request to LDAP server to grab user details for this user. Already sure ldap user exists
+ GWTServiceLookup.getLdapService().getLdapDetailsFor(user, new AsyncCallback<Map<String, String>>() {
+ public void onSuccess(final Map<String, String> ldapUserDetails) {
+ //now prepopulate UI fields if they exist
+ for (String key : ldapUserDetails.keySet()) {
+ String value;
+ if (key.equalsIgnoreCase("givenName")) {//aka first name
+ value = ldapUserDetails.get(key);
+ first.setValue(value);
+ } else if (key.equalsIgnoreCase("sn")) {//aka Surname
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ last.setValue(value);
+ }
+ } else if (key.equalsIgnoreCase("telephoneNumber")) {
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ phone.setValue(value);
+ }
+ } else if (key.equalsIgnoreCase("mail")) {
+ value = ldapUserDetails.get(key);
+ if ((value != null) && (!value.isEmpty())) {
+ email.setValue(value);
+ }
}
- first.clearValue();
- last.clearValue();
- email.clearValue();
- phone.clearValue();
- department.clearValue();
}
- });
- row.addMember(resetButton);
+ }
- IButton cancelButton = new LocatableIButton(inputForm.extendLocatorId("Cancel"), MSG.common_button_cancel());
- cancelButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- UserSessionManager.logout();
+ public void onFailure(Throwable caught) {
+ inputForm.setFieldErrors(FIRST, MSG.view_login_noLdap(), true);
+ Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur.");
+ }
+ });
+
+ IButton resetButton = new LocatableIButton(inputForm.extendLocatorId("Reset"), MSG.common_button_reset());
+ resetButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ //F5 refresh check? If they've reloaded the form for some reason then bail.
+ boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password
+ .trim().isEmpty()));
+ if (UserSessionManager.isLoggedOut() || credentialsEmpty) {
resetLogin(LoginView.this.extendLocatorId("Reset"));
+ return;
}
- });
- row.addMember(cancelButton);
- Label logoutLabel = new Label(MSG.view_login_registerLater());
- logoutLabel.setWrap(false);
- row.addMember(logoutLabel);
- column.addMember(row);
-
- window = new LocatableWindow(extendLocatorId("RegistrationWindow"));
- window.setWidth(670);
- window.setHeight(330);
- window.setTitle(MSG.view_login_registerUser());
- // forced focused, static size, can't close / dismiss
- window.setIsModal(true);
- window.setShowModalMask(true);
- window.setCanDragResize(false);
- window.setCanDragReposition(false);
- window.setShowCloseButton(false);
- window.setShowMinimizeButton(false);
- window.setAutoCenter(true);
-
- window.addItem(column);
- window.show();
- }
+ //clear out all validation messages.
+ {
+ String empty = " ";
+ first.setValue(empty);
+ last.setValue(empty);
+ email.setValue("test(a)test.com");
+ inputForm.validate();
+ }
+ first.clearValue();
+ last.clearValue();
+ email.clearValue();
+ phone.clearValue();
+ department.clearValue();
+ }
+ });
+ row.addMember(resetButton);
+
+ IButton cancelButton = new LocatableIButton(inputForm.extendLocatorId("Cancel"), MSG.common_button_cancel());
+ cancelButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ UserSessionManager.logout();
+ resetLogin(LoginView.this.extendLocatorId("Reset"));
+ }
+ });
+ row.addMember(cancelButton);
+ Label logoutLabel = new Label(MSG.view_login_registerLater());
+ logoutLabel.setWrap(false);
+ row.addMember(logoutLabel);
+ column.addMember(row);
+
+ window = new LocatableWindow(extendLocatorId("RegistrationWindow"));
+ window.setWidth(670);
+ window.setHeight(330);
+ window.setTitle(MSG.view_login_registerUser());
+
+ // forced focused, static size, can't close / dismiss
+ window.setIsModal(true);
+ window.setShowModalMask(true);
+ window.setCanDragResize(false);
+ window.setCanDragReposition(false);
+ window.setShowCloseButton(false);
+ window.setShowMinimizeButton(false);
+ window.setAutoCenter(true);
+
+ window.addItem(column);
+ window.show();
}
/** Go through steps of invalidating this login and piping them back to CoreGUI Login.
commit a4602636483a6c8a3093dd16e16c97498286bba9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 17:28:21 2011 -0500
[BZ 766574] for some reason, the remote interface was removed from the discovery SLSB. put it back.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index fcb2f9e..2ea6234 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -99,7 +99,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
@Stateless
-public class DiscoveryBossBean implements DiscoveryBossLocal {
+public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote {
private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName());
commit 99ff4f9c796c171b74c3e09b404a2c397607a698
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 14:40:53 2011 -0500
[BZ 766574] fix NPE if there is no availability yet
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 382ce8c..1623039 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -44,6 +44,7 @@ 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.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
import org.rhq.core.domain.resource.ResourceType;
@@ -671,7 +672,8 @@ public class TabularWriter {
} else if (object instanceof ResourceType) {
return ((ResourceType) object).getName();
} else if (object instanceof ResourceAvailability) {
- return ((ResourceAvailability) object).getAvailabilityType().getName();
+ AvailabilityType availType = ((ResourceAvailability) object).getAvailabilityType();
+ return (availType == null) ? "?" : availType.getName();
} else if (object != null && object.getClass().isArray()) {
return Arrays.toString((Object[]) object);
} else {
commit 9b740863e19ec6cde4007f53c4ad76d399d12ecb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 11 10:41:00 2011 -0500
[BZ 752981] remove duplicate call to FileSystemInfo.refresh(), which was resulting in invalid metric values (https://bugzilla.redhat.com/show_bug.cgi?id=752981); use switch-case rather than if-else in getValues() to make code more readable
(cherry picked from commit 68be8c6fa8086e0c16fa706e3bad3c84b9d8b2fd)
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java
index 9d68c23..5eae991 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java
@@ -1,6 +1,6 @@
- /*
+/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2011 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementReport;
@@ -39,12 +38,15 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.util.ObjectUtil;
import org.rhq.core.system.FileSystemInfo;
+import org.rhq.core.system.SystemInfo;
-/**
+ /**
* @author Greg Hinkle
*/
public class FileSystemComponent implements ResourceComponent<PlatformComponent>, MeasurementFacet {
+
private static final Log LOG = LogFactory.getLog(FileSystemComponent.class);
+
private ResourceContext<PlatformComponent> resourceContext;
public void start(ResourceContext<PlatformComponent> resourceContext) throws InvalidPluginConfigurationException,
@@ -65,26 +67,32 @@ public class FileSystemComponent implements ResourceComponent<PlatformComponent>
}
}
- private FileSystemInfo getFileSystemInfo() {
- return resourceContext.getSystemInformation().getFileSystem(resourceContext.getResourceKey());
- }
-
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
FileSystemInfo fileSystemInfo = getFileSystemInfo();
- fileSystemInfo.refresh();
- for (MeasurementScheduleRequest request : metrics) {
+ for (MeasurementScheduleRequest request : requests) {
try {
- if (request.getDataType() == DataType.TRAIT) {
- Object value = ObjectUtil.lookupDeepAttributeProperty(fileSystemInfo, request.getName());
- report.addData(new MeasurementDataTrait(request, String.valueOf(value)));
- } else if (request.getDataType() == DataType.MEASUREMENT) {
- report.addData(new MeasurementDataNumeric(request, ObjectUtil.lookupDeepNumericAttributeProperty(
- fileSystemInfo, request.getName())));
+ switch (request.getDataType()) {
+ case TRAIT:
+ Object object = ObjectUtil.lookupDeepAttributeProperty(fileSystemInfo, request.getName());
+ report.addData(new MeasurementDataTrait(request, String.valueOf(object)));
+ break;
+ case MEASUREMENT:
+ Double value = ObjectUtil.lookupDeepNumericAttributeProperty(fileSystemInfo, request.getName());
+ report.addData(new MeasurementDataNumeric(request, value));
+ break;
+ default:
+ throw new IllegalStateException("Unsupported metric type: " + request.getDataType());
}
} catch (Exception e) {
- LOG.info("Unable to collection file system metric [" + request.getName() + "] on resource "
- + this.resourceContext.getResourceKey(), e);
+ LOG.info("Unable to collect metric [" + request.getName() + "] on filesystem resource ["
+ + this.resourceContext.getResourceKey() + "].", e);
}
}
}
+
+ private FileSystemInfo getFileSystemInfo() {
+ SystemInfo systemInfo = resourceContext.getSystemInformation();
+ return systemInfo.getFileSystem(resourceContext.getResourceKey());
+ }
+
}
\ No newline at end of file
commit ceb7b6e337116f4b5af430f43c83884ad15988e1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 13 13:46:12 2011 -0500
[BZ 767263] don't assume there is always a template
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index b29e9a6..bece740 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -198,6 +198,9 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
templateField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
DriftDefinition def = (DriftDefinition) listGridRecord.getAttributeAsObject(ATTR_ENTITY);
+ if (null == def.getTemplate()) {
+ return MSG.common_val_none();
+ }
if (null != globalPermissions && globalPermissions.contains(Permission.MANAGE_SETTINGS)) {
int typeId = def.getResource().getResourceType().getId();
int templateId = def.getTemplate().getId();
@@ -422,7 +425,11 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_IS_PINNED, def.isPinned() ? ImageManager.getPinnedIcon() : ImageManager
.getUnpinnedIcon());
record.setAttribute(ATTR_ATTACHED, def.isAttached() ? MSG.common_val_yes() : MSG.common_val_no());
- record.setAttribute(ATTR_TEMPLATE, def.getTemplate().getName());
+ if (def.getTemplate() != null) {
+ record.setAttribute(ATTR_TEMPLATE, def.getTemplate().getName());
+ } else {
+ record.setAttribute(ATTR_TEMPLATE, MSG.common_val_none());
+ }
record.setAttribute(ATTR_CHANGE_SET_VERSION, (null != changeSet) ? String.valueOf(changeSet.getVersion()) : MSG
.common_label_none());
commit a449c64328ab7c4b729e83adc3505fdf6ec34b90
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Dec 22 17:57:02 2011 -0500
[BZ 767734] conditionally disabling remaining tags references from Bundles.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 5ac460c..bbc4175 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -124,7 +124,11 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
+ deployment.getDestination().getName(), LinkManager.getBundleDestinationLink(version.getBundle().getId(),
deployment.getDestination().getId())));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleDeployment_24.png"), deployment.getName()));
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMemberDeploymentsTable();
@@ -219,8 +223,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
// deployment represents content on the remote machines, showing purge only for live
// deployments makes sense).
if (deployment.isLive()) {
- IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"), MSG
- .view_bundle_revert());
+ IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"),
+ MSG.view_bundle_revert());
revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png");
revertButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) {
@@ -252,8 +256,9 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
new Message(MSG.view_bundle_dest_purgeSuccessful(destinationName),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle deployment view - it is not live anymore
- CoreGUI.goToView(LinkManager.getBundleDeploymentLink(bundle.getId(), deployment
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDeploymentLink(bundle.getId(), deployment.getId()),
+ true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 1e47427..d0966f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -101,7 +101,12 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
addMember(backButton);
addMember(header);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
+
addMember(createSummaryForm());
addMember(createDeploymentsTable());
addMember(detail);
@@ -223,8 +228,8 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
new Message(MSG.view_bundle_dest_purgeSuccessful(destination.getName()),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle destination view
- CoreGUI.goToView(LinkManager.getBundleDestinationLink(bundle.getId(), destination
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDestinationLink(bundle.getId(), destination.getId()), true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index e8eabfa..7a39e5a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -108,7 +108,11 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
addMember(backButton);
addMember(headerLabel);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMember(tabs);
@@ -184,8 +188,8 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
StaticTextItem versionCountItem = new StaticTextItem("versionCount", MSG.view_bundle_list_versionsCount());
versionCountItem.setValue(bundle.getBundleVersions() != null ? bundle.getBundleVersions().size() : 0);
- StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount", MSG
- .view_bundle_list_destinationsCount());
+ StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount",
+ MSG.view_bundle_list_destinationsCount());
destinationsCountItem.setValue(bundle.getDestinations() != null ? bundle.getDestinations().size() : 0);
StaticTextItem descriptionItem = new StaticTextItem("description", MSG.common_title_description());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 19116bb..5737a9c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -93,7 +93,10 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleVersion_24.png"), version.getName() + ": "
+ version.getVersion()));
- addMember(createTagEditor());
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
@@ -268,16 +271,17 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
criteria.fetchConfigurationDefinition(true);
criteria.fetchTags(true);
- bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria, new AsyncCallback<PageList<BundleVersion>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
- }
+ bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria,
+ new AsyncCallback<PageList<BundleVersion>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
+ }
- public void onSuccess(PageList<BundleVersion> result) {
- BundleVersion version = result.get(0);
- ViewId nextPath = viewPath.next().getCurrent();
- viewBundleVersion(version, nextPath);
- }
- });
+ public void onSuccess(PageList<BundleVersion> result) {
+ BundleVersion version = result.get(0);
+ ViewId nextPath = viewPath.next().getCurrent();
+ viewBundleVersion(version, nextPath);
+ }
+ });
}
}
commit 5407b2871b5c8ed074513992aec8cd07a687b949
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 23 17:49:51 2012 +0100
[BZ 767170] - The permissions are already known, don't try to fetch them
asynchronously again in the role and user views.
This simplifies the rendering of those views tremendously making them work
reliably and without possible race conditions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 53bd86d..7d4810b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -117,13 +117,13 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildSecuritySection() {
NavigationItem usersItem = new NavigationItem(UsersView.VIEW_ID, "global/User_16.png", new ViewFactory() {
public Canvas createView() {
- return new UsersView(extendLocatorId("Users"));
+ return new UsersView(extendLocatorId("Users"), getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
NavigationItem rolesItem = new NavigationItem(RolesView.VIEW_ID, "global/Role_16.png", new ViewFactory() {
public Canvas createView() {
- return new RolesView(extendLocatorId("Roles"));
+ return new RolesView(extendLocatorId("Roles"), getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index 3c3e91d..91f2c2f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.roles;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.Canvas;
@@ -29,10 +28,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.CellClickEvent;
import com.smartgwt.client.widgets.grid.events.CellClickHandler;
-import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
@@ -46,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
* @author Greg Hinkle
* @author Ian Springer
*/
-public class RolesView extends TableSection<RolesDataSource> implements BookmarkableView {
+public class RolesView extends TableSection<RolesDataSource> {
public static final ViewName VIEW_ID = new ViewName("Roles", MSG.common_title_roles());
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
@@ -55,22 +51,18 @@ public class RolesView extends TableSection<RolesDataSource> implements Bookmark
private static final String HEADER_ICON = "global/Role_24.png";
private boolean hasManageSecurity;
- private boolean initialized;
- public RolesView(String locatorId) {
+ public RolesView(String locatorId, boolean hasManageSecurity) {
super(locatorId, MSG.common_title_roles());
final RolesDataSource datasource = RolesDataSource.getInstance();
setDataSource(datasource);
setHeaderIcon(HEADER_ICON);
setEscapeHtmlInDetailsLinkColumn(true);
+
+ this.hasManageSecurity = hasManageSecurity;
}
-
- @Override
- protected void onDraw() {
- fetchManageSecurityPermissionAsync();
- }
-
+
@Override
protected void configureTable() {
updateSelectionStyle();
@@ -156,31 +148,12 @@ public class RolesView extends TableSection<RolesDataSource> implements Bookmark
};
}
- private void fetchManageSecurityPermissionAsync() {
- new PermissionsLoader().loadExplicitGlobalPermissions(new PermissionsLoadedListener() {
- public void onPermissionsLoaded(Set<Permission> permissions) {
- if (permissions != null) {
- hasManageSecurity = permissions.contains(Permission.MANAGE_SECURITY);
- refreshTableInfo();
- } else {
- hasManageSecurity = false;
- }
- if (!initialized) {
- RolesView.super.onDraw();
- }
- initialized = true;
- }
- });
- }
-
private void updateSelectionStyle() {
- if (initialized) {
- if (!hasManageSecurity) {
- getListGrid().deselectAllRecords();
- }
- SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
- getListGrid().setSelectionType(selectionStyle);
+ if (!hasManageSecurity) {
+ getListGrid().deselectAllRecords();
}
+ SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
+ getListGrid().setSelectionType(selectionStyle);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index a8b35fd..18213f1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.users;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.SelectionStyle;
@@ -32,8 +31,6 @@ import com.smartgwt.client.widgets.grid.events.CellClickHandler;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
-import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
@@ -61,9 +58,8 @@ public class UsersView extends TableSection<UsersDataSource> {
private static final String HEADER_ICON = "global/User_24.png";
private boolean hasManageSecurity;
- private boolean initialized;
- public UsersView(String locatorId) {
+ public UsersView(String locatorId, boolean hasManageSecurity) {
super(locatorId, MSG.common_title_users());
final UsersDataSource dataSource = UsersDataSource.getInstance();
@@ -71,8 +67,8 @@ public class UsersView extends TableSection<UsersDataSource> {
setDataSource(dataSource);
setHeaderIcon(HEADER_ICON);
setEscapeHtmlInDetailsLinkColumn(true);
-
- fetchManageSecurityPermissionAsync();
+
+ this.hasManageSecurity = hasManageSecurity;
}
@Override
@@ -101,28 +97,12 @@ public class UsersView extends TableSection<UsersDataSource> {
updateSelectionStyle();
}
- private void fetchManageSecurityPermissionAsync() {
- new PermissionsLoader().loadExplicitGlobalPermissions(new PermissionsLoadedListener() {
- public void onPermissionsLoaded(Set<Permission> permissions) {
- if (permissions != null) {
- hasManageSecurity = permissions.contains(Permission.MANAGE_SECURITY);
- refreshTableInfo();
- } else {
- hasManageSecurity = false;
- }
- initialized = true;
- }
- });
- }
-
private void updateSelectionStyle() {
- if (initialized) {
- if (!hasManageSecurity) {
- getListGrid().deselectAllRecords();
- }
- SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
- getListGrid().setSelectionType(selectionStyle);
+ if (!hasManageSecurity) {
+ getListGrid().deselectAllRecords();
}
+ SelectionStyle selectionStyle = hasManageSecurity ? getDefaultSelectionStyle() : SelectionStyle.NONE;
+ getListGrid().setSelectionType(selectionStyle);
}
private List<ListGridField> createFields() {
commit c8dad0b8a0270387ed55ef13e9f38a40fa08c462
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 23 17:45:46 2012 +0100
Added some clarification to the javadocs of InitializableView to lower
the expectations one might have about it.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
index b5fc3b9..f503d99 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java
@@ -33,7 +33,12 @@ public interface InitializableView {
/**
* Return true if this widget's {@link BaseWidget#init() initialization} has completed, or false otherwise.
- *
+ * <p>
+ * Don't expect this to work automagically if the result of this method is dependent on some asynchronous call.
+ * The consumers of this method need in that case loop and check this method periodically. If you cannot guarantee
+ * all the callers of this method on your instance actually do that, you can't assume that the results of
+ * the asynchronous call will be taken into account correctly.
+ *
* @return true if this widget's {@link BaseWidget#init() initialization} has completed, or false otherwise
*/
boolean isInitialized();
commit dc1deaf1195f6cecf8469abfc6e02e4df4927c3c
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Mon Jan 23 14:10:33 2012 -0500
development RHQ_4.2.0.JON.3.0.1-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 3167d39..ab99195 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 1e93560..220a98c 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 198d9bc..a9feac0 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 972a5a2..9eedad5 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 91f9d94..26e1cdc 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 262a9f7..0e962fa 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 2f2f2b3..93a1639 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 5442ad3..73212d2 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c425953..3b8f993 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ed95c9c..2103f84 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 848940f..afe9c89 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index c741bd1..7ca6e93 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 1c16c09..4a0de0e 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a8475ca..e951b80 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 1ce1e2c..da6acda 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 4aa616d..29644f0 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index eaa3727..3335f88 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 93a6f6b..9d863f7 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 24c2281..43e309b 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 4182380..6731f5b 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index be3e3a8..613ea49 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 7db2560..4ee4e30 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index a2ad386..4d7ba82 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f1af689..f18e4f8 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index b202e1f..7fceba9 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 3d1c787..c6bef48 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 5def783..aa7e09e 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index d840e09..26a5e78 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index dc59c86..c4a3a0c 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 638f32c..6016352 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index a84be24f..ff46085 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index ebb80cc..3827b41 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 5db71e7..7008072 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index a9be89d..b074322 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 049e375..bbcf6d8 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-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 e8a1e84..2256028 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-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 e7612ee..3cb73a3 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 70427bf..cac1f0d 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 8f44df2..65b08d1 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index b7cfdcf..821fa76 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 61fe184..67254f5 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 84f1702..2890d4f 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index aa5328b..7be793c 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 878c288..c3dfac4 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index c22ce1a..eb5465a 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 452d62a..4c62251 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index a30f495..f1cccee 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6ffab76..01b24f3 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 69f4c4b..8e80a11 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 9ccda53..44bacb8 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index b1b56d0..3a60731 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 6a7d56d..e26a76f 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 1282542..36c376b 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-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 5815d72..c80c517 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 47f753e..9c05951 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index cc629bf..506701b 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 5f5509f..704c9d7 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 733c73e..8e861bb 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 57ec9b0..02e95b4 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 492c91c..ddfc97f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 253d03f..00570be 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 364d1c5..5ceffeb 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 2c0a623..7fe0007 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index f67dc29..e7d38d2 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-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 999bb39..9b4f371 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index b67cfb7..7fef94f 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 5212bac..5ed59ab 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 872737a..f4daf69 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 1837a58..180153e 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index fb0b291..86176d3 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index c7d0dce..14f1af3 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 9902ea8..bdc8fb8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index c5aeb57..121eb84 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 0261e21..1e1fc8b 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index c9bf1ce..aa11ee5 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 3cdb7de..c2d92bb 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 26957d6..85d8db9 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index b177e34..af5afda 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 488cf6b..3187560 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0344994..168e602 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 6c3464e..105313b 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index a11d7ae..459145e 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 0518035..2a763d7 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b19fc30..b2ee37b 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 4c61b27..5e45df5 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 35b0bd9..aaf41d9 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 057ac66..035a549 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 8c46656..d419f5c 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index b1c024a..a5f251b 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index d487017..894a486 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 9a967d1..869c1d4 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index bd67dd4..105b759 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 930af72..fd6c214 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 4bd81f0..e961cba 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-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 0fff9eb..64a5224 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 04f2c6d..e22ab0d 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 3035090..ec76d69 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 3a1120c..24177f9 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index dc08ac6..6c1e3bf 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 56bdd06..fb3d651 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index ee74e39..699c361 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 8dfbf66..a6e8df7 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5fddda4..f6115d4 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9e1965c..e9a3825 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 46abf88..9b321c9 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 6935ffb..3a58b73 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 549daf1..5301544 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 05c6699..470d1b5 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 96fe70d..39362b4 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 54ac7dc..fc0f246 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index c0b4e13..4a0ef91 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 032969c..bf10a67 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 7673396..d80ddad 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 2add38e..60f52e9 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 9116f34..ddd89ae 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 03323d1..7360008 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index c02a3a2..2ac3880 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 58001eb..e827a6f 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index fc4cc67..c3f9556 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 287e029..e6f3fa9 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 0fcd691..ddfa15b 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 60aabe3..ba8ee84 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 8f21c6f..6c36e70 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ec51642..ce2901c 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f60d61..ed35f94 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f99eff..ee58b36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1.GA</version>
+ <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
12 years, 4 months
[rhq] Branch 'rc/jon3.0.1.GA' - 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/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 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 +-
126 files changed, 144 insertions(+), 144 deletions(-)
New commits:
commit 859b9142241b8262b13c44a141c80ca4c45242a4
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Wed Feb 1 16:30:57 2012 -0500
tag RHQ_4_2_0_JON_3_0_1_GA
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index ab99195..3167d39 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 220a98c..1e93560 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index a9feac0..198d9bc 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 9eedad5..972a5a2 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 26e1cdc..91f9d94 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 0e962fa..262a9f7 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 93a1639..2f2f2b3 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 73212d2..5442ad3 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 04ce359..dbeb7ef 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 2103f84..ed95c9c 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index afe9c89..848940f 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 7ca6e93..c741bd1 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 4a0de0e..1c16c09 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index e951b80..a8475ca 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index da6acda..1ce1e2c 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 29644f0..4aa616d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 3335f88..eaa3727 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 9d863f7..93a6f6b 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 43e309b..24c2281 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 6731f5b..4182380 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 613ea49..be3e3a8 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 4ee4e30..7db2560 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 4d7ba82..a2ad386 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index f18e4f8..f1af689 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 7fceba9..b202e1f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index c6bef48..3d1c787 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index aa7e09e..5def783 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 26a5e78..d840e09 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index c4a3a0c..dc59c86 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 6016352..638f32c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 218aea1..0050184 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 3827b41..ebb80cc 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 7008072..5db71e7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index b074322..a9be89d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index bbcf6d8..049e375 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 2256028..e8a1e84 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 3cb73a3..e7612ee 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index cac1f0d..70427bf 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 65b08d1..8f44df2 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 821fa76..b7cfdcf 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 67254f5..61fe184 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 2890d4f..84f1702 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 7be793c..aa5328b 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index c3dfac4..878c288 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index eb5465a..c22ce1a 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index 4c62251..452d62a 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index f1cccee..a30f495 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 01b24f3..6ffab76 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 8e80a11..69f4c4b 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 44bacb8..9ccda53 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 3a60731..b1b56d0 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index e26a76f..6a7d56d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 36c376b..1282542 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index c80c517..5815d72 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 9c05951..47f753e 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 506701b..cc629bf 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 704c9d7..5f5509f 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server Groovy Script Plugin</name>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 8e861bb..733c73e 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 02e95b4..57ec9b0 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index ddfc97f..492c91c 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 00570be..253d03f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 5ceffeb..364d1c5 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 7fe0007..2c0a623 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index e7d38d2..f67dc29 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 9b4f371..999bb39 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 7fef94f..b67cfb7 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 5ed59ab..5212bac 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index f4daf69..872737a 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 180153e..1837a58 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 86176d3..fb0b291 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 14f1af3..c7d0dce 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index bdc8fb8..9902ea8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 121eb84..c5aeb57 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 1e1fc8b..0261e21 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index aa11ee5..c9bf1ce 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index c2d92bb..3cdb7de 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
index 85d8db9..26957d6 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
+++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index af5afda..b177e34 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 3187560..488cf6b 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 168e602..0344994 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 105313b..6c3464e 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 459145e..a11d7ae 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 2a763d7..0518035 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index b2ee37b..b19fc30 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 5e45df5..4c61b27 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index aaf41d9..35b0bd9 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 035a549..057ac66 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index d419f5c..8c46656 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index a5f251b..b1c024a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 894a486..d487017 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 869c1d4..9a967d1 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 105b759..bd67dd4 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index fd6c214..930af72 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index e961cba..4bd81f0 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 64a5224..0fff9eb 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index e22ab0d..04f2c6d 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index ec76d69..3035090 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 24177f9..3a1120c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 6c1e3bf..dc08ac6 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index fb3d651..56bdd06 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 699c361..ee74e39 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index a6e8df7..8dfbf66 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index f6115d4..5fddda4 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index e9a3825..9e1965c 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 9b321c9..46abf88 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 3a58b73..6935ffb 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 5301544..549daf1 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 470d1b5..05c6699 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 39362b4..96fe70d 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index fc0f246..54ac7dc 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 4a0ef91..c0b4e13 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index bf10a67..032969c 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index d80ddad..7673396 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 60f52e9..2add38e 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index ddd89ae..9116f34 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 7360008..03323d1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 2ac3880..c02a3a2 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index e827a6f..58001eb 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index c3f9556..fc4cc67 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index e6f3fa9..287e029 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index ddfa15b..0fcd691 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index ba8ee84..60aabe3 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 6c36e70..8f21c6f 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index ce2901c..ec51642 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index ed35f94..5f60d61 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index ee58b36..3f99eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON.3.0.1-SNAPSHOT</version>
+ <version>4.2.0.JON.3.0.1.GA</version>
<packaging>pom</packaging>
<name>RHQ</name>
12 years, 4 months
[rhq] Branch 'feature/gwt-upgrade' - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 21f755d4e0cc2a7000e42e2fd6df7d1ac2e0e946
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Feb 1 12:24:08 2012 -0800
[BZ734047 - Incorrect dashboard name on immediate deletion] - For some timing reason, new dashboard tabs were not showing the proper name on the confirmation message when the tab is closed (delete).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index c3a83d9..28456b2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -247,7 +247,8 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain
public void onCloseClick(final TabCloseClickEvent tabCloseClickEvent) {
tabCloseClickEvent.cancel();
final DashboardView dashboardView = (DashboardView) tabCloseClickEvent.getTab().getPane();
- SC.ask(MSG.view_dashboards_confirm1() + " [" + tabCloseClickEvent.getTab().getTitle() + "]?",
+
+ SC.ask(MSG.view_dashboards_confirm1() + " [" + dashboardView.getStoredDashboard().getName()+ "]?",
new BooleanCallback() {
public void execute(Boolean confirmed) {
if (confirmed) {
12 years, 4 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 36 +-
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 35 +-
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 155 +++++-----
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 11
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java | 7
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 48 ++-
modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 13
7 files changed, 180 insertions(+), 125 deletions(-)
New commits:
commit d003658a94b0f88852f469e9f473eee418377849
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 1 14:28:41 2012 -0500
[Bug 785773 - CLI exporter variable not respecting settings]
This was rooted in the handling of the standard bindings we inject
into the script engine in an interactive CLI session. See the BZ for
details but in short this commit:
- stops treating every command line entry as a new script with new bindings
- ensures that non-standard bindings (like var x = 10) and non-client-dependent
standard bindings (like exporter) are maintained between command line
entries as well as through login/logout.
- treat 'exec -f' commands like extendsions of the command line session.
They inherit the current bindings and any modifications made by the script
file will affect the command line session after the script file has completed.
- ensure that login/logout update client-related bindings as needed, and
no others.
- don't leave behind manager bindings when the client changes (like on logout)
- protect against NPE for consecutive logout commands
- trivial: removed unused import from CliSender
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
index 5834922..106c2ae 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java
@@ -88,7 +88,7 @@ public class ScriptEngineFactory {
public static ScriptEngine getScriptEngine(String language, PackageFinder packageFinder, StandardBindings bindings)
throws ScriptException, IOException {
ScriptEngineInitializer initializer = getInitializer(language);
-
+
if (initializer == null) {
return null;
}
@@ -101,7 +101,7 @@ public class ScriptEngineFactory {
return engine;
}
-
+
/**
* This method is similar to the {@link #getScriptEngine(String, PackageFinder, StandardBindings)} method
* but additionally applies a security wrapper on the returned script engine so that the scripts execute
@@ -109,9 +109,10 @@ public class ScriptEngineFactory {
*
* @see #getScriptEngine(String, PackageFinder, StandardBindings)
*/
- public static ScriptEngine getSecuredScriptEngine(final String language, final PackageFinder packageFinder, final StandardBindings bindings, final PermissionCollection permissions) throws ScriptException, IOException {
+ public static ScriptEngine getSecuredScriptEngine(final String language, final PackageFinder packageFinder,
+ final StandardBindings bindings, final PermissionCollection permissions) throws ScriptException, IOException {
CodeSource src = new CodeSource(new URL("http://rhq-project.org/scripting"), (Certificate[]) null);
- ProtectionDomain scriptDomain = new ProtectionDomain(src, permissions);
+ ProtectionDomain scriptDomain = new ProtectionDomain(src, permissions);
AccessControlContext ctx = new AccessControlContext(new ProtectionDomain[] { scriptDomain });
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<ScriptEngine>() {
@@ -121,10 +122,10 @@ public class ScriptEngineFactory {
//change in security handling in the rhino script engine
//that occured in Java6u27 (due to a CVE desribed here:
//https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-3544)
-
+
//In Java 6u26 and earlier, it was enough to wrap a script engine
//in the sandbox and everything would work.
-
+
//Java 6u27 introduced new behavior where the rhino script engine
//remembers the access control context with which it has been
//constructed and combines that with the callers protection domain
@@ -132,7 +133,7 @@ public class ScriptEngineFactory {
//all the code in RHQ that called ScriptEngine.eval* also
//had all perms, the scripts would never be sandboxed even if the call
//was pushed through the SandboxedScriptEngine.
-
+
//This means that the below wrapping is necessary for the security
//to work in java6 pre u27 while the surrounding privileged block
//is necessary for the security to be applied in java6 u27 and later.
@@ -164,8 +165,8 @@ public class ScriptEngineFactory {
boolean deleteExistingBindings) {
bindings.preInject(engine);
- Bindings engineBindings =
- deleteExistingBindings ? engine.createBindings() : engine.getBindings(ScriptContext.ENGINE_SCOPE);
+ Bindings engineBindings = deleteExistingBindings ? engine.createBindings() : engine
+ .getBindings(ScriptContext.ENGINE_SCOPE);
for (Map.Entry<String, Object> entry : bindings.entrySet()) {
engineBindings.put(entry.getKey(), entry.getValue());
@@ -177,6 +178,23 @@ public class ScriptEngineFactory {
}
/**
+ * Remove the specified bindings from the engine.
+ *
+ * @param engine the engine
+ * @param keySet the binding keys to be removed
+ */
+ public static void removeBindings(ScriptEngine engine, Set<String> keySet) {
+
+ Bindings engineBindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+ for (String key : keySet) {
+ engineBindings.remove(key);
+ }
+
+ engine.setBindings(engineBindings, ScriptContext.ENGINE_SCOPE);
+ }
+
+ /**
* Goes through the methods of the object found in the <code>scriptEngine</code>'s ENGINE_SCOPE
* and for each of them generates a top-level function that is called the same name and accepts the same
* parameters.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
index ad29dc3..fd84c6d 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java
@@ -97,9 +97,25 @@ public class StandardBindings extends HashMap<String, Object> {
put(PRETTY, new TabularWriter(output));
put(ASSERT, new ScriptAssert());
+ setFacade(output, rhqFacade);
+ }
+
+ /**
+ * If you want to preserve non-client-dependent bindings when the facade changes, call this as opposed to
+ * constructing new StandardBindings.
+ */
+ public void setFacade(PrintWriter output, RhqFacade rhqFacade) {
+ // remove any existing managers
+ if (null != managers) {
+ for (String manager : managers.keySet()) {
+ remove(manager);
+ }
+ managers.clear();
+ }
+
//script utils can handle a null facade
put(SCRIPT_UTIL, new ScriptUtil(rhqFacade));
-
+
if (rhqFacade != null) {
managers = rhqFacade.getManagers();
@@ -112,15 +128,6 @@ public class StandardBindings extends HashMap<String, Object> {
}
putAll(managers);
-
- //I don't think these should belong in the standard bindings
- //because all the controller does is "login/logout" as methods
- //of the "rhq" object. ConfigurationEditor is interactive and
- //thus unusable outside of console bound CLI.
-
- //(the below were originally defined in the ScriptCommand)
- //bindObjectAndGlobalFuctions(new Controller(client), "rhq");
- //bindObjectAndGlobalFuctions(new ConfigurationEditor(client), "configurationEditor");
}
public void preInject(ScriptEngine scriptEngine) {
@@ -128,11 +135,11 @@ public class StandardBindings extends HashMap<String, Object> {
((ScriptAssert) get(ASSERT)).init(scriptEngine);
}
- public void postInject(ScriptEngine scriptEngine) {
+ public void postInject(ScriptEngine scriptEngine) {
ScriptEngineFactory.bindIndirectionMethods(scriptEngine, SCRIPT_UTIL);
ScriptEngineFactory.bindIndirectionMethods(scriptEngine, ASSERT);
}
-
+
public Map.Entry<String, PageControl> getUnlimitedPC() {
return castEntry(UNLIMITED_PC, PageControl.class);
}
@@ -162,8 +169,8 @@ public class StandardBindings extends HashMap<String, Object> {
}
public Map<String, Object> getManagers() {
- //XXX ideally this should be a projection into our map
- return managers;
+ //XXX ideally this should be a projection into our map
+ return (null == managers) ? managers = Collections.emptyMap() : managers;
}
private Map.Entry<String, Object> getEntry(String key) {
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
old mode 100755
new mode 100644
index 7323ecd..0444c3b
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java
@@ -80,7 +80,7 @@ public class ClientMain {
private String user;
private String pass;
private ArrayList<String> notes = new ArrayList<String>();
- private boolean showDetailedVersion;
+ private boolean showDetailedVersion;
// reference to the webservice reference factory
private RemoteClient remoteClient;
@@ -96,7 +96,7 @@ public class ClientMain {
// Entrance to main.
public static void main(String[] args) throws Exception {
- initCommands();
+ initCommands();
// instantiate
ClientMain main = new ClientMain();
@@ -126,10 +126,10 @@ public class ClientMain {
private void initScriptCommandAndServiceCompletor() {
ScriptCommand sc = (ScriptCommand) commands.get("exec");
- sc.initBindings(this);
-
+ sc.initClient(this);
+
this.serviceCompletor.setContext(sc.getContext());
-
+
if (remoteClient != null) {
this.serviceCompletor.setServices(remoteClient.getManagers());
}
@@ -156,12 +156,12 @@ public class ClientMain {
this.serviceCompletor = new InteractiveJavascriptCompletor(consoleReader);
consoleReader.addCompletor(new MultiCompletor(new Completor[] { serviceCompletor, helpCompletor,
commandCompletor }));
-
+
//ScriptCommand is super special because it handles executing all the code for us
initScriptCommandAndServiceCompletor();
// enable pagination
- consoleReader.setUsePagination(true);
+ consoleReader.setUsePagination(true);
}
public String getUserInput(String prompt) {
@@ -288,7 +288,8 @@ public class ClientMain {
outputWriter.println(command.getPromptCommandString() + ": " + e.getMessage());
outputWriter.println("Usage: " + command.getSyntax());
} catch (ArrayIndexOutOfBoundsException e) {
- outputWriter.println(command.getPromptCommandString() + ": An incorrect number of arguments was specified.");
+ outputWriter.println(command.getPromptCommandString()
+ + ": An incorrect number of arguments was specified.");
outputWriter.println("Usage: " + command.getSyntax());
}
} else {
@@ -373,7 +374,8 @@ public class ClientMain {
}
private void displayUsage() {
- outputWriter.println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
+ outputWriter
+ .println("rhq-cli.sh [-h] [-u user] [-p pass] [-P] [-s host] [-t port] [-v] [-f file]|[-c command]");
}
void processArguments(String[] args) throws IllegalArgumentException, IOException {
@@ -398,79 +400,80 @@ public class ClientMain {
while ((code = getopt.getopt()) != -1) {
switch (code) {
- case ':':
- case '?': {
- // for now both of these should exit
- displayUsage();
- throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
- }
+ case ':':
+ case '?': {
+ // for now both of these should exit
+ displayUsage();
+ throw new IllegalArgumentException(MSG.getMsg(ClientI18NResourceKeys.BAD_ARGS));
+ }
- case 1: {
- // this catches non-option arguments which can be passed when running a script in non-interactive mode
- // with -f or running a single command in non-interactive mode with -c.
- execCmdLine.add(getopt.getOptarg());
- break;
- }
+ case 1: {
+ // this catches non-option arguments which can be passed when running a script in non-interactive mode
+ // with -f or running a single command in non-interactive mode with -c.
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
- case 'h': {
- displayUsage();
- break;
- }
+ case 'h': {
+ displayUsage();
+ break;
+ }
- case 'u': {
- this.user = getopt.getOptarg();
- break;
- }
- case 'p': {
- this.pass = getopt.getOptarg();
- break;
- }
- case 'P': {
- this.pass = this.consoleReader.readLine("password: ", (char) 0);
- break;
- }
- case 'c': {
- interactiveMode = false;
- execCmdLine.add(getopt.getOptarg());
- break;
- }
- case 'f': {
- interactiveMode = false;
- execCmdLine.add("-f");
- execCmdLine.add(getopt.getOptarg());
- break;
- }
- case -2: {
- execCmdLine.add("--args-style=" + getopt.getOptarg());
- break;
- }
- case 's': {
- setHost(getopt.getOptarg());
- break;
- }
- case 'r': {
- setTransport(getopt.getOptarg());
- break;
- }
- case 't': {
- String portArg = getopt.getOptarg();
- try {
- setPort(Integer.parseInt(portArg));
- } catch (Exception e) {
- outputWriter.println("Invalid port [" + portArg + "]");
- }
- break;
- }
- case 'v': {
- showDetailedVersion = true;
- break;
+ case 'u': {
+ this.user = getopt.getOptarg();
+ break;
+ }
+ case 'p': {
+ this.pass = getopt.getOptarg();
+ break;
+ }
+ case 'P': {
+ this.pass = this.consoleReader.readLine("password: ", (char) 0);
+ break;
+ }
+ case 'c': {
+ interactiveMode = false;
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
+ case 'f': {
+ interactiveMode = false;
+ execCmdLine.add("-f");
+ execCmdLine.add(getopt.getOptarg());
+ break;
+ }
+ case -2: {
+ execCmdLine.add("--args-style=" + getopt.getOptarg());
+ break;
+ }
+ case 's': {
+ setHost(getopt.getOptarg());
+ break;
+ }
+ case 'r': {
+ setTransport(getopt.getOptarg());
+ break;
+ }
+ case 't': {
+ String portArg = getopt.getOptarg();
+ try {
+ setPort(Integer.parseInt(portArg));
+ } catch (Exception e) {
+ outputWriter.println("Invalid port [" + portArg + "]");
}
+ break;
+ }
+ case 'v': {
+ String versionString = Version.getProductNameAndVersionBuildInfo();
+ outputWriter.println(versionString);
+ break;
+ }
}
}
if (interactiveMode) {
- String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() :
- Version.getProductNameAndVersion();
+ String version = (showDetailedVersion) ? Version.getProductNameAndVersionBuildInfo() : Version
+ .getProductNameAndVersion();
outputWriter.println(version);
if (showDetailedVersion && args.length == 1) {
// If -v was the only option specified, exit after printing the version.
@@ -501,10 +504,10 @@ public class ClientMain {
public void setRemoteClient(RemoteClient remoteClient) {
this.remoteClient = remoteClient;
-
+
initScriptCommandAndServiceCompletor();
}
-
+
public Subject getSubject() {
return subject;
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
index 72bd8e1..97221af 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
@@ -112,23 +112,16 @@ public class LoginCommand implements ClientCommand {
Subject subject = remoteClient.login(username, password);
ProductInfo info = remoteClient.getSystemManager().getProductInfo(subject);
- String version = info.getVersion()
- + " (" + info.getBuildNumber() + ")";
+ String version = info.getVersion() + " (" + info.getBuildNumber() + ")";
client.getPrintWriter().println("Remote server version is: " + version);
+ // this call has the side effect of setting bindings for the new remote client and its subject
client.setRemoteClient(remoteClient);
client.setSubject(subject);
- bindSubject(client, subject);
-
return subject;
}
- private void bindSubject(ClientMain client, Subject subject) {
- ScriptCommand cmd = (ScriptCommand) client.getCommands().get("exec");
- cmd.initBindings(client);
- }
-
private String usage() {
return "Usage: " + getSyntax();
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
index 6966508..a29731f 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.client.commands;
import org.rhq.enterprise.client.ClientMain;
+import org.rhq.enterprise.clientapi.RemoteClient;
/**
* @author Greg Hinkle
@@ -40,7 +41,11 @@ public class LogoutCommand implements ClientCommand {
client.setTransport(null);
client.setHost(null);
client.setPort(0);
- client.getRemoteClient().logout();
+ RemoteClient remoteClient = client.getRemoteClient();
+ if (null != remoteClient) {
+ remoteClient.logout();
+ }
+ // this call has the side effect of setting bindings for the new remote client and its subject
client.setRemoteClient(null);
client.setSubject(null);
client.setUser(null);
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
index 4a99316..4e7e79a 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java
@@ -69,15 +69,15 @@ public class ScriptCommand implements ClientCommand {
public ScriptEngine getScriptEngine() {
if (jsEngine == null) {
try {
- jsEngine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Arrays
- .asList(getLibDir())), null);
+ jsEngine = ScriptEngineFactory.getScriptEngine("JavaScript",
+ new PackageFinder(Arrays.asList(getLibDir())), null);
} catch (ScriptException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
-
+
return jsEngine;
}
@@ -86,7 +86,14 @@ public class ScriptCommand implements ClientCommand {
}
public boolean execute(ClientMain client, String[] args) {
- initBindings(client);
+ // for a command line session we don't want to reset the bindings for each executed command line, the
+ // state, e.g. exporter settings, should be maintained from line to line. Note that scriptFiles
+ // executed via 'exec -f' are treated like extensions of the command line session. They inherit the
+ // current bindings and any modifications made by the script file will affect the command line session
+ // after the script file has completed.
+ if (null == bindings) {
+ initBindings(client);
+ }
if (isScriptFileCommandLine(args)) {
try {
@@ -177,29 +184,50 @@ public class ScriptCommand implements ClientCommand {
return true;
}
- public void initBindings(ClientMain client) {
+ private void initBindings(ClientMain client) {
bindings = new StandardBindings(client.getPrintWriter(), client.getRemoteClient());
- bindings.getSubject().setValue(client.getSubject());
+ // init pretty width with console setting
bindings.getPretty().getValue().setWidth(client.getConsoleWidth());
+ // replace ResourceClientFactory with Editable version or none at all
if (client.getRemoteClient() != null) {
bindings.getProxyFactory().setValue(new EditableResourceClientFactory(client));
} else {
bindings.getProxyFactory().setValue(null);
}
- //non-standard bindings
+ //non-standard bindings for console
bindings.put("configurationEditor", new ConfigurationEditor(client));
bindings.put("rhq", new Controller(client));
ScriptEngine engine = getScriptEngine();
-
+
ScriptEngineFactory.injectStandardBindings(engine, bindings, false);
- ScriptEngineFactory
- .bindIndirectionMethods(engine, "configurationEditor");
+ ScriptEngineFactory.bindIndirectionMethods(engine, "configurationEditor");
ScriptEngineFactory.bindIndirectionMethods(engine, "rhq");
}
+ public void initClient(ClientMain client) {
+ if (null == bindings) {
+ initBindings(client);
+
+ } else {
+ ScriptEngine engine = getScriptEngine();
+
+ // remove any current manager bindings from the engine, they may not be valid for the
+ // new client. The new standard bindings will include any new managers.
+ ScriptEngineFactory.removeBindings(engine, bindings.getManagers().keySet());
+
+ bindings.setFacade(client.getPrintWriter(), client.getRemoteClient());
+
+ // update the engine with the new client bindings. Keep the existing engine bindings as they
+ // may contain bindings outside this standard set (like any var created by the script or command line user)
+ ScriptEngineFactory.injectStandardBindings(engine, bindings, false);
+ }
+
+ return;
+ }
+
private void executeUtilScripts() {
InputStream stream = getClass().getResourceAsStream("test_utils.js");
InputStreamReader reader = new InputStreamReader(stream);
diff --git a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
index 43090c7..deba524 100644
--- a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
+++ b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java
@@ -40,7 +40,6 @@ import javax.script.ScriptException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.rhq.bindings.SandboxedScriptEngine;
import org.rhq.bindings.ScriptEngineFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.StandardScriptPermissions;
@@ -135,7 +134,7 @@ public class CliSender extends AlertSender<CliComponent> {
final ExceptionHolder exceptionHolder = new ExceptionHolder();
- final ScriptEngine e = engine;
+ final ScriptEngine e = engine;
Thread scriptRunner = new Thread(new Runnable() {
public void run() {
try {
@@ -336,8 +335,10 @@ public class CliSender extends AlertSender<CliComponent> {
if (versionToUse != null) {
ret = ret.replace("$packageName", versionToUse.getDisplayName());
- ret = ret.replace("$packageVersion", versionToUse.getDisplayVersion() == null ? versionToUse
- .getVersion() : versionToUse.getDisplayVersion());
+ ret = ret.replace(
+ "$packageVersion",
+ versionToUse.getDisplayVersion() == null ? versionToUse.getVersion() : versionToUse
+ .getDisplayVersion());
} else {
ret = ret.replace("$packageName", "unknown script with package id " + config.packageId);
ret = ret.replace("$packageVersion", "no version");
@@ -413,8 +414,8 @@ public class CliSender extends AlertSender<CliComponent> {
ScriptEngine engine = SCRIPT_ENGINES.poll();
if (engine == null) {
- engine = ScriptEngineFactory.getSecuredScriptEngine(ENGINE_NAME, new PackageFinder(Collections
- .<File> emptyList()), bindings, new StandardScriptPermissions());
+ engine = ScriptEngineFactory.getSecuredScriptEngine(ENGINE_NAME,
+ new PackageFinder(Collections.<File> emptyList()), bindings, new StandardScriptPermissions());
} else {
ScriptEngineFactory.injectStandardBindings(engine, bindings, true);
}
12 years, 4 months