modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java
| 4 ++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerBean.java
| 3 +--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerLocal.java
| 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectException.java
| 4 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateStillInProgressException.java
| 4 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java
| 1 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/ScheduleException.java
| 4 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/UnscheduleException.java
| 4 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceNotFoundException.java
| 4 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupNotFoundException.java
| 4 ++++
pom.xml
| 4 +++-
11 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit f0e1602b9f1577774b03022bd7c6c9f191a9ea94
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Aug 2 18:30:05 2010 -0400
changes to get build running w/ JDK7, including upgrading to EMS 1.2.14, which is
compiled w/ "-target 1.5", rather than "-target jsr14" like earlier
versions of EMS
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java
index 74f59f0..9f8726a 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java
@@ -66,8 +66,8 @@ abstract class AbstractConditionCache {
*/
cacheElement.setActive(true); // no harm to always set active
(though, technically, STATELESS operators don't need it)
cachedConditionProducer.sendActivateAlertConditionMessage(
- cacheElement.getAlertConditionTriggerId(), timestamp,
cacheElement
- .convertValueToString(providedValue), extraParams);
+ cacheElement.getAlertConditionTriggerId(), timestamp,
+ cacheElement.convertValueToString(providedValue), extraParams);
stats.matched++;
} catch (Exception e) {
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerBean.java
index bc901d4..f74663a 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerBean.java
@@ -32,7 +32,6 @@ import javax.jms.Session;
import org.rhq.enterprise.server.alert.engine.jms.model.ActiveAlertConditionMessage;
import org.rhq.enterprise.server.alert.engine.jms.model.InactiveAlertConditionMessage;
-import org.rhq.enterprise.server.alert.engine.model.AbstractCacheElement;
/**
* A convenience class that will be used by the AlertConditionCacheManager to send
messages to a JMS queue for
@@ -54,7 +53,7 @@ public class CachedConditionProducerBean implements
CachedConditionProducerLocal
private Queue alertConditionQueue;
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public <T extends AbstractCacheElement<S>, S> void
sendActivateAlertConditionMessage(int alertConditionId,
+ public <S> void sendActivateAlertConditionMessage(int alertConditionId,
long timestamp, S value, Object... extraParams) throws JMSException {
Connection connection = factory.createConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerLocal.java
index d2b4fb5..f431dd4 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/CachedConditionProducerLocal.java
@@ -33,7 +33,7 @@ public interface CachedConditionProducerLocal {
* Send a message to the appropriate JMS destination for processing. This destination
handles creating and
* persisting entities corresponding to triggered alert conditions.
*/
- <T extends AbstractCacheElement<S>, S> void
sendActivateAlertConditionMessage(int alertConditionId, long timestamp,
+ <S> void sendActivateAlertConditionMessage(int alertConditionId, long
timestamp,
S value, Object... extraParams) throws JMSException;
void sendDeactivateAlertConditionMessage(int alertConditionId, long timestamp) throws
JMSException;
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectException.java
index c4cc491..71856f5 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectException.java
@@ -20,6 +20,10 @@ package org.rhq.enterprise.server.auth;
public class SubjectException extends RuntimeException {
+ // Default no-arg constructor required by JAXB
+ public SubjectException() {
+ }
+
public SubjectException(String message) {
super(message);
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateStillInProgressException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateStillInProgressException.java
index 775f599..56abd94 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateStillInProgressException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateStillInProgressException.java
@@ -31,6 +31,10 @@ import javax.ejb.ApplicationException;
public class ConfigurationUpdateStillInProgressException extends RuntimeException {
private static final long serialVersionUID = 1L;
+ // Default no-arg constructor required by JAXB
+ public ConfigurationUpdateStillInProgressException() {
+ }
+
public ConfigurationUpdateStillInProgressException(String message) {
super(message);
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java
index 7b9ae57..3ee5c58 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java
@@ -30,6 +30,7 @@ public class RepoException extends ContentException {
private RepoExceptionType type = RepoExceptionType.GENERAL;
+ // Default no-arg constructor required by JAXB
public RepoException() {
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/ScheduleException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/ScheduleException.java
index 4d502bd..cb97f40 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/ScheduleException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/ScheduleException.java
@@ -29,6 +29,10 @@ package org.rhq.enterprise.server.exception;
public class ScheduleException extends RuntimeException {
private static final long serialVersionUID = 1L;
+ // Default no-arg constructor required by JAXB
+ public ScheduleException() {
+ }
+
public ScheduleException(String message) {
super(message);
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/UnscheduleException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/UnscheduleException.java
index 887998e..1b0f03a 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/UnscheduleException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/UnscheduleException.java
@@ -30,6 +30,10 @@ package org.rhq.enterprise.server.exception;
public class UnscheduleException extends RuntimeException {
private static final long serialVersionUID = 1L;
+ // Default no-arg constructor required by JAXB
+ public UnscheduleException() {
+ }
+
public UnscheduleException(String message) {
super(message);
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceNotFoundException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceNotFoundException.java
index 6ad8885..7c31d96 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceNotFoundException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceNotFoundException.java
@@ -25,6 +25,10 @@ package org.rhq.enterprise.server.resource;
public class ResourceNotFoundException extends RuntimeException {
private static final long serialVersionUID = 1L;
+ // Default no-arg constructor required by JAXB
+ public ResourceNotFoundException() {
+ }
+
/**
* Create an exception indicating the resource with the specified id was not found.
*
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupNotFoundException.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupNotFoundException.java
index 66ffa32..0d64c1e 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupNotFoundException.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupNotFoundException.java
@@ -21,6 +21,10 @@ package org.rhq.enterprise.server.resource.group;
public class ResourceGroupNotFoundException extends RuntimeException {
private static final long serialVersionUID = 1L;
+ // Default no-arg constructor required by JAXB
+ public ResourceGroupNotFoundException() {
+ }
+
public ResourceGroupNotFoundException(int groupId) {
super("A group with id " + groupId + " does not exist.");
}
diff --git a/pom.xml b/pom.xml
index f3c48ed..521bc40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<jsf-api.version>1.2_14</jsf-api.version>
<jsf-impl.version>1.2_14</jsf-impl.version>
<ojdbc5.version>11.2.0.1.0</ojdbc5.version>
- <ems.version>1.2.13</ems.version>
+ <ems.version>1.2.14</ems.version>
<postgresql.version>8.4-701.jdbc3</postgresql.version>
<h2.version>1.1.117</h2.version>
<jtds.version>1.2.2</jtds.version>
@@ -708,6 +708,8 @@
<source>1.6</source>
<target>1.6</target>
<optimize>false</optimize>
+ <verbose>true</verbose>
+ <compilerArgument>-Xlint</compilerArgument>
</configuration>
</plugin>