bug[ats_SM0J7]: Fix ATS services initialization and loading

AtsLoadConfig synchronization problems
Fix ATS services circular dependencies
Create internal AtsClientServices for each bundle
Move AtsConfigUtility to core internal
Remove references to AtsWorkDefinitionService and AtsQueryService
Changes to launch config for console
Updates for ats client service
Add service-component to manifest files
Create user resolver and attribute resolver service
Remove the need to load dictionary in the background
Move VersionsClient logic to VersionService
Fix ATS bulk load synchronization
Move cache provider functionality to lazyObject
Remove VersionsClient static class
Fix AtsTestUtil.cleanup to close editors
VersionArtifactWriter to use correct artifact type
Improve error logged in AtsWorkItemArtifactProviderImpl
Cleanup branch after ShowMergeManagerActionTest
Close Merge View if associated art is deleted

Change-Id: Iaa3fed5e99a3459c292d420a93e6238c2ca599fc

5 files changed, 26 insertions, 12 deletions

diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java
index f25c758fee7..895b4b38f5d 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.api.version;
 
+import java.util.Collection;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
 import org.eclipse.osee.framework.core.data.Identity;
@@ -24,6 +25,8 @@ public interface IAtsVersionService {
 
    IAtsVersion getTargetedVersion(Object object) throws OseeCoreException;
 
+   Collection<IAtsTeamWorkflow> getTargetedForTeamWorkflows(IAtsVersion verArt) throws OseeCoreException;
+
    IAtsVersion setTargetedVersion(IAtsTeamWorkflow teamWf, IAtsVersion version) throws OseeCoreException;
 
    IAtsVersion setTargetedVersionAndStore(IAtsTeamWorkflow teamWf, IAtsVersion build) throws OseeCoreException;
@@ -38,8 +41,6 @@ public interface IAtsVersionService {
 
    void removeTargetedVersion(IAtsTeamWorkflow teamWf) throws OseeCoreException;
 
-   void removeTargetedVersionAndStore(IAtsTeamWorkflow teamWf) throws OseeCoreException;
-
    IAtsVersion getById(Identity<String> id) throws OseeCoreException;
 
 }
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionServiceProvider.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionServiceProvider.java
new file mode 100644
index 00000000000..0bc25f8457b
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionServiceProvider.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.api.version;
+
+/**
+ * @author Donald G. Dunne
+ */
+public interface IAtsVersionServiceProvider {
+
+   IAtsVersionService getAtsVersionService();
+
+}
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionStore.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionStore.java
index 4b842945277..a09d91516cf 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionStore.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionStore.java
@@ -9,7 +9,6 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.api.version;
 
-import java.util.Collection;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
 import org.eclipse.osee.framework.core.data.Identity;
@@ -20,13 +19,11 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
  */
 public interface IAtsVersionStore {
 
-   public IAtsTeamWorkflow removeTargetedVersionLink(IAtsTeamWorkflow teamWf) throws OseeCoreException;
+   public IAtsTeamWorkflow removeTargetedVersionLinks(IAtsTeamWorkflow teamWf) throws OseeCoreException;
 
    public IAtsTeamWorkflow setTargetedVersionLink(IAtsTeamWorkflow teamWf, IAtsVersion version) throws OseeCoreException;
 
-   public IAtsVersion getTargetedVersion(Object object) throws OseeCoreException;
-
-   public Collection<IAtsVersion> getVersions(IAtsTeamDefinition teamDef) throws OseeCoreException;
+   public IAtsVersion loadTargetedVersion(Object object) throws OseeCoreException;
 
    public IAtsTeamDefinition getTeamDefinition(IAtsVersion version) throws OseeCoreException;
 
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionService.java
index 40a88b68c37..90488ae00f0 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionService.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionService.java
@@ -21,7 +21,7 @@ public interface IAtsWorkDefinitionService {
 
    IAtsWorkDefinition getWorkDef(String id, XResultData resultData) throws Exception;
 
-   IAtsWorkDefinition copyWorkDefinition(String newName, IAtsWorkDefinition workDef, XResultData resultData, IAttributeResolver resolver, IUserResolver iUserResolver);
+   IAtsWorkDefinition copyWorkDefinition(String newName, IAtsWorkDefinition workDef, XResultData resultData);
 
    boolean isStateWeightingEnabled(IAtsWorkDefinition workDef);
 
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionStore.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionStore.java
index 517381f8edc..ae970024754 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionStore.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IAtsWorkDefinitionStore.java
@@ -23,9 +23,5 @@ public interface IAtsWorkDefinitionStore {
 
    String loadWorkDefinitionString(String workDefId) throws OseeCoreException;
 
-   IAttributeResolver getAttributeResolver();
-
-   IUserResolver getUserResolver();
-
    List<Pair<String, String>> getWorkDefinitionStrings() throws OseeCoreException;
 }