[rhq] Branch 'drift-mongodb' - modules/enterprise

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 2 +- modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/DriftServerPluginComponent.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 276d4aa49f568399f5adb35134647e84a119aff9 Author: John Sanda <jsanda(a)redhat.com&gt; Date: Fri Jul 29 15:23:28 2011 -0400 Need to copy resource id filer into jpa criteria object 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 54eda95..8e4d1f7 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 @@ -66,11 +66,11 @@ import org.rhq.core.domain.drift.DriftChangeSetCategory; import org.rhq.core.domain.drift.DriftComposite; import org.rhq.core.domain.drift.DriftConfiguration; import org.rhq.core.domain.drift.DriftFile; -import org.rhq.core.domain.drift.RhqDriftFile; import org.rhq.core.domain.drift.DriftFileBits; import org.rhq.core.domain.drift.DriftFileStatus; import org.rhq.core.domain.drift.RhqDrift; import org.rhq.core.domain.drift.RhqDriftChangeSet; +import org.rhq.core.domain.drift.RhqDriftFile; import org.rhq.core.domain.drift.Snapshot; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageList; diff --git a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/DriftServerPluginComponent.java b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/DriftServerPluginComponent.java index bed8bd5..1755d3e 100644 --- a/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/DriftServerPluginComponent.java +++ b/modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/DriftServerPluginComponent.java @@ -110,6 +110,7 @@ public class DriftServerPluginComponent implements DriftServerPluginFacet { private DriftChangeSetJPACriteria toJPACriteria(DriftChangeSetCriteria criteria) { DriftChangeSetJPACriteria jpaCriteria = new DriftChangeSetJPACriteria(); jpaCriteria.addFilterId(criteria.getFilterId()); + jpaCriteria.addFilterResourceId(criteria.getFilterResourceId()); jpaCriteria.addFilterCategory(criteria.getFilterCategory()); jpaCriteria.addFilterCreatedAfter(criteria.getFilterCreatedAfter()); jpaCriteria.addFilterCreatedBefore(criteria.getFilterCreatedBefore());