[rhq] Branch 'drift' - modules/common modules/core modules/enterprise

[John Sanda]

 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java             
            |    2 -
 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java         
            |   12 +++++-----
 modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java     
            |   12 +++++-----
 modules/core/client-api/pom.xml                                                          
            |    6 +++++

modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
      |    3 +-

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
    |    5 ----

modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
|    3 +-

modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
      |    3 +-
 8 files changed, 26 insertions(+), 20 deletions(-)

New commits:
commit a404bd5fc6ffb3cb5c9b0070f831aff20a23a8b1
Author: John Sanda <jsanda(a)redhat.com&gt;
Date:   Tue Jun 28 10:32:33 2011 -0400

    Refactoring ChangeSetWriterImpl to take a Headers object
    
    Changing the args for DriftAgentService.requestDriftFiles to take a
    Headers object. The headers contain the info needed to locate the drift
    files on the agent.

diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
index bcf14da..25a973a8 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java
@@ -22,7 +22,7 @@ import java.io.IOException;
  * <ul>
  *   <li>drift configuration name</li>
  *   <li>drift configuration base directory</li>
- *   <li>flag indicating whether or not this is a coverage changeset</li>
+ *   <li>change set type flag indicating whether this is a coverage or drift
changeset</li>
  * </ul>
  * <br/>
  * and where DRIFT_ENTRY has two field that are space delimited. The first is the
directory path
diff --git
a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
index c77a54c..4244fac 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java
@@ -15,19 +15,19 @@ public class ChangeSetWriterImpl implements ChangeSetWriter {
 
     private File changeSetFile;
 
-    public ChangeSetWriterImpl(File changeSetFile, DriftConfiguration driftConfig,
DriftChangeSetCategory type)
+    public ChangeSetWriterImpl(File changeSetFile, Headers headers)
         throws IOException {
 
         this.changeSetFile = changeSetFile;
         writer = new BufferedWriter(new FileWriter(this.changeSetFile));
 
-        writeHeader(driftConfig, type);
+        writeHeaders(headers);
     }
 
-    private void writeHeader(DriftConfiguration driftConfig, DriftChangeSetCategory type)
throws IOException {
-        writer.write(driftConfig.getName() + "\n");
-        writer.write(driftConfig.getBasedir() + "\n");
-        writer.write(type.code() + "\n");
+    private void writeHeaders(Headers headers) throws IOException {
+        writer.write(headers.getDriftConfigurationName() + "\n");
+        writer.write(headers.getBasedir() + "\n");
+        writer.write(headers.getType().code() + "\n");
     }
 
     public void writeDirectoryEntry(DirectoryEntry dirEntry) throws IOException {
diff --git
a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
index 0e6786a..3f4efda 100644
---
a/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
+++
b/modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java
@@ -36,9 +36,9 @@ public class ChangeSetWriterImplTest {
     @SuppressWarnings("unchecked")
     public void writeDirectoryEntryWithAddedFile() throws Exception {
         File changeSetFile = new File(changeSetsDir, "added-file-test");
-        DriftConfiguration driftConfig = driftConfiguration("added-file-test",
"myresource");
+        Headers headers = new Headers("added-file-test",
"myresource", COVERAGE);
 
-        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, driftConfig,
COVERAGE);
+        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, headers);
 
         writer.writeDirectoryEntry(new DirectoryEntry("myresource/conf").add(
             addedFileEntry("myconf.conf", "a34ef6")));
@@ -62,9 +62,9 @@ public class ChangeSetWriterImplTest {
     @SuppressWarnings("unchecked")
     public void writeDirectoryEntryWithRemovedFile() throws Exception {
         File changeSetFile = new File(changeSetsDir, "removed-file-test");
-        DriftConfiguration driftConfig =
driftConfiguration("removed-file-test", "myresource");
+        Headers headers = new Headers("removed-file-test",
"myresource", COVERAGE);
 
-        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, driftConfig,
COVERAGE);
+        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, headers);
 
         writer.writeDirectoryEntry(new DirectoryEntry("myresource/conf").add(
             removedFileEntry("myconf.conf", "a34ef6")));
@@ -88,9 +88,9 @@ public class ChangeSetWriterImplTest {
     @SuppressWarnings("unchecked")
     public void writeDirectoryEntryWithChangedFile() throws Exception {
         File changeSetFile = new File(changeSetsDir, "changed-file-test");
-        DriftConfiguration driftConfig =
driftConfiguration("changed-file-test", "myresource");
+        Headers headers = new Headers("changed-file-test",
"myresource", COVERAGE);
 
-        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, driftConfig,
COVERAGE);
+        ChangeSetWriterImpl writer = new ChangeSetWriterImpl(changeSetFile, headers);
 
         writer.writeDirectoryEntry(new DirectoryEntry("myresource/conf").add(
             changedFileEntry("myconf.conf", "a34ef6",
"c2d55f")));
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 42819ca..9fed074 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -31,6 +31,12 @@
          <scope>provided</scope>
       </dependency>
 
+       <dependency>
+          <groupId>${rhq.groupId}</groupId>
+          <artifactId>rhq-common-drift</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+
       <!-- TODO: This is a fix for the Javac bug requiring annotations to be
                  available when compiling dependent classes; it is fixed in JDK 6.
-->
 
diff --git
a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
index 3442b67..c269e5a 100644
---
a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
+++
b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
@@ -21,6 +21,7 @@ package org.rhq.core.clientapi.agent.drift;
 
 import java.util.List;
 
+import org.rhq.common.drift.Headers;
 import org.rhq.core.domain.drift.DriftConfiguration;
 import org.rhq.core.domain.drift.DriftFile;
 
@@ -39,7 +40,7 @@ public interface DriftAgentService {
      * @param driftFiles
      * @return the results of the immediate scheduling
      */
-    boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles);
+    boolean requestDriftFiles(int resourceId, Headers headers, List<DriftFile>
driftFiles);
 
     /**
      * Execute drift detection immediately. If any drift is found, the agent will send
the
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 e88425d..089eb36 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
@@ -43,8 +43,6 @@ import javax.jms.Session;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import com.sun.net.httpserver.Headers;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Hibernate;
@@ -181,8 +179,7 @@ public class DriftManagerBean implements DriftManagerLocal,
DriftManagerRemote {
                                 resourceId);
                             DriftAgentService service =
agentClient.getDriftAgentService();
                             try {
-                                if (service.requestDriftFiles(resourceId,
-                                    reader.getHeaders().getDriftConfigurationName(),
emptyDriftFiles)) {
+                                if (service.requestDriftFiles(resourceId,
reader.getHeaders(), emptyDriftFiles)) {
                                     for (DriftFile driftFile : emptyDriftFiles) {
                                         driftFile.setStatus(DriftFileStatus.REQUESTED);
                                     }
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index 58f4ba2..ba3c4ec 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import org.rhq.common.drift.Headers;
 import org.rhq.core.clientapi.agent.drift.DriftAgentService;
 import org.rhq.core.clientapi.server.drift.DriftServerService;
 import org.rhq.core.domain.auth.Subject;
@@ -342,7 +343,7 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
     private class TestConfigService implements DriftAgentService {
 
         @Override
-        public boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles) {
+        public boolean requestDriftFiles(int resourceId, Headers headers,
List<DriftFile> driftFiles) {
             return false;
         }
 
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
index 68b940c..8d39917 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.rhq.common.drift.Headers;
 import org.rhq.core.clientapi.agent.PluginContainerException;
 import org.rhq.core.clientapi.agent.bundle.BundleAgentService;
 import org.rhq.core.clientapi.agent.bundle.BundlePurgeRequest;
@@ -330,7 +331,7 @@ public class TestAgentClient implements AgentClient,
BundleAgentService, DriftAg
     }
 
     @Override
-    public boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles) {
+    public boolean requestDriftFiles(int resourceId, Headers headers,
List<DriftFile> driftFiles) {
         return false;
     }