9 files changed, 118 insertions, 24 deletions

diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunContentProvider.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunContentProvider.java
index 90486073b72..fe35e6ac13b 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunContentProvider.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunContentProvider.java
@@ -17,8 +17,8 @@ import java.util.HashSet;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask;
 
 public class AutoRunContentProvider implements ITreeContentProvider {
 
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunLabelProvider.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunLabelProvider.java
index cc0b719c2e5..c48c03c976f 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunLabelProvider.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunLabelProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.admin.autoRun;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.XViewerColumn;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewer.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewer.java
index baa83a5bdcd..a10af88aa15 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewer.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/AutoRunXViewer.java
@@ -18,8 +18,8 @@ import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask;
 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.util.SkynetGuiDebug;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.IXViewerFactory;
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/XAutoRunViewer.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/XAutoRunViewer.java
index a7dfa43cf6c..2f99741bd90 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/XAutoRunViewer.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/autoRun/XAutoRunViewer.java
@@ -15,12 +15,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask.RunDb;
 import org.eclipse.osee.framework.ui.admin.AdminPlugin;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.autoRun.AutoRunStartup;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask;
 import org.eclipse.osee.framework.ui.skynet.autoRun.LaunchAutoRunWorkbench;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask.RunDb;
 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
 import org.eclipse.osee.framework.ui.swt.ALayout;
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunCheckTreeDialog.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunCheckTreeDialog.java
index 69d0dace68f..940d4d7be00 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunCheckTreeDialog.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunCheckTreeDialog.java
@@ -18,7 +18,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.swt.graphics.Image;
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunStartup.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunStartup.java
index fe27c69525d..9656b98ac9d 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunStartup.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunStartup.java
@@ -24,13 +24,16 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.eclipse.osee.framework.plugin.core.config.ConfigUtil;
 import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask.RunDb;
+import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask.RunDb;
 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
+import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultData;
+import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultPage;
+import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultPage.Manipulations;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.PlatformUI;
 import org.osgi.framework.Bundle;
@@ -52,7 +55,7 @@ public class AutoRunStartup implements IStartup {
     */
    public void earlyStartup() {
       final String autoRunTaskId = OseeProperties.getInstance().getAutoRun();
-      final StringBuffer sb = new StringBuffer();
+      final XResultData resultData = new XResultData(SkynetGuiPlugin.getLogger());
       IAutoRunTask autoRunTask = null;
       try {
          if (autoRunTaskId == null) {
@@ -72,29 +75,47 @@ public class AutoRunStartup implements IStartup {
          } else {
             Result result = validateAutoRunExecution(autoRunTask);
             if (result.isFalse()) {
-               sb.append("Auto Run Task invalid to run: " + result.getText());
+               resultData.log("Auto Run Task invalid to run: " + result.getText());
             } else {
-               sb.append("Starting AutoRunTaskId=\"" + autoRunTaskId + "\" - " + XDate.getDateNow(XDate.MMDDYYHHMM) + "\n\n");
-               autoRunTask.startTasks(sb);
-               sb.append("\n\nCompleted AutoRunTaskId=\"" + autoRunTaskId + "\" - " + XDate.getDateNow(XDate.MMDDYYHHMM) + "\n");
+               resultData.log("Starting AutoRunTaskId=\"" + autoRunTaskId + "\" - " + XDate.getDateNow(XDate.MMDDYYHHMM) + "\n\n");
+               autoRunTask.startTasks(resultData);
+               resultData.log("\n\nCompleted AutoRunTaskId=\"" + autoRunTaskId + "\" - " + XDate.getDateNow(XDate.MMDDYYHHMM) + "\n");
             }
 
             // Email successful run
-            AEmail email =
+            String subject = "Completed AutoRunTaskId=\"" + autoRunTaskId + "\"";
+            XResultPage page =
+                  resultData.getReport("AutoRunTaskId=\"" + autoRunTaskId + "\"", Manipulations.ALL,
+                        Manipulations.ERROR_WARNING_HEADER);
+            String htmlBody = page.getManipulatedHtml();
+            AEmail emailMessage =
                   new AEmail(autoRunTask.getNotificationEmailAddresses(),
-                        autoRunTask.getNotificationEmailAddresses()[0], autoRunTask.getNotificationEmailAddresses()[0],
-                        "Completed AutoRunTaskId=\"" + autoRunTaskId + "\"", sb.toString());
-            email.send();
+                        SkynetAuthentication.getInstance().getAuthenticatedUser().getEmail(),
+                        SkynetAuthentication.getInstance().getAuthenticatedUser().getEmail(), subject);
+            emailMessage.setSubject(subject);
+            emailMessage.addHTMLBody(htmlBody);
+            emailMessage.send();
          }
       } catch (Exception ex) {
          String[] emails = new String[] {"donald.g.dunne@boeing.com"};
          if (autoRunTask != null) emails = autoRunTask.getNotificationEmailAddresses();
          // Email exception
-         AEmail email =
-               new AEmail(emails, emails[0], emails[0],
-                     "Exception running AutoRunTaskId=\"" + autoRunTaskId + "\" Exceptioned",
-                     "Output:\n\n" + sb.toString() + "\n\nException:\n\n" + Lib.exceptionToString(ex));
-         email.send();
+         String subject = "Exception running AutoRunTaskId=\"" + autoRunTaskId + "\" Exceptioned";
+         XResultPage page =
+               resultData.getReport("AutoRunTaskId=\"" + autoRunTaskId + "\"", Manipulations.ALL,
+                     Manipulations.ERROR_WARNING_HEADER);
+         String htmlBody = "Output:\n\n" + page.getManipulatedHtml() + "\n\nException:\n\n" + Lib.exceptionToString(ex);
+         AEmail emailMessage =
+               new AEmail(autoRunTask.getNotificationEmailAddresses(),
+                     SkynetAuthentication.getInstance().getAuthenticatedUser().getEmail(),
+                     SkynetAuthentication.getInstance().getAuthenticatedUser().getEmail(), subject);
+         try {
+            emailMessage.setSubject(subject);
+            emailMessage.addHTMLBody(htmlBody);
+            emailMessage.send();
+         } catch (Exception ex2) {
+            OSEELog.logException(SkynetGuiPlugin.class, ex2, false);
+         }
       } finally {
          if (autoRunTaskId != null) {
             logger.log(Level.INFO, "Sleeping...");
diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunTask.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunTask.java
new file mode 100644
index 00000000000..a66501bd2ea
--- /dev/null
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/AutoRunTask.java
@@ -0,0 +1,33 @@
+/*

+ * Created on Jan 22, 2008

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.framework.ui.skynet.autoRun;

+

+/**

+ * @author Donald G. Dunne

+ */

+public abstract class AutoRunTask implements IAutoRunTask {

+

+   public AutoRunTask() {

+   }

+

+   private String autoRunUniqueId;

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.skynet.core.util.IAutoRunTask#getName()

+    */

+   public String getAutoRunUniqueId() {

+      if (autoRunUniqueId != null) return autoRunUniqueId;

+      return "Un-named";

+   }

+

+   /* (non-Javadoc)

+    * @see org.eclipse.osee.framework.skynet.core.util.IAutoRunTask#setName(java.lang.String)

+    */

+   public void setAutoRunUniqueId(String name) {

+      this.autoRunUniqueId = name;

+   }

+

+}

diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/IAutoRunTask.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/IAutoRunTask.java
new file mode 100644
index 00000000000..adeda4e2b9a
--- /dev/null
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/IAutoRunTask.java
@@ -0,0 +1,42 @@
+/*

+ * Created on Jan 18, 2008

+ *

+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

+ */

+package org.eclipse.osee.framework.ui.skynet.autoRun;

+

+import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultData;

+

+/**

+ * @author Donald G. Dunne

+ */

+public interface IAutoRunTask {

+

+   public enum RunDb {

+      Production_Db, Test_Db

+   };

+

+   public enum TaskType {

+      Regression, Db_Health_Check, Data_Exchange, Backup

+   }

+

+   public void startTasks(XResultData resultData) throws Exception;

+

+   public int getHourStartTime();

+

+   public int getMinuteStartTime();

+

+   public String[] getNotificationEmailAddresses();

+

+   public void setAutoRunUniqueId(String autoRunUniqueId);

+

+   public String getAutoRunUniqueId();

+

+   public TaskType getTaskType();

+

+   public String getDescription();

+

+   public RunDb getRunDb();

+

+   public String getCategory();

+}

diff --git a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/LaunchAutoRunWorkbench.java b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/LaunchAutoRunWorkbench.java
index ce94213cb77..5dd208c2391 100644
--- a/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/LaunchAutoRunWorkbench.java
+++ b/MS_0.1.4_20080103/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/autoRun/LaunchAutoRunWorkbench.java
@@ -18,10 +18,9 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask;
-import org.eclipse.osee.framework.skynet.core.util.IAutoRunTask.RunDb;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkspace;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.skynet.autoRun.IAutoRunTask.RunDb;
 
 /**
  * This Action (kicked off from Artifact Explorer pulldown toolbar menu) will kickoff an event task that will in turn