feature[ats_WYMGS]: Move non-rest ATS code from ats.rest to ats.impl

Change-Id: I2ce19d2ec05d8a52a1a10291aff3e7e2df74dcd8

12 files changed, 34 insertions, 32 deletions

diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java
index 1c9f77be111..ff82c4bfcdd 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.impl;
 
-import org.eclipse.osee.ats.impl.internal.convert.ConvertTestSuite;
 import org.eclipse.osee.ats.impl.internal.model.ModelTestSuite;
+import org.eclipse.osee.ats.impl.internal.workdef.WorkDefTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -19,7 +19,7 @@ import org.junit.runners.Suite;
  * @author Donald G. Dunne
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ConvertTestSuite.class, ModelTestSuite.class})
+@Suite.SuiteClasses({WorkDefTestSuite.class, ModelTestSuite.class})
 public class AllAtsImplTestSuite {
    // Test Suite
 }
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItemTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItemTest.java
index de07a68605e..29e1799e2b9 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItemTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/AbstractWorkDefItemTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.impl.internal.model;
 
-import org.eclipse.osee.ats.impl.internal.model.AbstractWorkDefItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.AbstractWorkDefItem;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/CompositeStateItemTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/CompositeStateItemTest.java
index f22ef5ec46a..ec621a06521 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/CompositeStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/CompositeStateItemTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.osee.ats.impl.internal.model;
 
 import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem;
-import org.eclipse.osee.ats.impl.internal.model.CompositeLayoutItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.CompositeLayoutItem;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java
index a83b6d8a51a..d93eafd3ec3 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.ats.impl.internal.model;
 import org.junit.Assert;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 import org.eclipse.osee.ats.api.workdef.StateEventType;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewDefinition;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewOption;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewOption;
 import org.junit.Test;
 
 /**
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java
index 8791186e3e0..e42d78a516f 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.impl.internal.model;
 import java.util.Arrays;
 import org.junit.Assert;
 import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewOption;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewOption;
 import org.junit.Test;
 
 /**
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelUtilTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelUtilTest.java
index f0eba4d6cb7..0482e08c090 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelUtilTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/ModelUtilTest.java
@@ -20,10 +20,10 @@ import org.eclipse.osee.ats.api.workdef.StateType;
 import org.eclipse.osee.ats.dsl.IResourceProvider;
 import org.eclipse.osee.ats.dsl.ModelUtil;
 import org.eclipse.osee.ats.dsl.atsDsl.AtsDsl;
-import org.eclipse.osee.ats.impl.internal.convert.ConvertWorkDefinitionToAtsDsl;
-import org.eclipse.osee.ats.impl.internal.model.StateDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WidgetDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WorkDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.ConvertWorkDefinitionToAtsDsl;
+import org.eclipse.osee.ats.impl.internal.workdef.model.StateDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WidgetDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WorkDefinition;
 import org.eclipse.osee.framework.core.util.XResultData;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java
index 33913f61c2b..52c1119da83 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.impl.internal.model;
 import org.junit.Assert;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 import org.eclipse.osee.ats.api.workdef.StateEventType;
-import org.eclipse.osee.ats.impl.internal.model.PeerReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.PeerReviewDefinition;
 import org.junit.Test;
 
 /**
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java
index 4247e621575..5d9cee09efa 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java
@@ -17,13 +17,13 @@ import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption;
 import org.eclipse.osee.ats.api.workdef.StateColor;
 import org.eclipse.osee.ats.api.workdef.StateType;
 import org.eclipse.osee.ats.impl.internal.AtsWorkDefinitionServiceImpl;
-import org.eclipse.osee.ats.impl.internal.model.CompositeLayoutItem;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewDefinition;
-import org.eclipse.osee.ats.impl.internal.model.LayoutItem;
-import org.eclipse.osee.ats.impl.internal.model.PeerReviewDefinition;
-import org.eclipse.osee.ats.impl.internal.model.StateDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WidgetDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WorkDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.CompositeLayoutItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.LayoutItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.PeerReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.StateDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WidgetDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WorkDefinition;
 import org.junit.Test;
 
 public class StateDefinitionTest {
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java
index 39ae8f67888..0d3a8ed6438 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.impl.internal.model;
 
 import org.junit.Assert;
 import org.eclipse.osee.ats.api.workdef.WidgetOption;
-import org.eclipse.osee.ats.impl.internal.model.WidgetDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WidgetDefinition;
 import org.junit.Test;
 
 /**
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java
index a1fd2a221b6..5aa1aa4336f 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java
@@ -17,6 +17,8 @@ import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition;
 import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition;
 import org.eclipse.osee.ats.api.workdef.StateType;
 import org.eclipse.osee.ats.impl.internal.AtsWorkDefinitionServiceImpl;
+import org.eclipse.osee.ats.impl.internal.workdef.model.StateDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WorkDefinition;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/workdef/ConvertWorkDefinitionToAtsDslTest.java
index 88c3097d81e..357d447a988 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/workdef/ConvertWorkDefinitionToAtsDslTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.impl.internal.convert;
+package org.eclipse.osee.ats.impl.internal.workdef;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,15 +33,15 @@ import org.eclipse.osee.ats.dsl.atsDsl.WidgetDef;
 import org.eclipse.osee.ats.dsl.atsDsl.WorkflowEventType;
 import org.eclipse.osee.ats.dsl.atsDsl.impl.AtsDslFactoryImpl;
 import org.eclipse.osee.ats.impl.internal.AtsWorkDefinitionServiceImpl;
-import org.eclipse.osee.ats.impl.internal.convert.ConvertWorkDefinitionToAtsDsl;
-import org.eclipse.osee.ats.impl.internal.model.CompositeLayoutItem;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewDefinition;
-import org.eclipse.osee.ats.impl.internal.model.DecisionReviewOption;
-import org.eclipse.osee.ats.impl.internal.model.LayoutItem;
-import org.eclipse.osee.ats.impl.internal.model.PeerReviewDefinition;
-import org.eclipse.osee.ats.impl.internal.model.StateDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WidgetDefinition;
-import org.eclipse.osee.ats.impl.internal.model.WorkDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.ConvertWorkDefinitionToAtsDsl;
+import org.eclipse.osee.ats.impl.internal.workdef.model.CompositeLayoutItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.DecisionReviewOption;
+import org.eclipse.osee.ats.impl.internal.workdef.model.LayoutItem;
+import org.eclipse.osee.ats.impl.internal.workdef.model.PeerReviewDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.StateDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WidgetDefinition;
+import org.eclipse.osee.ats.impl.internal.workdef.model.WorkDefinition;
 import org.eclipse.osee.framework.core.util.XResultData;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertTestSuite.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/workdef/WorkDefTestSuite.java
index 4e0954d715b..affab760ec6 100644
--- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertTestSuite.java
+++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/workdef/WorkDefTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.impl.internal.convert;
+package org.eclipse.osee.ats.impl.internal.workdef;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -18,6 +18,6 @@ import org.junit.runners.Suite;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ConvertWorkDefinitionToAtsDslTest.class})
-public class ConvertTestSuite {
+public class WorkDefTestSuite {
    // Test Suite
 }