[rhq] Branch 'release_jon3.x' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 7 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 2 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 11 +++++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 2 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java | 2 +
modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 5 ++++
6 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 162cef94f640dc8b226023161c29e6bef00c2c2d
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 19 10:12:38 2011 -0500
Adding method to retrieve drift content as byte array
Yesterday I discovered an issue while working on a CLI script that was
trying to fetch drift file content. Whitespace characters like \n and \t
were getting stripped out and replaced with a single whitespace
character. After a lot of debugging I determined that this is happening
in the transport layer which is jboss remoting. Fetching file content as
a byte array and then constructing a string on the client side bypasses
this issue.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 851372d..e3c5602 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -684,6 +684,13 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
@Override
+ public byte[] getDriftFileAsByteArray(Subject subject, String hash) {
+ log.debug("Retrieving drift file content for " + hash);
+ DriftServerPluginFacet driftServerPlugin = getServerPlugin();
+ return driftServerPlugin.getDriftFileAsByteArray(subject, hash);
+ }
+
+ @Override
public FileDiffReport generateUnifiedDiff(Subject subject, Drift<?, ?> drift) {
log.debug("Generating diff for " + drift);
String oldContent = getDriftFileBits(subject, drift.getOldDriftFile().getHashId());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
index f75602b..1d3dc82 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
@@ -104,6 +104,8 @@ public interface DriftManagerRemote {
*/
String getDriftFileBits(Subject subject, String hash);
+ byte[] getDriftFileAsByteArray(Subject subject, String hash);
+
/**
* Calculate and return requested Drift Snapshot.
*
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 dce9398..142e959 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
@@ -29,6 +29,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -497,14 +498,18 @@ public class JPADriftServerBean implements JPADriftServerLocal {
@Override
public String getDriftFileBits(String hash) {
// TODO add security
+ return new String(getDriftFileAsByteArray(hash), Charset.defaultCharset());
+ }
+
+ @Override
+ public byte[] getDriftFileAsByteArray(String hash) {
try {
JPADriftFileBits content = (JPADriftFileBits) entityManager.createNamedQuery(
JPADriftFileBits.QUERY_FIND_BY_ID).setParameter("hashId", hash).getSingleResult();
if (content.getDataSize() == null || content.getDataSize() < 1) {
- return "";
+ return new byte[] {};
}
- byte[] bytes = StreamUtil.slurp(content.getBlob().getBinaryStream());
- return new String(bytes);
+ return StreamUtil.slurp(content.getBlob().getBinaryStream());
} catch (SQLException e) {
e.printStackTrace();
return null;
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 76b125a..0cd1e78 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
@@ -131,4 +131,6 @@ public interface JPADriftServerLocal {
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
String getDriftFileBits(String hash);
+
+ byte[] getDriftFileAsByteArray(String hash);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
index 97e402e..a9d7f30 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
@@ -146,4 +146,6 @@ public interface DriftServerPluginFacet {
* @return The content as a string
*/
String getDriftFileBits(Subject subject, String hash);
+
+ byte[] getDriftFileAsByteArray(Subject subject, String hash);
}
diff --git a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
index 2da3167..9ebc2fc 100644
--- a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
+++ b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
@@ -132,4 +132,9 @@ public class JPADriftServerPluginComponent implements DriftServerPluginFacet, Se
public String getDriftFileBits(Subject subject, String hash) {
return getJPADriftServer().getDriftFileBits(hash);
}
+
+ @Override
+ public byte[] getDriftFileAsByteArray(Subject subject, String hash) {
+ return getJPADriftServer().getDriftFileAsByteArray(hash);
+ }
}
12 years, 6 months
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 7 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 2 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 11 +++++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 2 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java | 2 +
modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 5 ++++
6 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 28c35ecb0001cdd8fd68d9e870e819b7ab60c665
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 19 10:12:38 2011 -0500
Adding method to retrieve drift content as byte array
Yesterday I discovered an issue while working on a CLI script that was
trying to fetch drift file content. Whitespace characters like \n and \t
were getting stripped out and replaced with a single whitespace
character. After a lot of debugging I determined that this is happening
in the transport layer which is jboss remoting. Fetching file content as
a byte array and then constructing a string on the client side bypasses
this issue.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 851372d..e3c5602 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -684,6 +684,13 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
@Override
+ public byte[] getDriftFileAsByteArray(Subject subject, String hash) {
+ log.debug("Retrieving drift file content for " + hash);
+ DriftServerPluginFacet driftServerPlugin = getServerPlugin();
+ return driftServerPlugin.getDriftFileAsByteArray(subject, hash);
+ }
+
+ @Override
public FileDiffReport generateUnifiedDiff(Subject subject, Drift<?, ?> drift) {
log.debug("Generating diff for " + drift);
String oldContent = getDriftFileBits(subject, drift.getOldDriftFile().getHashId());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
index f75602b..1d3dc82 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java
@@ -104,6 +104,8 @@ public interface DriftManagerRemote {
*/
String getDriftFileBits(Subject subject, String hash);
+ byte[] getDriftFileAsByteArray(Subject subject, String hash);
+
/**
* Calculate and return requested Drift Snapshot.
*
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 dce9398..142e959 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
@@ -29,6 +29,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -497,14 +498,18 @@ public class JPADriftServerBean implements JPADriftServerLocal {
@Override
public String getDriftFileBits(String hash) {
// TODO add security
+ return new String(getDriftFileAsByteArray(hash), Charset.defaultCharset());
+ }
+
+ @Override
+ public byte[] getDriftFileAsByteArray(String hash) {
try {
JPADriftFileBits content = (JPADriftFileBits) entityManager.createNamedQuery(
JPADriftFileBits.QUERY_FIND_BY_ID).setParameter("hashId", hash).getSingleResult();
if (content.getDataSize() == null || content.getDataSize() < 1) {
- return "";
+ return new byte[] {};
}
- byte[] bytes = StreamUtil.slurp(content.getBlob().getBinaryStream());
- return new String(bytes);
+ return StreamUtil.slurp(content.getBlob().getBinaryStream());
} catch (SQLException e) {
e.printStackTrace();
return null;
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 76b125a..0cd1e78 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
@@ -131,4 +131,6 @@ public interface JPADriftServerLocal {
int purgeOrphanedDriftFiles(Subject subject, long purgeMillis);
String getDriftFileBits(String hash);
+
+ byte[] getDriftFileAsByteArray(String hash);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
index 97e402e..a9d7f30 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java
@@ -146,4 +146,6 @@ public interface DriftServerPluginFacet {
* @return The content as a string
*/
String getDriftFileBits(Subject subject, String hash);
+
+ byte[] getDriftFileAsByteArray(Subject subject, String hash);
}
diff --git a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
index 2da3167..9ebc2fc 100644
--- a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
+++ b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java
@@ -132,4 +132,9 @@ public class JPADriftServerPluginComponent implements DriftServerPluginFacet, Se
public String getDriftFileBits(Subject subject, String hash) {
return getJPADriftServer().getDriftFileBits(hash);
}
+
+ @Override
+ public byte[] getDriftFileAsByteArray(Subject subject, String hash) {
+ return getJPADriftServer().getDriftFileAsByteArray(hash);
+ }
}
12 years, 6 months
[rhq] 2 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 30
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 9
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/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 | 40 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReportResourceSearchView.java | 134 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 29
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 12
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 9
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 15
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 9
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/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 29
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 2
19 files changed, 621 insertions(+), 237 deletions(-)
New commits:
commit d545b1925aa9712236ee636a6f4d66e7a88d5846
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 18 17:16:55 2011 -0500
Integrated new drift pinned icons into code.
- Note, kept unpinned as is (grey, left pointing) but put new active
pinned (green, downpointing) icon in place. There is a new inactive
pinned icon (similar if not same to previous greyed, downpointing), but
it's not incorporated into any views as of now.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index 1b8b978..3d95849 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -99,7 +99,14 @@ public class ImageManager {
* Returns a generic pinned icon.
*/
public static String getPinnedIcon() {
- return "[SKIN]/headerIcons/pin_down.png";
+ return "subsystems/drift/Pinned_active.png";
+ }
+
+ /**
+ * Returns a generic pinned icon.
+ */
+ public static String getPinnedInactiveIcon() {
+ return "subsystems/drift/Pinned_inactive.png";
}
public static String getDriftIcon() {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_active.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_active.png
new file mode 100644
index 0000000..3c98f46
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_active.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_inactive.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_inactive.png
new file mode 100644
index 0000000..f3e3ffa
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_inactive.png differ
commit d8a00d8623e694df6bdd2926d0cfc523029d1bd5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 18 17:13:36 2011 -0500
Create new Drift Compliance Report
Similar to the Inventory Summary report with two differences:
1. Constrained to types that provide drift monitoring
2. Adds compliance columns
- Restored Inventory Summary Report to its former self, removing the
compliance stuff that had been added. This makes it more focused and
faster.
- Added separate SLSB support for the new report.
- Fixed a problem in the compliance queries that generated the wrong
resource count.
- Fixed sorting issue for compliance column in report's resource view
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index c2dbe74..dd5da1b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -740,31 +740,31 @@ import org.rhq.core.domain.util.Summary;
+ "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id " //
+ "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name "),
- // @NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_REPORT, query = "" //
- // + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " //
- // + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), r.version) " //
- // + "FROM Resource r " //
- // + "WHERE r.inventoryStatus = 'COMMITTED' " //
- // + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version " //
- // + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version "),
+ @NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_REPORT, query = "" //
+ + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " //
+ + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), r.version) " //
+ + "FROM Resource r " //
+ + "WHERE r.inventoryStatus = 'COMMITTED' " //
+ + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version " //
+ + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version "),
@NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE, query = ""
+ "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount("
- + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), "
+ + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(distinct r), "
+ "r.version, size(templates), 0) "
- + "FROM Resource r JOIN r.resourceType type LEFT JOIN type.driftDefinitionTemplates templates "
- + "WHERE r.inventoryStatus = 'COMMITTED' AND 0 = (" + " SELECT COUNT(defs) "
- + " FROM r.driftDefinitions defs " + " WHERE NOT defs.complianceStatus = 0) "
+ + "FROM Resource r JOIN r.resourceType type JOIN type.driftDefinitionTemplates templates "
+ + "WHERE r.inventoryStatus = 'COMMITTED' AND " //
+ + " 0 = ( SELECT COUNT(defs) FROM r.driftDefinitions defs WHERE NOT defs.complianceStatus = 0) "
+ "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version "
+ "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version "),
@NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_OUT_OF_COMPLIANCE, query = ""
+ "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount("
- + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), "
+ + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(distinct r), "
+ "r.version, size(templates), 1) "
- + "FROM Resource r JOIN r.resourceType type LEFT JOIN type.driftDefinitionTemplates templates "
- + "WHERE r.inventoryStatus = 'COMMITTED' AND 0 < (" + " SELECT COUNT(defs) "
- + " FROM r.driftDefinitions defs " + " WHERE defs.complianceStatus <> 0) "
+ + "FROM Resource r JOIN r.resourceType type JOIN type.driftDefinitionTemplates templates "
+ + "WHERE r.inventoryStatus = 'COMMITTED' AND " //
+ + " 0 < ( SELECT COUNT(defs) FROM r.driftDefinitions defs WHERE defs.complianceStatus <> 0) "
+ "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version "
+ "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version ") })
@SequenceGenerator(name = "RHQ_RESOURCE_SEQ", sequenceName = "RHQ_RESOURCE_ID_SEQ")
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java
index 030dcc6..877686f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java
@@ -41,6 +41,15 @@ public class ResourceInstallCount implements Serializable {
public ResourceInstallCount() {
}
+ public ResourceInstallCount(String typeName, String typePlugin, ResourceCategory category, int typeId, long count) {
+ this(typeName, typePlugin, category, typeId, count, null, -1, -1);
+ }
+
+ public ResourceInstallCount(String typeName, String typePlugin, ResourceCategory category, int typeId, long count,
+ String version) {
+ this(typeName, typePlugin, category, typeId, count, version, -1, -1);
+ }
+
public ResourceInstallCount(String typeName, String typePlugin, ResourceCategory category, int typeId, long count,
String version, int numDriftTemplates, int inCompliance) {
this.count = count;
@@ -53,16 +62,6 @@ public class ResourceInstallCount implements Serializable {
this.inCompliance = inCompliance == 0;
}
-
- public ResourceInstallCount(String typeName, String typePlugin, ResourceCategory category, int typeId, long count) {
- this.count = count;
- this.typeName = typeName;
- this.typePlugin = typePlugin;
- this.category = category;
- this.typeId = typeId;
- }
-
-
public long getCount() {
return count;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
index f44cf8e..5842483 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
@@ -71,6 +71,10 @@ public interface ResourceGWTService extends RemoteService {
PageList<ProblemResourceComposite> findProblemResources(long ctime, int maxItems) throws RuntimeException;
+ List<ResourceInstallCount> findResourceComplianceCounts() throws RuntimeException;
+
+ List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException;
+
Resource getPlatformForResource(int resourceId) throws RuntimeException;
Map<Resource, List<Resource>> getQueuedPlatformsAndServers(HashSet<InventoryStatus> statuses, PageControl pc)
@@ -94,5 +98,4 @@ public interface ResourceGWTService extends RemoteService {
List<Integer> uninventoryResources(int[] resourceIds) throws RuntimeException;
- List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
new file mode 100644
index 0000000..51e9282
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java
@@ -0,0 +1,301 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.report;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.widgets.events.DoubleClickEvent;
+import com.smartgwt.client.widgets.events.DoubleClickHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.composite.ResourceInstallCount;
+import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+/**
+ * A tweaked version of the InventorySummary report that narrows the relevant types to those that support Drift
+ * monitoring, and shows the compliance state of each type.
+ *
+ * @author Jay Shaughnessy
+ */
+public class DriftComplianceReport extends LocatableVLayout implements BookmarkableView {
+
+ public static final ViewName VIEW_ID = new ViewName("DriftCompliance", MSG.view_reports_driftCompliance());
+
+ private ResourceSearchView resourceList;
+
+ public DriftComplianceReport(String locatorId) {
+ super(locatorId);
+
+ setHeight100();
+ setWidth100();
+ }
+
+ @Override
+ public void renderView(ViewPath viewPath) {
+ if (!viewPath.isEnd()) {
+ int resourceTypeId = Integer.parseInt(viewPath.getCurrent().getPath());
+ viewPath.next();
+ Criteria criteria;
+ if (!viewPath.isEnd()) {
+ String resourceVersion = viewPath.getCurrent().getPath();
+ criteria = createResourceSearchViewCriteria(resourceTypeId, resourceVersion);
+ } else {
+ criteria = createResourceSearchViewCriteria(resourceTypeId);
+ }
+ showResourceList(criteria);
+ } else {
+ hideResourceList();
+ }
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ addMember(new DriftComplianceReportTable(extendLocatorId("table")));
+ }
+
+ protected Criteria createResourceSearchViewCriteria(int resourceTypeId) {
+ Criteria criteria = new Criteria();
+ criteria.addCriteria(ResourceDataSourceField.TYPE.propertyName(), resourceTypeId);
+ return criteria;
+ }
+
+ protected Criteria createResourceSearchViewCriteria(int resourceTypeId, String resourceVersion) {
+ Criteria criteria = new Criteria();
+ criteria.addCriteria(ResourceDataSourceField.TYPE.propertyName(), resourceTypeId);
+ criteria.addCriteria("version", resourceVersion);
+ return criteria;
+ }
+
+ private void showResourceList(Criteria criteria) {
+ hideResourceList();
+ resourceList = new DriftComplianceReportResourceSearchView(extendLocatorId("resourceList"), criteria);
+ addMember(resourceList);
+ markForRedraw();
+ }
+
+ private void hideResourceList() {
+ if (resourceList != null) {
+ removeMember(resourceList);
+ resourceList.destroy();
+ resourceList = null;
+ }
+ markForRedraw();
+ }
+
+ class DriftComplianceReportTable extends Table<DriftComplianceReportTable.DataSource> {
+
+ public DriftComplianceReportTable(String locatorId) {
+ super(locatorId, VIEW_ID.getTitle());
+ setDataSource(new DataSource());
+ }
+
+ @Override
+ protected void configureTable() {
+ ListGridField fieldTypeName = new ListGridField(DataSource.Field.TYPENAME, MSG.common_title_resource_type());
+ ListGridField fieldPlugin = new ListGridField(DataSource.Field.TYPEPLUGIN, MSG.common_title_plugin());
+ ListGridField fieldCategory = new ListGridField(DataSource.Field.CATEGORY, MSG.common_title_category());
+ ListGridField fieldVersion = new ListGridField(DataSource.Field.VERSION, MSG.common_title_version());
+ ListGridField fieldCount = new ListGridField(DataSource.Field.COUNT, MSG.common_title_count());
+
+ ListGridField fieldInCompliance = new ListGridField(DataSource.Field.IN_COMPLIANCE, MSG
+ .common_title_in_compliance());
+ HashMap<String, String> complianceIcons = new HashMap<String, String>();
+ complianceIcons.put("true", ImageManager.getAvailabilityIcon(true));
+ complianceIcons.put("false", ImageManager.getAvailabilityIcon(false));
+ fieldInCompliance.setValueIcons(complianceIcons);
+ fieldInCompliance.setType(ListGridFieldType.ICON);
+ fieldInCompliance.setCanSortClientOnly(true);
+
+ fieldTypeName.setWidth("35%");
+ fieldPlugin.setWidth("10%");
+ fieldCategory.setWidth(70);
+ fieldVersion.setWidth("*");
+ fieldCount.setWidth(60);
+ fieldInCompliance.setWidth(100);
+
+ // TODO (ips, 11/11/11): The groupBy functionality is very buggy in SmartGWT 2.4. Once they fix it
+ // uncomment these lines to allow grouping by the plugin or category fields.
+ /*getListGrid().setCanGroupBy(true);
+ fieldTypeName.setCanGroupBy(false);
+ fieldVersion.setCanGroupBy(false);
+ fieldCount.setCanGroupBy(false);
+ fieldInCompliance.setCanGroupBy(false);*/
+
+ fieldTypeName.setCellFormatter(new CellFormatter() {
+ @Override
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String url = getResourceTypeTableUrl(record);
+ if (url == null) {
+ return value.toString();
+ }
+
+ return "<a href=\"" + url + "\">" + value.toString() + "</a>";
+ }
+ });
+
+ fieldCategory.setType(ListGridFieldType.ICON);
+ fieldCategory.setShowValueIconOnly(true);
+ HashMap<String, String> categoryIcons = new HashMap<String, String>(3);
+ categoryIcons
+ .put(ResourceCategory.PLATFORM.name(), ImageManager.getResourceIcon(ResourceCategory.PLATFORM));
+ categoryIcons.put(ResourceCategory.SERVER.name(), ImageManager.getResourceIcon(ResourceCategory.SERVER));
+ categoryIcons.put(ResourceCategory.SERVICE.name(), ImageManager.getResourceIcon(ResourceCategory.SERVICE));
+ fieldCategory.setValueIcons(categoryIcons);
+ fieldCategory.setShowHover(true);
+ fieldCategory.setHoverCustomizer(new HoverCustomizer() {
+ @Override
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String cat = record.getAttribute(DataSource.Field.CATEGORY);
+ if (ResourceCategory.PLATFORM.name().equals(cat)) {
+ return MSG.common_title_platform();
+ } else if (ResourceCategory.SERVER.name().equals(cat)) {
+ return MSG.common_title_server();
+ } else if (ResourceCategory.SERVICE.name().equals(cat)) {
+ return MSG.common_title_service();
+ }
+ return "";
+ }
+ });
+
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
+ @Override
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid lg = (ListGrid) event.getSource();
+ ListGridRecord selected = lg.getSelectedRecord();
+ String url = getResourceTypeTableUrl(selected);
+ if (url != null) {
+ CoreGUI.goToView(url);
+ }
+ }
+ });
+
+ setListGridFields(fieldTypeName, fieldPlugin, fieldCategory, fieldVersion, fieldCount, fieldInCompliance);
+ }
+
+ private String getResourceTypeTableUrl(ListGridRecord selected) {
+ String url = null;
+ if (selected != null) {
+ int resourceTypeId = selected.getAttributeAsInt(DataSource.Field.TYPEID);
+ String version = selected.getAttribute(DataSource.Field.VERSION);
+ if (version == null) {
+ url = "#Reports/Inventory/DriftCompliance/" + resourceTypeId;
+ } else {
+ url = "#Reports/Inventory/DriftCompliance/" + resourceTypeId + "/" + version;
+ }
+ }
+ return url;
+ }
+
+ class DataSource extends RPCDataSource<ResourceInstallCount, org.rhq.core.domain.criteria.Criteria> {
+
+ public class Field {
+ public static final String COUNT = "count"; // long that we convert to int
+ public static final String TYPENAME = "typeName"; // String
+ public static final String TYPEPLUGIN = "typePlugin"; // String
+ public static final String CATEGORY = "category"; // ResourceCategory
+ public static final String TYPEID = "typeId"; // int
+ public static final String VERSION = "version"; // String
+ public static final String OBJECT = "object";
+ public static final String IN_COMPLIANCE = "inCompliance";
+ }
+
+ @Override
+ public ResourceInstallCount copyValues(Record from) {
+ return (ResourceInstallCount) from.getAttributeAsObject(DataSource.Field.OBJECT);
+ }
+
+ @Override
+ public ListGridRecord copyValues(ResourceInstallCount from) {
+ ListGridRecord record = new ListGridRecord();
+
+ record.setAttribute(Field.COUNT, Long.valueOf(from.getCount()).intValue()); // we'll never have over Integer.MAX_VALUE, overflow not a worry
+ record.setAttribute(Field.TYPENAME, from.getTypeName());
+ record.setAttribute(Field.TYPEPLUGIN, from.getTypePlugin());
+ record.setAttribute(Field.CATEGORY, from.getCategory().name());
+ record.setAttribute(Field.TYPEID, from.getTypeId());
+ record.setAttribute(Field.VERSION, from.getVersion());
+ record.setAttribute(Field.OBJECT, from);
+
+ if (from.getNumDriftTemplates() > 0) {
+ record.setAttribute(Field.IN_COMPLIANCE, Boolean.toString(from.isInCompliance()));
+ }
+
+ return record;
+ }
+
+ @Override
+ protected org.rhq.core.domain.criteria.Criteria getFetchCriteria(DSRequest request) {
+ // we don't use criterias for this datasource, just return null
+ return null;
+ }
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response,
+ final org.rhq.core.domain.criteria.Criteria unused) {
+ ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
+
+ resourceService.findResourceComplianceCounts(new AsyncCallback<List<ResourceInstallCount>>() {
+
+ @Override
+ public void onSuccess(List<ResourceInstallCount> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.size());
+ processResponse(request.getRequestId(), response);
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_reports_inventorySummary_failFetch(), caught);
+ response.setStatus(DSResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
new file mode 100644
index 0000000..e076aae
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
@@ -0,0 +1,191 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.report;
+
+import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+
+import java.util.EnumSet;
+import java.util.List;
+
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.widgets.events.DoubleClickEvent;
+import com.smartgwt.client.widgets.events.DoubleClickHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.drift.DriftComplianceStatus;
+import org.rhq.core.domain.drift.DriftDefinition;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.components.table.IconField;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceDetailView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+
+/**
+ * Extends the ResourceSearchView with drift compliance information.
+ *
+ * @author Jay Shaughnessy
+ * @author John Sanda
+ */
+public class DriftComplianceReportResourceSearchView extends ResourceSearchView {
+
+ private final int resourceTypeId;
+
+ public DriftComplianceReportResourceSearchView(String locatorId, Criteria criteria) {
+ super(locatorId, criteria);
+
+ setInitialCriteriaFixed(true);
+
+ this.resourceTypeId = criteria.getAttributeAsInt(ResourceDataSourceField.TYPE.propertyName());
+ };
+
+ // suppress unchecked warnings because the superclass has different generic types for the datasource
+ @SuppressWarnings("unchecked")
+ @Override
+ protected RPCDataSource getDataSourceInstance() {
+ return new DataSource();
+ }
+
+ @Override
+ protected List<ListGridField> createFields() {
+
+ List<ListGridField> fields = super.createFields();
+
+ // replace the cell formatter on the name field to go directly to drift tab
+ ListGridField nameField = null;
+ for (ListGridField field : fields) {
+ if (NAME.propertyName().equals(field.getName())) {
+ nameField = field;
+ break;
+ }
+ }
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String url = LinkManager.getResourceTabLink(record.getAttributeAsInt("id"),
+ ResourceDetailView.Tab.DRIFT, null);
+ String name = StringUtility.escapeHtml(value.toString());
+ return SeleniumUtility.getLocatableHref(url, name, null);
+ }
+ });
+
+ IconField inComplianceField = new IconField(DataSource.ATTR_IN_COMPLIANCE, MSG.common_title_in_compliance(), 95);
+ inComplianceField.setCanSortClientOnly(true);
+ fields.add(inComplianceField);
+
+ return fields;
+ }
+
+ @Override
+ protected void configureTable() {
+ super.configureTable();
+
+ // replace the doubleClickHandler to go directly to drift tab
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid listGrid = (ListGrid) event.getSource();
+ ListGridRecord[] selectedRows = listGrid.getSelection();
+ if (selectedRows != null && selectedRows.length == 1) {
+ String selectedId = selectedRows[0].getAttribute("id");
+ CoreGUI.goToView(LinkManager.getResourceTabLink(Integer.valueOf(selectedId),
+ ResourceDetailView.Tab.DRIFT, null));
+ }
+ }
+ });
+
+ }
+
+ private class DataSource extends ResourceDatasource {
+
+ private static final String ATTR_IN_COMPLIANCE = "inCompliance";
+
+ private ResourceType resourceType;
+
+ @Override
+ public void executeFetch(final DSRequest request, final DSResponse response, final ResourceCriteria criteria) {
+
+ if (null == resourceType) {
+
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceTypeId,
+ EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates),
+ new ResourceTypeRepository.TypeLoadedCallback() {
+
+ public void onTypesLoaded(ResourceType type) {
+ resourceType = type;
+ DataSource.super.executeFetch(request, response, criteria);
+ }
+ });
+
+ } else {
+ super.executeFetch(request, response, criteria);
+ }
+ }
+
+ @Override
+ protected ResourceCriteria getFetchCriteria(DSRequest request) {
+ ResourceCriteria criteria = super.getFetchCriteria(request);
+ criteria.fetchDriftDefinitions(true);
+
+ // filter out unsortable fields (i.e. fields sorted client-side only)
+ PageControl pageControl = getPageControl(request);
+ pageControl.removeOrderingField(ATTR_IN_COMPLIANCE);
+ criteria.setPageControl(pageControl);
+
+ return criteria;
+ }
+
+ @Override
+ public ListGridRecord copyValues(Resource from) {
+ ListGridRecord record = super.copyValues(from);
+
+ if (!resourceType.getDriftDefinitionTemplates().isEmpty()) {
+ record.setAttribute(ATTR_IN_COMPLIANCE, ImageManager.getAvailabilityIcon(!isOutOfCompliance(from)));
+ }
+ return record;
+ }
+
+ private boolean isOutOfCompliance(Resource resource) {
+ for (DriftDefinition def : resource.getDriftDefinitions()) {
+ if (def.getComplianceStatus() != DriftComplianceStatus.IN_COMPLIANCE) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index 06da7a5..73c88ec 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -112,20 +112,20 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
}
});
- NavigationItem recentConfigurationChangesItem = new NavigationItem(ResourceConfigurationHistoryListView.VIEW_ID,
- "subsystems/configure/Configure_16.png", new ViewFactory() {
+ NavigationItem recentConfigurationChangesItem = new NavigationItem(
+ ResourceConfigurationHistoryListView.VIEW_ID, "subsystems/configure/Configure_16.png", new ViewFactory() {
public Canvas createView() {
- return new ResourceConfigurationHistoryListView(extendLocatorId(ResourceConfigurationHistoryListView.VIEW_ID.getName()),
- getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ return new ResourceConfigurationHistoryListView(
+ extendLocatorId(ResourceConfigurationHistoryListView.VIEW_ID.getName()), getGlobalPermissions()
+ .contains(Permission.MANAGE_INVENTORY));
}
});
NavigationItem recentOperationsItem = new NavigationItem(OperationHistoryView.SUBSYSTEM_VIEW_ID,
"subsystems/control/Operation_16.png", new ViewFactory() {
public Canvas createView() {
- return new SubsystemOperationHistoryListView(
- extendLocatorId(OperationHistoryView.SUBSYSTEM_VIEW_ID.getName()), getGlobalPermissions()
- .contains(Permission.MANAGE_INVENTORY));
+ return new SubsystemOperationHistoryListView(extendLocatorId(OperationHistoryView.SUBSYSTEM_VIEW_ID
+ .getName()), getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
}
});
@@ -138,8 +138,8 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
}
});
- NavigationItem alertDefinitionsItem = new NavigationItem(new ViewName("AlertDefinitions",
- MSG.view_reports_alertDefinitions()), "subsystems/alert/Alerts_16.png", new ViewFactory() {
+ NavigationItem alertDefinitionsItem = new NavigationItem(new ViewName("AlertDefinitions", MSG
+ .view_reports_alertDefinitions()), "subsystems/alert/Alerts_16.png", new ViewFactory() {
public Canvas createView() {
return new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName()));
}
@@ -174,14 +174,22 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
}
}, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
- NavigationItem platformSystemInfoItem = new NavigationItem(PlatformSummaryPortlet.VIEW_ID,
- ImageManager.getResourceIcon(ResourceCategory.PLATFORM), new ViewFactory() {
- public Canvas createView() {
- return new PlatformSummaryPortlet(extendLocatorId(PlatformSummaryPortlet.VIEW_ID.getName()));
- }
- });
+ NavigationItem platformSystemInfoItem = new NavigationItem(PlatformSummaryPortlet.VIEW_ID, ImageManager
+ .getResourceIcon(ResourceCategory.PLATFORM), new ViewFactory() {
+ public Canvas createView() {
+ return new PlatformSummaryPortlet(extendLocatorId(PlatformSummaryPortlet.VIEW_ID.getName()));
+ }
+ });
+
+ NavigationItem driftComplianceItem = new NavigationItem(DriftComplianceReport.VIEW_ID, ImageManager
+ .getDriftIcon(), new ViewFactory() {
+ public Canvas createView() {
+ return new DriftComplianceReport(extendLocatorId(DriftComplianceReport.VIEW_ID.getName()));
+ }
+ }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
- return new NavigationSection(SECTION_INVENTORY_VIEW_ID, inventorySummaryItem, platformSystemInfoItem);
+ return new NavigationSection(SECTION_INVENTORY_VIEW_ID, inventorySummaryItem, platformSystemInfoItem,
+ driftComplianceItem);
}
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
index 818ab5a..72b5b6b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
@@ -112,7 +112,7 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
private void showResourceList(Criteria criteria) {
hideResourceList();
- resourceList = new ResourceInstallReportResourceSearchView(extendLocatorId("resourceList"), criteria);
+ resourceList = new ResourceSearchView(extendLocatorId("resourceList"), criteria);
addMember(resourceList);
markForRedraw();
}
@@ -141,28 +141,18 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
ListGridField fieldVersion = new ListGridField(DataSource.Field.VERSION, MSG.common_title_version());
ListGridField fieldCount = new ListGridField(DataSource.Field.COUNT, MSG.common_title_count());
- ListGridField fieldInCompliance = new ListGridField(DataSource.Field.IN_COMPLIANCE, MSG
- .common_title_in_compliance());
- HashMap<String, String> complianceIcons = new HashMap<String, String>();
- complianceIcons.put("true", ImageManager.getAvailabilityIcon(true));
- complianceIcons.put("false", ImageManager.getAvailabilityIcon(false));
- fieldInCompliance.setValueIcons(complianceIcons);
- fieldInCompliance.setType(ListGridFieldType.ICON);
-
fieldTypeName.setWidth("35%");
fieldPlugin.setWidth("10%");
fieldCategory.setWidth(70);
fieldVersion.setWidth("*");
fieldCount.setWidth(60);
- fieldInCompliance.setWidth(100);
// TODO (ips, 11/11/11): The groupBy functionality is very buggy in SmartGWT 2.4. Once they fix it
// uncomment these lines to allow grouping by the plugin or category fields.
/*getListGrid().setCanGroupBy(true);
fieldTypeName.setCanGroupBy(false);
fieldVersion.setCanGroupBy(false);
- fieldCount.setCanGroupBy(false);
- fieldInCompliance.setCanGroupBy(false);*/
+ fieldCount.setCanGroupBy(false); */
fieldTypeName.setCellFormatter(new CellFormatter() {
@Override
@@ -212,7 +202,7 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
}
});
- setListGridFields(fieldTypeName, fieldPlugin, fieldCategory, fieldVersion, fieldCount, fieldInCompliance);
+ setListGridFields(fieldTypeName, fieldPlugin, fieldCategory, fieldVersion, fieldCount);
}
private String getResourceTypeTableUrl(ListGridRecord selected) {
@@ -239,7 +229,6 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
public static final String TYPEID = "typeId"; // int
public static final String VERSION = "version"; // String
public static final String OBJECT = "object";
- public static final String IN_COMPLIANCE = "inCompliance";
}
@Override
@@ -259,10 +248,6 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
record.setAttribute(Field.VERSION, from.getVersion());
record.setAttribute(Field.OBJECT, from);
- if (from.getNumDriftTemplates() > 0) {
- record.setAttribute(Field.IN_COMPLIANCE, Boolean.toString(from.isInCompliance()));
- }
-
return record;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReportResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReportResourceSearchView.java
deleted file mode 100644
index 59c7ed2..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReportResourceSearchView.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.report;
-
-import java.util.EnumSet;
-import java.util.List;
-
-import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.widgets.grid.ListGridField;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.drift.DriftComplianceStatus;
-import org.rhq.core.domain.drift.DriftDefinition;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
-import org.rhq.enterprise.gui.coregui.client.components.table.IconField;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-
-/**
- * @author Jay Shaughnessy
- * @author John Sanda
- */
-public class ResourceInstallReportResourceSearchView extends ResourceSearchView {
-
- private final int resourceTypeId;
-
- public ResourceInstallReportResourceSearchView(String locatorId, Criteria criteria) {
- super(locatorId, criteria);
-
- setInitialCriteriaFixed(true);
-
- this.resourceTypeId = criteria.getAttributeAsInt(ResourceDataSourceField.TYPE.propertyName());
- };
-
- // suppress unchecked warnings because the superclass has different generic types for the datasource
- @SuppressWarnings("unchecked")
- @Override
- protected RPCDataSource getDataSourceInstance() {
- return new DataSource();
- }
-
- @Override
- protected List<ListGridField> createFields() {
-
- List<ListGridField> fields = super.createFields();
-
- IconField inComplianceField = new IconField(DataSource.ATTR_IN_COMPLIANCE, MSG.common_title_in_compliance(), 95);
- fields.add(inComplianceField);
-
- return fields;
- }
-
- private class DataSource extends ResourceDatasource {
-
- private static final String ATTR_IN_COMPLIANCE = "inCompliance";
-
- private ResourceType resourceType;
-
- @Override
- public void executeFetch(final DSRequest request, final DSResponse response, final ResourceCriteria criteria) {
-
- if (null == resourceType) {
-
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceTypeId,
- EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates),
- new ResourceTypeRepository.TypeLoadedCallback() {
-
- public void onTypesLoaded(ResourceType type) {
- resourceType = type;
- DataSource.super.executeFetch(request, response, criteria);
- }
- });
-
- } else {
- super.executeFetch(request, response, criteria);
- }
- }
-
- @Override
- protected ResourceCriteria getFetchCriteria(DSRequest request) {
- ResourceCriteria criteria = super.getFetchCriteria(request);
- criteria.fetchDriftDefinitions(true);
- return criteria;
- }
-
- @Override
- public ListGridRecord copyValues(Resource from) {
- ListGridRecord record = super.copyValues(from);
-
- if (!resourceType.getDriftDefinitionTemplates().isEmpty()) {
- record.setAttribute(ATTR_IN_COMPLIANCE, ImageManager.getAvailabilityIcon(!isOutOfCompliance(from)));
- }
- return record;
- }
-
- private boolean isOutOfCompliance(Resource resource) {
- for (DriftDefinition def : resource.getDriftDefinitions()) {
- if (def.getComplianceStatus() != DriftComplianceStatus.IN_COMPLIANCE) {
- return true;
- }
- }
- return false;
- }
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index 89e217e..d124879 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -151,6 +151,25 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
}
}
+ public List<ResourceInstallCount> findResourceComplianceCounts() throws RuntimeException {
+ try {
+ List<ResourceInstallCount> result = resourceManager.findResourceComplianceCounts(getSessionSubject());
+ return SerialUtility.prepare(result, "ResourceService.findResourceComplianceCounts");
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
+
+ public List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException {
+ try {
+ List<ResourceInstallCount> result = resourceManager.findResourceInstallCounts(getSessionSubject(),
+ groupByVersions);
+ return SerialUtility.prepare(result, "ResourceService.findResourceInstallCounts");
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
+
/** Locate ProblemResourcesComposites and generate the disambiguation reports for them.
* Criteria passed in not currently used.
*/
@@ -367,14 +386,4 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
throw getExceptionToThrowToClient(t);
}
}
-
- public List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException {
- try {
- List<ResourceInstallCount> result = resourceManager.findResourceInstallCounts(getSessionSubject(),
- groupByVersions);
- return SerialUtility.prepare(result, "ResourceService.findResourceInstallCounts");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index ad245ed..5a5f154 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -625,8 +625,8 @@ view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must
view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than
view_admin_systemSettings_cannotLoadServerDetails = Cannot load server details
view_admin_systemSettings_cannotLoadSettings = Cannot obtain the current system settings
-view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_fixBeforeSaving = Please fix the invalid values before saving
view_admin_systemSettings_group_baseline = Automatic Baseline Configuration Properties
view_admin_systemSettings_group_dataMgr = Data Manager Configuration Properties
@@ -1674,6 +1674,7 @@ view_reportsTop_title = Reports
view_reports_alertDefinitions = Alert Definitions
view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition
view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template.
+view_reports_driftCompliance = Drift Compliance
view_reports_inventorySummary_failFetch = Failed to get inventory summary
view_reports_platforms = Platform Utilization
view_reports_subsystems = Subsystems
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index d0f4a19..c5d56d5 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -24,7 +24,7 @@ common_button_create_child = Kind-Ressource erzeugen
common_button_delete = Löschen
common_button_delete_all = Alle Löschen
common_button_disable = Deaktivieren
-## common_button_dump_sysInfo_to_log = System information ins Logfile schreiben
+##common_button_dump_sysInfo_to_log = System information ins Logfile schreiben
common_button_edit = Bearbeiten
common_button_enable = Aktivieren
common_button_execute = Ausführen
@@ -527,10 +527,10 @@ view_admin_systemSettings_AlertPurge_name = Lösche Alarme, die älter sind als
view_admin_systemSettings_AvailabilityPurge_name = Lösche Verfügbarkeitsdaten, die älter sind als
##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days.
view_admin_systemSettings_DriftFilePurge_name = Lösche ungenutzte Drift-Dateine, die älter sind als
-view_admin_systemSettings_dumpedToLog = System informationen wurden erfolgreich in die Server-Log-Datei geschrieben
-view_admin_systemSettings_dumpToLogFailed = Schreiben der Systeminformation in die Server-Log-Datei ist fehlgeschlagen
view_admin_systemSettings_LDAPBindPW_name = Passwort
view_admin_systemSettings_TraitPurge_name = Lösche Trait-Daten, die älter sind als
+view_admin_systemSettings_dumpToLogFailed = Schreiben der Systeminformation in die Server-Log-Datei ist fehlgeschlagen
+view_admin_systemSettings_dumpedToLog = System informationen wurden erfolgreich in die Server-Log-Datei geschrieben
##view_admin_systemSettings_group_drift = Drift Server Configuration Settings
view_admin_systemSettings_saveFailure = Das Speichern der Systemeinstellungen ist fehlgeschlagen
view_admin_systemSettings_savedSettings = Sie haben die Systemeinstellungen erfolgreich gespeichert
@@ -1041,7 +1041,7 @@ view_dashboards_title = Dashboard
##view_drift_category_fileRemoved = File Removed
##view_drift_confirm_deleteAllDefs = Delete all drift detection definitions?
##view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)?
-view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
+##view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
##view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions.
##view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates
##view_drift_failure_detectNow = Failed to submit drift detection run request
@@ -1455,6 +1455,10 @@ view_remoteAgentInstall_stopAgent = Agent anhalten
view_reportsTop_description = Dieser Abschnitt bietet Zugang zu applikationsweiten Berichten
view_reportsTop_title = Berichte
view_reports_alertDefinitions = Alarmierungskriterien
+##view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition
+##view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template.
+##view_reports_driftCompliance = Drift Compliance
+##view_reports_inventorySummary_failFetch = Failed to get inventory summary
view_reports_platforms = Cpu- und Speicherauslastung
view_reports_subsystems = Subsysteme
##view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 26cf259..d673c42 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -24,7 +24,7 @@ common_button_create_child = 子を作成
common_button_delete = 削除
common_button_delete_all = すべてを削除
common_button_disable = 無効
-## common_button_dump_sysInfo_to_log = Dump system info to log file
+##common_button_dump_sysInfo_to_log = Dump system info to log file
common_button_edit = 編集
common_button_enable = 有効
##common_button_execute = Execute
@@ -624,8 +624,8 @@ view_admin_systemSettings_TraitPurge_desc = データベースから除去され
view_admin_systemSettings_TraitPurge_name = 次より古い測定トレイトの削除
view_admin_systemSettings_cannotLoadServerDetails = サーバー詳細をロードできません
view_admin_systemSettings_cannotLoadSettings = 現在のシステム設定を取得できません
-## view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
-## view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+##view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+##view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_fixBeforeSaving = 保存前に無効な値を修正してください
view_admin_systemSettings_group_baseline = 自動ベースライン構成プロパティ
view_admin_systemSettings_group_dataMgr = データマネージャー構成プロパティ
@@ -1183,7 +1183,7 @@ view_dashboards_title = ダッシュボード
##view_drift_category_fileRemoved = File Removed
##view_drift_confirm_deleteAllDefs = Delete all drift detection definitions?
##view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)?
-view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
+##view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
##view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions.
##view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates
##view_drift_failure_detectNow = Failed to submit drift detection run request
@@ -1662,6 +1662,7 @@ view_reportsTop_title = レポート
view_reports_alertDefinitions = アラート定義
view_reports_alertDefinitions_parentHover = クリックすると親のアラート定義へ行きます
view_reports_alertDefinitions_resTypeLoadError = テンプレートリソースタイプを取得できません - アラートテンプレートの閲覧ができません
+##view_reports_driftCompliance = Drift Compliance
view_reports_inventorySummary_failFetch = インベントリサマリーの取得に失敗しました
view_reports_platforms = プラットフォーム利用率
view_reports_subsystems = サブシステム
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 0a79c3d..56e46b1 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -22,7 +22,7 @@ common_button_create_child = Criar filho
common_button_delete = Excluir
common_button_delete_all = Excluir Todos
common_button_disable = Desabilitar
-## common_button_dump_sysInfo_to_log = Dump system info to log file
+##common_button_dump_sysInfo_to_log = Dump system info to log file
common_button_edit = Editar
common_button_enable = Habilitar
##common_button_execute = Execute
@@ -593,8 +593,6 @@ view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset
view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days.
view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency
view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours.
-## view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
-## view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
view_admin_systemSettings_DataMaintenance_name = Database Maintenance Period
view_admin_systemSettings_DataReindex_desc = If enabled, certain database tables will be re-indexed periodically.
view_admin_systemSettings_DataReindex_name = Reindex Data Tables Nightly
@@ -634,6 +632,8 @@ view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must
view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than
view_admin_systemSettings_cannotLoadServerDetails = Cannot load server details
view_admin_systemSettings_cannotLoadSettings = Cannot obtain the current system settings
+##view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+##view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_fixBeforeSaving = Please fix the invalid values before saving
view_admin_systemSettings_group_baseline = Automatic Baseline Configuration Properties
view_admin_systemSettings_group_dataMgr = Data Manager Configuration Properties
@@ -1212,7 +1212,7 @@ view_drift_category_fileChanged = Arquivo alterado
##view_drift_category_fileRemoved = Arquivo removido
##view_drift_confirm_deleteAllDefs = Delete all drift detection definitions?
##view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)?
-view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
+##view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
##view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions.
##view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates
view_drift_failure_detectNow = Falha ao submeter a requisi��o de detec��o do drift
@@ -1778,9 +1778,10 @@ view_remoteAgentInstall_updateStatus = Status da Atualiza\u00E7\u00E3o
view_reportsTop_description = This section provides access to global reports.
view_reportsTop_title = Relat\u00F3rios
view_reports_alertDefinitions = Defini\u00E7\u00E3o de Alertas
-view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition
-view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template.
-view_reports_inventorySummary_failFetch = Failed to get inventory summary
+##view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition
+##view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template.
+##view_reports_driftCompliance = Drift Compliance
+##view_reports_inventorySummary_failFetch = Failed to get inventory summary
view_reports_platforms = Utiliza\u00E7\u00E3o de Mem\u00F3ria e CPU
view_reports_subsystems = Subsistemas
view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index 9937a45..670769e 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -22,7 +22,7 @@ common_button_create_child = Create Child
common_button_delete = \u5220\u9664
common_button_delete_all = \u5220\u9664\u6240\u6709
common_button_disable = \u7981\u7528
-## common_button_dump_sysInfo_to_log = Dump system info to log file
+##common_button_dump_sysInfo_to_log = Dump system info to log file
common_button_edit = \u7f16\u8f91
common_button_enable = \u542f\u7528
##common_button_execute = Execute
@@ -622,8 +622,8 @@ view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must
view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than
view_admin_systemSettings_cannotLoadServerDetails = \u65e0\u6cd5\u52a0\u8f7d\u670d\u52a1\u5668\u8be6\u60c5
view_admin_systemSettings_cannotLoadSettings = \u65e0\u6cd5\u83b7\u5f97\u5f53\u524d\u7cfb\u7edf\u914d\u7f6e
-## view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
-## view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+##view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed
+##view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file
view_admin_systemSettings_fixBeforeSaving = \u4fdd\u5b58\u524d\u8bf7\u4fee\u590d\u9519\u8bef
view_admin_systemSettings_group_baseline = \u81ea\u52a8Baseline\u914d\u7f6e\u5c5e\u6027
view_admin_systemSettings_group_dataMgr = \u6570\u636e\u7ba1\u7406\u5668\u57fa\u672c\u5c5e\u6027
@@ -1192,7 +1192,7 @@ view_dashboards_title = \u7edf\u8ba1\u8868\u76d8
##view_drift_category_fileRemoved = File Removed
##view_drift_confirm_deleteAllDefs = Delete all drift detection definitions?
##view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)?
-view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
+##view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue?
##view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions.
##view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates
##view_drift_failure_detectNow = Failed to submit drift detection run request
@@ -1672,6 +1672,7 @@ view_reportsTop_title = \u62a5\u8868
view_reports_alertDefinitions = \u544a\u8b66\u5b9a\u4e49
view_reports_alertDefinitions_parentHover = \u70b9\u51fb\u5230\u7236\u7ea7\u544a\u8b66\u83dc\u5355
view_reports_alertDefinitions_resTypeLoadError = \u65e0\u6cd5\u83b7\u53d6\u8d44\u6e90\u6a21\u677f\u7c7b\u578b - \u65e0\u6cd5\u67e5\u770b\u544a\u8b66\u6a21\u677f.
+##view_reports_driftCompliance = Drift Compliance
view_reports_inventorySummary_failFetch = \u83b7\u53d6\u7edf\u8ba1\u6e05\u5355\u5931\u8d25
view_reports_platforms = \u5e73\u53f0\u4f7f\u7528\u7387\u62a5\u8868
view_reports_subsystems = \u5b50\u7cfb\u7edf\u62a5\u8868
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index c2ac7db..f2d05c5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -2047,8 +2047,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
ResourceError error = entityManager.find(ResourceError.class, resourceErrorId);
if (error != null) {
- if (!authorizationManager.hasResourcePermission(user, Permission.MODIFY_RESOURCE,
- error.getResource().getId())) {
+ if (!authorizationManager.hasResourcePermission(user, Permission.MODIFY_RESOURCE, error.getResource()
+ .getId())) {
throw new PermissionException("Cannot delete Resource error [" + resourceErrorId + "]. User [" + user
+ "] does not have permission to modify Resource [" + error.getResource().getName() + "].");
}
@@ -2373,20 +2373,25 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
@SuppressWarnings("unchecked")
@RequiredPermission(Permission.MANAGE_INVENTORY)
public List<ResourceInstallCount> findResourceInstallCounts(Subject subject, boolean groupByVersions) {
+ String queryName = groupByVersions ? Resource.QUERY_RESOURCE_VERSION_REPORT : Resource.QUERY_RESOURCE_REPORT;
+ Query query = entityManager.createNamedQuery(queryName);
+ List<ResourceInstallCount> results = query.getResultList();
+
+ return results;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ @RequiredPermission(Permission.MANAGE_INVENTORY)
+ public List<ResourceInstallCount> findResourceComplianceCounts(Subject subject) {
Query query = null;
List<ResourceInstallCount> results = null;
- if (!groupByVersions) {
- query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_REPORT);
- results = query.getResultList();
- } else {
- //query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_VERSION_REPORT);
- query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE);
- results = query.getResultList();
+ query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE);
+ results = query.getResultList();
- query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_OUT_OF_COMPLIANCE);
- results.addAll(query.getResultList());
- }
+ query = entityManager.createNamedQuery(Resource.QUERY_RESOURCE_VERSION_AND_DRIFT_OUT_OF_COMPLIANCE);
+ results.addAll(query.getResultList());
return results;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
index 1d1ec69..7f71cbe 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
@@ -484,6 +484,8 @@ public interface ResourceManagerLocal {
*/
List<Integer> uninventoryResources(Subject subject, int[] resourceIds);
+ List<ResourceInstallCount> findResourceComplianceCounts(Subject subject);
+
List<ResourceInstallCount> findResourceInstallCounts(Subject subject, boolean groupByVersions);
PageList<ResourceComposite> findResourceCompositesByCriteria(Subject subject, ResourceCriteria criteria);
12 years, 6 months
[rhq] modules/enterprise pom.xml
by ips
modules/enterprise/binding/pom.xml | 3 ++-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 7 +++++++
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 8 +++++++-
modules/enterprise/server/ear/pom.xml | 4 ++++
modules/enterprise/server/jar/pom.xml | 2 +-
pom.xml | 4 ++--
9 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit c995682f3467f88dd2d41d4b031b2dbd5be980c1
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 18 16:45:32 2011 -0500
[BZ 726689] upgrade Javassist from 3.8.0.GA to 3.9.0.GA to prevent intermittent NPEs on JSF-based pages
(https://bugzilla.redhat.com/show_bug.cgi?id=726689)
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 6f2287b..0a9dd46 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -192,9 +192,10 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
+
</dependencies>
<build>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index ffc2b42..8ea3d46 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -389,7 +389,7 @@
<!-- ============ Testing ========================-->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
diff --git a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
index 803afe6..b7dfe30 100644
--- a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
+++ b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
@@ -59,7 +59,7 @@
<copy file="${settings.localRepository}/org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" tofile="${lib.home}/rhq-enterprise-comm-${project.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/jboss/jboss-common/${jboss-common.version}/jboss-common-${jboss-common.version}.jar" tofile="${lib.home}/jboss-common-${jboss-common.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/jboss/jboss-remoting/${jboss-remoting.version}/jboss-remoting-${jboss-remoting.version}.jar" tofile="${lib.home}/jboss-remoting-${jboss-remoting.version}.jar" verbose="true" />
- <copy file="${settings.localRepository}/jboss/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar" tofile="${lib.home}/javassist-${jboss-javassist.version}.jar" verbose="true" />
+ <copy file="${settings.localRepository}/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar" tofile="${lib.home}/javassist-${jboss-javassist.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/oswego-concurrent/concurrent/${concurrent.version}/concurrent-${concurrent.version}.jar" tofile="${lib.home}/concurrent-${concurrent.version}.jar" verbose="true" />
<!-- TODO: This can probaby go away after we stop using EJB classes as Exceptions in the RemoteAPI -->
<copy file="${settings.localRepository}/javax/persistence/persistence-api/${persistence-api.version}/persistence-api-${persistence-api.version}.jar" tofile="${lib.home}/persistence-api-${persistence-api.version}.jar" verbose="true" />
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 3051557..257a9dd 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 428e1cb..f48f998 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -121,6 +121,12 @@
<artifactId>resteasy-jettison-provider</artifactId>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ </dependency>
+
</dependencies>
<build>
@@ -181,6 +187,7 @@
<property name="ojdbc5.version" value="${ojdbc5.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
+ <property name="jboss-javassist.version" value="${jboss-javassist.version}" />
<property name="jtds.version" value="${jtds.version}" />
<property name="jsf-api.version" value="${jsf-api.version}" />
<property name="jsf-impl.version" value="${jsf-impl.version}" />
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index d5f3e51..9dbae53 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -301,12 +301,18 @@
<copy file="${settings.localRepository}/javax/faces/jsf-impl/${jsf-impl.version}/jsf-impl-${jsf-impl.version}.jar"
tofile="${jsf-libs.dir}/jsf-impl.jar" verbose="true" />
- <echo>Upgrading quartz.jar to v${quartz.version} ...</echo>
+ <echo>Upgrading Quartz to v${quartz.version} ...</echo>
<copy file="${settings.localRepository}/org/opensymphony/quartz/quartz/${quartz.version}/quartz-${quartz.version}.jar"
tofile="${jboss.home}/server/default/lib/quartz.jar" overwrite="true" verbose="true" />
<copy file="${settings.localRepository}/org/opensymphony/quartz/quartz-oracle/${quartz.version}/quartz-oracle-${quartz.version}.jar"
tofile="${jboss.home}/server/default/lib/quartz-oracle.jar" overwrite="true" verbose="true" />
+ <echo>Upgrading Javassist from v3.8.0.GA to v${jboss-javassist.version} ...</echo>
+ <copy file="${settings.localRepository}/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar"
+ tofile="${jboss.home}/server/default/lib/javassist.jar" overwrite="true" verbose="true" />
+ <copy file="${settings.localRepository}/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar"
+ tofile="${jboss.home}/client/javassist.jar" overwrite="true" verbose="true" />
+
<echo>Preparing JMS backend ...</echo>
<mkdir dir="${jboss.deploy.dir}/jms" />
<copy todir="${jboss.deploy.dir}/${jms.oracle.dir}">
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 5a7136e..258a946e 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -89,6 +89,10 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 07aebae..db286a1 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -154,7 +154,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index c2d7c46..ed424a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<jboss-jta.version>4.2.3.SP7</jboss-jta.version>
<jboss-remoting.version>2.2.2.SP8</jboss-remoting.version>
<jboss-serialization.version>1.0.3.GA</jboss-serialization.version>
- <jboss-javassist.version>3.8.0.GA</jboss-javassist.version>
+ <jboss-javassist.version>3.9.0.GA</jboss-javassist.version>
<jbossws-native-dist.version>3.1.1.GA</jbossws-native-dist.version>
<!-- End: JBoss AS Dependency Versions -->
@@ -242,7 +242,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>${jboss-javassist.version}</version>
</dependency>
12 years, 6 months
[rhq] Branch 'release_jon3.x' - rhq_bash.lib
by snegrea
rhq_bash.lib | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 180c9d4a2685a5362dd3d3cb0183e92f93550911
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 18 11:49:46 2011 -0600
Make the output a little bit nicer by adding a function execution marker.
diff --git a/rhq_bash.lib b/rhq_bash.lib
index 8f9b3dd..8b1a300 100644
--- a/rhq_bash.lib
+++ b/rhq_bash.lib
@@ -236,3 +236,18 @@ unset_script_debug_mode()
set +x
}
+
+#========================================================================================
+# Description: Print function information (name and parameters).
+#========================================================================================
+print_function_information()
+{
+ function_name=$1
+ shift
+
+ function_parameters=$(printf ", %s " "$@")
+ function_parameters=${function_parameters:1}
+
+ echo "+ $function_name ($function_parameters)"
+}
+
12 years, 6 months
[rhq] rhq_bash.lib
by snegrea
rhq_bash.lib | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit dbff94512871fd298f9e9b6cc1a4059bc56d56bf
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 18 11:49:46 2011 -0600
Make the output a little bit nicer by adding a function execution marker.
diff --git a/rhq_bash.lib b/rhq_bash.lib
index 8f9b3dd..8b1a300 100644
--- a/rhq_bash.lib
+++ b/rhq_bash.lib
@@ -236,3 +236,18 @@ unset_script_debug_mode()
set +x
}
+
+#========================================================================================
+# Description: Print function information (name and parameters).
+#========================================================================================
+print_function_information()
+{
+ function_name=$1
+ shift
+
+ function_parameters=$(printf ", %s " "$@")
+ function_parameters=${function_parameters:1}
+
+ echo "+ $function_name ($function_parameters)"
+}
+
12 years, 6 months
[rhq] Branch 'release_jon3.0.0_CR2' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml
by rhqci
modules/cli-tests/pom.xml | 2 +-
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/drift/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
126 files changed, 144 insertions(+), 144 deletions(-)
New commits:
commit 2802391c7a175ad8bc341410cd389645f0efd084
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Fri Nov 18 12:32:55 2011 -0500
development RHQ_4.2.0.JON300-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index f09c76b..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.CR2</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 40ed203..34594e9 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.CR2</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 f8e0585..9ee103d 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.CR2</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 aeca327..06b5e53 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.CR2</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 b71259f..e2dcf41 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.CR2</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 03be40f..cd1bbd1 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.CR2</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 ab1471f..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.CR2</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 8f2f258..30aa48f 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.CR2</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 6033779..41710d7 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.CR2</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 2e81191..7927911 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.CR2</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 0ce0b42..dbd8dd4 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.CR2</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 dcebf4c..f661783 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.CR2</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 587c8b9..8949753 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.CR2</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 f6b7929..a04c370 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.CR2</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 a129123..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.CR2</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 c792134..02ebc3b 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.CR2</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 9380b0f..b04e453 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.CR2</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 f103ec3..89615a7 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.CR2</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 db7a55b..6a1025f 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.CR2</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 1ed3caf..a7b8fcb 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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON300.CR2</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 64d371a..a5ef9ad 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.CR2</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 8f5cb42..76dda07 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.CR2</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 8470206..0293a60 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.CR2</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 1b72c26..e9668b8 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.CR2</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 d095b27..54de724 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.CR2</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 2d26830..d98b5ca 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.CR2</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 0ef2162..552cb24 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.CR2</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 157ffbf..d9c8ad1 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.CR2</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 dd493dc..5bdde31 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.CR2</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 eb6083d..6b79078 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.CR2</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 ec0a023..9f0ad6b 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.CR2</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 c38066b..589f956 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.CR2</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 19dca7a..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.CR2</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 e452b7a..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.CR2</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 a64808b..ea667f3 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.CR2</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 38ae205..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.CR2</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.CR2</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 a7b79e9..ba6e869 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.CR2</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 521cc86..1244e9f 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.CR2</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 eba61e5..6f33801 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.CR2</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 333afe4..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.CR2</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 aa7a613..59ee950 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.CR2</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 8fcfbab..2ea918e 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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON300.CR2</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 4487cc2..a98420e 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.CR2</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.CR2</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 7ecff57..bc33e77 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.CR2</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.CR2</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 8232023..1a6d7a0 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.CR2</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.CR2</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 e295b2a..be56d79 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.CR2</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.CR2</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 c6369af..4b879c0 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.CR2</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.CR2</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 28c7b37..3b2c497 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.CR2</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.CR2</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 e115b5a..9ddf288 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.CR2</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.CR2</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 71823ea..b671985 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.CR2</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.CR2</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 24d6248..cbf675e 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.CR2</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.CR2</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 440128f..55ddfeb 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.CR2</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 b1fd0db..dc07299 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.CR2</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.CR2</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 5d9de15..d7de3c5 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.CR2</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 e7efc59..50a99c0 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.CR2</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 7472c29..a0fd74d 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.CR2</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 b4fc926..071cd55 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.CR2</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.CR2</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 6a2d4ea..5a39976 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.CR2</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 b7fb59e..5385e2a 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.CR2</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.CR2</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 fab62d7..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.CR2</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 92febcf..41b88cc 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.CR2</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 ae2a288..1a76392 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.CR2</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 97855c0..d8a4ac6 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.CR2</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 2347c4b..dd4a47a 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.CR2</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 687f1eb..6945305 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.CR2</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 791cbbd..602c25f 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.CR2</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 ec41e9e..bc90e65 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.CR2</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 dadc0f4..40c1e62 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.CR2</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 4a59c08..78560b5 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.CR2</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 d75e578..4486bb2 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.CR2</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 86cc699..c5368a3 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.CR2</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 be913a1..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.CR2</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.CR2</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 c5233dc..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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON300.CR2</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 5d318e5..e6c463b 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.CR2</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 15af529..beefa91 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.CR2</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 a17dbb6..b04ba2e 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.CR2</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 10d9aac..63848d3 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.CR2</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 80ffd48..1e17896 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.CR2</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 ed2e9d9..4db2480 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.CR2</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 739cf1a..188b6de 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.CR2</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 3071fbc..012fece 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.CR2</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 451c69f..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.CR2</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 819a5a7..6847acd 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.CR2</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 a94d062..bd03bfe 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.CR2</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 c294dba..8392b5b 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.CR2</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 3a7000b..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.CR2</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 c603c2a..19a0cf2 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.CR2</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 aad9497..75b726c 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.CR2</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 019be55..3bc7ec3 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.CR2</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 94b3519..a4129a0 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.CR2</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 5c3c407..c6d5cfc 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.CR2</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 5d1dfbf..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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON300.CR2</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 f5b1225..66af2a7 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.CR2</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 9fea9f5..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.CR2</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 af88b7a..ad2feef 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.CR2</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 adcebba..cafd482 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.CR2</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 2d8a610..e72e971 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.CR2</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 88cf186..56f9285 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.CR2</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 bd3c9af..282bc5d 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.CR2</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 e005cd4..99fa05a 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.CR2</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 31718fe..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.CR2</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 d90f0d6..50e752c 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.CR2</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 7d8b008..a80ce3e 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.CR2</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 95ac6c7..492ca4f 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.CR2</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 8dc4001..aa93058 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.CR2</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 89331b7..1eda352 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.CR2</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 bb2bde1..beffd18 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.CR2</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 c15112f..a1045b1 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.CR2</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 cca953a..d281b42 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.CR2</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 bdd371c..1696f99 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.CR2</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 8087484..8f9e5a5 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.CR2</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 da06988..393c28c 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.CR2</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 035efae..f781608 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.CR2</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 7a5fdbb..7cc6fa6 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.CR2</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 2741d1c..d4a17cd 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.CR2</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 359b415..58ca78c 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.CR2</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 fa67601..886a2c3 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.CR2</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 338b6e5..ed8a7f6 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.CR2</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 fb5049d..ec0912d 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.CR2</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 f75ba07..0e50104 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.CR2</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 ff0be0d..c0bb0b9 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.CR2</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 ea3b6cb..890ea42 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.CR2</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 4d62abb..e090a09 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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 7244665..59b81a7 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.CR2</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 b07ad36..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.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 44e465b..b05464f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON300.CR2</version>
+ <version>4.2.0.JON300-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
12 years, 6 months
[rhq] Changes to 'refs/tags/RHQ_4_2_0_JON300_CR2'
by rhqci
Changes since RHQ_3_0_0-BETA1:
Heiko W. Rupp (84):
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.
BZ 751016 - set content type,as as7 requires this now.(cherry picked from commit 0b363407c23241cb3323300b3aa91487c6f65669)
BZ 751065 better detect the version and mark EAP servers as such.
BZ 736481 - Fix the missing ':' errors.(cherry picked from commit e1ae664a1474a18a74f02f720c21aa016bbb0fae)
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.(cherry picked from commit aba8b66bcc9dfb864a369167c55bc6a42098fe19)
BZ 750241 remove insufficient <http-method> entries in web.xml so that they don't trigger CVE-2010-0738 by accident.(cherry picked from commit f0585d1c2e41087f0130aee1b66b9e1eb1683326)
BZ 751065 prepend "EAP " to the names of server(s) and host controllers.(cherry picked from commit 94059b0de8a15cdf76135f3b3c7cd3f34d98276c)
BZ 715404 prevent creation of groups with duplicate names
BZ 751065 prepend "EAP " to the names of server(s) and host controllers. Be careful with the resource key.
Revert " [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 750240 - escape <,",>,&,',/ to prevent html injection attacks(cherry picked from commit faa248b)
BZ 754838 - if no host name or port are found, use a default for now.
Hudson (5):
development RHQ_4.3.0-SNAPSHOT
tag RHQ_4_2_0
tag RHQ_4_2_0_JON300_CR1
development RHQ_4.2.0.JON300-SNAPSHOT
tag RHQ_4_2_0_JON300_CR2
Ian Springer (123):
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
[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
[BZ 752814] fix broken detail links in recent operations portlets
[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 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 634306] increase the max length of a product version from 50 to 100, so it
[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)
Jay Shaughnessy (130):
[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
Update plugins supporting drift to use better template names
Rework drift metadata update for changes to plugin defined drift templates.
Fix issue in handling of non-cached metadata types in type repo. Also,
Log failures to reschedule EJB timers. If they don't get rescheduled bad
Change DriftSnapshotView to inline drift details via another level of
[751091 - Resource tree fails to render for non inventory manager]
Remove the ":" character from the plugin defined drift template names as
[BZ 738369 - a user with "Manage Drift" permissions of "Read" (implied) cannot view Drift]
[745236 - JON3 BETA2 ...WARN messages after clean install, drift related]
[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 (...)]
Revert "[BZ 751914] Adding compliance column to resource list table"
Change some stuff around so that only the Inventory Report resource list
Remove the Drift tab from compatible group views (for the valid types).
Initial work for db upgrade issues [Bug 751778]
make in Compliance column wider so column header isn't clipped.
more work for [bug 753000 - Error on the initial snapshot when creating a drift profile on Windows]
Fix to QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE to ensure we
[bug 750917 - Can't update a drift template]
[bug 669521-getting agent clients is now too restrictive]
Related to Bug 669521
[Bug 754382 - Login after session timeout does not (re)display the portlets on summary tab]
db-upgrade changes
Related to bug 753000, prevent paths and filter patterns that will
Fix oracle syntax for sequence renaming in drift upgrade.
- make sure to protect against null *and* empty path or pattern fields
Remove superfluous not null assignment in spec version 115. Oracle
John Mazzitelli (92):
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] no metrics on by default in hardware plugin
[BZ 741331] just some very limited number of metrics to be enabled out of box - mainly in platform plugin
[BZ 741331] turn off all plugin metrics by default, up all default collection intervals
[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
[BZ 754556] strip paths from uploaded file names
John Sanda (187):
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
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
Bumping versions up to 4.2.1-SNAPSHOT
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 749415] Making the pinned field editable
[BZ 751914] Show compliance at the resource type level
[BZ 751914] Adding compliance column to resource list table
[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 streams are closed
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
Larry O'Leary (1):
Bug 736792 - CLI retrieveBackingContent gives a file not found exception on the agent
Lukas Krejci (36):
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 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
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 (48):
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 752408] Back out change to dbupgrade to make sequences configurable from product release branch.
[BZ 751065] - Add EAP monicker to EAP6 server resource names.
Simeon Pinder (37):
[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.
Updating POM versions for release_jon3.x. consitent with following direction:
moving build number logic out of profiles and back into core build since brew now supports access to git exe.
fix error in release script.
[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.
[BZ 731864] flipping bit to disable tags on release branch.
Fixing a number of lingering productization strings.
[BZ 743986] insert branded content in mashup portlet for product releases.
add tag removal parameters for enterprise runs.
missed a translation file.
Stefan Negrea (137):
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"
[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.
Add tag override to the release script to replace an existing tag with this new one.
Remove Git ignores for essential Eclipse files.
When branching the name of the branch should be similar to the release version and not tag version.
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.
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.
[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.
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 | 16
.gitignore | 7
.settings/org.eclipse.jdt.ui.prefs | 236
dev/null |binary
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 | 4
etc/m2/settings.xml | 1
etc/m2/smartgwt-war-archetype/pom.xml | 23
etc/m2/smartgwt-war-archetype/src/main/resources/archetype-resources/pom.xml | 23
etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml | 5
modules/cli-tests/pom.xml | 2
modules/common/ant-bundle/pom.xml | 3
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 17
modules/common/drift/pom.xml | 3
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 | 3
modules/common/jboss-as/pom.xml | 7
modules/common/pom.xml | 2
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/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 | 2
modules/core/dbutils/pom.xml | 12
modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 16
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 77
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 | 14
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 | 6
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 | 512 +
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 | 173
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 | 70
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 | 24
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 | 16
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/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 | 2
modules/core/native-system/pom.xml | 60
modules/core/plugin-api/pom.xml | 43
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/upgrade/ResourceUpgradeContext.java | 27
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java | 2
modules/core/plugin-container/pom.xml | 9
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 | 607 +
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 | 178
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/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 | 5
modules/core/util/pom.xml | 3
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 | 61
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 | 40
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/AgentUpdate.java | 25
modules/enterprise/binding/pom.xml | 105
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 | 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 | 10
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 | 73
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 165
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 | 402 +
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 | 430 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 601 -
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 | 1123 +++
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/queue/AutodiscoveryPortlet.java | 5
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 | 424 +
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 | 402 +
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 | 267
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 268
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 | 169
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/SystemGWTService.java | 8
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 | 6
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 | 91
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 5
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 | 11
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 | 192
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 | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 41
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReportResourceSearchView.java | 134
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 | 2
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 | 62
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 | 8
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 312
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1363 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 300
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 419 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 288
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 2
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/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 | 2
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 | 14
modules/enterprise/gui/pom.xml | 8
modules/enterprise/gui/portal-war/pom.xml | 2
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/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 | 303
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 | 1
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
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 | 153
modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js | 244
modules/enterprise/remoting/cli/src/main/samples/drift.js | 257
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 | 11
modules/enterprise/remoting/client-api/pom.xml | 15
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 | 2
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 | 2
modules/enterprise/server/container/pom.xml | 93
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 8
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/scripts/rhq-container.assembly.xml | 5
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 52
modules/enterprise/server/ear/pom.xml | 22
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 | 241
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 | 203
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/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 | 675 +
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 | 63
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/JPADriftServerBean.java | 274
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 18
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 | 65
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 | 91
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 | 88
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 | 30
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/SystemManagerBean.java | 312
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 6
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 | 4
modules/enterprise/server/plugins/alert-email/pom.xml | 4
modules/enterprise/server/plugins/alert-irc/pom.xml | 7
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4
modules/enterprise/server/plugins/alert-microblog/pom.xml | 10
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 | 4
modules/enterprise/server/plugins/alert-operations/pom.xml | 4
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 | 4
modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 4
modules/enterprise/server/plugins/alert-sms/pom.xml | 4
modules/enterprise/server/plugins/alert-snmp/pom.xml | 6
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 | 4
modules/enterprise/server/plugins/ant-bundle/pom.xml | 6
modules/enterprise/server/plugins/cloud/pom.xml | 4
modules/enterprise/server/plugins/cobbler/pom.xml | 6
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/drift-mongodb/pom.xml | 23
modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java | 118
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 | 2
modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 31
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 6
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 | 5
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 | 8
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
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 | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 8
modules/enterprise/server/pom.xml | 3
modules/enterprise/server/safe-invoker/pom.xml | 2
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 | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java | 650 +
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/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/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 1
modules/helpers/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/integration-tests/apache-plugin-test/pom.xml | 6
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 | 4
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 369 +
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 | 2
modules/jopr/dist/server/pom.xml | 4
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 17
modules/plugins/JBossOSGi/pom.xml | 2
modules/plugins/aliases/pom.xml | 4
modules/plugins/ant-bundle/pom.xml | 4
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 20
modules/plugins/apache/pom.xml | 10
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 | 24
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 10
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 10
modules/plugins/byteman/pom.xml | 4
modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/cobbler/pom.xml | 7
modules/plugins/cron/pom.xml | 6
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 | 4
modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabaseComponent.java | 3
modules/plugins/filetemplate-bundle/pom.xml | 4
modules/plugins/grub/pom.xml | 4
modules/plugins/hadoop/pom.xml | 2
modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml | 28
modules/plugins/hibernate/pom.xml | 8
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 | 4
modules/plugins/hudson/pom.xml | 4
modules/plugins/hudson/src/main/java/org/rhq/plugins/hudson/HudsonServerComponent.java | 14
modules/plugins/iis/pom.xml | 2
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/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 | 5
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 | 51
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 | 24
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 219
modules/plugins/jboss-as-5/testsuite/pom.xml | 3
modules/plugins/jboss-as-7/d2d.sh | 2
modules/plugins/jboss-as-7/pom.xml | 9
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 2
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 | 7
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 43
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/ManagedASDiscovery.java | 18
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 | 25
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 2
modules/plugins/jboss-as/pom.xml | 4
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 | 88
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 20
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/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/JnpConfig.java | 24
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 | 4
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 | 2
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/CacheConfigurationHelper.java | 89
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 43
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/resources/META-INF/rhq-plugin.xml | 47
modules/plugins/jdbctrace/pom.xml | 2
modules/plugins/jira/pom.xml | 6
modules/plugins/jmx/pom.xml | 8
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 | 2
modules/plugins/mod-cluster/pom.xml | 66
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 | 81
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 | 6
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 | 8
modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml | 6
modules/plugins/onewire/pom.xml | 2
modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/oracle/pom.xml | 6
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 38
modules/plugins/pattern-generator/pom.xml | 2
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 | 78
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 | 6
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 | 88
modules/plugins/pom.xml | 4
modules/plugins/postfix/pom.xml | 4
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessDiscoveryComponent.java | 5
modules/plugins/postgres/pom.xml | 8
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 | 2
modules/plugins/rhq-agent/pom.xml | 6
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 | 7
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 90
modules/plugins/samba/pom.xml | 4
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 39
modules/plugins/script/pom.xml | 2
modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/script2/pom.xml | 4
modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptComponent.java | 31
modules/plugins/services/pom.xml | 1
modules/plugins/snmptrapd/pom.xml | 5
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 | 4
modules/plugins/sudoers/pom.xml | 6
modules/plugins/tomcat/pom.xml | 6
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/TomcatServerComponent.java | 16
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 | 4
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 | 2
modules/plugins/virt/pom.xml | 4
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 | 32
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 | 283
publish_release.sh | 413 -
release.sh | 980 +-
rhq_bash.lib | 238
1234 files changed, 68918 insertions(+), 20960 deletions(-)
---
12 years, 6 months
[rhq] Branch 'release_jon3.0.0_CR2' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml
by rhqci
modules/cli-tests/pom.xml | 2 +-
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/drift/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++--
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
126 files changed, 144 insertions(+), 144 deletions(-)
New commits:
commit a16c2ea4c02b0d91f172cd4b4d46b9f19494e916
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Fri Nov 18 12:31:48 2011 -0500
tag RHQ_4_2_0_JON300_CR2
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 39759f0..f09c76b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 34594e9..40ed203 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 9ee103d..f8e0585 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 06b5e53..aeca327 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 e2dcf41..b71259f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index cd1bbd1..03be40f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 756e92f..ab1471f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 30aa48f..8f2f258 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 41710d7..6033779 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 7927911..2e81191 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index dbd8dd4..0ce0b42 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index f661783..dcebf4c 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 8949753..587c8b9 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a04c370..f6b7929 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 6eb1d10..a129123 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 02ebc3b..c792134 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index b04e453..9380b0f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 89615a7..f103ec3 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 6a1025f..db7a55b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index a7b8fcb..1ed3caf 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 a5ef9ad..64d371a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 76dda07..8f5cb42 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 0293a60..8470206 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 e9668b8..1b72c26 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 54de724..d095b27 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 d98b5ca..2d26830 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 552cb24..0ef2162 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 d9c8ad1..157ffbf 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 5bdde31..dd493dc 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 6b79078..eb6083d 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 9f0ad6b..ec0a023 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 589f956..c38066b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 adfb7b1..19dca7a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 3a6121f..e452b7a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index ea667f3..a64808b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 494e4bd..38ae205 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 ba6e869..a7b79e9 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 1244e9f..521cc86 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 6f33801..eba61e5 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 9be794e..333afe4 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 59ee950..aa7a613 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 2ea918e..8fcfbab 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 a98420e..4487cc2 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 bc33e77..7ecff57 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 1a6d7a0..8232023 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 be56d79..e295b2a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 4b879c0..c6369af 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 3b2c497..28c7b37 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 9ddf288..e115b5a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 b671985..71823ea 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 cbf675e..24d6248 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 55ddfeb..440128f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 dc07299..b1fd0db 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 d7de3c5..5d9de15 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 50a99c0..e7efc59 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 a0fd74d..7472c29 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 071cd55..b4fc926 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>groovy-script-server-plugin</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 5a39976..6a2d4ea 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 5385e2a..b7fb59e 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 9351bdb..fab62d7 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 41b88cc..92febcf 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 1a76392..ae2a288 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 d8a4ac6..97855c0 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 dd4a47a..2347c4b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 6945305..687f1eb 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 602c25f..791cbbd 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index bc90e65..ec41e9e 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 40c1e62..dadc0f4 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 78560b5..4a59c08 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 4486bb2..d75e578 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 c5368a3..86cc699 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 3256d73..be913a1 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<build>
<plugins>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 9f1dd01..c5233dc 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 e6c463b..5d318e5 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index beefa91..15af529 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 b04ba2e..a17dbb6 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 63848d3..10d9aac 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 1e17896..80ffd48 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 4db2480..ed2e9d9 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 188b6de..739cf1a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 012fece..3071fbc 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 00d7107..451c69f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 6847acd..819a5a7 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index bd03bfe..a94d062 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 8392b5b..c294dba 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 6e50fda..3a7000b 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 19a0cf2..c603c2a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 75b726c..aad9497 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 3bc7ec3..019be55 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index a4129a0..94b3519 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index c6d5cfc..5c3c407 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 16fdc4a..5d1dfbf 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 66af2a7..f5b1225 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 82b1e94..9fea9f5 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 ad2feef..af88b7a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 cafd482..adcebba 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index e72e971..2d8a610 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 56f9285..88cf186 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 282bc5d..bd3c9af 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 99fa05a..e005cd4 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 8dfea53..31718fe 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 50e752c..d90f0d6 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index a80ce3e..7d8b008 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 492ca4f..95ac6c7 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index aa93058..8dc4001 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 1eda352..89331b7 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index beffd18..bb2bde1 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index a1045b1..c15112f 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index d281b42..cca953a 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 1696f99..bdd371c 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 8f9e5a5..8087484 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 393c28c..da06988 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index f781608..035efae 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 7cc6fa6..7a5fdbb 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index d4a17cd..2741d1c 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 58ca78c..359b415 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 886a2c3..fa67601 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index ed8a7f6..338b6e5 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index ec0912d..fb5049d 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 0e50104..f75ba07 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index c0bb0b9..ff0be0d 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</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 890ea42..ea3b6cb 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index e090a09..4d62abb 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 59b81a7..7244665 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index f7d7aed..b07ad36 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-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index b05464f..44e465b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.2.0.JON300-SNAPSHOT</version>
+ <version>4.2.0.JON300.CR2</version>
<packaging>pom</packaging>
<name>RHQ</name>
12 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/remoting/cli/src/main/samples/bundles.js | 19 ++++++------
1 file changed, 10 insertions(+), 9 deletions(-)
New commits:
commit be095e3cd9e7d24e25566b26b70dbe7c2fb3563f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 18 11:45:42 2011 -0500
add a boolean isCleanDeployment param to deployBundle()
diff --git a/modules/enterprise/remoting/cli/src/main/samples/bundles.js b/modules/enterprise/remoting/cli/src/main/samples/bundles.js
index 4402ad8..a8d7168 100644
--- a/modules/enterprise/remoting/cli/src/main/samples/bundles.js
+++ b/modules/enterprise/remoting/cli/src/main/samples/bundles.js
@@ -1,18 +1,16 @@
/**
* file: bundles.js
*
- * description: this file contains a couple of example functions for more convenient
- * work with the bundle subsystem.
+ * description: this file contains a few helper functions to make working
+ * with the bundle subsystem more convenient.
* This script has a dependency on util.js. To load this script's functions into your
- * CLI session execute the following from the CLI shell,
+ * CLI session, execute the following commands from the CLI shell:
*
* $ login <username> <password>
* $ exec -f samples/util.js
* $ exec -f samples/bundles.js
*
- * Note that you must login before you can load the scripts. Also please note
- * that if a function is not documented, then it is not intended for public
- * use. It is used only as an internal helper function.
+ * Note that you must login before you can load the scripts.
*
* author: lkrejci(a)redhat.com
*/
@@ -109,14 +107,16 @@ function createBundleDestination(destinationName, description, bundleName, group
* @param bundleVersion the bundle version to deploy (or id thereof)
* @param deploymentConfiguration the deployment configuration. This can be an ordinary
* javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
- * it is converted to the Configuration instance using the <code>asConfiguration</code>
+ * it is converted to a Configuration instance using the <code>asConfiguration</code>
* function from <code>util.js</code>. Please consult the documentation of that method
* to understand the limitations of that approach.
* @param description the deployment description
+ * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
+ * perform as an upgrade to the existing deployment, if any
*
* @return the BundleDeployment instance describing the deployment
*/
-function deployBundle(destination, bundleVersion, deploymentConfiguration, description) {
+function deployBundle(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
var destinationId = destination;
if (typeof(destination) == 'object') {
destinationId = destination.id;
@@ -134,7 +134,7 @@ function deployBundle(destination, bundleVersion, deploymentConfiguration, descr
var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
- deployment = BundleManager.scheduleBundleDeployment(deployment.id, false);
+ deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
var crit = new BundleDeploymentCriteria;
crit.addFilterId(deployment.id);
@@ -151,3 +151,4 @@ function deployBundle(destination, bundleVersion, deploymentConfiguration, descr
return deployment;
}
+
12 years, 6 months