Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2013-03-28 10:22:02 -0400
committerRoberto E. Escobar2013-04-11 18:13:44 -0400
commit27ce368f4e9347e6c5d385045d2bd658ce8c9a3e (patch)
tree14954135b044d2ba54003728caf3595039ff5ca9 /plugins/org.eclipse.osee.ats.reports.split
parent9c4b39b9d203b49340c43d81fe4ed31364bf92c4 (diff)
downloadorg.eclipse.osee-27ce368f4e9347e6c5d385045d2bd658ce8c9a3e.tar.gz
org.eclipse.osee-27ce368f4e9347e6c5d385045d2bd658ce8c9a3e.tar.xz
org.eclipse.osee-27ce368f4e9347e6c5d385045d2bd658ce8c9a3e.zip
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
Diffstat (limited to 'plugins/org.eclipse.osee.ats.reports.split')
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/.project5
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/OSGI-INF/ats.client.ref.xml5
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/build.properties3
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/internal/AtsClientService.java30
-rw-r--r--plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/ui/LoadDistributionDataOperation.java5
6 files changed, 47 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.ats.reports.split/.project b/plugins/org.eclipse.osee.ats.reports.split/.project
index 002e2a4fbd..4e5e967762 100644
--- a/plugins/org.eclipse.osee.ats.reports.split/.project
+++ b/plugins/org.eclipse.osee.ats.reports.split/.project
@@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF
index 7d4ba7e643..a81b39fe1d 100644
--- a/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.reports.split/META-INF/MANIFEST.MF
@@ -16,10 +16,11 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.ats.api.data,
org.eclipse.osee.ats.api.version,
org.eclipse.osee.ats.api.workdef,
+ org.eclipse.osee.ats.core.client,
org.eclipse.osee.ats.core.client.config,
- org.eclipse.osee.ats.core.client.config.store,
org.eclipse.osee.ats.core.client.team,
org.eclipse.osee.ats.core.client.workflow,
+ org.eclipse.osee.ats.core.config,
org.eclipse.osee.ats.reports,
org.eclipse.osee.ats.util,
org.eclipse.osee.ats.util.widgets,
@@ -37,3 +38,4 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.ui.skynet.results,
org.eclipse.osee.framework.ui.swt,
org.osgi.framework
+Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.ats.reports.split/OSGI-INF/ats.client.ref.xml b/plugins/org.eclipse.osee.ats.reports.split/OSGI-INF/ats.client.ref.xml
new file mode 100644
index 0000000000..d49399f940
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.reports.split/OSGI-INF/ats.client.ref.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.reports.split.internal.AtsClientService">
+ <implementation class="org.eclipse.osee.ats.reports.split.internal.AtsClientService"/>
+ <reference bind="setAtsClient" cardinality="1..1" interface="org.eclipse.osee.ats.core.client.IAtsClient" name="IAtsClient" policy="static"/>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.reports.split/build.properties b/plugins/org.eclipse.osee.ats.reports.split/build.properties
index 4c45e04c9d..e992c23771 100644
--- a/plugins/org.eclipse.osee.ats.reports.split/build.properties
+++ b/plugins/org.eclipse.osee.ats.reports.split/build.properties
@@ -3,7 +3,8 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
reports/,\
- plugin.xml
+ plugin.xml,\
+ OSGI-INF/
additional.bundles = org.eclipse.osee.ats.reports,\
org.eclipse.osee.ats.core,\
org.eclipse.osee.framework.core,\
diff --git a/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/internal/AtsClientService.java b/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/internal/AtsClientService.java
new file mode 100644
index 0000000000..7344d934fb
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/internal/AtsClientService.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.reports.split.internal;
+
+import org.eclipse.osee.ats.core.client.IAtsClient;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class AtsClientService {
+
+ private static IAtsClient atsClient;
+
+ public void setAtsClient(IAtsClient atsClient) {
+ AtsClientService.atsClient = atsClient;
+ }
+
+ public static IAtsClient get() {
+ return atsClient;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/ui/LoadDistributionDataOperation.java b/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/ui/LoadDistributionDataOperation.java
index 46a3457398..6118b98b9b 100644
--- a/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/ui/LoadDistributionDataOperation.java
+++ b/plugins/org.eclipse.osee.ats.reports.split/src/org/eclipse/osee/ats/reports/split/ui/LoadDistributionDataOperation.java
@@ -7,8 +7,8 @@ package org.eclipse.osee.ats.reports.split.ui;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.api.version.IAtsVersion;
-import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore;
import org.eclipse.osee.ats.reports.split.Activator;
+import org.eclipse.osee.ats.reports.split.internal.AtsClientService;
import org.eclipse.osee.ats.reports.split.model.AIDistributionEntry;
import org.eclipse.osee.ats.reports.split.model.DistributionModel;
import org.eclipse.osee.ats.reports.split.model.StateDistributionEntry;
@@ -34,8 +34,7 @@ public class LoadDistributionDataOperation extends AbstractOperation {
@Override
protected void doWork(IProgressMonitor monitor) throws Exception {
Conditions.checkNotNull(version, "teamDefinition");
- VersionArtifactStore artifactStore = new VersionArtifactStore(version);
- Artifact artifact = artifactStore.getArtifact();
+ Artifact artifact = AtsClientService.get().getConfigArtifact(version);
AIDistributionEntry aiSplitEntry = new AIDistributionEntry(artifact);
aiSplitEntry.computeAISplit();

Back to the top