modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java | 7 ++++--- modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 5 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 2 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-)
New commits: commit dc604ae17d538a129371f1bf9fbe8e324d1f4e5e Author: John Mazzitelli mazz@redhat.com Date: Tue Mar 26 12:12:35 2013 -0400
Revert "do not pass not-yet-fully-initialized "this" reference to GroupOperationHistory.addResourceOperationHistory() in ResourceOperationHistory's constructor, as the GWT compiler fails when it sees this (at least in my OS X 10.7.5, Oracle JDK 1.7.0_17 environment)"
This reverts commit df18b71df2d5114d9edc8a26ad42e0d7a9036eb2.
Charles asked that I revert this.
Reverting for a couple reasons: * This broke a jenkins build - an API change has been introduced and it therefore fails the API check job. (I think its due to a change in a public domain object's constructor). * Also, There is no BZ for this - we don't know what this addressed.
Ian - feel free to commit this back in a branch (not master) and create a BZ for this. We'll cherry pick in master at the appropriate time.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java index 08611ac..08c29be 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java @@ -126,11 +126,12 @@ public class ResourceOperationHistory extends OperationHistory { protected ResourceOperationHistory() { }
- public ResourceOperationHistory( - String jobName, String jobGroup, String subjectName, - OperationDefinition operationDefinition, Configuration parameters, Resource resource) { + public ResourceOperationHistory(String jobName, String jobGroup, String subjectName, + OperationDefinition operationDefinition, Configuration parameters, Resource resource, + GroupOperationHistory groupHistory) { super(jobName, jobGroup, subjectName, operationDefinition, parameters); this.resource = resource; + setGroupOperationHistory(groupHistory); }
public Resource getResource() { diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java index 6ec38e5..34837a1 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java @@ -285,8 +285,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createGroupIndividualResourceHistory(GroupOperationHistory g1) { ResourceOperationHistory r2 = new ResourceOperationHistory("job3" + System.currentTimeMillis(), "group3", - "user", newOperation, null, newResource); - r2.setGroupOperationHistory(g1); + "user", newOperation, null, newResource, g1); r2.setStartedTime(); em.persist(r2); return r2; @@ -301,7 +300,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createIndividualResourceHistory() { ResourceOperationHistory r1 = new ResourceOperationHistory("job1" + System.currentTimeMillis(), "group1", - "user", newOperation, null, newResource); + "user", newOperation, null, newResource, null); r1.setStartedTime(); em.persist(r1); return r1; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java index 5b3b374..4bc457e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java @@ -149,7 +149,7 @@ public class ResourceOperationHistoryDataSource extends
@Override protected ResourceOperationHistory createOperationHistory() { - return new ResourceOperationHistory(null, null, null, null, null, null); + return new ResourceOperationHistory(null, null, null, null, null, null, null); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java index dc5e887..df1e09e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java @@ -431,7 +431,7 @@ public class OperationHistoryDataSource extends ResourceOperationHistory resourceOperationHistory = new ResourceOperationHistory(null, null, from.getAttribute(Field.SUBJECT), (OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION), - (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource); + (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource, null); resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID)); return resourceOperationHistory; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java index 6982d58..955de7a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java @@ -97,8 +97,7 @@ public abstract class OperationJob implements Job {
ResourceOperationHistory history; history = new ResourceOperationHistory(jobName, jobGroup, schedule.getSubject().getName(), op, parameters, - schedule.getResource()); - history.setGroupOperationHistory(groupHistory); + schedule.getResource(), groupHistory);
// persist the results of the initial create ResourceOperationHistory persisted;
rhq-commits@lists.fedorahosted.org