New branch 'release_jon3.0.0.CR4' available with the following commits:
1
0
30 Nov '11
modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 229 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 14
3 files changed, 154 insertions(+), 95 deletions(-)
New commits:
commit 66a4abdf1e8661a926869f23b8dbd0d357a8c11a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 14:40:55 2011 -0500
[Bug 758724 - Transaction timing can prevent drift file content from being persisted]
Resolves a timing issue where it was possible for the agent to submit
DriftFile content before the DriftFile entity was committed to the
database, thus generating exceptions due to the missing entity, and
a failure to store the required content.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
index fb13e94..a567b75 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
@@ -128,4 +128,10 @@ public class Headers implements Serializable {
this.version = version;
}
+ @Override
+ public String toString() {
+ return "Headers [driftDefinitionName=" + driftDefinitionName + ", resourceId=" + resourceId + ", version="
+ + version + "]";
+ }
+
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
index 6633c22..c985c1e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
@@ -19,6 +19,7 @@
*/
package org.rhq.enterprise.server.drift;
+import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.rhq.core.domain.drift.DriftFileStatus.LOADED;
@@ -300,10 +301,38 @@ public class JPADriftServerBean implements JPADriftServerLocal {
df.setStatus(LOADED);
}
+ // This facade does not start, or participate in, a transaction so that it can execute its work
+ // in two new transactions. The first transaction ensures all new entities are committed to the
+ // database. The second transaction can then safely ackknowledge that the changeset is persisted
+ // and request drift file content, if necessary.
@Override
- @TransactionAttribute(REQUIRES_NEW)
+ @TransactionAttribute(NOT_SUPPORTED)
public DriftChangeSetSummary storeChangeSet(Subject subject, final int resourceId, final File changeSetZip)
throws Exception {
+
+ // a List to be populated by storeChangeSetInNewTransaction for use in ackChangeSetInNewTransaction
+ List<JPADriftFile> driftFilesToRequest = new ArrayList<JPADriftFile>();
+ // a 1 element array so storeChangeSetInNewTransaction can return the Headers for use in ackChangeSetInNewTransaction
+ Headers[] headers = new Headers[1];
+
+ DriftChangeSetSummary result = JPADriftServer.storeChangeSetInNewTransaction(subject, resourceId, changeSetZip,
+ driftFilesToRequest, headers);
+
+ if (null == result) {
+ return result;
+ }
+
+ JPADriftServer.ackChangeSetInNewTransaction(subject, resourceId, headers[0], driftFilesToRequest);
+
+ return result;
+ }
+
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, final int resourceId,
+ final File changeSetZip, final List<JPADriftFile> driftFilesToRequest, final Headers[] headers)
+ throws Exception {
+
final Resource resource = getResource(resourceId);
final DriftChangeSetSummary summary = new DriftChangeSetSummary();
final boolean storeBinaryContent = isBinaryContentStorageEnabled();
@@ -313,105 +342,82 @@ public class JPADriftServerBean implements JPADriftServerLocal {
@Override
public boolean visit(ZipEntry zipEntry, ZipInputStream stream) throws Exception {
- List<JPADriftFile> emptyDriftFiles = new ArrayList<JPADriftFile>();
+
JPADriftChangeSet driftChangeSet = null;
- try {
- ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(
- stream)), false);
+ ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(stream)),
+ false);
- // store the new change set info (not the actual blob)
- DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
- if (driftDef == null) {
- log.error("Unable to locate DriftDefinition for Resource [" + resource
- + "]. Change set cannot be saved.");
- return false;
- }
- // TODO: Commenting out the following line for now. We want to set the
- // version to the value specified in the headers, but we may want to also
- // validate it against the latest version we have in the database so that
- // we can make sure that the agent is in sync with the server.
- //
- //int version = getChangeSetVersion(resource, config);
- int version = reader.getHeaders().getVersion();
-
- DriftChangeSetCategory category = reader.getHeaders().getType();
- driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
- entityManager.persist(driftChangeSet);
-
- summary.setCategory(category);
- summary.setResourceId(resourceId);
- summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
- summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
- summary.setCreatedTime(driftChangeSet.getCtime());
-
- if (version > 0) {
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList);
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
-
- // TODO Figure out an efficient way to save coverage change sets.
- // The initial/coverage change set could contain hundreds or even thousands
- // of entries. We probably want to consider doing some kind of batch insert
- //
- // jsanda
-
- // use a path with only forward slashing to ensure consistent paths across reports
- String path = FileUtil.useForwardSlash(entry.getFile());
- JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
- newDriftFile);
- entityManager.persist(drift);
-
- // we are taking advantage of the fact that we know the summary is only used by the server
- // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
- // not alert on coverage reports) - so don't waste memory by collecting all the paths
- // when we know they aren't going to be used anyway.
- if (category == DriftChangeSetCategory.DRIFT) {
- summary.addDriftPathname(path);
- }
- }
- } else {
- summary.setInitialChangeSet(true);
- JPADriftSet driftSet = new JPADriftSet();
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
- String path = FileUtil.useForwardSlash(entry.getFile());
- // A Drift always has a changeSet. Note that in this code section the changeset is
- // always going to be set to a DriftDefinition's changeSet. But that is not always the
- // case, it could also be set to a DriftDefinitionTemplate's changeSet.
- driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null,
- newDriftFile));
+ // store the new change set info (not the actual blob)
+ DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
+ if (driftDef == null) {
+ log.error("Unable to locate DriftDefinition for Resource [" + resource
+ + "]. Change set cannot be saved.");
+ return false;
+ }
+ // TODO: Commenting out the following line for now. We want to set the
+ // version to the value specified in the headers, but we may want to also
+ // validate it against the latest version we have in the database so that
+ // we can make sure that the agent is in sync with the server.
+ //
+ //int version = getChangeSetVersion(resource, config);
+ int version = reader.getHeaders().getVersion();
+
+ DriftChangeSetCategory category = reader.getHeaders().getType();
+ driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
+ entityManager.persist(driftChangeSet);
+
+ summary.setCategory(category);
+ summary.setResourceId(resourceId);
+ summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
+ summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
+ summary.setCreatedTime(driftChangeSet.getCtime());
+
+ if (version > 0) {
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), driftFilesToRequest, addToList);
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+
+ // TODO Figure out an efficient way to save coverage change sets.
+ // The initial/coverage change set could contain hundreds or even thousands
+ // of entries. We probably want to consider doing some kind of batch insert
+ //
+ // jsanda
+
+ // use a path with only forward slashing to ensure consistent paths across reports
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
+ newDriftFile);
+ entityManager.persist(drift);
+
+ // we are taking advantage of the fact that we know the summary is only used by the server
+ // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
+ // not alert on coverage reports) - so don't waste memory by collecting all the paths
+ // when we know they aren't going to be used anyway.
+ if (category == DriftChangeSetCategory.DRIFT) {
+ summary.addDriftPathname(path);
}
- entityManager.persist(driftSet);
- driftChangeSet.setInitialDriftSet(driftSet);
- entityManager.merge(driftChangeSet);
}
-
- AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
- DriftAgentService service = agentClient.getDriftAgentService();
-
- service.ackChangeSet(resourceId, reader.getHeaders().getDriftDefinitionName());
-
- // send a message to the agent requesting the empty JPADriftFile content
- if (!emptyDriftFiles.isEmpty()) {
- try {
- if (service.requestDriftFiles(resourceId, reader.getHeaders(), emptyDriftFiles)) {
- for (DriftFile driftFile : emptyDriftFiles) {
- driftFile.setStatus(DriftFileStatus.REQUESTED);
- }
- }
- } catch (Exception e) {
- log.warn(" Unable to inform agent of drift file request [" + emptyDriftFiles + "]", e);
- }
+ } else {
+ summary.setInitialChangeSet(true);
+ JPADriftSet driftSet = new JPADriftSet();
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ // A Drift always has a changeSet. Note that in this code section the changeset is
+ // always going to be set to a DriftDefinition's changeSet. But that is not always the
+ // case, it could also be set to a DriftDefinitionTemplate's changeSet.
+ driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null, newDriftFile));
}
- } catch (Exception e) {
- String msg = "Failed to store drift changeset [" + driftChangeSet + "]";
- log.error(msg, e);
- return false;
+ entityManager.persist(driftSet);
+ driftChangeSet.setInitialDriftSet(driftSet);
+ entityManager.merge(driftChangeSet);
}
+ headers[0] = reader.getHeaders();
+
return true;
}
});
@@ -423,16 +429,43 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (null != resource) {
msg += resource;
} else {
- msg += ("resourceId " + resourceId);
+ msg += ("resourceId [" + resourceId + "]");
}
log.error(msg, e);
return null;
+
} finally {
// delete the changeSetFile?
}
}
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public void ackChangeSetInNewTransaction(Subject subject, final int resourceId, final Headers headers,
+ final List<JPADriftFile> driftFilesToRequest) throws Exception {
+
+ try {
+ AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
+ DriftAgentService service = agentClient.getDriftAgentService();
+
+ service.ackChangeSet(resourceId, headers.getDriftDefinitionName());
+
+ // send a message to the agent requesting the necessary JPADriftFile content. Note that the
+ // driftFile status has been set to REQUESTED outside of this call.
+ if (!driftFilesToRequest.isEmpty()) {
+ try {
+ service.requestDriftFiles(resourceId, headers, driftFilesToRequest);
+
+ } catch (Exception e) {
+ log.warn("Unable to inform agent of drift file request [" + driftFilesToRequest + "]", e);
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Unable to acknowledge changeSet storage with agent for " + headers, e);
+ }
+ }
+
private boolean isBinaryContentStorageEnabled() {
String binaryContent = System.getProperty("rhq.server.drift.store-binary-content", "false");
return binaryContent.equals("true");
@@ -446,9 +479,15 @@ public class JPADriftServerBean implements JPADriftServerLocal {
}
result = entityManager.find(JPADriftFile.class, sha256);
- // if the JPADriftFile is not yet in the db, then it needs to be fetched from the agent
+ // if the JPADriftFile is not yet in the db then persist it, and mark it requested if content is to be fetched
+ // note - by immediately setting the initial status to REQUESTED we avoid a future update and a
+ // potential deadlock scenario where the REQUESTED and LOADED status updates can happen simultaneously
if (null == result) {
- result = persistDriftFile(new JPADriftFile(sha256));
+ JPADriftFile driftFile = new JPADriftFile(sha256);
+ if (addToList) {
+ driftFile.setStatus(DriftFileStatus.REQUESTED);
+ }
+ result = persistDriftFile(driftFile);
if (addToList) {
emptyDriftFiles.add(result);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
index 0cd1e78..940a54b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
@@ -21,9 +21,11 @@ package org.rhq.enterprise.server.drift;
import java.io.File;
import java.io.InputStream;
+import java.util.List;
import javax.ejb.Local;
+import org.rhq.common.drift.Headers;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.DriftChangeSetCriteria;
import org.rhq.core.domain.criteria.DriftCriteria;
@@ -103,6 +105,18 @@ public interface JPADriftServerLocal {
DriftChangeSetSummary storeChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception;
/**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, int resourceId, File changeSetZip,
+ List<JPADriftFile> driftFilesToRequest, Headers[] headers) throws Exception;
+
+ /**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ void ackChangeSetInNewTransaction(Subject subject, int resourceId, Headers headers,
+ List<JPADriftFile> driftFilesToRequest) throws Exception;
+
+ /**
* This method stores the provided drift files. The files should correspond to requested drift files.
* The unzipped files will have their sha256 generated. Those not corresponding to needed content will
* be logged and ignored.
1
0
modules/enterprise/pom.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit c7aa8dbb5e387dadc03fb6c7d615857e82d645f4
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Nov 30 16:37:49 2011 -0500
Adding itests module to build
I discovered earlier today that the itests module is not getting built
in integration builds. It is declared in the list of modules of the
server pom, but the server module itself is not listed in
enterprise/pom.xml.
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 22a7c7e..e119090 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -46,6 +46,7 @@
<module>server/ear</module>
<module>binding</module>
<module>server/client-api</module>
+ <module>server/itests</module>
</modules>
</profile>
1
0
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 112 ++++------
1 file changed, 50 insertions(+), 62 deletions(-)
New commits:
commit ca50dc7aef3203af9d88227e216d96febbfbe57d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 15:22:50 2011 -0500
Fix some minor issues in the server itests.
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
index 08c5b4d..895cf9b 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java
@@ -59,7 +59,6 @@ import org.rhq.core.domain.drift.JPADrift;
import org.rhq.core.domain.drift.JPADriftChangeSet;
import org.rhq.core.domain.drift.JPADriftFile;
import org.rhq.core.domain.drift.JPADriftSet;
-import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
@@ -68,12 +67,13 @@ import org.rhq.test.TransactionCallback;
public class DriftTemplateManagerBeanTest extends DriftServerTest {
+ private static final String TEST_CREATE_TEMPLATE = "test-createTemplateForNegativeUpdateTests";
+ private static final String TEST_PIN_TEMPLATE = "test-pinTemplate";
+
private DriftTemplateManagerLocal templateMgr;
private DriftManagerLocal driftMgr;
- private List<Resource> resources = new LinkedList<Resource>();
-
private JPADrift drift1;
private JPADrift drift2;
private JPADriftFile driftFile1;
@@ -117,7 +117,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createNewTemplate() {
final DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createNewTemplate");
+ definition.setName("test-createNewTemplate");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -148,7 +148,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createTemplateForNegativeUpdateTests() {
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createTemplateForNegativeUpdateTests");
+ definition.setName(TEST_CREATE_TEMPLATE);
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -159,48 +159,40 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertNotNull("Failed to load template", loadTemplate(definition.getName()));
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*base directory.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*base directory.*cannot be modified")
@InitDB(false)
public void doNotAllowBaseDirToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
DriftDefinition definition = template.getTemplateDefinition();
definition.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/TEST"));
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*filters.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*filters.*cannot be modified")
@InitDB(false)
public void doNotAllowFiltersToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
DriftDefinition definition = template.getTemplateDefinition();
definition.addExclude(new Filter("/foo/bar/TEST/conf", "*.xml"));
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*name.*cannot be modified")
@InitDB(false)
public void doNotAllowTemplateNameToBeUpdated() {
- DriftDefinitionTemplate template = loadTemplate("test::createTemplateForNegativeUpdateTests");
+ DriftDefinitionTemplate template = loadTemplate(TEST_CREATE_TEMPLATE);
template.setName("A new name");
templateMgr.updateTemplate(getOverlord(), template);
}
- @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests",
- expectedExceptions = EJBException.class,
- expectedExceptionsMessageRegExp = ".*template name must be unique.*")
+ @Test(dependsOnMethods = "createTemplateForNegativeUpdateTests", expectedExceptions = EJBException.class, expectedExceptionsMessageRegExp = ".*template name must be unique.*")
@InitDB(false)
public void doNotAllowDuplicateTemplateNames() {
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::createTemplateForNegativeUpdateTests");
+ definition.setName(TEST_CREATE_TEMPLATE);
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
definition.setInterval(2400L);
@@ -212,7 +204,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void createAndUpdateTemplate() {
// create the template
DriftDefinition definition = new DriftDefinition(new Configuration());
- definition.setName("test::updateTemplate");
+ definition.setName("test-updateTemplate");
definition.setDescription("update template test");
definition.setEnabled(true);
definition.setDriftHandlingMode(normal);
@@ -252,12 +244,11 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
String msg = "Failed to propagate update to attached definition " + toString(updatedDef) + " - ";
DriftDefinition updatedTemplateDef = updatedTemplate.getTemplateDefinition();
- assertEquals(msg + "enabled property not updated", updatedTemplateDef.isEnabled(),
- updatedDef.isEnabled());
- assertEquals(msg + "driftHandlingMode property not updated",
- updatedTemplateDef.getDriftHandlingMode(), updatedDef.getDriftHandlingMode());
- assertEquals(msg + "interval property not updated", updatedTemplateDef.getInterval(),
- updatedDef.getInterval());
+ assertEquals(msg + "enabled property not updated", updatedTemplateDef.isEnabled(), updatedDef.isEnabled());
+ assertEquals(msg + "driftHandlingMode property not updated", updatedTemplateDef.getDriftHandlingMode(),
+ updatedDef.getDriftHandlingMode());
+ assertEquals(msg + "interval property not updated", updatedTemplateDef.getInterval(), updatedDef
+ .getInterval());
}
// verify that the detached definitions have not been updated.
@@ -266,25 +257,23 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
String msg = "Detached definition " + toString(def) + " should not get updated - ";
assertEquals(msg + "enabled property was modified", def.isEnabled(), defAfterUpdate.isEnabled());
- assertEquals(msg + "driftHandlingMode property was modified", def.getDriftHandlingMode(),
- defAfterUpdate.getDriftHandlingMode());
+ assertEquals(msg + "driftHandlingMode property was modified", def.getDriftHandlingMode(), defAfterUpdate
+ .getDriftHandlingMode());
assertEquals(msg + "interval property was modified", def.getInterval(), defAfterUpdate.getInterval());
}
}
-
- @SuppressWarnings("unchecked")
public void pinTemplate() throws Exception {
// First create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test::pinTemplate");
+ templateDef.setName(TEST_PIN_TEMPLATE);
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
templateDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
- final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(),
- resourceType.getId(), true, templateDef);
+ final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(), resourceType.getId(), true,
+ templateDef);
// next create some resource level definitions
final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
@@ -338,10 +327,11 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertTrue("Template should be marked pinned", updatedTemplate.isPinned());
}
+ @SuppressWarnings("unchecked")
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void persistChangeSetWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
GenericDriftChangeSetCriteria criteria = new GenericDriftChangeSetCriteria();
criteria.addFilterId(template.getChangeSetId());
@@ -352,9 +342,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertEquals("Expected to find change set for pinned template", 1, changeSets.size());
JPADriftChangeSet expectedChangeSet = new JPADriftChangeSet(resource, 1, COVERAGE, null);
- List<? extends Drift> expectedDrifts = asList(
- new JPADrift(expectedChangeSet, "drift.1", FILE_ADDED, null, driftFile1),
- new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
+ List<? extends Drift> expectedDrifts = asList(new JPADrift(expectedChangeSet, "drift.1", FILE_ADDED, null,
+ driftFile1), new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
DriftChangeSet<?> actualChangeSet = changeSets.get(0);
List<? extends Drift> actualDrifts = new ArrayList(actualChangeSet.getDrifts());
@@ -375,7 +364,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void updateAttachedDefinitionsWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
// get the attached definitions
List<DriftDefinition> attachedDefs = new LinkedList<DriftDefinition>();
@@ -392,7 +381,7 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
@Test(dependsOnMethods = "pinTemplate")
@InitDB(false)
public void doNotUpdateDetachedDefinitionsWhenTemplateGetsPinned() throws Exception {
- DriftDefinitionTemplate template = loadTemplate("test::pinTemplate");
+ DriftDefinitionTemplate template = loadTemplate(TEST_PIN_TEMPLATE);
// get the detached definitions
List<DriftDefinition> detachedDefs = new LinkedList<DriftDefinition>();
@@ -409,14 +398,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
public void deleteTemplate() throws Exception {
// first create the template
final DriftDefinition templateDef = new DriftDefinition(new Configuration());
- templateDef.setName("test::pinTemplate");
+ templateDef.setName(TEST_PIN_TEMPLATE);
templateDef.setEnabled(true);
templateDef.setDriftHandlingMode(normal);
templateDef.setInterval(2400L);
templateDef.setBasedir(new DriftDefinition.BaseDirectory(fileSystem, "/foo/bar/test"));
- final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(),
- resourceType.getId(), true, templateDef);
+ final DriftDefinitionTemplate template = templateMgr.createTemplate(getOverlord(), resourceType.getId(), true,
+ templateDef);
// next create some resource level definitions
final DriftDefinition attachedDef1 = createDefinition(template, "attachedDef1", true);
@@ -472,22 +461,23 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
// verify that attached definitions along with their change sets have
// been deleted
assertNull("Change sets belonging to attached definitions should be deleted", loadChangeSet(changeSet0.getId()));
- assertNull("Attached definition " + toString(attachedDef1) + " should be deleted",
- loadDefinition(attachedDef1.getId()));
- assertNull("Attached definition " + toString(attachedDef2) + " should be deleted",
- loadDefinition(attachedDef2.getId()));
+ assertNull("Attached definition " + toString(attachedDef1) + " should be deleted", loadDefinition(attachedDef1
+ .getId()));
+ assertNull("Attached definition " + toString(attachedDef2) + " should be deleted", loadDefinition(attachedDef2
+ .getId()));
// verify that detached definitions along with their change sets have not been deleted
- assertNotNull("Change sets belonging to detached definitions should not be deleted",
- loadChangeSet(changeSet1.getId()));
+ assertNotNull("Change sets belonging to detached definitions should not be deleted", loadChangeSet(changeSet1
+ .getId()));
assertDetachedDefinitionNotDeleted(detachedDef1.getId());
assertDetachedDefinitionNotDeleted(detachedDef2.getId());
// verify that the template itself has been deleted
- assertNull("The template " + toString(template) + " should have been deleted",
- loadTemplate(template.getName(), false));
+ assertNull("The template " + toString(template) + " should have been deleted", loadTemplate(template.getName(),
+ false));
}
+ @SuppressWarnings("unchecked")
private void assertDefinitionIsPinned(DriftDefinition definition) throws Exception {
// verify that the definition is marked as pinned
assertTrue("Expected " + toString(definition) + " to be pinned", definition.isPinned());
@@ -503,9 +493,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
assertEquals("Expected to find one change set", 1, changeSets.size());
JPADriftChangeSet expectedChangeSet = new JPADriftChangeSet(resource, 1, COVERAGE, null);
- List<? extends Drift> expectedDrifts = asList(
- new JPADrift(expectedChangeSet, drift1.getPath(), FILE_ADDED, null, driftFile1),
- new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
+ List<? extends Drift> expectedDrifts = asList(new JPADrift(expectedChangeSet, drift1.getPath(), FILE_ADDED,
+ null, driftFile1), new JPADrift(expectedChangeSet, drift2.getPath(), FILE_ADDED, null, driftFile2));
DriftChangeSet<?> actualChangeSet = changeSets.get(0);
List<? extends Drift> actualDrifts = new ArrayList(actualChangeSet.getDrifts());
@@ -519,8 +508,8 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
criteria.addFilterStartVersion(1);
criteria.addFilterDriftDefinitionId(definition.getId());
- assertEquals("There should not be any drift change sets", 0,
- driftMgr.findDriftChangeSetsByCriteria(getOverlord(), criteria).size());
+ assertEquals("There should not be any drift change sets", 0, driftMgr.findDriftChangeSetsByCriteria(
+ getOverlord(), criteria).size());
}
private void assertDefinitionIsNotPinned(DriftDefinition definition) throws Exception {
@@ -534,15 +523,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest {
PageList<? extends DriftChangeSet<?>> changeSets = driftMgr.findDriftChangeSetsByCriteria(getOverlord(),
criteria);
- assertEquals("Did not expect to find any change sets for " + toString(definition) + ". Note that this " +
- "assertion method assumes that the definition you are testing is not supposed to have any change sets.",
+ assertEquals("Did not expect to find any change sets for " + toString(definition) + ". Note that this "
+ + "assertion method assumes that the definition you are testing is not supposed to have any change sets.",
0, changeSets.size());
}
private void assertDriftTemplateEquals(String msg, DriftDefinitionTemplate expected, DriftDefinitionTemplate actual) {
- AssertUtils
- .assertPropertiesMatch(msg + ": basic drift definition template properties do not match", expected, actual,
- "id", "resourceType", "ctime", "templateDefinition");
+ AssertUtils.assertPropertiesMatch(msg + ": basic drift definition template properties do not match", expected,
+ actual, "id", "resourceType", "ctime", "templateDefinition");
assertDriftDefEquals(msg + ": template definitions do not match", expected.getTemplateDefinition(), actual
.getTemplateDefinition());
}
1
0
modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 6
modules/enterprise/server/itests/pom.xml | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 229 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 14
4 files changed, 155 insertions(+), 96 deletions(-)
New commits:
commit e705478deae5e5c6e11cb0ca6a54af228d207102
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 14:57:54 2011 -0500
Fix dep group for javassist
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index d9d8677..f269e77 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -104,7 +104,7 @@
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
commit b31e3a66a1e75dcad0070b5b78bbd3f8e9005533
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 14:40:55 2011 -0500
[Bug 758724 - Transaction timing can prevent drift file content from being persisted]
Resolves a timing issue where it was possible for the agent to submit
DriftFile content before the DriftFile entity was committed to the
database, thus generating exceptions due to the missing entity, and
a failure to store the required content.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
index fb13e94..a567b75 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
@@ -128,4 +128,10 @@ public class Headers implements Serializable {
this.version = version;
}
+ @Override
+ public String toString() {
+ return "Headers [driftDefinitionName=" + driftDefinitionName + ", resourceId=" + resourceId + ", version="
+ + version + "]";
+ }
+
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
index 6633c22..c985c1e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java
@@ -19,6 +19,7 @@
*/
package org.rhq.enterprise.server.drift;
+import static javax.ejb.TransactionAttributeType.NOT_SUPPORTED;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
import static org.rhq.core.domain.drift.DriftFileStatus.LOADED;
@@ -300,10 +301,38 @@ public class JPADriftServerBean implements JPADriftServerLocal {
df.setStatus(LOADED);
}
+ // This facade does not start, or participate in, a transaction so that it can execute its work
+ // in two new transactions. The first transaction ensures all new entities are committed to the
+ // database. The second transaction can then safely ackknowledge that the changeset is persisted
+ // and request drift file content, if necessary.
@Override
- @TransactionAttribute(REQUIRES_NEW)
+ @TransactionAttribute(NOT_SUPPORTED)
public DriftChangeSetSummary storeChangeSet(Subject subject, final int resourceId, final File changeSetZip)
throws Exception {
+
+ // a List to be populated by storeChangeSetInNewTransaction for use in ackChangeSetInNewTransaction
+ List<JPADriftFile> driftFilesToRequest = new ArrayList<JPADriftFile>();
+ // a 1 element array so storeChangeSetInNewTransaction can return the Headers for use in ackChangeSetInNewTransaction
+ Headers[] headers = new Headers[1];
+
+ DriftChangeSetSummary result = JPADriftServer.storeChangeSetInNewTransaction(subject, resourceId, changeSetZip,
+ driftFilesToRequest, headers);
+
+ if (null == result) {
+ return result;
+ }
+
+ JPADriftServer.ackChangeSetInNewTransaction(subject, resourceId, headers[0], driftFilesToRequest);
+
+ return result;
+ }
+
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, final int resourceId,
+ final File changeSetZip, final List<JPADriftFile> driftFilesToRequest, final Headers[] headers)
+ throws Exception {
+
final Resource resource = getResource(resourceId);
final DriftChangeSetSummary summary = new DriftChangeSetSummary();
final boolean storeBinaryContent = isBinaryContentStorageEnabled();
@@ -313,105 +342,82 @@ public class JPADriftServerBean implements JPADriftServerLocal {
@Override
public boolean visit(ZipEntry zipEntry, ZipInputStream stream) throws Exception {
- List<JPADriftFile> emptyDriftFiles = new ArrayList<JPADriftFile>();
+
JPADriftChangeSet driftChangeSet = null;
- try {
- ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(
- stream)), false);
+ ChangeSetReader reader = new ChangeSetReaderImpl(new BufferedReader(new InputStreamReader(stream)),
+ false);
- // store the new change set info (not the actual blob)
- DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
- if (driftDef == null) {
- log.error("Unable to locate DriftDefinition for Resource [" + resource
- + "]. Change set cannot be saved.");
- return false;
- }
- // TODO: Commenting out the following line for now. We want to set the
- // version to the value specified in the headers, but we may want to also
- // validate it against the latest version we have in the database so that
- // we can make sure that the agent is in sync with the server.
- //
- //int version = getChangeSetVersion(resource, config);
- int version = reader.getHeaders().getVersion();
-
- DriftChangeSetCategory category = reader.getHeaders().getType();
- driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
- entityManager.persist(driftChangeSet);
-
- summary.setCategory(category);
- summary.setResourceId(resourceId);
- summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
- summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
- summary.setCreatedTime(driftChangeSet.getCtime());
-
- if (version > 0) {
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), emptyDriftFiles, addToList);
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
-
- // TODO Figure out an efficient way to save coverage change sets.
- // The initial/coverage change set could contain hundreds or even thousands
- // of entries. We probably want to consider doing some kind of batch insert
- //
- // jsanda
-
- // use a path with only forward slashing to ensure consistent paths across reports
- String path = FileUtil.useForwardSlash(entry.getFile());
- JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
- newDriftFile);
- entityManager.persist(drift);
-
- // we are taking advantage of the fact that we know the summary is only used by the server
- // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
- // not alert on coverage reports) - so don't waste memory by collecting all the paths
- // when we know they aren't going to be used anyway.
- if (category == DriftChangeSetCategory.DRIFT) {
- summary.addDriftPathname(path);
- }
- }
- } else {
- summary.setInitialChangeSet(true);
- JPADriftSet driftSet = new JPADriftSet();
- for (FileEntry entry : reader) {
- boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
- JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles, addToList);
- String path = FileUtil.useForwardSlash(entry.getFile());
- // A Drift always has a changeSet. Note that in this code section the changeset is
- // always going to be set to a DriftDefinition's changeSet. But that is not always the
- // case, it could also be set to a DriftDefinitionTemplate's changeSet.
- driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null,
- newDriftFile));
+ // store the new change set info (not the actual blob)
+ DriftDefinition driftDef = findDriftDefinition(resource, reader.getHeaders());
+ if (driftDef == null) {
+ log.error("Unable to locate DriftDefinition for Resource [" + resource
+ + "]. Change set cannot be saved.");
+ return false;
+ }
+ // TODO: Commenting out the following line for now. We want to set the
+ // version to the value specified in the headers, but we may want to also
+ // validate it against the latest version we have in the database so that
+ // we can make sure that the agent is in sync with the server.
+ //
+ //int version = getChangeSetVersion(resource, config);
+ int version = reader.getHeaders().getVersion();
+
+ DriftChangeSetCategory category = reader.getHeaders().getType();
+ driftChangeSet = new JPADriftChangeSet(resource, version, category, driftDef);
+ entityManager.persist(driftChangeSet);
+
+ summary.setCategory(category);
+ summary.setResourceId(resourceId);
+ summary.setDriftDefinitionName(reader.getHeaders().getDriftDefinitionName());
+ summary.setDriftHandlingMode(driftDef.getDriftHandlingMode());
+ summary.setCreatedTime(driftChangeSet.getCtime());
+
+ if (version > 0) {
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile oldDriftFile = getDriftFile(entry.getOldSHA(), driftFilesToRequest, addToList);
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+
+ // TODO Figure out an efficient way to save coverage change sets.
+ // The initial/coverage change set could contain hundreds or even thousands
+ // of entries. We probably want to consider doing some kind of batch insert
+ //
+ // jsanda
+
+ // use a path with only forward slashing to ensure consistent paths across reports
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ JPADrift drift = new JPADrift(driftChangeSet, path, entry.getType(), oldDriftFile,
+ newDriftFile);
+ entityManager.persist(drift);
+
+ // we are taking advantage of the fact that we know the summary is only used by the server
+ // if the change set is a DRIFT report. If its a coverage report, it is not used (we do
+ // not alert on coverage reports) - so don't waste memory by collecting all the paths
+ // when we know they aren't going to be used anyway.
+ if (category == DriftChangeSetCategory.DRIFT) {
+ summary.addDriftPathname(path);
}
- entityManager.persist(driftSet);
- driftChangeSet.setInitialDriftSet(driftSet);
- entityManager.merge(driftChangeSet);
}
-
- AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
- DriftAgentService service = agentClient.getDriftAgentService();
-
- service.ackChangeSet(resourceId, reader.getHeaders().getDriftDefinitionName());
-
- // send a message to the agent requesting the empty JPADriftFile content
- if (!emptyDriftFiles.isEmpty()) {
- try {
- if (service.requestDriftFiles(resourceId, reader.getHeaders(), emptyDriftFiles)) {
- for (DriftFile driftFile : emptyDriftFiles) {
- driftFile.setStatus(DriftFileStatus.REQUESTED);
- }
- }
- } catch (Exception e) {
- log.warn(" Unable to inform agent of drift file request [" + emptyDriftFiles + "]", e);
- }
+ } else {
+ summary.setInitialChangeSet(true);
+ JPADriftSet driftSet = new JPADriftSet();
+ for (FileEntry entry : reader) {
+ boolean addToList = storeBinaryContent || !DriftUtil.isBinaryFile(entry.getFile());
+ JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), driftFilesToRequest, addToList);
+ String path = FileUtil.useForwardSlash(entry.getFile());
+ // A Drift always has a changeSet. Note that in this code section the changeset is
+ // always going to be set to a DriftDefinition's changeSet. But that is not always the
+ // case, it could also be set to a DriftDefinitionTemplate's changeSet.
+ driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null, newDriftFile));
}
- } catch (Exception e) {
- String msg = "Failed to store drift changeset [" + driftChangeSet + "]";
- log.error(msg, e);
- return false;
+ entityManager.persist(driftSet);
+ driftChangeSet.setInitialDriftSet(driftSet);
+ entityManager.merge(driftChangeSet);
}
+ headers[0] = reader.getHeaders();
+
return true;
}
});
@@ -423,16 +429,43 @@ public class JPADriftServerBean implements JPADriftServerLocal {
if (null != resource) {
msg += resource;
} else {
- msg += ("resourceId " + resourceId);
+ msg += ("resourceId [" + resourceId + "]");
}
log.error(msg, e);
return null;
+
} finally {
// delete the changeSetFile?
}
}
+ @Override
+ @TransactionAttribute(REQUIRES_NEW)
+ public void ackChangeSetInNewTransaction(Subject subject, final int resourceId, final Headers headers,
+ final List<JPADriftFile> driftFilesToRequest) throws Exception {
+
+ try {
+ AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
+ DriftAgentService service = agentClient.getDriftAgentService();
+
+ service.ackChangeSet(resourceId, headers.getDriftDefinitionName());
+
+ // send a message to the agent requesting the necessary JPADriftFile content. Note that the
+ // driftFile status has been set to REQUESTED outside of this call.
+ if (!driftFilesToRequest.isEmpty()) {
+ try {
+ service.requestDriftFiles(resourceId, headers, driftFilesToRequest);
+
+ } catch (Exception e) {
+ log.warn("Unable to inform agent of drift file request [" + driftFilesToRequest + "]", e);
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Unable to acknowledge changeSet storage with agent for " + headers, e);
+ }
+ }
+
private boolean isBinaryContentStorageEnabled() {
String binaryContent = System.getProperty("rhq.server.drift.store-binary-content", "false");
return binaryContent.equals("true");
@@ -446,9 +479,15 @@ public class JPADriftServerBean implements JPADriftServerLocal {
}
result = entityManager.find(JPADriftFile.class, sha256);
- // if the JPADriftFile is not yet in the db, then it needs to be fetched from the agent
+ // if the JPADriftFile is not yet in the db then persist it, and mark it requested if content is to be fetched
+ // note - by immediately setting the initial status to REQUESTED we avoid a future update and a
+ // potential deadlock scenario where the REQUESTED and LOADED status updates can happen simultaneously
if (null == result) {
- result = persistDriftFile(new JPADriftFile(sha256));
+ JPADriftFile driftFile = new JPADriftFile(sha256);
+ if (addToList) {
+ driftFile.setStatus(DriftFileStatus.REQUESTED);
+ }
+ result = persistDriftFile(driftFile);
if (addToList) {
emptyDriftFiles.add(result);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
index 0cd1e78..940a54b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java
@@ -21,9 +21,11 @@ package org.rhq.enterprise.server.drift;
import java.io.File;
import java.io.InputStream;
+import java.util.List;
import javax.ejb.Local;
+import org.rhq.common.drift.Headers;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.DriftChangeSetCriteria;
import org.rhq.core.domain.criteria.DriftCriteria;
@@ -103,6 +105,18 @@ public interface JPADriftServerLocal {
DriftChangeSetSummary storeChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception;
/**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ DriftChangeSetSummary storeChangeSetInNewTransaction(Subject subject, int resourceId, File changeSetZip,
+ List<JPADriftFile> driftFilesToRequest, Headers[] headers) throws Exception;
+
+ /**
+ * For transactioning purposes only, part of storeChangeSet impl. Not to be exposed outside of local interface.
+ */
+ void ackChangeSetInNewTransaction(Subject subject, int resourceId, Headers headers,
+ List<JPADriftFile> driftFilesToRequest) throws Exception;
+
+ /**
* This method stores the provided drift files. The files should correspond to requested drift files.
* The unzipped files will have their sha256 generated. Those not corresponding to needed content will
* be logged and ignored.
1
0
New branch 'stefan/release_BZ758753' available with the following commits:
1
0
30 Nov '11
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 9 +
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 18 +++
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 51 ++++++----
3 files changed, 59 insertions(+), 19 deletions(-)
New commits:
commit dee518db2b8c61813bf1cdad229f6388c0c4ec61
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Nov 29 12:18:17 2011 -0500
[Bug 758261 - A bad drift definition can prevent agent startup]
Add more aggressive catching (Throwable) because it's better to skip
detection for a problematic definition than it is to prevent agent
startup.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index c70b546..7b0752d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -152,9 +152,11 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
try {
syncWithServer(r, d);
schedulesQueue.addSchedule(new DriftDetectionSchedule(r.getId(), d));
- } catch (IOException e) {
+
+ } catch (Throwable t) {
+ // catch throwable, don't prevent agent startup just due to a bad definition
log.error("Failed to sync with server for " + toString(r.getId(), d) + ". Drift detection will not be "
- + "scheduled.", e);
+ + "scheduled.", t);
}
}
@@ -681,7 +683,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
// find out the type of base location that is specified by the drift def
DriftDefinition.BaseDirectory baseDir = driftDefinition.getBasedir();
if (baseDir == null) {
- throw new IllegalArgumentException("Missing basedir in drift definition");
+ throw new IllegalArgumentException("Base directory is null for drift definition ["
+ + driftDefinition.getName() + "]");
}
// based on the type of base location, determine the root base directory
commit b7e1b73df192f483f91dff5831b13d2741cdd165
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:43:54 2011 -0500
[Bug 758565 - Add drift templates to JBAS WAR/EAR resources]
After reverting the changes to support EAR/WAR/Embedded WAR
types for AS-4 and AS-5 plugins, this now adds back drift
templates for EAR and WAR types. The Embedded WAR support will
be added back in later, when the repo is open for the plugin
code changes required to offer that support.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index b6ce5ec..e1b8d25 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,6 +2313,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="Web Application (WAR)"
@@ -2364,6 +2373,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index db4b8e5..d4d0874 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,8 +259,9 @@
</configuration>
</content>
- <drift-definition name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition
+ name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2267,6 +2268,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2460,55 +2470,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2524,6 +2534,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="EJB3 Entity Tree Cache"
1
0
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java | 28 +++++-----
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 12 ----
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 4 -
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 9 ---
4 files changed, 16 insertions(+), 37 deletions(-)
New commits:
commit 663c3c65527a5aacbcafead08614e4b416d52fa6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:43:54 2011 -0500
[Bug 758565 - Add drift templates to JBAS WAR/EAR resources]
After reverting the changes to support EAR/WAR/Embedded WAR
types for AS-4 and AS-5 plugins, this now adds back drift
templates for EAR and WAR types. The Embedded WAR support will
be added back in later, when the repo is open for the plugin
code changes required to offer that support.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 32aca99..2729d31 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,6 +2313,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="Web Application (WAR)"
@@ -2364,6 +2373,15 @@
&deploymentContentConfigProps;
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>measurementTrait</value-context>
+ <value-name>custom.path</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index db4b8e5..d4d0874 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,8 +259,9 @@
</configuration>
</content>
- <drift-definition name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition
+ name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2267,6 +2268,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2460,55 +2470,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2524,6 +2534,15 @@
</configuration>
</content>
+ <drift-definition
+ name="Template-Files"
+ description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>filename</value-name>
+ </basedir>
+ </drift-definition>
+
</service>
<service name="EJB3 Entity Tree Cache"
commit 42c78796a8b115058f4f87f2d9f61f1cdec11428
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:38:16 2011 -0500
Revert "Fix issue in AS-4 plugin such that for embedded WAR resources the"
This reverts commit 8c6dcd3817195f9a0f0d9855b3f7b648bd1ada5d.
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
index 9ad2fbd..18a6b38 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java
@@ -65,7 +65,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
// Once we've finished making sure the plugin configurations have the data we need:
// 1) First the stuff generic to all WARs...
- JBossASServerComponent<?> grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
+ JBossASServerComponent grandparentJBossASComponent = parentEarComponent.getParentResourceComponent();
resourceDetails = WarDiscoveryHelper.initPluginConfigurations(grandparentJBossASComponent, resourceDetails,
parentEarComponent);
@@ -74,7 +74,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone
for (DiscoveredResourceDetails resource : resourceDetails) {
Configuration pluginConfiguration = resource.getPluginConfiguration();
pluginConfiguration.put(new PropertySimple(WarComponent.FILE_NAME, parentEarFullFileName
- + pluginConfiguration.getSimpleValue(WarComponent.NAME_CONFIG_PROP, "")));
+ + resource.getResourceName()));
}
return resourceDetails;
commit a481dd1c53a035f9a633551ea982bc70d9e0188b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:37:50 2011 -0500
Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin"
This reverts commit 0ad22b15a3f6d5b700bfec506db74f6a20633f21.
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index b5d4bd1..db4b8e5 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -259,9 +259,8 @@
</configuration>
</content>
- <drift-definition
- name="Template-Base Files"
- description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
+ <drift-definition name="Template-Base Files"
+ description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files.">
<basedir>
<value-context>pluginConfiguration</value-context>
<value-name>jbossHomeDir</value-name>
@@ -2268,15 +2267,6 @@
</configuration>
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
<service name="Embedded Web Application (WAR)"
class="org.rhq.plugins.jbossas.WarComponent"
discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent"
@@ -2394,15 +2384,6 @@
<metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
</service>
</service>
@@ -2479,55 +2460,55 @@
dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL"
description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/>
- <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
+ <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time"
units="milliseconds"
description="Minimum response time of a servlet"/>
- <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
+ <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time"
units="milliseconds"
description="Average response time of a servlet"/>
- <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
+ <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time"
units="milliseconds"
description="Maximum response time of a servlet"/>
- <metric property="Servlet.TotalTime" displayName="Total processing time"
+ <metric property="Servlet.TotalTime" displayName="Total processing time"
units="milliseconds"
description="Total processing time of the webapp" measurementType="trendsup"/>
- <metric property="Servlet.NumRequests" displayName="Requests served"
+ <metric property="Servlet.NumRequests" displayName="Requests served"
units="none" description="Number of requests served by servlets"
measurementType="trendsup" displayType="summary"/>
- <metric property="Servlet.NumErrors" displayName="Errors while processing"
+ <metric property="Servlet.NumErrors" displayName="Errors while processing"
units="none" description="Number of errors while processing"
measurementType="trendsup" displayType="summary"/>
- <metric property="Session.activeSessions" displayName="Currently Active Sessions"
+ <metric property="Session.activeSessions" displayName="Currently Active Sessions"
units="none" description="Number active sessions for the webapp right now" />
- <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
+ <metric property="Session.maxActive" displayName="Maximum number of Active Sessions"
units="none" description="Maximum number of active sessions for the webapp" />
- <metric property="Session.sessionCounter" displayName="Sessions created"
+ <metric property="Session.sessionCounter" displayName="Sessions created"
units="none" description="Number of sessions created for the webapp"
measurementType="trendsup" />
- <metric property="Session.expiredSessions" displayName="Expired Sessions"
+ <metric property="Session.expiredSessions" displayName="Expired Sessions"
units="none" description="Number of expired sessions for the webapp"
measurementType="trendsup" />
- <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
+ <metric property="Session.rejectedSessions" displayName="Rejected Sessions"
units="none" description="Number of sessions rejected for the webapp"
measurementType="trendsup" />
- <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
+ <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time"
units="seconds" description="Average alive time of a Sessions" />
- <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
+ <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time"
units="seconds" description="Maximum alive time of a Sessions" />
- <metric property="Vhost.name" displayName="Vhost" dataType="trait"
+ <metric property="Vhost.name" displayName="Vhost" dataType="trait"
description="Virtual hosts this app runs on"/>
<content name="file" displayName="WAR File" category="deployable" isCreationType="true">
@@ -2543,15 +2524,6 @@
</configuration>
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>pluginConfiguration</value-context>
- <value-name>filename</value-name>
- </basedir>
- </drift-definition>
-
</service>
<service name="EJB3 Entity Tree Cache"
commit aa79d1e533ca7a3e216719c933493d8ffef64b6b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 30 10:36:24 2011 -0500
Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin"
This reverts commit 72d6aa5c440900dacaf8f97914ea2e17dea07112.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
index ea8d467..2ed3159 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java
@@ -33,28 +33,28 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
/**
* @author Ian Springer
*/
-public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent implements MeasurementFacet {
+public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent
+ implements MeasurementFacet
+{
private static final String CUSTOM_PARENT_TRAIT = "custom.parent";
- private static final String CUSTOM_PATH_TRAIT = "custom.path";
// ------------ MeasurementFacet Implementation ------------
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
- Set<MeasurementScheduleRequest> remainingRequests = new HashSet<MeasurementScheduleRequest>();
- for (MeasurementScheduleRequest request : requests) {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests)
+ throws Exception
+ {
+ Set<MeasurementScheduleRequest> remainingRequests = new HashSet();
+ for (MeasurementScheduleRequest request : requests)
+ {
String metricName = request.getName();
- if (metricName.equals(CUSTOM_PARENT_TRAIT)) {
+ if (metricName.equals(CUSTOM_PARENT_TRAIT))
+ {
String parentDeploymentName = getManagedDeployment().getParent().getName();
MeasurementDataTrait trait = new MeasurementDataTrait(request, parentDeploymentName);
report.addData(trait);
-
- } else if (metricName.equals(CUSTOM_PATH_TRAIT)) {
- boolean exploded = this.deploymentFile.isDirectory();
- if (exploded) {
- MeasurementDataTrait trait = new MeasurementDataTrait(request, this.deploymentFile.getPath());
- report.addData(trait);
- }
- } else {
+ }
+ else
+ {
remainingRequests.add(request);
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 470b0f6..32aca99 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -2313,15 +2313,6 @@
&deploymentContentConfigProps;
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
</service>
<service name="Web Application (WAR)"
@@ -2373,15 +2364,6 @@
&deploymentContentConfigProps;
</content>
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
<service name="Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
@@ -2444,21 +2426,9 @@
<metric property="custom.parent" displayName="Parent"
dataType="trait" displayType="summary"
description="the name of this WAR's parent deployment"/>
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this WAR directory (not supported for WAR's embedded in non-exploded EARs)"/>
&webApplicationMetrics;
- <drift-definition
- name="Template-Files"
- description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring.">
- <basedir>
- <value-context>measurementTrait</value-context>
- <value-name>custom.path</value-name>
- </basedir>
- </drift-definition>
-
<service name="Embedded Web Application Context"
class="WebApplicationContextComponent"
discovery="WebApplicationContextDiscoveryComponent"
1
0
29 Nov '11
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 68881aa5190548bc95667ad8f775e6737fc8a6b0
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Tue Nov 29 20:20:52 2011 -0500
development RHQ_4.2.0.JON300-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index ac3f8ef..39759f0 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 418391a..54c7d4b 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 221a0c5..5a2ceae 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 5c0e40d..7e1d8f9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 e2fb9f2..f536d78 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index a974ff9..270b59c 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 0e26d22..756e92f 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 38639ef..3b83423 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 43a3c60..3dc6715 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 9d8be5e..87563da 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index da22452..1aa8eaa 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index e14c43c..61f0991 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index e6d9a3f..b4baf2a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 3557f83..1744c6a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 ae4adfd..6eb1d10 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e06fbe4..69f7a57 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 79bc543..4216d9b 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 46f6d8d..5fc607d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index a73a7bc..f92859d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 14331bf..2969a51 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 0e335a5..d2e2342 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 7460302..881418e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 caa48ec..a37c31c 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 c5cd46f..142339a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 6a4ff80..3e55870 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 a57f209..ba0ddf1 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index e623a6c..77172ea 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 0dee2d0..15816b1 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 bb81cf3..858daf5 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index ccd4537..82321d0 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index e1f4272..aba10c1 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 a7a5f3f..00314fe 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 c8f3517..adfb7b1 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index b43fe92..3a6121f 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index f6a900a..58e6d10 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 e571c22..494e4bd 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 353e884..fcfbbf3 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index fecddfa..e29f200 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 6c60e1a..2f1d041 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index d7e4bd8..9be794e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 406d891..b5a8472 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 2c50c80..e696e99 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 5cc537e..39dc495 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 aac44b7..a38f2d4 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 fcfc4b0..eaf2b05 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 d0ac979..6a9f9e8 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 40cebdd..a84be24 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 149e647..9adf4c8 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 e4c8ca9..812e8f9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 3230561..8f3df57 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 f73ba3f..9cec44e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 6d8051c..4f33cbe 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 5a7bcde..8b21424 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 1d49e0c..19c9a90 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 a328602..a17e300 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 b8ff71a..de5a3ab 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 6ab95dd..dd6d3bb 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 1c75ca1..a1db4d2 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 f2543b1..59426d5 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 2fef184..9351bdb 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 1b8963a..13ada4e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 8f9502e..8701512 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 a55302b..a405e83 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 d3c5f78..b1f8c7a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 68c5b52..a126ee1 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 fbb1816..5e088eb 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 9e0c19d..353336f 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 87ad752..64331da 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 7497ebc..c9a6de9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index f06dcd7..aab6b2b 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 e067c83..89809b2 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 8b1a39a..3256d73 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 8ec5329..9f1dd01 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 6499a6c..17ceaf7 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index d573af3..090db0e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 935d846..1bb4625 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 6ca0adf..0a5681c 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 4c668f3..017a62e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 608115b..28afcba 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 1c70548..9629111 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 086313d..4399374 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 5316f3c..00d7107 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 5aad81f..bcd9276 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 47f2879..f81e086 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index e8b5d40..1ba03b6 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 8b1edb4..6e50fda 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index ee66194..23c1748 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index de5d7d6..11cad6a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 21f5091..c1cb11e 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 0f17e0f..bfdfd44 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 5525602..2d0068c 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index f3637fd..16fdc4a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-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 efca7bd..19c0938 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index b905a10..82b1e94 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 fbfea7a..5191d15 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 c647c9f..1dd9fcf 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index d5a4d5a..e6ed0a9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 52de5b1..1686af0 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 ba7cab3..e345452 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 473662f..e63174f 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 23e3879..8dfea53 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 64eadd3..07c203d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 168383c..9e4ef15 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index c481fe5..ae68994 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 267efaf..f1616cb 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index afc186f..77875d9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 721193f..12ff874 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index d8b19d0..892e637 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 4b038d4..38e75e4 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 0fff177..983550d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 29c1ab8..659b8b5 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index dd34c6b..09afafc 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index f7e2f9d..aae1489 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index b57f93c..455c369 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index f5a7642..d4aa59d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 81ff88e..8d33313 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 47962e8..979abb6 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index cd156bb..c01be1d 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 1b0f0e6..2dfbee9 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 1c6d4a0..e7a3441 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 900bc22..87da210 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.JON300.CR3</version>
+ <version>4.2.0.JON300-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 66c5465..f185800 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index e7aac1e..d9b1e6c 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 04e7538..82b6b5a 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index e94bf67..f7d7aed 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.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 9b6354b..497cf4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON300.CR3</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
1
0
Changes since RHQ_3_0_0-BETA1:
Elias Ross (1):
BZ 750665 - fix a regex issue with formatMessage
Heiko W. Rupp (100):
Very basic initial working version of a REST interface.
Allow to output xml and json for Availability.
Add the rest war to the container build.
Move the REST interface over to the server jar.
Adding REST libs to the container build.
Add another provider for metrics (dummy for now)
Enable the metric provide in web.xml. Otherwise it can't be found.
Provide a ResourceWithType as sort of a DAO for rest.
Emit Schedules and metric data for schedules.
Obtain single schedules.
Merge branch 'master' into heiko-rest
Add a filter to check the authorization of the request.
Merge branch 'master' into heiko-rest
Add standard web authentication, as this puts the principal trhough to the EJB layer, where an interceptor then populates the 'caller' variable with the subject of the caller.
Argh, the Interceptors annotation had vanished - readding.
Move the REST 'domain' classes into the server package, as they are only needed there.
Auth filter is not needed anymore.
Better URIs for resources, handling of favorite resources.
Merge branch 'master' into heiko-rest
Add some handling around alerts, system status and Exceptions.
Add time and description of alert.
Add more linking. Move base url to /rest/1. Add a 'landing page'.
Some better treatment of the parent resource. Turn primitives to Objects as this way they may be skipped when marshalling.
Merge branch 'master' into heiko-rest
Better schedule and data handling.
Merge remote-tracking branch 'origin/master' into heiko-rest
Improve status display.
Add some graphing of values as examples.
Hide empty values and improve display somewhat.
Start some support for HTML output of data. Freemarker ftw!
Fix the url to fetch the data from (this must be relative so that the browser can prepend the host and port).
Further improve html display for mere humans.
Add some code to display resource trees. Still unfinished.
Add a resource tree browser.
Put tree code in a separate file.
Fix some fallout from type-detection.
Merge branch 'master' into heiko-rest
Merge branch 'master' into heiko-rest
Start support for updating of schedules.
BZ 741855 - use standard conforming escapes in Postgres 9.1+
BZ 738029 - partially revert the change of BZ 536496, so that plugins that still use the deprecated (and useless) attribute can be deployed. Spit out a warning to the console.
BZ 734135 -- Don't accept dynagroups with <,$,',[,{ in the name and < in the expression.
Merge remote-tracking branch 'origin/master' into heiko-rest
BZ 742614 filter out < in messages so that the message content is not treated as html and interpreted by the browser.
Merge branch 'master' into heiko-rest
Make some tweaks to build REST nicely and also add the links library to the container build that was missing in heiko-rest branch.
Depending on the system, the schedule ids may map to other metrics, so remove the naming.
Add a note about the API not being stable.
BZ 694741 filter destinations according to user roles (and thus visible resource groups)
BZ 743559 Fix link from Inventory summary portlet to DynaGroup definitions
Add the developer group from nexus, in the hope that the jsp compiler can be found again.
Pass the RESTeasy version to the ant task that builds the container. Try to access nexus via https.
Only use the language code without country for the installer translations.
Disable JSP compilation in the hope to get the build to go again.
There are no JSPs in here. Remove that part.
Re-enable jsp compilation to see if the needed jars can be resolved now.
Add an ID column to RHQ_DRIFT_DEF_TEMPLATE in the upgrade script.
BZ 739629 - make sure ant-contrib.jar gets included.
BZ 683556 - Don't display links to pages of the old UI. That are wrong and not needed anyway.
BZ 744770 - Don't put html in the message, as the sanitizer would not allow to render it.
A few more German translations.
BZ 743221 catch some rare occurrences where not all fields were in preferences and use the default in that case.
BZ 728274 - add a message that the user needs to wait for the purge to complete before re-adding the plugin.
Add a description to the plugin descriptor.
Skip the two tests that only work on Linux instead of letting the build fail on them if not on Linux.
BZ 738642 Try to resolve ${} expressions for the management port.
Fix a small typo and add a link to the forums.
BZ 734895 cli samples no longer throw an error when being run on the command line of the CLI. Also add links to blog post that discusses them.
BZ 734592 make the details r/o for autogroups.
Some more translations
BZ 747681 Fix Microblog plugin to use the already provided keys. Also disable on initial load, as the user has to configure it before first usage.
BZ 747922 Prevent a NPE when the valuesList is null.
Add some comments + do some cleanup on the samples.
We need to check if the user has actually enabled any swap at all before checking for free swap.
Add the deprecated repo of JBoss Nexus as it is needed for Hibernate.
Bump max memory setting for surefire tests, as the old one is no longer enough in some scenarios.
Add the deprecated repo of JBoss Nexus as it is needed for Hibernate.
Add the deprecated repo of JBoss Nexus as it is needed for Hibernate.
BZ 751016 - set content type,as as7 requires this now.
BZ 751027 Skip tests if not on a RH flavor of Linux
BZ 751065 better detect the version and mark EAP servers as such.
Add some more translations.
Add the deprecated-repo of the nexus to the root pom, as this is needed in many places when the old repo.j.org/maven2 repo is not available.
BZ 736481 - Fix the missing ':' errors.
BZ 638181 Don't print server side stack traces on stdout of the CLI. Check for username + password being present before to prevent ArrayIndexOufOfBound exceptions.
BZ_715404 prevent creation of groups with duplicate names
BZ 750241 remove insufficient <http-method> entries in web.xml so that they don't trigger CVE-2010-0738 by accident.
BZ 751065 prepend "EAP " to the names of server(s) and host controllers.
BZ 751065 prepend "EAP " to the names of server(s) and host controllers.
BZ 751065 Do not prepend EAP to the resource key, as this is needed later to address the server through the api.
BZ 753177 Standardize server types for AS7 plugin
We still need the user admin page for LDAP logins. Change the error page to point to the new GWT-locations.
BZ 750240 - escape <,",>,&,',/ to prevent html injection attacks
BZ 754199 don't print to stdout/err from within plugins. Also put the discovery loop in a try-catch-block, so that one failed discovery does not prevent discovery of other processes.
Merge remote-tracking branch 'origin/master'
BZ 750849 - provide a way to dump the system information to the server log.
BZ 754838 - if no host name or port are found, use a default for now.
BZ 755544 prevent NPE when no resource or group or metric were selected.
BZ 757175 Prevent a NPE by missing directory listing rights.
BZ 757178 If we can't read the file return to prevent an Exception later.
Hudson (3):
development RHQ_4.3.0-SNAPSHOT
development RHQ_4.3.0-SNAPSHOT
tag RHQ_4_2_0_JON300_CR3
Ian Springer (150):
add more detailed logging of SQLExceptions in a couple places
tweak the metric collection intervals in the configurable-5 scenario to
[BZ 676761] add better error handling when user enters an invalid search expression on the Inventory>Children subtab (https://bugzilla.redhat.com/show_bug.cgi?id=676761)
add support for dev profile to perftest plugin's pom
[BZ 722548] add new #Test/Rpc view that can be used to invoke a new sleep() RPC
[BZ 734610] remove validator on username field that was disallowing usernames
[BZ 608798, 608803] changes to LoginView and MenuBarView to allow RHQ logos to
[BZ 735232] Message portlet should not be displayed on default dashboard in JON
include exception in logged error when adding a ResourceError fails
document what the default collection interval will default to if the defaultInterval attribute is not specified for a metric in an Agent plugin descriptor
make various improvements to the server-a resourceType used by the configurable-1 scenario, including setting up resource subCategories; add generic support to PerfTestComponent for simulating operation execution; make minor Javadoc improvement in PerfTestEventPoller
[BZ 553034] fix so Solaris lofs and tmpfs fielsystems are discovered
guard against possible NPE; extract constants for fs sys type names
[BZ 736439] prevent potential timeout of overlord session
Merge branch 'master' into feature/performance
[BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848)
[BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848)
[BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031)
[BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050)
add traits and operations to the server-a/service-a resource types used by configurable-1 scenario, and add metric and trait generators to that scenario; make SimpleNumericMeasurementFactory and SimpleTraitFactory return more realistic metric and trait values
[BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050)
[BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031)
Merge branch 'master' into feature/performance
fix minor bug where as/as5 server discovery failed to parse the --properties
fix minor bug where as/as5 server discovery failed to parse the --properties
Merge branch 'master' into feature/performance
disable footer controls on metric schedules list view after Set
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
add commented out skipTests=true prop in overrides profile
Merge branch 'master' into feature/performance
add commented lines that can be uncommented to enable JProfiler agent
update the pattern-generator plugin so it can be used to reproduce
[BZ 736517] remove unnecessary loading of grandchildren Resources in
[BZ 739529] fix a regression that was causing the group Configuration tab to
fix typo in comment
[BZ 737121] fix sorting bug for Type, Children, and Descendants columns on Resource group list views (https://bugzilla.redhat.com/show_bug.cgi?id=737121)
fix javadoc generation
remove an unused param; misc cosmetic tweaks
[BZ 736848] fix links to autogroups and cluster groups in various places where
[BZ 727869] load ConfigurationUpdate.configuration entity field lazily in order
upgrade to surefire plugin 2.10 and TestNG 6.2; use useSystemClassloader=true,
fix test failures caused by TestNG upgrade
optimize imports, in particular removing illegal import of non-public class
downgrade testng from 6.2 to 6.1.1 to prevent server-jar test failures
[BZ 734599] fix "Could not enlist in transaction on entering meta-aware object!"
disable annotation processing in default compiler plugin config
[BZ 743271] Fix LazyInitializationException that occurred when going to the
[BZ 743683] prevent NPEs in Message constructor
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 744003] log an INFO message once the Server is fully started; use
[BZ 738798] dynamically calculate RPC timeout for calls to delete-all and acknowledge-all alerts to ensure timeout is long enough when deleting or acknowledging a large number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798)
[BZ 720786] fix NPE that occurred when hovering over an ancestry cell in a ListGrid before the grid's data was loaded (https://bugzilla.redhat.com/show_bug.cgi?id=720786)
[BZ 738798] for delete-all or acknowledge-all actions on alert list views, calculate thr RPC timeout dynamically based on the total number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798)
add a ds field for "id", so the ds has a primary key field defined; optimize fetch by not specifying a priorities filter if all three priorities were specified by the user
optimize fetch by not specifying a severities filter if all five severities were specified by the user
fetch condition logs by default
on fetch requests, log the PageControl being used at debug level; also, log a warning if getFetchCriteria() returns a null criteria (since this means there would be no paging of the fetch results)
[BZ 720826] for Tables that have an initialCriteria, don't use autoFetch, since it causes the ListGrid to set the page size to 1000, rather than the specified page size, on the initial fetch request (https://bugzilla.redhat.com/show_bug.cgi?id=720826); turn off group-by by default on the ListGrid; set the max group-by records to 200, rather than the default of 1000, to prevent group-by attempts from loading too many records
[BZ 720786] fix a 2nd potential NPE in AncestryUtil (https://bugzilla.redhat.com/show_bug.cgi?id=720786)
for BZ 720826 (https://bugzilla.redhat.com/show_bug.cgi?id=720826):
update setFirstRecord(), reset(), and toString() to support the recently added optional 'firstRecord' field
hide the suggestion box when user clicks Enter in the search form item to submit a search request
[BZ 746277] on alerts list view, after a delete-all call completes, reset sorting and paging before refreshing to avoid invalid PageControl exception from occurring on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=746277); on alerts list view, call refreshTableInfo() upon failure of any action (Delete, Delete All, etc.) so Table buttons will get re-enabled; in Tables with search support, when user clicks Enter in the search form item, only submit a fetch request if the search expression has changed; in RPCDataSource, when a fetch request is initiated, reset PageControl to first page if the criteria has changed since the last fetch request - this prevent invalid PageControl exceptions on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=720490); turn down verbositoy of DEBUG logging in RPCDataSource; add new setPagingInfo method in RPCDataSource and begin refactoring subclasses to use it; add a new CriteriaUtility class containing utility methods for working with SmartGWT Criteri
[BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - invalidateCache() and fetchData() should only be called when the Table's ListGrid is DataSource-backed, otherwise NPEs occur for Tables that are not DataSource-backed; make Table and AbstractTableSection implement InitializableView so users of the class can determine when onInit() is done; when rendering an alert templates view for a particular restype, do not call renderView() on the alert templates view until its onInit() is done (this prevents a potential NPE in renderView())
cosmetic - improve a log message; remove two unnecessary null checks
[BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - do not assume this.listGrid is non-null in fetchData() callback, since if the user went off to another view before the fetch completed, the Table widget could have been destroyed by our Selenium locator infrastructure and this.listGrid could have been nulled out
was using the wrong QueryImpl class in DEBUG logging in findAlertsByCriteria() - use org.hibernate.ejb.QueryImpl from hibernate-entitymanager.jar, not org.hibernate.impl.QueryImpl from hibernate3.jar
(minor) fix bug in logic that determines whether to add a Back to List button on
[BZ 746669] make sure that Table uses getDataSource(), rather than this.datasource, when it needs its dataSource, in case a subclass has overridden getDataSource(), instead of calling super.setDatasource() (https://bugzilla.redhat.com/show_bug.cgi?id=746669)
[BZ 737191] stop grouping rows, since it can cause too many records to be fetched resulting in perf issues (https://bugzilla.redhat.com/show_bug.cgi?id=737191)
misc minor
remove redundant test-scoped hibernate-entitymanager dep (made redundant by the recently added provided-scoped hibernate-entitymanager dep); group all test-scoped deps together
optimize equals() method by adding an == check at the very top
replace clearSortingAndPaging() method in Table with a new refresh(boolean resetPaging) method, which refreshes the data, and if resetPaging=true, also resets paging; paging is reset via the listGrid.scrollToRow(), rather than the listGrid.clearSort() hack that was used by clearSortingAndPaging()
[BZ 746670] add new createListGrid() to Table to clearly separate the ListGrid
specify setInitialCriteriaFixed(false) in ResourceSearchView, and pass in
several fixes to SmartGWT-war Maven archetype
[BZ 746347] allow a user w/ MANAGE_SECURITY to edit the assigned roles of an LDAP-authenticated user if LDAP authorization is not enabled in the system settings (https://bugzilla.redhat.com/show_bug.cgi?id=746347)
update comment describing gwt.userAgent prop
upgrade twitter4j from 2.1.2 to 2.2.4 to fix compile errors in alert-microblog
[BZ 717284] prevent NumberFormatException from occurring when a non-numeric
[BZ 738325] prevent "JavaScriptException:(TypeError): listGridRecord is null"
fix compilation errors and deprecation warnings in twitter plugin
misc minor improvements
fix recent regression where Resource Inventory > Child Resources subtab was
fix recent regression that caused group Inventory > Members subtab to list all inventoried Resources, rather than just the group member Resources
reset this.initialized to false in destroy() to prevent potential NPEs if refresh() is called after a Table is destroyed
minor improvement to log messages
if any of the RPC calls fail during init, abort rendering of the editor
update all places that use the "CAM_JAAS_PROVIDER" system setting to assume its
update all places that use the "CAM_LDAP_PROTOCOL" system setting to assume its
[BZ 747678] increase the maximum number of available items listed on the left in selectors and display a warning message to the user if that number ends up being less than the total number of items in the DB (https://bugzilla.redhat.com/show_bug.cgi?id=747678)
minor - javadoc fixes etc.
various minor fixes to exception handing in our GWT RPC services
[BZ 748002] fix NPE that occurred upon hovering over the Category column (https://bugzilla.redhat.com/show_bug.cgi?id=748002)
[BZ 748003] fix NPE that occurs if RPC call to load global perms fails (https://bugzilla.redhat.com/show_bug.cgi?id=748003)
interpret this.dataPageSize == null as paging disabled
[BZ 734231] set max lengths on input fields in group definition detail view to prevent user from entering illegal values (https://bugzilla.redhat.com/show_bug.cgi?id=734231)
[BZ 734073] set max length of dashboard name input field to 200 to prevent user from entering an illegal value (https://bugzilla.redhat.com/show_bug.cgi?id=734073)
[BZ 736836] in the config editor, properly handle editing values of simple props
[BZ 748111] fix bug where when a prop became invalid, the fired prop value changed event incorrectly indicated that the set of invalid props had not changed (https://bugzilla.redhat.com/show_bug.cgi?id=748111)
fix minor bug where when a green message got replaced by a red one (or vice
simplify logic
increase timeout in test from 2s to 3s in hopes of getting it to pass in jenkins
[BZ 734064] don't allow multiple dashboards with the same name on the global
minor - make non-unique-dashboard-name error message transient
[BZ 734438] don't allow user to set the # of columns on a dashboard to 0
increase timeout of event test from 3s to 4s, since the test is still failing
[BZ 737159] fix a number of major bugs in jboss-cache resource config loading
[BZ 736836] fix recent regression caused by recent switch to using SpinnerItems
there is a bug in the RHQ criteria API, where when an unlimited
[BZ 749277] fix bug where the ""Only 1 out of 2 available items are listed -
[BZ 749654] (stopgap workaround for RHQ 4.2) for selectors with no filters, set the available record page size to 500, rather than 100, to minimize the chances of use not being able to view some available items (https://bugzilla.redhat.com/show_bug.cgi?id=749654)
[BZ 749657] display not-all-available-records-loaded warning message within selector widget itself, rather than in the main message bar (https://bugzilla.redhat.com/show_bug.cgi?id=749657)
minor - fix a couple typos
fix ordering of modules so a clean mvn install can be done from the root dir
minor - fix typo in comment
[BZ 751097] various improvements to the code used to load top-level server and
[BZ 744273] improve variable names and extract some variables to aid debugging
[BZ 701375] upgrade EMS from 1.2.16 to 1.3 in order to prevent exceptions in
[BZ 751421] fix so two ResourceTypes with same name
minor - fix a typo
[BZ 627023] use JBossEntityResolver to locally resolve DTDs and XSDs referenced in XML config files parsed by jboss-as, jboss-cache, and mod-cluster plugins - this allows these plugins to function even if the RHQ Agent cannot access the Internet (https://bugzilla.redhat.com/show_bug.cgi?id=627023)
[BZ 627023] two files I missed in my previous commit
[BZ 752239] at runtime, default to the "en" locale, not the "default" locale;
[BZ 627023] add SelectiveSkippingEntityResolver class to plugin-api and use
improve the Javadoc for getValues()
[BZ 752399] fix bug in property adapter framework that was causing datasource resource creation to fail (https://bugzilla.redhat.com/show_bug.cgi?id=752399)
[BZ 752814] fix broken detail links in recent operations portlets
[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
log message reporting invalid numeric metrics at DEBUG, rather than WARN,
filter out infinite values, as well as null and NaN values, in addNumericData()
[BZ 753264] make JNP URL discovery more robust, so it doesn't provide garbage values in certain edge cases (https://bugzilla.redhat.com/show_bug.cgi?id=753264)
add a Version field to the agent plugin and server plugin list views, but hide it by default
minor - add a TODO to add groupBy support to the Resource Install Report view once the groupBy bugs in SmartGWT have been fixed; add copyright headers to a couple classes that were missing them
[BZ 750240] comment out all Struts actions that are no longer needed by the new SmartGWT GUI (https://bugzilla.redhat.com/show_bug.cgi?id=750240)
[BZ 752893] refresh the resource-errors (yellow triangle) icon after the user
[BZ 634306] increase the max length of a product version from 50 to 100, so it
[BZ 753883] require a user to have MODIFY_RESOURCE perm on a Resource in order
improve description of "Version Name" trait
add support for authentication; reproduce profile service bug with
[BZ 712433] ProductInfo.properties file is now included in installer.war; this file is read in to determine if the current product is RHQ or JON; if JON, server properties that are not supported in JON (namely, unsupported DB types and embedded-agent related props) are not displayed in the installer GUI (https://bugzilla.redhat.com/show_bug.cgi?id=712433)
initial version of a shell script for creating a JBoss AS or EAP bundle zipfile
v2 of this script - remove the top-level jboss-as dir from the AS/EAP zipfile
minor - fix a bunch of typos
add a boolean isCleanDeployment param to deployBundle()
[BZ 726689] upgrade Javassist from 3.8.0.GA to 3.9.0.GA to prevent intermittent NPEs on JSF-based pages
[BZ 756106] ensure resource classloader is initialized in processSyncInfo() prior to making any resource component facet
[BZ 620603] turn log level down from WARN to ERROR for org.hibernate.hql.ast.QueryTranslatorImpl
minor - fix javadoc typos
Jan Martiska (1):
changed maven profiles for integration tests
Jan Martiška (1):
Add a profile for integration testing
Jay Shaughnessy (145):
[BZ 695889 - Search Bar Saved Search issues]
[BZ 733144 - links to non-default subtabs don't work]
[BZ 734034 - Saved search name should be removed from search bar after user deletes it]
[BZ 734092 - 'Discovery Queue' portlet refresh is not working on dashboard]
[BZ 34054 - Throws 'Globally uncaught exception' while adding 'Platform Utilization' on dashboard]
[BZ 733613 - Add button got disabled, if user cancel the drift creation]
[BZ 734879 - Drift display issue ... Change Sets-->Context Menu--->Details]
Some initial domain/entity for drift configuration mode (planned changes support)
Planned Drift Support - DriftConfigurationDefinition work
Change instances of History.newItem to be CoreGUI.goToView to ensure
Update Mongo plugin with drift handling mode support (still has TODOs)
comment out some debug messaging that leaked into a previous commit.
Add DriftHandlingMode filtering to DriftCriteria in order to filter out
To ensure we don't accidentally cancel our drift detection job due
Expand the drift configuration nodes by default, so you can see the
Add Drift Handling column to the drift configuration list view.
Fix the drift config list view column sort options
Protect drift detector from nonexistent base directories and throw a
[BZ 736050 - Domain jar being packaged in rhq.ear lib directory]
fix the element name to match our convention.
dbupgrade addition for drift config's drift handling mode support
Reflect in the GUI when a changeset contains planned changes. It is
Som boilerplate for group level drift tab
[BZ 736685 - cannot uninventory resource that has condition log not associated with an alert]
merge two antrun plugin sections into one with two executions
Change rhq_drift_config.mode column to rhq_drift_config.drift_handling_mode
Fix issue setting default value for enumerated value property in
Convert drift I18N properties to use updated terminology. Additionally, made
Add a drift profile that basically builds the agent, coregui and drift
More terminology changes, this time the canned dift config def.
First pass at Drift Carousel view, this is a work in progress!
Fix a variety of merge issues. Hopefully got them all.
Make sure our renamed resource field does not get wiped when sent to the
Add null protection for fileUtil.useForwardSlash()
Normalize drift file entries to use forward slash for safer comparison
Protect certain tests from the fact that windows flavors don't support
A second wave of refactor updates moving code from "drift config" to
Fix filtering issues in drift carousel
Drift Carousel Work
Drift carousel tweaks
Drift GUI Work
Drift GUI work, some cleanup
Remove the Drift snapshots subtab and the supporting tree display code.
Remove unused imports and fix some formatting
Add Eclipse dependencies for building REST interface
Complete merge work for building snapshots given the new initial
Drift Snapshot work: make sure to fetch drifts in order to calculate snapshot.
Trivial - Fix several "@{link" instances to correctly be "{@link".
Added a utility to get filename from a path string. And then realized
Protect Table against possible NPE in rare circumstances.
Add new "Pinned?" column to Drift Def List View. This indicates pinning and
Rework snapshot view to correctly get the directory-specific stuff. This
Fix issue with getCurrentSnapshot impl
Fix some broken tests.
Make sure drift def names are trimmed, both for correctness and to solve
Drift work
Split admin templates view into three parts, one for each kind of template:
merge in changes from e96159b835e481fb6059c3dd22882beeb363c084 and
Drift: Fix table column name using oracle reserved word.
Drift Admin Template Work - *not yet ready for use*
Fix issue in sequence name in the upgrade and the entity.
More incremental work on the Drift template add wizard
Finish adding support for drift definition descriptions.
One more thing to support drift definition descriptions
Started Pin to Template Work (in progress)
Fill out the Pin Template Wizard
Drift pin to template wizard wired to call SLSB.
Ensure getSnapshot returns a DriftSnapshot object. It was incorrectly
When pinning a template ensure the potential templates have the correct
BZ 734592 - Make sure when computing the tree the first time (and thus computing the name of the AG), the parent is fetched to determine the correct name for the AG.
Add support to wizard framework for skipping steps if the step returns a
make the drift pin template wizard more robust, allowing the ability
Update eclipse .classpath with new twitter4j version
fix error in twitter4j pom, it was missing a groupId element value
drift, fix a few seeming build issues and remove a few warnings
Beef up the drift pin to template wizard with more help and better titles.
trivia - remove some unused code / warnings
Dial down this new logging from ERROR to DEBUG since it seems on windows
Drift templates view work
I18N fix.
Hopefully this does not adversely affect other eclipse users. Get rid of
Fix array index issue when there are no macthing existing templates.
Add support for display of pinned snapshot for a template.
- Working version of SnapshotView for pinned template
[Bug 714277 - Consider redesigning Administration-->Templates UI]
trivial - add license header
Add findDriftDefinitionCompositesByCriteria in order to fetch a more
Change the carousel start filter from a text box to a spinner so it can
Comment out the Drift History subtab to simplify the drift
- Enhance the titles on the snapshot view to give better context
PageControl - Add ability to remove an OrderingField. With this the
- Use new DriftDefinitionComposite fetch to display information about
Drift - Move some local slsb methods to the remote
Drift fix for accidentally reassigning a drift's changeset id in
Fix snapshot directory view, removing bad assumption about what will
Drift Defs View, make sure ATTR_ENTITY is properly set for use by
Drift, fix diffs involving new and removed files.
Drift - Make JPADrift.changeSet not null. This field should never be
Add optional fetch for DriftDefinitionTemplate.resourceType
Coregui: Add the ability for the ResourceType cache to provide non-cached
Fix subtle caching issues suffered by the drift template wizards because
Coregui: add ability to get the current viewpath index. Without this
[BZ 749432 - Drift detail view navigation issues]
A post 4.2 TODO for Table
Log failures to reschedule EJB timers. If they don't get rescheduled bad
Change DriftSnapshotView to inline drift details via another level of
Fix issue in handling of non-cached metadata types in type repo. Also,
Rework drift metadata update for changes to plugin defined drift templates.
Update plugins supporting drift to use better template names
remove webservices stuff from eclipse libs, I don't think we need it for
We've already upped the pom versions in every place that the release builds
Remove the ":" character from the plugin defined drift template names as
eclipse: add new itests module's src into project source
[751091 - Resource tree fails to render for non inventory manager]
[745236 - JON3 BETA2 ...WARN messages after clean install, drift related]
[BZ 738369 - a user with "Manage Drift" permissions of "Read" (implied) cannot view Drift]
[Bug 734592 - in summary header for autogroups, Name, Description, and Recursive fields are editable and for some autogroups, the Name field contains the string "null (...)]
take webservices out of the eclipse libraries so it gets ignored.
Change some stuff around so that only the Inventory Report resource list
Remove the Drift tab from compatible group views (for the valid types).
Normalize BaseDir and Filter paths to use forward slashing. This gives
Work related to bug 753000
Initial work for db upgrade issues [Bug 751778]
Fix to QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE to ensure we
more work for [bug 753000 - Error on the initial snapshot when creating a drift profile on Windows]
make in Compliance column wider so column header isn't clipped.
[bug 669521-getting agent clients is now too restrictive]
Related to Bug 669521
[bug 750917 - Can't update a drift template]
Related to bug 753000, prevent paths and filter patterns that will
db-upgrade changes
[Bug 754382 - Login after session timeout does not (re)display the portlets on summary tab]
- make sure to protect against null *and* empty path or pattern fields
Fix oracle syntax for sequence renaming in drift upgrade.
Remove superfluous not null assignment in spec version 115. Oracle
Create new Drift Compliance Report
Integrated new drift pinned icons into code.
[Bug 755712 - Drift carousel view previous button generates exception]
[Bug 753659 - Exception thrown when clicking Back to List after pinning snapshot to template]
Add new required method to mongo drift server impl
[Bug 756171 - The UI does not have a way to see the template from which a drift definition is derived]
[Bug 754197 - When agent runs on loopback address, the advisory text is incorrect. Administration > High Availability does not exist]
Convert back to unix line terminators
[Bug 757201 - NPE in Server with drift report processing]
Make forEachFile() more efficient.
John Mazzitelli (95):
create/delete child history has its own inventory filter - will add more timeline markers for inventory shortly
add inventory data to timeline (when resource was discovered and when it was inventoried)
add drift to timeline
clean up some of the timeline
we have create-child and delete-child icons - use those rather than re-use the inventory icons
start of drift alerting support.
Merge commit 'origin/master' into drift-alert
Merge commit 'origin/master' into drift-alert
set the data directory so we don't get changesets directory outside of the target/ dir
have eclipse use skipTests when doing full builds
after we persist a drift change set, hand off the summary data to the alert condition cache manager to check to see if drift alerts need to be fired
Merge commit 'origin/master' into drift
Merge commit 'origin/master' into drift
[BZ 735230] initial attempt at alerting on drift for certain drift configs and certain pathnames of files
[BZ 735230] provide better messages in ui
Merge commit 'origin/master' into drift
fix the error log to include the stack. add debug message so we know we got the message
this gets JMS messages to flow in our test embedded container
test log4j.xml hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers
this completes the integration of JMS into the server/jar test embedded container.
start alert unit tests. this commit causes one test failure. need to fix 736685
create the server entity with a custom name so it doesn't clash with a possibly already existing default one
make test better
add test that shows bug BZ-736685
refactor to make some of the helper methods more generic
[BZ 735262] to support range alert definitions, we now have a "RANGE" conditional.
Merge commit 'origin/master' into drift
BZ 737565 - do not allow user to pick multiple conditions using the same metric if using ALL conjunction
upgrade ems version in eclipse classpath
fix version in pom
remove the Refresh button since there is nothing to refresh (the table is always fully populated)
make sure we show the proper values in the alert conditions, formatted based on their units.
trivial - clean up imports, add TODO to mark a possible duplicate class
[BZ 698600] fix UI so users can enter units and see units in alert condition UI
[BZ 698600] do some null checks, because i am paranoid
don't show the refresh button in the alert details view - they don't do anything and when you click it, they get disabled and never enabled again.
make the test group names unique from other tests so we can tell what tests created what groups
don't throw exception if a bad jobID is given, just log a message. this also fixes an error in our unit tests that couldn't clean up
rename AlertManagerBeanTest to DeleteAlertsTest - it is still disabled, some other test isn't cleaning up properly and causing bad data to be sitting in the DB that this test fails on
[BZ 738614] fix condition pretty printing - this is for email alert messages and other notifications
add configurability to the logging of the hibernate detach utility. with this checkin, the following happens:
make sure we re-enable the table buttons
this method still needs to do something - it has to set the label of the title bar, even if it shouldn't set the window title. putting some of this back.
[BZ 741691] make sure the plugin XML descriptor accepts all units that the code can support
Merge commit 'origin/master'
[BZ 681708] allow upload of bundle distro files as byte array to support CLI. note this requires the file to be loaded in memory which can cause OOM in either the server OR the CLI.
framework to get large groups. extend LargeGroupTestBase to access API to create and destroy large groups
fix the names given to the entities
trivial change to test warning message
Merge commit 'origin/master'
[BZ 737196] refactor the code that checks to see if there is an INPROGRESS plugin config update
trivial - no code changes, just correcting format
fix test utils - create resources as committed and spit out some more messages so we know the test is doing something
[BZ 737196] use JPQL to get the explicit member size, rather than using .size() to make things a bit faster
[BZ 737196] fix the queries for getting both resource and plugin config updates by adding ORDER BY clause
do unauthz testing for large group plugin config access
NPE checks
[BZ 736802] test large group resource config updates
fix eclipse classpath
[BZ 743742] first attempt at getting group members properties editor to work. looks good from the test page's group config editors.
the stack trace in message details is sanitized but this makes sure the indentation is preserved
add new scenario to perftest plugin to test all types of configuration properties
[BZ 743742] the new group member values editor
remove the {0} placeholder, we don't use that anymore for this message
[BZ 743423] canceling group membership dialog now ensures the footer buttons are re-enabled.
trivial fixes to javadoc
[BZ 683543] new confirmation messages warning user when disabling/deleting plugins
code no longer passes {0} to the message - we took out the link
there is no plugin config for the filetemplate server plugin
[BZ 747626] [BZ 747611] do not bomb out the entire master server plugin container if a single plugin fails to load. capture the error and report it, but keep going and allow other plugins to start when possible.
add javadoc to explain the version format
[BZ 748024] fix plugin upload - the file name needs to be passed to the servlet
[BZ 748511] check for null
[BZ 749824] fix login logo so it isn't clipped. we now have two logo files - one 40px high and the other 28px high (40 for login screen, 28 for top menu bar)
[BZ 749560] make it clear that "deleting" bundle entities only removes them from the DB, the remote content is not purged.
[BZ 745456] catch exceptions in the EventJSON jsp pages so we don't blow up the Timeline component
[BZ 748474] add a fixed criteria and blank out the search bar. users find this more intuitive.
[BZ 741331] turn off all plugin metrics by default, up all default collection intervals
[BZ 741331] just some very limited number of metrics to be enabled out of box - mainly in platform plugin
[BZ 741331] no metrics on by default in hardware plugin
[BZ 750224] NPE check
[BZ 741331] change default intervals
[BZ 751128] missing calltime alert stats. also adds "total cache element count" as well.
[BZ 741331] go through plugins and switch some services' metrics away from being "summary" to detail (this is the displayType attribute)
[BZ 751177] make sure the buttons in the footer are re-enabled.
[BZ 751231] delay the initial collection to avoid missing it the first time through
[BZ 751424] make sure to re-enable footer buttons
[BZ 747925] revert the changes that BZ 741331 made to the JMX plugin rhq-plugin.xml that materially affects the metadata.
[BZ 753959] do not add dup menu items
[BZ 753947] fix the selector so there isn't abnormal whitespace. Reduce the warning message so it is on a single line and add a yellow warning icon to bring the message to the attention of the user
[BZ 753585] fix group metric and ops portlets for auto-group/cluster
provide a eclipse tool to easily build GWT for dual FF/IE8 support
[BZ 754556] strip paths from uploaded file names
[BZ 755564] null check to avoid NPE. summary must be non-null as per data model
[BZ 756205] installer should go to /coregui explicitly
John Sanda (193):
Check to see if a schedule has been removed before sending change set to server
Updating clean up code in DriftManager to not delete files until streams are closed
[BZ 732078] Adding support for detecting "viewable" files
Enable drift configurations by default
Package sample/demo scripts with CLI
[BZ 734194] Check that content is loaded in db on drift details view
fixing test failures
[BZ 734842] Adding more detailed logging around drift detection
[BZ 734814] Adding docs
[BZ 734881] Need to check for empty content because oracle blobs don't handle it
Fixing syntax error
Override default tmp directory used during gwt compilation
Update the resource container when a drift config is deleted
Adding support for syncing drift configs when agent starts with --cleanconfig
Detect deleted drift configs during inventory sync
Fix test failure
No need to reschedule drift configs that have not changed
Add change set version to headers in change set report
Removing commented out, obsolete code
fixing test failure
Adding more detailed logging
Do not purge change set directories for configs that have not been deleted
Adding more logging around drift detection and inventory sync
Filter queue by resource id when checking for deleted configs
Refactoring drift config sync code out of InventoryManager
adding javadocs
Update test/example to write and read file using GridFS
Initial commit for FileDAO and FileDAO test
Have the agent track and store the change set version number
Updating test to set change set version from headers
Merge branch 'mongodb-drift'
Set the change set version from the headers
Updating MongoDB drift plugin to store file contents.
Adding more drift criteria query support
Adding more drift criteria query support
First pass at using $slice operator to fetch drift entries by id
Adding error handling logic on the agent during drift detection
Server now sends acknowledgement to agent when change set content is persisted
Scan for change set content at start up that needs to be resent to server
Resend change set content during inventory sync
[BZ 727959] Check to make sure files are readable during drift detection
First, (very) rough cut of support for pinned snapshots
Merge branch 'master' into pinned-snapshot
more merge clean up
Merge branch 'master' into mongodb-drift
Adding support for fetching drift entries by id using the $slice operator
Adding more filterin support for drift criteria queries
Adding initial suport for filtering on change set and entry fiels in drift criteria queries
Adding better support for filtering change set entries in memory
Adding support for filtering on creation time and path for drift criteria queries
Merge branch 'master' into pinned-snapshot
Adding a new change set header, "repeated"
Refactoring file permission logic into a help method
Updating logic for drift detection with a pinned snapshot
Updating inventory sync logic to handle pinned snapshots
Updating drift def comparator and tests to handle new pinned snapshot fields
Merge branch 'master' into pinned-snapshot
Removing repeat change set header as it is not needed
updating dbupgrade with new columns for rhq_drift_config table
fixing dbupgrade error
Initial commit for DriftDefinitionTemplate
Updating usage of ResourceType.driftDefinitionTemplates
Updating dbupgrade with rhq_drift_def_template table
Adding assocation between DriftDefinition and DriftDefinitionTemplate
Refactoring the template <---> definition association
fixing dbupgrade script with template id column in drift_config table
Iniital commit for DriftSet entity
Adding rhq_drift_set to dbupgrade script
adding some docs
Updating javadocs and adding logic for accessing drifts of the initial change set
Removing pinned version from drift definition data model
Updating logic JPADriftServerBean to use JPADriftSet for initial change set
Updating logic for querying change sets.
Adding javadocs
Refactoring snapshot generation logic in DriftManagerBean
Merge branch 'master' into feature/drift
Initial commit for DriftDefinitionTemplate
Updating usage of ResourceType.driftDefinitionTemplates
Updating dbupgrade with rhq_drift_def_template table
Adding assocation between DriftDefinition and DriftDefinitionTemplate
Refactoring the template <---> definition association
fixing dbupgrade script with template id column in drift_config table
Iniital commit for DriftSet entity
Adding rhq_drift_set to dbupgrade script
adding some docs
Updating javadocs and adding logic for accessing drifts of the initial change set
Removing pinned version from drift definition data model
Updating logic JPADriftServerBean to use JPADriftSet for initial change set
Updating logic for querying change sets.
Adding javadocs
Refactoring snapshot generation logic in DriftManagerBean
Removing createSnapshot method.
fixing test failure and dbupgrade script typos
fixing another dbupgrade error
Stubbing out test code temporarily
fixing test failure
fixing more dbupgrade errors
First pass at SLSB code creating a drift template
Merge branch 'master' into feature/drift
Attemmpting to fix test failure
Adding description field to DriftDefinition
Debugging jenkins test failure
Attempting to fix test failure that may be due to a surefire bug
fixing oracle dbupgrade error
First pass at SLSB code creating a drift template
fixing oracle dbupgrade error
Hopefully resolving weird test failure
Refactoring drift db set up/tear down code into common base class
Merge branch 'master' into feature/drift
Add temlateDefinition property to DriftDefinitionTemplate
Updating drift meta data parser to use new templateDefinition property
fixing tests
Initial commit for DriftDefinitionTemplateCriteria
Fixing drift template criteria filters
Adding some test and preliminary code for updating templates
Set directory property of Drift entity so that we have better test coverage
Adding server side logic for pinning snapshots
re-enabling test
send request to agent to pin snapshot in DriftManagerBean.pinSnapshot
[BZ 738346] handle non-existent base directory during drift detection
fixing tests that broke as a result of db table name change
fixing logic for persisting pinned snapshot
fixing failing test
trying to get drift server tests passing on hudson
Attempting to clean up, simplify tests
Initial server support for pinning a drift template
fixing mistake from merge conflict
more post-merge clean up
drift handling mode flag was wrong on the change for the pinned template
Updating and adding tests in JPADriftServerBean
Adding initial impl of JPADriftServerBean.copyChangeSet
Changing signature of createTemplate so that it returns the template
Call EntityManager.persist to get id for template returned from createTemplate
Removing redundant call to EntityManager.persist
Copy the pinned snapshot when definition is created from pinned template
Addding support for generating snapshot for definition created from pinned template
Adding support for generating snapshot that is not tied to a defnintion
fixing logic for generating snapshot when creating drift definition
Only look at directory specs when generating list of templates for wizard
Pass the right template to the server when pinning a snapshot
Initial support for propagating changes to defs when pinning a template
Adding attached flag to drift definition
Set the template reference of definitions when pinning a template
Do not modify detached definitions when pinning a template
Fixing bug in resource-level pinning
first pass at template deletion
Adding inital support for updating templates
Do not allow template name to be changed
Adding support for updating template fields that can be modidied.
Propagate template updates to attached definitions
Adding test to verify that template updates are not propagated to detached definitions
Fixing bug where I was passing an attached entity to the agent
fixing another detached/persist exception
Handle detached definitions when deleting a template
[BZ 749415] Control drift def fields that are rendered and editable
fixing/updating tests
[BZ 749415] check the right entity context to determine which drift config def to use
Temporarily disabling drift tests due to test dependency issue
fixing failing tests
[BZ 749415] Making the pinned field editable
Initial commit for integration-tests module
Renaming module integration-tests to itests
removing unnecessary dependencies
no longer need to exclude drift tests in server/jar
upping module version
fixing compilation errors that resulted from itests refactoring
fixing mbean interface name that was causing test failures
[BZ 749899] Adding support for deleting drift templates
[BZ 750895] Update the attached field when the definitions configuration is updated
[BZ 750886] drift detection needs to handle resource going back into compliance
[BZ 738404] Disable 'Detect Now' button for disabled definitons
Do not enlist the SLSB call in the same txn context as the MDB
[BZ 7517474] Initial support for tracking compliance
[BZ 7517474] Adding compliance field to drift definitions view
[BZ 7517474] Incorporate missing base directory into compliance
[BZ 7517474] Updating compliance status when a definition is unpinned
[BZ 751914] Show compliance at the resource type level
[BZ 751914] Adding compliance column to resource list table
Make sure streams are closed
[BZ 753000] Normalize on using forward slashes in path names
[BZ 749419] Do not allow pinned definition to be re-pinned
[BZ 749419] We still want to allow pinning a snapshot to a template
make sure file streams get closed
[BZ 753827] Do not allow templates to be created with duplicate names
Make DriftTemplateManager available to server-side scripts
[BZ 753827] Fixing regression for pinning snapshot to existing template
Adding method to retrieve drift content as byte array
Fixing issue with duplicate snapshot getting reported
Handle agent being down when pinning snapshot to definition
[BZ 757758] Adding logic to filter out binary content
[BZ 757758] make property name/values consistent with other server properties
[BZ 755073] Do not display the view link for binary files
[BZ 757958] updating script to work with current APIs
Larry O'Leary (1):
Bug 736792 - CLI retrieveBackingContent gives a file not found exception on the agent
Lukas Krejci (41):
Merge branch 'master' into code-smell
Merge branch 'master' into code-smell
BZ 707669 - The bundled native augeas libraries have been bumped to version 0.9.0.
BZ 707669 - Forgot to check in the plugin-container pom that actually fetches the augeas-native as its dependency.
BZ 737996 - Working around the property names inconsistency in the clustered web app contexts.
Added support for using the import configuration specified in the export
Some amendments to the perftest-support database state export algorithms:
BZ-735810 - make sure to reload the system config cache after its update.
BZ 740582 - generate correct group URLs in the JSF-based metric graphs page in various contexts.
BZ 743632, BZ 634648
Generics cleanup and formatting
BZ 743379 - Make sure to initialize the script engine with as much bindings
Added support for calling overloaded methods using the global indirection
BZ 711502 - make sure the availability collectors are initialized before any resource component is started.
BZ 728292 - Restore the behaviour from RHQ3 where we showed just an info
BZ 745488 - make sure the JSP and JSF resource name disambiguation components generate links to GWT GUI.
BZ 730335 - The system properties are now actually enumerated so that no other property names are possible. The values are validated at 2 places.
Fix the config-sync tests.
some more hardening of system settings validation.
fixing the server/jar unit tests to account for the fact that the system manager now depends on there being drift server plugin service installed and running to be able to determine the installed drift plugins.
Renaming SystemProperty to SystemSetting.
Fixing the messed up merge of SystemProperty -> SystemSetting renaming.
BZ 747709 - Making the user editor show itself for non-admin users.
SystemManagerRemote.getSystemConfiguration() now returns data in the same
Adding support for mocking the drift server service to the PluginContainerTest.
Making the LdapGroupManagerBeanTest pass...
DataPurgeJobTest now passes
Formatting
BZ 687992 - A final touch on making the apache config file parsing
BZ 717787 - Making sure augeas is only ever used if the apache resource
BZ 697585 - A better warning message if an absolute path of httpd
BZ 698474 - Work around the limitations in PIQL so that we don't try to
[BZ 749126] - Loosening validation requirements on import.
[BZ 751765] Use the correct classloader for obtaining the bundled lens files
[BZ 751246] - Sample scripts for deploying apps to JBAS.
[BZ 753225] - removing the unused "directive index" property from
[BZ 751246] - do NOT include implicit resources in the list of resource
[BZ 688800] - More robust detection of EWS tomcat installation dirs.
[BZ 754968] - making quoted arguments work with CLI on *nix.
[BZ 690957] - EWS Tomcat is identical to "normal" tomcat when installed through RPM (at least wrt system services installed)
[BZ 755653] - Make sure role membership is not updated through
Rafael Soares (5):
still working on pt translation...
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
adding OAuth support to microblog alert-sender plugin
adding OAuth support to microblog alert-sender plugin
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Robert Buck (52):
Add rpc timeout capability so users can specify an override timeout via query string parameters. The new query string parameter is rpcTimeout, the type an integer, and the units are expressed in seconds.
Re rpcTimeout, trap numeric exceptions and fallback if a user does not provide an integer value.
Merge branch 'master' into rbuck/rpctimeout
[BZ 722600] Add index to RHQ_MEASUREMENT_SCHED.RESOURCE_ID column as recommended by Oracle EM to improve performance.
Hide Eclipse plugin .metadata directory from Git.
[BZ 726524] Consider adding an index for the RHQ_ALERT_CONDITION_LOG.CONDITION_ID to optimize queries.
Merge branch 'master' into feature/performance
Merge branch 'master' into feature/performance
Merge branch 'master' into feature/performance
Merge branch 'master' into feature/performance
Merge branch 'master' into code-smell
[BZ 726434] Fix io stream resource leak; also fixed a javadoc issue that caused code-red.
[BZ 726435][coverity 13283] Fix Coverity identified RESOURCE_LEAK; close some IO streams.
[BZ 726435][coverity 13112, 13113, 13276, 13277, 13041, 13025, 13005, 13012] Fix Coverity identified RESOURCE_LEAK; close some IO streams.
[BZ 726435][coverity 13231,13284,13288,13343,13344,13361,13417,13424,13504,13521,13527,13542,14054] Fix Coverity identified RESOURCE_LEAK; close some IO streams.
[BZ 726435][coverity 13171] Fix Coverity identified REVERSE_INULL. Fix unnecessary boxing of '0' to Integer object returns.
[BZ 726435][coverity 13546 12979 12996] Fix Coverity identified FORWARD_NULL. Also, fixed several bitwise-and uses on booleans, switching to logical-and.
[BZ 726435] Fixed several bitwise-or uses on booleans, switching to logical-or.
[BZ 726435][coverity] Fix Coverity identified RESOURCE_LEAK; close some IO streams.
[BZ 726435][coverity 13064, 13106, 13115, 13231, 13232, 13283, 13346] Fix Coverity identified RESOURCE_LEAK; close some IO streams.
merged
Merge branch 'master' into feature/performance
Merge branch 'master' into feature/performance
[BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s.
oracle em cites lots of open cursor issues; fix open cursor leaks by closing result sets and prepared statements in finally blocks.
[bz 734599] fix schedule update changes per code review
[bz 734599] fix schedule update changes per code review; added doc and renamed method
[BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s.
[BZ 734599] Change notification of schedule updates to agents so it uses quartz; use unique quartz job and trigger names to avoid conflicts.
merged master to feature/performance
merge master to code-smell
revert some inlining; some folks seem to prefer non-inlined returns as a breakpoint spot
revert inlined returns to non-inlined returns so folks can place a breakpoint on the return
Merge branch 'master' into code-smell
[BZ 741971] Agent measurement schedules list becomes broken after a change on the UI; the resource container code replaced the prior collection with the subset. Instead, we simply need to update (always).
remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods
remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods
Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse.
[BZ 721121] Fix IO stream resource leak.
[BZ 721117] Fix IO stream resource leak; I fixed this previously, but as I was in here I fixed a few minor issues, making it code-green.
Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse.
fix an obvious mistake in some old code; missing a throw before construction of an exception type
[BZ 736802] Improve displayed message in GUI when outstanding autogroup async configuration updates are pending.
[BZ 720794] Decrease user perceived latency when importing lots of resources by scheduling all server-agent communication as a background quartz task.
[BZ 728547] Make SEQID cache sizes configurable; the new solution supports NOCACHE and CACHE semantics, it supports factory default sizes; for cases where factory default sizes are larger than the previous default value of 10, we opt for the factory default sizes.
[BZ 751873] Prevent JBoss log spew and undeploy issues; w/o this fix after a bundle is deployed to an EAP cluster and a war is updated, it is no longer possible to undeploy via rm -fr on the command line.
[BZ 748483] Make dbsetup sequence id cache size configurable.
[BZ 748483] Make dbsetup sequence id cache size configurable. Here the fallback size is the legacy value of 10 when unspecified.
[BZ 751065] - Add EAP monicker to EAP6 server resource names.
[BZ 751065] - Add EAP monicker to EAP6 server resource names.
Merge branch 'bug/751065'
add support for authentication; reproduce profile service bug with
Simeon Pinder (34):
[maven-release-plugin] prepare for next development iteration
disabling mongodb server side plugin for a)cause problematic brew
Merge branch 'release_jon3.0.0-test-build' of ssh://git.fedorahosted.org/git/rhq/rhq into release_jon3.0.0-test-build
[maven-release-plugin] prepare release RHQ_4_1_1-BETA1
[maven-release-plugin] prepare for next development iteration
Revert "[maven-release-plugin] prepare for next development iteration"
Disabling 'plugindoc' plugin which generated DocBook and Confluence docs off the plugin.xmls. Causing brew dependency issues and doesn't appear to be used.
-applying missing brew patches to master. Somehow these got lost in translation.
Merge branch 'jon3_test-build' into track_master4
removing JAVA5 backwards compatiblity support. Only commenting out logic as similar logic needed for JDK6 vs JDK7 in the near future.
also removing JAVA5 logic from publish_release. Same reason as earlier commit.
reverting back to SNAPSHOT version.
inserting missing profile. Make sure release number gets included in
BZ:733019: changed i)plugin display name to be more consistent with AS4 and AS5
refactor to use one build-property file.
Update to use the right build property for brew.
BZ 736077: applied patches from bz and one other fix(to disable TitleBar from hardcoding RHQ) to get JON and not RHQ in browser titles.
BZ 735403 : repackaging to avoid signed jar issues causing ClassNotFound errors.
Reverting CustomJaasDeploymentService logic to use string values again.
use exact matching value check.
BZ 747995: Making findSubjectByName deterministic by enabling strict query criteria for usernames.
trivial comment cleanup.
BZ 707047: merging LDAP group member search escape logic to master.
disable test for now. Needs more work.
BZ 748966: moving LDAP test and utils into server/jar instead.
Fixing productization issue for new LDAP registration.
[BZ 746658] reverting RHQ-1415 as it lays down unsigned elements to file system which breaks signed builds for portal.war.
moving build number logic out of profiles and back into core build since brew now supports access to git exe.
[BZ 753211] removing remote agent install from non-rhq builds.
[BZ 731864] Enable Tags removal from RHQ. Requires CoreGUI enable/disable in src, but rest is maven command line parameter configurable.
Fixing a number of lingering productization strings.
[BZ 743986] insert branded content in mashup portlet for product releases.
missed a translation file.
add tag removal parameters for enterprise runs.
Stefan Negrea (142):
Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder.
Add jar dependencies for testing with JBoss 5&6.
With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests.
Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file.
The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings.
Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x
Renaming mod_cluster components to match their explicit purpose.
More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type.
Added the proxyInfo metric back to Catalina service context since it is readly available.
Small refactoring and code formating change to make the class easier to read and understand.
Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder.
Add jar dependencies for testing with JBoss 5&6.
With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests.
Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file.
The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings.
Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x
Renaming mod_cluster components to match their explicit purpose.
More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type.
Added the proxyInfo metric back to Catalina service context since it is readly available.
Small refactoring and code formating change to make the class easier to read and understand.
Merge branch 'mod_cluster_plugin' of ssh://git.fedorahosted.org/git/rhq/rhq into mod_cluster_plugin
Merge branch 'mod_cluster_plugin'
Moved private method at the bottom fo the file to follow standard java file structure.
Add property persistance functionality to catalina JMX listener for mod_cluster by saving the configuration directly into the server.xml file.
All the node lists are zero based index. Fixing for the incorrect indexing of lists.
Refactoring configuration file classes to accept files in the constructor to allow testing. Also, added basic configuration files for testing.
Merge branch 'mod_cluster_plugin'
BZ728621 - The correct procedure to update mod_cluster properties for JBoss 42 is:
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ729051 - Extended the default MBean resource component implementation to support TimeUnit arguments.
BZ727963 - Updated the code to declare the logger locally before using it. The logger declared at parent level was issuing usage warnings on the agent container.
BZ733775 - Update the plugin configuration file to have correct descriptions for each service available. Also added a new class to verify the availability of a className mbean resource.
Add proxy information metric to make the mod_cluster component dyna group friendly for complex queries (eg. group based on httpd proxy).
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ684320 - Updated permissions only for the zip archives of server and agent to 744.
BZ684320 - Updated default permissions one more time to match JBoss AS defaults.
Clip an unnecessary system.out statement that was forgotten from unit testing.
Adding wsprovide to the list of libs for Eclipse.
Abstract and simplify a couple of portions of the publish release script.
No need to cleanout maven repos from within the script. This should be done at system level.
Move more parts around to allow function declarations at the start of the script.
Move argument validation to its own function.
Maven purge interval no longer needed.
Moving environment variable setup into its own function.
Integration tests for mod_cluster should be run on JBoss AS6 Final going forward.
First set of wildcard generic updates. The change was mainly done in the plugin-api module but updated all the code directly affected by the change.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
More wildcard updates propagated upwards from the agent api.
More refactoring for the publish and release scripts.
Added two ignores required by the release scripts to prevent environment files to get committed to the repo.
One more ignore added to git to avoid committing files used only for ci.
Merge branch 'master' into mod_cluster_plugin
Format messy pom.xml file in preparation for more updates.
Enable mod_cluster plugin for Tomcat. Also added a couple of integration tests for the resource.
Add SSL configuration for JBoss 5.x and 6.0. Without this configuration the SSL boolean property is not usable.
Take out the settings file from the actual release script. No reason to override anything, the settings have should have been pre-configured to support a release.
Move environment setup in a function to make the code more readable.
Removed the git cloning option from the scripts. The scripts do not exist unless the git repo was already cloned.
Update the git script to function on the assumption that the current folder is a git folder and the folder to build from.
Replace maven release plugin with versions plugin. Also removed all the code that will not be use going forward.
Added documentation for existing functions. Also, done a little refactoring to make the main script more legible.
Introduce the concept of script mode and add it to the command line arguments.
Abort the script if local or remote tags already exist. This should never happen regardless of the script mode.
Added rough tagging and versioning algorithm for cases when tagging is the only operation to be performed.
Small updates to get the script ready for live test runs.
Make an explicit call to pull the release branch and not the entire repo.
Updating if/then statements after a bash syntax error.
Remove WORKING_DIR concept, the current folder is working folder. Simplify the assumptions for maven to run either Hudson or default local methods.
The work is done on the build branch, so push the build branch when everything is done.
Update the code to remove local tags. If the tag is just local that means there were errors during the build process and the tag was published.
Add code to push the tag too. Since the original push was just for the build branch the tag was not pushed to the git.
Added standard option parsing to the script. Updated the usage text.
Create a function for tag verification. A couple more updates to make the script more readable.
Move some sections of code to applicable functions to clean the main script flow.
Moved the release info to its own function. Updated the script documentation and formatting.
Moved the last two pieces of the release script into functions.
Split the tagging and development version updates into two separate functions.
Verify the tags before doing anything.
Add support for branching for release.
Add support to change the development version on the originating branch.
A couple more updates and cleanup around variable setup.
Simplify tag only option to just tag.
Make the community release default.
Added scm-strategy as a supertype for branch and tag options to accommodate running this script from Hudson.
Updated script mode options to support Hudson builds by adding a supertype. Also, changed the default script mode to the more conservative test value.
Take into account the script mode before updating the release branch for developments updates.
Minor formatting updates to replace tabs with spaces.
Updates to the usage text after updating the actual option parsing.
Git username no longer need after all the updates and changes to the initial script assumptions.
First, perform a clean install instead of clean and then an install.
Added an option to allow users to augment the set of maven profiles used by the script.
Fix a small variable naming mistake.
Enable tests for the maven builds run from this script.
Cleanup local variables that are no longer needed. Moved variables next to the context where they are used.
Updated function names to be more descriptive of what they do.
Move abort function to the common library. The function is identical in the two scripts.
Create local maven folder and explicitly set it in the maven arguments.
Added a script option to be enable maven debug mode.
Modified sed to replace dots and dashes with underscore for the tag version.
Fix a syntax error.
Merge branch 'stefan/release_updates'
Merge branch 'mod_cluster_plugin'
Added comments for each function in the bash library.
The script was testing the wrong directory before attempting to create the maven local repo dir. This was a non-issue because the hudson workspace was empty.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ564514 - Updated the JMX plugin code to gracefully handle the case when the ems connection is null due to missing JMX credentials. Also, updated mod_cluster plugin code that was using a similar implementation of loadBean method.
Update usage of generics after refactoring loadBean method.
BZ564543 - Updated the description for Script Prefix to clarify the concept.
Replaced unreliable and recursive resource discovery method with a linear tree traversal method.
Updated script usage documentation, extra profile was missing argument.
BZ564538 - Removed broken View link from the Content page since the functionality is not supported. Also, removed a relative path link that was pointing to the old UI.
Make the entire path to mod_cluster configuration file configurable by the user.
Add debug mode support to the bash library.
Update script to avoid platforms compatibility issues.
Add debug mode support for the release script.
Add parsing for debug mode.
Activate profiles in a consistent order with other the build environments.
Update the publish script to use a maven repo folder under the workspace folder.
Checkout the release branch regardless...
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Revert "development RHQ_4.3.0-SNAPSHOT"
Avoid having the settings file wiped out because of git clean commands.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Add tag override to the release script to replace an existing tag with this new one.
Improve release script output/debug by echoing the function being executed.
Echo out the steps being executed by the complicated release specific functions to facilitate debug.
Add workspace override option to better facilitate local script runs.
Move publishing code out of the release script. The code is commented out in the publish release script to include it at a later time.
When branching the name of the branch should be similar to the release version and not tag version.
[BZ 743437] Transformed Type Mapping into a simple text box. All the other implementations considered are currently not supported by the underlying structure.
[BZ 743437] Add default type mappings to the property description to make it easier for users to select a predefined type mapping.
Remove Git ignores for essential Eclipse files.
Added a pull from origin right before pushing changes. The script will fail in the event a manual merge is required.
Make push commands to use explicit refs for branch and tag disambiguation. Also simplify the checkout command to allow automatic branch name resolution.
Remove version information from the actual plugin descriptor.
Remove all the scm tags and related properties from the poms. The tags are no longer in use.
Removing the last maven scm and release references.
[BZ 747430] Add support for loading help view content from product info file.
[BZ 747430] Update the code that defaults the icon to document.png to check for nulls. The exception path is specific to I18N implementation.
Have a fallback method if the remote branch is already tracked in the local repo.
Make the output a little bit nicer by adding a function execution marker.
Ted Won 원종석 (4):
First batch of Korean translations for the installer.
More translations for Korean language
More Korean translations
Final translations to Korean. Make them display via charset = UTF-8
---
.classpath | 18
.gitignore | 7
.settings/org.eclipse.jdt.ui.prefs | 236
dev/null |binary
etc/apt/pom.xml | 11
etc/cli-scripts/drift.js | 164
etc/cli-scripts/measurement_utils.js | 134
etc/cli-scripts/util.js | 95
etc/dev-utils/setup-rest/setup.sh | 17
etc/eclipse-tools/maven/RHQ | 37
etc/m2/settings.xml | 11
etc/m2/smartgwt-war-archetype/pom.xml | 29
etc/m2/smartgwt-war-archetype/src/main/resources/archetype-resources/pom.xml | 23
etc/samples/perspectives/sample-perspective/app/pom.xml | 7
etc/samples/perspectives/sample-perspective/perspective/pom.xml | 2
etc/samples/perspectives/sample-perspective/pom.xml | 9
etc/samples/provisioning/sample-bundle/pom.xml | 5
etc/samples/skeleton-plugin/pom.xml | 2
etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml | 5
etc/scripts/create-jbossas-bundle.sh | 95
modules/cli-tests/pom.xml | 2
modules/common/ant-bundle/pom.xml | 12
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 18
modules/common/drift/pom.xml | 12
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java | 35
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java | 7
modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java | 5
modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java | 19
modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 44
modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java | 31
modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java | 59
modules/common/filetemplate-bundle/pom.xml | 12
modules/common/jboss-as/pom.xml | 17
modules/common/pom.xml | 9
modules/core/client-api/pom.xml | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java | 68
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java | 11
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/DriftMetadataParser.java | 41
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java | 43
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 16
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java | 95
modules/core/client-api/src/main/resources/rhq-configuration.xsd | 15
modules/core/client-api/src/main/resources/rhq-plugin.xsd | 44
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 27
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/PluginMetadataParserTest.java | 143
modules/core/comm-api/pom.xml | 11
modules/core/dbutils/pom.xml | 16
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java | 24
modules/core/dbutils/src/main/java/org/rhq/core/db/H2DatabaseType.java | 9
modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java | 10
modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 16
modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java | 9
modules/core/dbutils/src/main/java/org/rhq/core/db/SQLServerDatabaseType.java | 18
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/DbAntI18NResourceKeys.java | 7
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SST_CreateSequence.java | 22
modules/core/dbutils/src/main/java/org/rhq/core/db/builders/CreateSequenceExprBuilder.java | 265
modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Column.java | 22
modules/core/dbutils/src/main/java/org/rhq/core/db/setup/H2Column.java | 9
modules/core/dbutils/src/main/java/org/rhq/core/db/setup/OracleColumn.java | 8
modules/core/dbutils/src/main/java/org/rhq/core/db/setup/PostgresColumn.java | 7
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 77
modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd | 1
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml | 5
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 457 -
modules/core/dbutils/src/test/java/org/rhq/core/db/AbstractDatabaseTestUtil.java | 2
modules/core/dbutils/src/test/java/org/rhq/core/db/DatabaseTest.java | 16
modules/core/domain/pom.xml | 21
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 61
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 15
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionDriftCategoryComposite.java | 40
modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionRangeCategoryComposite.java | 48
modules/core/domain/src/main/java/org/rhq/core/domain/common/EntityContext.java | 20
modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 200
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSettings.java | 100
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdate.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 5
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PluginConfigurationUpdate.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractGroupConfigurationUpdateCriteria.java | 8
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BaseCriteria.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetCriteria.java | 159
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftConfigurationCriteria.java | 87
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftCriteria.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java | 96
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java | 63
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java | 67
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftCriteria.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupPluginConfigurationUpdateCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupResourceConfigurationUpdateCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java | 111
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java | 53
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/drift/Drift.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java | 63
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSetCategory.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java | 37
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComposite.java | 33
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java | 390 -
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java | 136
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 339
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java | 543 +
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComparator.java | 162
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComposite.java | 60
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java | 285
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDetails.java | 126
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java | 184
modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshotRequest.java | 187
modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java | 141
modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftSet.java | 69
modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftDTO.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java | 584 -
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginKey.java | 23
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlDefinition.java | 73
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlResults.java | 93
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 58
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 57
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java | 39
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceTypeTemplateCountComposite.java | 19
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 31
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/sync/ImportReport.java | 44
modules/core/domain/src/main/java/org/rhq/core/domain/util/PageControl.java | 44
modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java | 15
modules/core/domain/src/main/java/org/rhq/core/domain/util/UnlimitedPageControl.java | 2
modules/core/domain/src/main/java/org/rhq/core/server/EntitySerializer.java | 29
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java | 298
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDataAccessTest.java | 62
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTemplateTest.java | 326
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTest.java | 397 +
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java | 52
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftSnapshotTest.java | 469 +
modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 157
modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java | 390 -
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 2
modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java | 4
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 2
modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 13
modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 5
modules/core/gui/pom.xml | 15
modules/core/native-system/pom.xml | 69
modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java | 6
modules/core/plugin-api/pom.xml | 52
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java | 24
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ClassLoaderFacet.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ManualAddFacet.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceComponent.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 14
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryContext.java | 13
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/measurement/MeasurementFacet.java | 37
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java | 27
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/SelectiveSkippingEntityResolver.java | 80
modules/core/plugin-container/pom.xml | 20
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 20
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java | 26
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java | 45
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java | 18
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java | 22
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSummary.java | 108
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 547 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java | 28
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftInputStream.java | 93
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 618 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/FilterFileVisitor.java | 8
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java | 72
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java | 144
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java | 174
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizer.java | 92
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizerFactory.java | 37
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/RuntimeSynchronizer.java | 140
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/StartupSynchronizer.java | 137
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryFile.java | 23
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 199
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 29
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 9
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java | 27
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java | 32
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 24
modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/History.java | 23
modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 28
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java | 25
modules/core/plugin-container/src/test/java/org/rhq/core/pc/PluginContainerTest.java | 51
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java | 24
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java | 44
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java | 747 +-
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java | 26
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java | 279
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java | 74
modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 11
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java | 130
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeFailureHandlingTest.java | 96
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeProgressHandlingTest.java | 19
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/DiscComponent.java | 14
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/ResComponent.java | 14
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseDiscoveryComponent.java | 2
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseResourceComponent.java | 54
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseUpgradingDiscoveryComponent.java | 10
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/NothingDiscoveringDiscoveryComponent.java | 3
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/DiscComponent.java | 4
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/ResComponent.java | 4
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/DiscComponent.java | 8
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/ResComponent.java | 4
modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java | 10
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 38
modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDocGenerator.java | 14
modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/VelocityTemplateProcessor.java | 14
modules/core/pom.xml | 14
modules/core/util/pom.xml | 12
modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java | 9
modules/core/util/src/main/java/org/rhq/core/util/PropertiesFileUpdate.java | 24
modules/core/util/src/main/java/org/rhq/core/util/ZipUtil.java | 33
modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 80
modules/core/util/src/main/java/org/rhq/core/util/jdbc/JDBCUtil.java | 15
modules/core/util/src/main/java/org/rhq/core/util/maven/MavenArtifactProperties.java | 6
modules/enterprise/agent/ant-run.xml | 15
modules/enterprise/agent/pom.xml | 49
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 4
modules/enterprise/agentupdate/pom.xml | 8
modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/AgentUpdate.java | 25
modules/enterprise/binding/pom.xml | 108
modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 101
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 25
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 8
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManagers.java | 73
modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/JsEngineInitializer.java | 43
modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/ScriptEngineInitializer.java | 15
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/NoTopLevelIndirection.java | 41
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssert.java | 1
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java | 12
modules/enterprise/comm/pom.xml | 7
modules/enterprise/gui/base-perspective-jar/pom.xml | 7
modules/enterprise/gui/base-perspective-war/pom.xml | 7
modules/enterprise/gui/content_http-war/pom.xml | 11
modules/enterprise/gui/coregui/pom.xml | 42
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 66
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 80
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 172
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 97
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java | 152
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java | 409 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java | 252
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java | 372 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java | 437 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 624 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 81
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 213
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 228
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 188
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 375 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 67
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 197
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 362 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 43
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 124
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 563 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 74
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 216
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 1121 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselMember.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselWidget.java | 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 151
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 616 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java | 121
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java | 112
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AuthorizedTableAction.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/StringIDTableSection.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 355
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PluginFileUploadForm.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardContainer.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 71
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 22
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupGraphPortlet.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 80
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/RecentDriftsPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeDataSource.java | 212
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeView.java | 419 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 255
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 421 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftChangeSetsView.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationDataSource.java | 268
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationEditView.java | 194
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationView.java | 240
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java | 44
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 456 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 198
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java | 312
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 186
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 211
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java | 284
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 267
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDataSource.java | 200
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java | 82
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 531 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeDataSource.java | 84
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeView.java | 99
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftConfigurationView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddConfigWizard.java | 93
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddDefinitionWizard.java | 104
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftPinTemplateWizard.java | 110
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizard.java | 159
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardConfigStep.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java | 193
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 111
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java | 157
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java | 166
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java | 126
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java | 238
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DriftGWTService.java | 90
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/PluginGWTService.java | 189
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TestGWTService.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 22
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 111
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/AbstractGroupCreateWizard.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 90
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 93
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 229
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java | 206
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java | 176
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 176
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java | 178
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryView.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 235
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java | 301
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java | 191
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 71
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java | 78
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRpcView.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CriteriaUtility.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/GwtRelativeDurationConverter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementConverterClient.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 139
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/GwtMeasurementConverter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/MeasurementParser.java | 121
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AgentGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertTemplateGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleDistributionFileUploadServlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ClusterGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DashboardGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DriftGWTServiceImpl.java | 155
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/FileUploadServlet.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupDefinitionExpressionBuilderGWTServiceImpl.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementScheduleGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginFileUploadServlet.java | 113
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginGWTServiceImpl.java | 508 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RepoGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceBossGWTServiceImpl.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TagGWTServiceImpl.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TestGWTServiceImpl.java | 43
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 318
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1372 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 306
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 431 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 294
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 6
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 16
modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 7
modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_active.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_inactive.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_success_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_success_16.png |binary
modules/enterprise/gui/installer-war/pom.xml | 8
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 36
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java | 17
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 79
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 9
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties | 256
modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties | 9
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml | 1
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 16
modules/enterprise/gui/pom.xml | 17
modules/enterprise/gui/portal-war/pom.xml | 12
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 15
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java | 18
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java | 6
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java | 9
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 24
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 32
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/FileUploadUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 97
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 12
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 108
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DisambiguatedResourceLineageRenderer.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java | 7
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewDesignatedChartAction.java | 147
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/GroupForm.java | 38
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java | 14
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/DisambiguatedResourceNameTag.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/ContextUtils.java | 18
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/graphs/IndicatorChartsUIBean.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/ExternalizableStrategyCommandListener.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 101
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 81
modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 44
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_failed.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_success.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_failed.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_success.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Drift_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 12
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 7
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 15
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 28
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 64
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 40
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventInventoryJSON.jsp | 52
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 20
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 10
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 40
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/error.xhtml | 20
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs-plain.xhtml | 65
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data-plain.xhtml | 17
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response-plain.xhtml | 63
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml | 7
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item.xhtml | 7
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml | 19
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create.xhtml | 19
modules/enterprise/gui/rest-war/pom.xml | 289
modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/AuthFilter.java | 86
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/jboss-web.xml | 6
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 90
modules/enterprise/gui/rest-war/src/main/webapp/bars_simple.html | 123
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 31
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.behavior.js | 198
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.chart.js | 984 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 3592 ++++++++++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 1923 +++++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 660 +
modules/enterprise/gui/rest-war/src/main/webapp/js/resource_tree.js | 66
modules/enterprise/gui/rest-war/src/main/webapp/js/whisker.js | 92
modules/enterprise/gui/rest-war/src/main/webapp/stacked1.html | 125
modules/enterprise/gui/rest-war/src/main/webapp/stacked2.html | 125
modules/enterprise/gui/rest-war/src/main/webapp/tree.html | 44
modules/enterprise/gui/rest-war/src/main/webapp/whisker.html | 109
modules/enterprise/gui/rest-war/src/main/webapp/whisker2.html | 70
modules/enterprise/gui/webdav-war/pom.xml | 12
modules/enterprise/pom.xml | 11
modules/enterprise/remoting/cli/pom.xml | 8
modules/enterprise/remoting/cli/src/etc/rhq-cli.sh | 23
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 32
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java | 50
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 24
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 54
modules/enterprise/remoting/cli/src/main/samples/README.txt | 25
modules/enterprise/remoting/cli/src/main/samples/bundles.js | 154
modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js | 244
modules/enterprise/remoting/cli/src/main/samples/drift.js | 243
modules/enterprise/remoting/cli/src/main/samples/measurement_utils.js | 144
modules/enterprise/remoting/cli/src/main/samples/util.js | 286
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 13
modules/enterprise/remoting/client-api/pom.xml | 24
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 19
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 13
modules/enterprise/remoting/client-deps/pom.xml | 2
modules/enterprise/remoting/pom.xml | 2
modules/enterprise/remoting/webservices/pom.xml | 8
modules/enterprise/server/client-api/pom.xml | 4
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 5
modules/enterprise/server/container-lib/pom.xml | 11
modules/enterprise/server/container/pom.xml | 108
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 8
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 6
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml | 16
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/alert-cache-service.xml | 11
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml | 78
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml | 107
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml | 40
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html | 6
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf | 2
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 2
modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 5
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 72
modules/enterprise/server/ear/pom.xml | 32
modules/enterprise/server/itests/pom.xml | 263
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java | 146
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java | 25
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java | 231
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 618 +
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/InitDB.java | 32
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 309
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 254
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 275
modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml | 28
modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar |binary
modules/enterprise/server/itests/src/test/resources/default.persistence.properties | 22
modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml | 360 +
modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml | 160
modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml | 132
modules/enterprise/server/itests/src/test/resources/jms-ra.rar |binary
modules/enterprise/server/itests/src/test/resources/jndi.properties | 2
modules/enterprise/server/itests/src/test/resources/log4j.xml | 74
modules/enterprise/server/itests/src/test/resources/login-config.xml | 72
modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml | 25
modules/enterprise/server/itests/src/test/resources/security-beans.xml | 13
modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt | 46
modules/enterprise/server/itests/src/test/resources/test-ldap.properties | 2
modules/enterprise/server/itests/src/test/resources/test-scheduler.properties | 29
modules/enterprise/server/itests/src/test/resources/testng.xml | 12
modules/enterprise/server/jar/pom.xml | 211
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 73
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 499 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerLocal.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java | 126
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheUtils.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java | 62
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/DriftCacheElement.java | 103
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementNumericCacheElement.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElement.java | 95
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 189
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerRemote.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 128
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java | 72
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 27
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 11
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 213
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 29
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 66
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java | 41
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/AgentInventoryStatusUpdateJob.java | 94
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 109
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftChangesetBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftFileBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 639 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java | 123
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 94
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 217
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerLocal.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerRemote.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUploadRequest.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 297
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementPreferences.java | 31
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 190
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/NotifyAgentsOfScheduleUpdatesJob.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataInserter.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataReader.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 26
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java | 129
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectiveServerPluginManager.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteWsInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 111
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java | 100
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 93
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 93
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java | 31
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 146
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 95
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java | 185
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerLocal.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 175
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 82
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RHQApplication.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 220
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java | 113
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/SetCallerInterceptor.java | 93
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java | 105
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerLocal.java | 46
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StuffNotFoundException.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java | 139
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerLocal.java | 54
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertDefinitionRest.java | 87
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertRest.java | 152
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java | 79
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricAggregate.java | 178
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithChildren.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java | 135
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Status.java | 96
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedScheduler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AsyncResourceDeleteJob.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/DefaultImportConfigurationDescriptor.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java | 100
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/MetricTemplateSynchronizer.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationConstants.java | 112
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerBean.java | 250
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerLocal.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerRemote.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizedEntity.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizerFactory.java | 42
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SystemSettingsSynchronizer.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/Importer.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/MetricTemplateImporter.java | 56
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/SystemSettingsImporter.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/ConsistencyValidator.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/DeployedAgentPluginsValidator.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/EntityValidator.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MaxCountValidator.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MetricTemplateValidator.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/SystemSettingsValidator.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/UniquenessValidator.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java | 132
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 321
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerRemote.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 27
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 39
modules/enterprise/server/jar/src/main/resources/rest_templates/listMetricSchedule.ftl | 32
modules/enterprise/server/jar/src/main/resources/rest_templates/listResourceWithType.ftl | 32
modules/enterprise/server/jar/src/main/resources/rest_templates/metricData.ftl | 67
modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl | 52
modules/enterprise/server/jar/src/main/resources/rest_templates/resourceWithType.ftl | 53
modules/enterprise/server/jar/src/main/resources/rest_templates/status.ftl | 49
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElementTest.java | 96
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 442 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 487 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java | 123
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 64
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupPluginConfigurationTest.java | 235
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupResourceConfigurationTest.java | 227
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 205
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 76
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/TestDefService.java | 72
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 48
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 10
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java | 50
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 507 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 122
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateContentSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateNativesSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateOperationsSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 446 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 407 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 25
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 18
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/DeployedAgentPluginsValidatorTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java | 32
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MaxCountValidatorTest.java | 52
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateExporterTest.java | 26
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateImporterTest.java | 42
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateValidatorTest.java | 161
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java | 745 ++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsExporterTest.java | 5
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsImporterTest.java | 1
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsValidatorTest.java | 22
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/UniquenessValidatorTest.java | 51
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java | 97
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 87
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/DataAccessTest.java | 8
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java | 309
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 27
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 113
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java | 25
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 2950 ++++++++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapCtxFactory.java | 61
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeNamingEnumeration.java | 76
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 54
modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 177
modules/enterprise/server/jar/src/test/resources/jboss-jms-beans.xml | 102
modules/enterprise/server/jar/src/test/resources/jms-ra.rar |binary
modules/enterprise/server/jar/src/test/resources/log4j.xml | 14
modules/enterprise/server/jar/src/test/resources/login-config.xml | 9
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 2
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 3
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml | 36
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 8
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 8
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 8
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 4
modules/enterprise/server/jar/src/test/resources/rhq-mdb-beans.xml | 25
modules/enterprise/server/jar/src/test/resources/test-ldap.properties | 2
modules/enterprise/server/jar/src/test/resources/test/metadata/alerts/type-with-metric.xml | 14
modules/enterprise/server/plugins/alert-cli/pom.xml | 13
modules/enterprise/server/plugins/alert-email/pom.xml | 13
modules/enterprise/server/plugins/alert-irc/pom.xml | 17
modules/enterprise/server/plugins/alert-log4j/pom.xml | 14
modules/enterprise/server/plugins/alert-microblog/pom.xml | 21
modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 107
modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogServerPluginComponent.java | 183
modules/enterprise/server/plugins/alert-microblog/src/main/resources/META-INF/rhq-serverplugin.xml | 41
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 13
modules/enterprise/server/plugins/alert-operations/pom.xml | 10
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/PrintTokens.java | 11
modules/enterprise/server/plugins/alert-roles/pom.xml | 10
modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 18
modules/enterprise/server/plugins/alert-sms/pom.xml | 12
modules/enterprise/server/plugins/alert-snmp/pom.xml | 17
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 54
modules/enterprise/server/plugins/alert-subject/pom.xml | 20
modules/enterprise/server/plugins/ant-bundle/pom.xml | 17
modules/enterprise/server/plugins/cloud/pom.xml | 12
modules/enterprise/server/plugins/cobbler/pom.xml | 12
modules/enterprise/server/plugins/disk/pom.xml | 13
modules/enterprise/server/plugins/drift-mongodb/pom.xml | 28
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java | 124
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CategoryFilter.java | 42
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAO.java | 107
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilter.java | 28
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilters.java | 45
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedAfterFilter.java | 37
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedBeforeFilter.java | 36
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAO.java | 59
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/PathFilter.java | 37
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java | 31
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSetEntry.java | 34
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBFile.java | 12
modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/GridFSTest.java | 63
modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAOTest.java | 306
modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAOTest.java | 161
modules/enterprise/server/plugins/drift-rhq/pom.xml | 11
modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 36
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 15
modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java | 16
modules/enterprise/server/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-serverplugin.xml | 8
modules/enterprise/server/plugins/groovy-script/pom.xml | 10
modules/enterprise/server/plugins/jboss-software/pom.xml | 12
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 20
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 12
modules/enterprise/server/plugins/perspectives/policy/app/pom.xml | 7
modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/policy/pom.xml | 7
modules/enterprise/server/plugins/pom.xml | 17
modules/enterprise/server/plugins/rhnhosted/pom.xml | 13
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java | 8
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java | 18
modules/enterprise/server/plugins/url/pom.xml | 12
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 11
modules/enterprise/server/plugins/yum/pom.xml | 11
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 8
modules/enterprise/server/pom.xml | 12
modules/enterprise/server/safe-invoker/pom.xml | 11
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvoker.java | 58
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvokerDeploymentAspect.java | 59
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java | 610 +
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvoker.java | 58
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvokerDeploymentAspect.java | 59
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 569 -
modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtilityTest.java | 142
modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/util/HibernateDetachUtilityTest.java | 141
modules/enterprise/server/sars/agent-sar/pom.xml | 8
modules/enterprise/server/sars/pom.xml | 7
modules/enterprise/server/xml-schemas/pom.xml | 11
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java | 650 +
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorUtil.java | 2
modules/enterprise/server/xml-schemas/src/test/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtilTest.java | 212
modules/helpers/bundleGen/pom.xml | 4
modules/helpers/bundleGen/src/main/java/org/rhq/helpers/bundleGen/BundleGen.java | 39
modules/helpers/inventory-serializer/pom.xml | 4
modules/helpers/perftest-support/data.sh | 2
modules/helpers/perftest-support/pom.xml | 4
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/Exporter.java | 13
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbsetup/DbSetup.java | 15
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbunit/EntityRelationshipFilter.java | 98
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/jpa/mapping/MappingTranslator.java | 4
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java | 8
modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/DummyTest.java | 1
modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/ExcelExporterTest.java | 27
modules/helpers/pluginAnnotations/pom.xml | 5
modules/helpers/pluginGen/pom.xml | 6
modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 1
modules/helpers/pluginGen/src/main/resources/pom.ftl | 1
modules/helpers/pom.xml | 13
modules/helpers/rtfilter/pom.xml | 8
modules/integration-tests/apache-plugin-test/pom.xml | 12
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/setup/ApacheTestSetup.java | 14
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java | 3
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java | 43
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 4
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 13
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 368 +
modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java | 250
modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModclusterPluginTest.java | 210
modules/integration-tests/pom.xml | 52
modules/jopr/dist/agent/pom.xml | 9
modules/jopr/dist/pom.xml | 9
modules/jopr/dist/server/pom.xml | 11
modules/jopr/etc/jbas5-jnp-client/README | 16
modules/jopr/etc/jbas5-jnp-client/client.sh | 6
modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java | 27
modules/jopr/modules-plugins-pom.xml | 9
modules/jopr/modules-pom.xml | 7
modules/jopr/pom.xml | 10
modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml | 7
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 17
modules/plugins/JBossOSGi/pom.xml | 7
modules/plugins/aliases/pom.xml | 10
modules/plugins/ant-bundle/pom.xml | 15
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 20
modules/plugins/apache/pom.xml | 16
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 16
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java | 17
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 9
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApachePluginLifecycleListener.java | 132
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 40
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 125
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 38
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 8
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ModJKComponent.java | 78
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 33
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/SpecificParams.java | 6
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java | 102
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 124
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/RuntimeApacheConfiguration.java | 341
modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPClient.java | 7
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 43
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/RuntimeConfigurationTest.java | 30
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/SnmpMappingTest.java | 13
modules/plugins/augeas/pom.xml | 8
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasNodeBuffer.java | 2
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 27
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 10
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasPluginLifecycleListener.java | 7
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 10
modules/plugins/byteman/pom.xml | 15
modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/cobbler/pom.xml | 14
modules/plugins/cron/pom.xml | 12
modules/plugins/database/pom.xml | 2
modules/plugins/database/src/main/java/org/rhq/plugins/database/AbstractDatabaseComponent.java | 3
modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java | 25
modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableDiscoveryComponent.java | 6
modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java | 9
modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabaseComponent.java | 3
modules/plugins/filetemplate-bundle/pom.xml | 13
modules/plugins/grub/pom.xml | 10
modules/plugins/hadoop/pom.xml | 6
modules/plugins/hardware/pom.xml | 2
modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml | 28
modules/plugins/hibernate/pom.xml | 17
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityComponent.java | 48
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityDiscoveryComponent.java | 50
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/StatisticsComponent.java | 60
modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 24
modules/plugins/hosts/pom.xml | 10
modules/plugins/hudson/pom.xml | 4
modules/plugins/hudson/src/main/java/org/rhq/plugins/hudson/HudsonServerComponent.java | 14
modules/plugins/iis/pom.xml | 15
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerComponent.java | 3
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostComponent.java | 10
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java | 4
modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml | 38
modules/plugins/iptables/pom.xml | 11
modules/plugins/irc/pom.xml | 5
modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCServerComponent.java | 2
modules/plugins/irc/src/main/resources/META-INF/rhq-plugin.xml | 3
modules/plugins/jboss-as-5/pom.xml | 14
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java | 26
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 17
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java | 115
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 17
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerContentFacetDelegate.java | 1
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 99
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 10
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java | 22
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebDiscoveryComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JmsDestinationDiscoveryComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 58
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedDeploymentDiscoveryComponent.java | 4
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java | 397 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformDiscoveryComponent.java | 128
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java | 14
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 217
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java | 7
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 14
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 9
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 64
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 23
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JBossConfigurationUtility.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JnpConfig.java | 86
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 221
modules/plugins/jboss-as-5/testsuite/pom.xml | 11
modules/plugins/jboss-as-7/d2d.sh | 2
modules/plugins/jboss-as-7/pom.xml | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 8
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 6
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 93
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 9
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 243
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java | 3
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/LoggerComponent.java | 20
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 120
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java | 41
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java | 82
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 69
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 2
modules/plugins/jboss-as/pom.xml | 44
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 58
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationDiscoveryComponent.java | 16
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ConnectionFactoryComponent.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/DatasourceComponent.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB2BeanComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB3BeanComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 19
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBMDestinationDiscoveryComponent.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 92
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 24
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 24
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java | 54
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatServerComponent.java | 8
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostDiscoveryService.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostService.java | 46
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMQDiscoveryComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingComponent.java | 49
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingDiscoveryComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JMSComponent.java | 53
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarDiscoveryComponent.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 64
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstanceInfo.java | 9
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptComponent.java | 7
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptDiscoveryComponent.java | 75
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/AbstractMessagingConfigurationEditor.java | 9
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/ConnectionFactoryConfigurationEditor.java | 12
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DatasourceConfigurationEditor.java | 16
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 14
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossConfigurationUtility.java | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossMessagingConfigurationEditor.java | 6
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JMSConfigurationEditor.java | 4
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JnpConfig.java | 75
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 136
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java | 7
modules/plugins/jboss-cache-v3/pom.xml | 10
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java | 60
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java | 8
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java | 4
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 4
modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml | 8
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java | 2
modules/plugins/jboss-cache/pom.xml | 31
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/CacheConfigurationHelper.java | 93
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 45
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheDiscoveryComponent.java | 6
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemComponent.java | 2
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemDiscovery.java | 4
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java | 4
modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 47
modules/plugins/jdbctrace/pom.xml | 14
modules/plugins/jira/pom.xml | 18
modules/plugins/jmx/pom.xml | 19
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 16
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 4
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXComponent.java | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 3
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 41
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java | 41
modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 42
modules/plugins/kickstart/pom.xml | 2
modules/plugins/lsof/pom.xml | 15
modules/plugins/mod-cluster/pom.xml | 79
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/CatalinaServiceComponent.java | 121
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java | 63
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanDiscoveryComponent.java | 87
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java | 102
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextDiscoveryComponent.java | 118
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/FileConfiguredMBeanResourceComponent.java | 153
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/LoadMetricDiscoveryComponent.java | 59
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterDiscoveryComponent.java | 85
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java | 70
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServiceComponent.java | 51
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModclusterServerComponent.java | 45
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java | 310
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextComponent.java | 117
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java | 117
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/AbstractConfigurationFile.java | 85
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/JBossWebServerFile.java | 92
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/ModClusterBeanFile.java | 253
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/helper/JBossHelper.java | 49
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/model/ProxyInfo.java | 310
modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml | 616 +
modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java | 2
modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ServerConfigTest.java | 91
modules/plugins/mod-cluster/src/test/resources/xml_config/mod_cluster-jboss-beans.xml | 337
modules/plugins/mod-cluster/src/test/resources/xml_config/server.xml | 157
modules/plugins/mysql/pom.xml | 15
modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 3
modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml | 26
modules/plugins/netservices/pom.xml | 17
modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml | 6
modules/plugins/onewire/pom.xml | 13
modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/oracle/pom.xml | 15
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 38
modules/plugins/pattern-generator/pom.xml | 12
modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java | 79
modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java | 2
modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/perftest/pom.xml | 87
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/PerfTestComponent.java | 19
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/configuration/SimpleConfigurationFactory.java | 27
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/event/PerfTestEventPoller.java | 2
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/measurement/SimpleNumericMeasurementFactory.java | 16
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/trait/SimpleTraitFactory.java | 20
modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 415 -
modules/plugins/perftest/src/main/resources/all-config.xml | 17
modules/plugins/perftest/src/main/resources/configurable-1.xml | 4
modules/plugins/perftest/src/main/resources/configurable-5.xml | 12
modules/plugins/platform/pom.xml | 19
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java | 46
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java | 78
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformComponent.java | 7
modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 86
modules/plugins/pom.xml | 13
modules/plugins/postfix/pom.xml | 10
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessDiscoveryComponent.java | 5
modules/plugins/postgres/pom.xml | 17
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseComponent.java | 25
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java | 10
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 28
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java | 38
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserComponent.java | 6
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java | 6
modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml | 10
modules/plugins/raw-config-test/pom.xml | 4
modules/plugins/rhq-agent/pom.xml | 15
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptComponent.java | 4
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptDiscoveryComponent.java | 8
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperComponent.java | 8
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperDiscoveryComponent.java | 8
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptComponent.java | 6
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptDiscoveryComponent.java | 8
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 5
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 68
modules/plugins/rhq-server/pom.xml | 16
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 90
modules/plugins/samba/pom.xml | 10
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 39
modules/plugins/script/pom.xml | 11
modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/script2/pom.xml | 14
modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptComponent.java | 31
modules/plugins/services/pom.xml | 6
modules/plugins/snmptrapd/pom.xml | 14
modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponent.java | 2
modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponentTest.java | 46
modules/plugins/sshd/pom.xml | 10
modules/plugins/sudoers/pom.xml | 12
modules/plugins/tomcat/pom.xml | 15
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 6
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 5
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 47
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 16
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 4
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 4
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 7
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostDiscoveryComponent.java | 11
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java | 2
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatPluginTest.java | 35
modules/plugins/twitter/pom.xml | 8
modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java | 7
modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/TwitterComponent.java | 31
modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml | 6
modules/plugins/validate-all-plugins/pom.xml | 11
modules/plugins/virt/pom.xml | 10
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationHostComponent.java | 2
modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml | 12
modules/pom.xml | 38
modules/test-utils/pom.xml | 2
modules/test-utils/src/main/java/org/rhq/test/JPAUtils.java | 79
modules/test-utils/src/main/java/org/rhq/test/TransactionCallbackWithContext.java | 10
pom.xml | 337
publish_release.sh | 413 -
release.sh | 980 +-
rhq_bash.lib | 253
1316 files changed, 71377 insertions(+), 22784 deletions(-)
---
1
0