modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
| 4 ++-
modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
| 7 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
| 11 +++-------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
| 2 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
| 2 -
5 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit e2bae516376dfd5f33ac9cf495c58d08356055c7
Merge: ce99967 0189554
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:34:47 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 018955418ebd767b1996caac1729bfda58ece561
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Mar 26 18:29:38 2013 +0100
Changing the return type in for the findOperationDefinitionsByCriteria() signature
from List to PageList. Now there is no need to overcast the result.
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
index e675d9a..21dc048 100644
--- a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
@@ -6,4 +6,11 @@
<method>void uninventoryAllResourcesByAgent(org.rhq.core.domain.auth.Subject,
org.rhq.core.domain.resource.Agent)</method>
<justification>Adding a method to a remote API interface is safe. This class is
never to be implemented by users.</justification>
</difference>
+ <difference>
+
<className>org/rhq/enterprise/server/operation/OperationManagerRemote</className>
+ <differenceType>7006</differenceType> <!-- method added to an
interface -->
+ <method>java.util.List
findOperationDefinitionsByCriteria(org.rhq.core.domain.auth.Subject,
org.rhq.core.domain.criteria.OperationDefinitionCriteria)</method>
+ <to>org.rhq.core.domain.util.PageList</to>
+ <justification>Method Return Type changed. Returning the PageList instead of
List. PageList is assignable to a List variable, therefore this change is
safe.</justification>
+ </difference>
</differences>
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
index e7151fb..088f13e 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
@@ -1994,17 +1994,15 @@ public class OperationManagerBean implements
OperationManagerLocal, OperationMan
}
}
- @SuppressWarnings("unchecked")
- public List<OperationDefinition> findOperationDefinitionsByCriteria(Subject
subject,
+ public PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject
subject,
OperationDefinitionCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject,
criteria);
- CriteriaQueryRunner<OperationDefinition> queryRunner = new
CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<OperationDefinition> queryRunner = new
CriteriaQueryRunner<OperationDefinition>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<ResourceOperationHistory>
findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject,
criteria);
@@ -2013,12 +2011,11 @@ public class OperationManagerBean implements
OperationManagerLocal, OperationMan
subject.getId());
}
- CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new
CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new
CriteriaQueryRunner<ResourceOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<GroupOperationHistory>
findGroupOperationHistoriesByCriteria(Subject subject,
GroupOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject,
criteria);
@@ -2027,7 +2024,7 @@ public class OperationManagerBean implements OperationManagerLocal,
OperationMan
subject.getId());
}
- CriteriaQueryRunner<GroupOperationHistory> queryRunner = new
CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<GroupOperationHistory> queryRunner = new
CriteriaQueryRunner<GroupOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
index bce2a18..2d1ea239 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
@@ -740,7 +740,7 @@ public interface OperationManagerLocal {
*/
void unscheduleGroupOperation(Subject subject, String jobId, int resourceGroupId)
throws UnscheduleException;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject
subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory>
findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
index 8a4bf1d..3c6e81d 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
@@ -267,7 +267,7 @@ public interface OperationManagerRemote {
List<GroupOperationSchedule> findScheduledGroupOperations(Subject subject, int
groupId) throws Exception;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject
subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory>
findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
commit 3b9efe8bbf6e88ab90c0e25b289e3598d90d0d7f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:21:21 2013 -0400
BZ 824010 - don't do this yet - it will blow away native prefs and we don't
want to support this file based prefs yet
diff --git a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
index 6601de3..a24f374 100644
--- a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
+++ b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
@@ -133,7 +133,9 @@
</copy>
<!-- if necessary, migrate native prefs into our file prefs (since RHQ 4.7)
-->
+ <!--
<migrate-agent-preferences todir="${_update.tmp.dir}/rhq-agent/conf"
/>
+ -->
<!-- if there are any Windows wrapper environment or include files, copy them
-->
<echo>Copy existing Java Service Wrapper configuration files from the old
agent to the new agent</echo>
@@ -342,4 +344,4 @@ Jar File: ${rhq.agent.update.jar-file}
<target name="process-exit-code-unix"
if="_launcher.unix.successful">
<echo>Launched Unix agent successfully</echo>
</target>
-</project>
\ No newline at end of file
+</project>