From d2bfa4a133dcfa7a912ea67f4cc5eb567ad192f0 Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Tue, 19 Aug 2014 08:18:32 -0700 Subject: feature[ats_ATS98528]: Remove un-necessary dependencies from ATS bundles Change-Id: Iadf2e949000a640003f3c9c3be8a7741d4049c7f --- .../META-INF/MANIFEST.MF | 35 ++++++-- .../META-INF/MANIFEST.MF | 88 ++++++++++++++++++-- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 28 +++---- .../org.eclipse.osee.ats.core/META-INF/MANIFEST.MF | 1 - .../org/eclipse/osee/ats/core/config/Versions.java | 3 +- .../eclipse/osee/ats/core/internal/Activator.java | 32 -------- .../osee/ats/core/internal/state/StateManager.java | 5 +- .../core/workdef/AtsWorkDefinitionAdminImpl.java | 5 +- .../core/workflow/transition/TransitionHelper.java | 3 +- .../META-INF/MANIFEST.MF | 4 +- .../org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF | 11 +-- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF | 93 +++++++++++++++++++--- 15 files changed, 216 insertions(+), 104 deletions(-) delete mode 100644 plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/Activator.java diff --git a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF index 5bc39446156..439fac8b343 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF @@ -7,16 +7,11 @@ Eclipse-ExtensibleAPI: true Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.osee.framework.plugin.core, - org.eclipse.osee.framework.database, - org.eclipse.osee.ats, - org.eclipse.osee.framework.jdk.core, - org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.framework.ui.skynet, - org.eclipse.osee.framework.ui.plugin, org.eclipse.ui.forms Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.filesystem, + org.eclipse.osee.ats, + org.eclipse.osee.ats.actions.wizard, org.eclipse.osee.ats.api, org.eclipse.osee.ats.api.ai, org.eclipse.osee.ats.api.commit, @@ -31,6 +26,8 @@ Import-Package: org.eclipse.core.filesystem, org.eclipse.osee.ats.api.workflow, org.eclipse.osee.ats.api.workflow.state, org.eclipse.osee.ats.api.workflow.transition, + org.eclipse.osee.ats.artifact, + org.eclipse.osee.ats.config, org.eclipse.osee.ats.core, org.eclipse.osee.ats.core.client, org.eclipse.osee.ats.core.client.action, @@ -52,6 +49,13 @@ Import-Package: org.eclipse.core.filesystem, org.eclipse.osee.ats.core.workdef, org.eclipse.osee.ats.core.workflow, org.eclipse.osee.ats.core.workflow.state, + org.eclipse.osee.ats.health, + org.eclipse.osee.ats.navigate, + org.eclipse.osee.ats.util, + org.eclipse.osee.ats.version, + org.eclipse.osee.ats.workdef, + org.eclipse.osee.ats.world, + org.eclipse.osee.ats.world.search, org.eclipse.osee.define.traceability, org.eclipse.osee.define.traceability.data, org.eclipse.osee.framework.core.client, @@ -62,8 +66,25 @@ Import-Package: org.eclipse.core.filesystem, org.eclipse.osee.framework.core.model.type, org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.core.util, + org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.database.init, + org.eclipse.osee.framework.jdk.core.type, + org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.skynet.core, + org.eclipse.osee.framework.skynet.core.artifact, + org.eclipse.osee.framework.skynet.core.artifact.search, + org.eclipse.osee.framework.skynet.core.importing.parsers, + org.eclipse.osee.framework.skynet.core.importing.resolvers, + org.eclipse.osee.framework.skynet.core.transaction, + org.eclipse.osee.framework.skynet.core.utility, + org.eclipse.osee.framework.ui.plugin, + org.eclipse.osee.framework.ui.plugin.util, + org.eclipse.osee.framework.ui.plugin.xnavigate, + org.eclipse.osee.framework.ui.skynet, + org.eclipse.osee.framework.ui.skynet.Import, + org.eclipse.osee.framework.ui.skynet.util, + org.eclipse.osee.framework.ui.skynet.widgets.util, org.eclipse.osee.framework.ui.swt, org.eclipse.osee.support.test.util Export-Package: diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF index 16a54ad2a59..125159b19b4 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF @@ -10,21 +10,74 @@ Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.core.resources, org.eclipse.ui, org.eclipse.ui.forms, - org.eclipse.osee.ats, - org.eclipse.osee.ats.api, - org.eclipse.osee.ats.core, - org.eclipse.osee.ats.core.client, - org.eclipse.osee.support.test.util, - org.eclipse.osee.framework.ui.skynet, - org.eclipse.osee.framework.skynet.core, org.mockito;bundle-version="1.9.0", org.hamcrest.core, org.objenesis Import-Package: org.eclipse.nebula.widgets.xviewer, org.eclipse.nebula.widgets.xviewer.customize, org.eclipse.nebula.widgets.xviewer.customize.dialog, + org.eclipse.osee.ats, + org.eclipse.osee.ats.access, + org.eclipse.osee.ats.actions, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, + org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.ev, + org.eclipse.osee.ats.api.notify, + org.eclipse.osee.ats.api.review, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.util, + org.eclipse.osee.ats.api.version, + org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow, + org.eclipse.osee.ats.api.workflow.log, + org.eclipse.osee.ats.api.workflow.state, + org.eclipse.osee.ats.api.workflow.transition, + org.eclipse.osee.ats.artifact, org.eclipse.osee.ats.client.demo, + org.eclipse.osee.ats.column, + org.eclipse.osee.ats.config, + org.eclipse.osee.ats.config.copy, + org.eclipse.osee.ats.core.client, + org.eclipse.osee.ats.core.client.action, + org.eclipse.osee.ats.core.client.actions, + org.eclipse.osee.ats.core.client.artifact, + org.eclipse.osee.ats.core.client.branch, + org.eclipse.osee.ats.core.client.config, + org.eclipse.osee.ats.core.client.ev, + org.eclipse.osee.ats.core.client.operation, + org.eclipse.osee.ats.core.client.review, + org.eclipse.osee.ats.core.client.review.defect, + org.eclipse.osee.ats.core.client.review.role, + org.eclipse.osee.ats.core.client.task, + org.eclipse.osee.ats.core.client.task.createtasks, + org.eclipse.osee.ats.core.client.team, + org.eclipse.osee.ats.core.client.util, + org.eclipse.osee.ats.core.client.workflow, + org.eclipse.osee.ats.core.client.workflow.note, + org.eclipse.osee.ats.core.client.workflow.transition, + org.eclipse.osee.ats.core.config, + org.eclipse.osee.ats.core.users, + org.eclipse.osee.ats.core.util, + org.eclipse.osee.ats.core.workdef, + org.eclipse.osee.ats.core.workflow.state, + org.eclipse.osee.ats.core.workflow.transition, + org.eclipse.osee.ats.editor, + org.eclipse.osee.ats.editor.renderer, + org.eclipse.osee.ats.editor.stateItem, + org.eclipse.osee.ats.health, org.eclipse.osee.ats.mocks, + org.eclipse.osee.ats.navigate, + org.eclipse.osee.ats.review, + org.eclipse.osee.ats.task, + org.eclipse.osee.ats.util, + org.eclipse.osee.ats.util.Import, + org.eclipse.osee.ats.util.xviewer.column, + org.eclipse.osee.ats.version, + org.eclipse.osee.ats.world, + org.eclipse.osee.ats.world.search, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, @@ -38,10 +91,31 @@ Import-Package: org.eclipse.nebula.widgets.xviewer, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.skynet.core, + org.eclipse.osee.framework.skynet.core.artifact, + org.eclipse.osee.framework.skynet.core.artifact.search, + org.eclipse.osee.framework.skynet.core.change, + org.eclipse.osee.framework.skynet.core.event, + org.eclipse.osee.framework.skynet.core.event.model, + org.eclipse.osee.framework.skynet.core.revision, + org.eclipse.osee.framework.skynet.core.transaction, + org.eclipse.osee.framework.skynet.core.types, + org.eclipse.osee.framework.skynet.core.utility, org.eclipse.osee.framework.ui.plugin, org.eclipse.osee.framework.ui.plugin.util, org.eclipse.osee.framework.ui.plugin.xnavigate, + org.eclipse.osee.framework.ui.skynet, + org.eclipse.osee.framework.ui.skynet.access, + org.eclipse.osee.framework.ui.skynet.artifact.massEditor, + org.eclipse.osee.framework.ui.skynet.blam, + org.eclipse.osee.framework.ui.skynet.render, + org.eclipse.osee.framework.ui.skynet.results, + org.eclipse.osee.framework.ui.skynet.results.html, + org.eclipse.osee.framework.ui.skynet.widgets, + org.eclipse.osee.framework.ui.skynet.widgets.util, + org.eclipse.osee.framework.ui.skynet.widgets.xnavigate, org.eclipse.osee.framework.ui.swt, + org.eclipse.osee.support.test.util, org.osgi.framework Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF index ec13e610c60..e5944aad8e2 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client.test/META-INF/MANIFEST.MF @@ -13,8 +13,4 @@ Require-Bundle: org.junit, Export-Package: org.eclipse.osee.ats.core.client, org.eclipse.osee.ats.core.client.validator Import-Package: org.eclipse.osee.ats.core.validator, - org.eclipse.osee.ats.mocks, - org.eclipse.osee.framework.database.core, - org.eclipse.osee.framework.plugin.core, - org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.support.test.util + org.eclipse.osee.ats.mocks diff --git a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF index 0b106606042..796977f7344 100644 --- a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Import-Package: com.google.inject, org.eclipse.osee.ats.api.program, org.eclipse.osee.ats.api.query, org.eclipse.osee.ats.api.review, - org.eclipse.osee.ats.api.rule, org.eclipse.osee.ats.api.team, org.eclipse.osee.ats.api.user, org.eclipse.osee.ats.api.util, @@ -31,22 +30,15 @@ Import-Package: com.google.inject, org.eclipse.osee.ats.api.workflow.log, org.eclipse.osee.ats.api.workflow.state, org.eclipse.osee.ats.api.workflow.transition, - org.eclipse.osee.ats.core, org.eclipse.osee.ats.core.column, org.eclipse.osee.ats.core.config, - org.eclipse.osee.ats.core.model, org.eclipse.osee.ats.core.model.impl, org.eclipse.osee.ats.core.users, org.eclipse.osee.ats.core.util, org.eclipse.osee.ats.core.validator, org.eclipse.osee.ats.core.workdef, - org.eclipse.osee.ats.core.workflow, - org.eclipse.osee.ats.core.workflow.log, org.eclipse.osee.ats.core.workflow.state, org.eclipse.osee.ats.core.workflow.transition, - org.eclipse.osee.ats.dsl, - org.eclipse.osee.ats.dsl.atsDsl, - org.eclipse.osee.ats.dsl.atsDsl.impl, org.eclipse.osee.framework.access, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, @@ -60,7 +52,6 @@ Import-Package: com.google.inject, org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.database, - org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.xml, @@ -70,17 +61,20 @@ Import-Package: com.google.inject, org.eclipse.osee.framework.skynet.core.artifact, org.eclipse.osee.framework.skynet.core.artifact.search, org.eclipse.osee.framework.skynet.core.attribute, + org.eclipse.osee.framework.skynet.core.change, + org.eclipse.osee.framework.skynet.core.conflict, + org.eclipse.osee.framework.skynet.core.event, + org.eclipse.osee.framework.skynet.core.event.filter, + org.eclipse.osee.framework.skynet.core.event.listener, + org.eclipse.osee.framework.skynet.core.event.model, + org.eclipse.osee.framework.skynet.core.relation, + org.eclipse.osee.framework.skynet.core.revision, + org.eclipse.osee.framework.skynet.core.transaction, + org.eclipse.osee.framework.skynet.core.types, org.eclipse.osee.framework.skynet.core.utility, - org.eclipse.osee.framework.ui.plugin, - org.eclipse.osee.framework.ui.skynet, org.eclipse.osee.framework.ui.skynet.notify, - org.eclipse.osee.framework.ui.skynet.results, - org.eclipse.osee.framework.ui.skynet.results.chart, - org.eclipse.osee.framework.ui.skynet.results.table, - org.eclipse.osee.framework.ui.skynet.results.table.xresults, org.eclipse.osee.framework.ui.skynet.util, org.eclipse.osee.jaxrs.client, - org.eclipse.xtext.resource, org.osgi.framework Export-Package: org.eclipse.osee.ats.core.client, org.eclipse.osee.ats.core.client.access, @@ -104,7 +98,5 @@ Export-Package: org.eclipse.osee.ats.core.client, org.eclipse.osee.ats.core.client.workflow.note, org.eclipse.osee.ats.core.client.workflow.stateitem, org.eclipse.osee.ats.core.client.workflow.transition -Require-Bundle: org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.ats.api Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF index ba79d3cb97a..6aafd09630b 100644 --- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF @@ -61,6 +61,5 @@ Export-Package: org.eclipse.osee.ats.core, org.eclipse.osee.ats.core.workflow.log, org.eclipse.osee.ats.core.workflow.state, org.eclipse.osee.ats.core.workflow.transition -Bundle-Activator: org.eclipse.osee.ats.core.internal.Activator Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java index a97ec1e9580..e16c248b57b 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java @@ -19,7 +19,6 @@ import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.version.IAtsVersionService; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.core.internal.Activator; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; @@ -49,7 +48,7 @@ public class Versions { "Workflow " + teamWf.getAtsId() + " targeted for released version, but not completed: " + version; // only log error once if (!targetErrorLoggedForId.contains(teamWf.getGuid())) { - OseeLog.log(Activator.class, Level.SEVERE, errStr, null); + OseeLog.log(Versions.class, Level.SEVERE, errStr, null); targetErrorLoggedForId.add(teamWf.getGuid()); } return "!Error " + errStr; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/Activator.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/Activator.java deleted file mode 100644 index 09db6276e92..00000000000 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/Activator.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * 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.core.internal; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * @author Donald G. Dunne - */ -public class Activator implements BundleActivator { - - public static final String PLUGIN_ID = "org.eclipse.osee.ats.core"; - - @Override - public void start(final BundleContext context) throws Exception { - // - } - - @Override - public void stop(BundleContext context) throws Exception { - // - } -} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java index 10fa05f2e20..b09a2a0e618 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java @@ -32,7 +32,6 @@ import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.LogType; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.api.workflow.state.WorkStateFactory; -import org.eclipse.osee.ats.core.internal.Activator; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsObjects; @@ -322,7 +321,7 @@ public class StateManager implements IAtsStateManager { if (getVisitedStateNames().contains(name)) { String errorStr = String.format("Error: Duplicate state [%s] for [%s]", name, factory.getId()); if (logError) { - OseeLog.log(Activator.class, Level.SEVERE, errorStr); + OseeLog.log(StateManager.class, Level.SEVERE, errorStr); } return; } else { @@ -566,7 +565,7 @@ public class StateManager implements IAtsStateManager { if (getVisitedStateNames().contains(state.getName())) { String errorStr = String.format("Error: Duplicate state [%s] for [%s]", state.getName(), factory.getId()); if (logError) { - OseeLog.log(Activator.class, Level.SEVERE, errorStr); + OseeLog.log(StateManager.class, Level.SEVERE, errorStr); } return; } else { diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImpl.java index aef69ad500c..dc4016c2b54 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImpl.java @@ -32,7 +32,6 @@ import org.eclipse.osee.ats.api.workflow.IAtsGoal; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; -import org.eclipse.osee.ats.core.internal.Activator; import org.eclipse.osee.ats.core.util.CacheProvider; import org.eclipse.osee.framework.core.exception.MultipleAttributesExist; import org.eclipse.osee.framework.core.util.XResultData; @@ -119,11 +118,11 @@ public class AtsWorkDefinitionAdminImpl implements IAtsWorkDefinitionAdmin { } } if (match.isMatched()) { - OseeLog.logf(Activator.class, Level.INFO, "Loaded Work Definition [%s]", match); + OseeLog.logf(AtsWorkDefinitionAdminImpl.class, Level.INFO, "Loaded Work Definition [%s]", match); getCache().cache(id, match); toReturn = match; } else { - OseeLog.logf(Activator.class, Level.INFO, "Unable to load Work Definition [%s]", id); + OseeLog.logf(AtsWorkDefinitionAdminImpl.class, Level.INFO, "Unable to load Work Definition [%s]", id); } } if (toReturn == null) { diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelper.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelper.java index 4de268c5b29..d883080a793 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelper.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelper.java @@ -20,7 +20,6 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; -import org.eclipse.osee.ats.core.internal.Activator; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -143,7 +142,7 @@ public class TransitionHelper extends TransitionHelperAdapter { try { return workItemService.getTransitionListeners(); } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); + OseeLog.log(TransitionHelper.class, Level.SEVERE, ex); } return java.util.Collections.emptyList(); } diff --git a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF index cb066be8ef4..b5e48925048 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF @@ -6,7 +6,9 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-Version: 0.19.0.qualifier Fragment-Host: org.eclipse.osee.ats.impl Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.osee.ats.api.workdef +Import-Package: org.eclipse.emf.common.util, + org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.dsl.atsDsl.impl Require-Bundle: org.junit, org.mockito;bundle-version="1.9.0", org.hamcrest.core, diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF index 9d8ee1cff1a..38285b03872 100644 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF @@ -12,11 +12,8 @@ Import-Package: com.google.inject, org.eclipse.osee.ats.api.ai, org.eclipse.osee.ats.api.commit, org.eclipse.osee.ats.api.data, - org.eclipse.osee.ats.api.ev, org.eclipse.osee.ats.api.notify, - org.eclipse.osee.ats.api.query, org.eclipse.osee.ats.api.review, - org.eclipse.osee.ats.api.rule, org.eclipse.osee.ats.api.team, org.eclipse.osee.ats.api.user, org.eclipse.osee.ats.api.util, @@ -26,21 +23,17 @@ Import-Package: com.google.inject, org.eclipse.osee.ats.api.workflow.log, org.eclipse.osee.ats.api.workflow.state, org.eclipse.osee.ats.api.workflow.transition, - org.eclipse.osee.ats.core, org.eclipse.osee.ats.core.config, org.eclipse.osee.ats.core.model.impl, org.eclipse.osee.ats.core.review, org.eclipse.osee.ats.core.users, org.eclipse.osee.ats.core.util, org.eclipse.osee.ats.core.workdef, - org.eclipse.osee.ats.core.workflow, org.eclipse.osee.ats.core.workflow.state, org.eclipse.osee.ats.core.workflow.transition, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, - org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.model, - org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.database, org.eclipse.osee.framework.jdk.core.type, @@ -52,9 +45,7 @@ Import-Package: com.google.inject, org.eclipse.osee.orcs.data, org.eclipse.osee.orcs.search, org.eclipse.osee.orcs.transaction, - org.eclipse.osee.template.engine, - org.json, - org.osgi.framework + org.eclipse.osee.template.engine Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF index bd873a37543..5fe0806cee0 100644 --- a/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports.burndown/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Version: 0.19.0.qualifier Bundle-Activator: org.eclipse.osee.ats.reports.burndown.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.ui, - org.eclipse.ui.forms, - org.eclipse.osee.ats.api + org.eclipse.ui.forms Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF index 164ee9537e5..a8092c5c5ac 100644 --- a/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.reports/META-INF/MANIFEST.MF @@ -22,6 +22,5 @@ Import-Package: org.eclipse.birt.report.viewer.utilities, org.eclipse.osee.framework.ui.swt, org.osgi.framework Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.ui, - org.eclipse.osee.framework.ui.skynet +Require-Bundle: org.eclipse.ui Export-Package: org.eclipse.osee.ats.reports diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF index e2c9d999410..e2138fcddd9 100644 --- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF @@ -8,25 +8,16 @@ Bundle-Activator: org.eclipse.osee.ats.internal.Activator Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Require-Bundle: org.eclipse.gef, - org.eclipse.osee.framework.jdk.core, org.eclipse.ui.forms, - org.eclipse.osee.framework.database, - org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.framework.ui.skynet, org.eclipse.core.resources, org.eclipse.ui.ide, org.eclipse.ui, org.eclipse.help, - org.eclipse.osee.framework.ui.plugin, - org.eclipse.osee.framework.plugin.core, org.eclipse.ui.editors, org.eclipse.zest.layouts, org.eclipse.ui.views, - org.eclipse.nebula.widgets.xviewer, org.eclipse.birt.chart.engine, org.eclipse.search, - org.eclipse.osee.ats.help.ui, - org.eclipse.osee.ats.core, org.eclipse.core.jobs Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.osee.ats, @@ -72,6 +63,10 @@ Import-Package: com.google.gson, javax.mail.internet, javax.ws.rs.client;version="2.0.0", javax.ws.rs.core, + org.eclipse.nebula.widgets.xviewer, + org.eclipse.nebula.widgets.xviewer.action, + org.eclipse.nebula.widgets.xviewer.customize, + org.eclipse.nebula.widgets.xviewer.util, org.eclipse.osee.ats.api, org.eclipse.osee.ats.api.ai, org.eclipse.osee.ats.api.commit, @@ -114,11 +109,19 @@ Import-Package: com.google.gson, org.eclipse.osee.ats.core.client.workflow.stateitem, org.eclipse.osee.ats.core.client.workflow.transition, org.eclipse.osee.ats.core.column, + org.eclipse.osee.ats.core.config, + org.eclipse.osee.ats.core.cpa, + org.eclipse.osee.ats.core.users, + org.eclipse.osee.ats.core.util, org.eclipse.osee.ats.core.workdef, org.eclipse.osee.ats.core.workflow, + org.eclipse.osee.ats.core.workflow.log, + org.eclipse.osee.ats.core.workflow.state, + org.eclipse.osee.ats.core.workflow.transition, org.eclipse.osee.ats.dsl, org.eclipse.osee.ats.dsl.atsDsl, org.eclipse.osee.ats.dsl.atsDsl.impl, + org.eclipse.osee.ats.help.ui, org.eclipse.osee.define.traceability, org.eclipse.osee.define.traceability.report, org.eclipse.osee.framework.access, @@ -139,8 +142,80 @@ Import-Package: com.google.gson, org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.core.util, + org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.database.init, + org.eclipse.osee.framework.jdk.core.type, + org.eclipse.osee.framework.jdk.core.util, + org.eclipse.osee.framework.jdk.core.util.io, + org.eclipse.osee.framework.jdk.core.util.io.xml, org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.plugin.core, + org.eclipse.osee.framework.plugin.core.util, + org.eclipse.osee.framework.skynet.core, + org.eclipse.osee.framework.skynet.core.artifact, + org.eclipse.osee.framework.skynet.core.artifact.search, + org.eclipse.osee.framework.skynet.core.artifact.update, + org.eclipse.osee.framework.skynet.core.attribute, + org.eclipse.osee.framework.skynet.core.change, + org.eclipse.osee.framework.skynet.core.conflict, + org.eclipse.osee.framework.skynet.core.event, + org.eclipse.osee.framework.skynet.core.event.filter, + org.eclipse.osee.framework.skynet.core.event.listener, + org.eclipse.osee.framework.skynet.core.event.model, + org.eclipse.osee.framework.skynet.core.httpRequests, + org.eclipse.osee.framework.skynet.core.relation, + org.eclipse.osee.framework.skynet.core.revision, + org.eclipse.osee.framework.skynet.core.transaction, + org.eclipse.osee.framework.skynet.core.types, + org.eclipse.osee.framework.skynet.core.utility, + org.eclipse.osee.framework.skynet.core.validation, + org.eclipse.osee.framework.ui.plugin, + org.eclipse.osee.framework.ui.plugin.util, + org.eclipse.osee.framework.ui.plugin.xnavigate, + org.eclipse.osee.framework.ui.skynet, + org.eclipse.osee.framework.ui.skynet.access, + org.eclipse.osee.framework.ui.skynet.action, + org.eclipse.osee.framework.ui.skynet.artifact, + org.eclipse.osee.framework.ui.skynet.artifact.annotation, + org.eclipse.osee.framework.ui.skynet.artifact.editor, + org.eclipse.osee.framework.ui.skynet.artifact.editor.parts, + org.eclipse.osee.framework.ui.skynet.artifact.editor.sections, + org.eclipse.osee.framework.ui.skynet.artifact.massEditor, + org.eclipse.osee.framework.ui.skynet.blam, + org.eclipse.osee.framework.ui.skynet.branch, + org.eclipse.osee.framework.ui.skynet.change, + org.eclipse.osee.framework.ui.skynet.cm, + org.eclipse.osee.framework.ui.skynet.commandHandlers, + org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.commit, + org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers, + org.eclipse.osee.framework.ui.skynet.compare, + org.eclipse.osee.framework.ui.skynet.group, + org.eclipse.osee.framework.ui.skynet.notify, + org.eclipse.osee.framework.ui.skynet.render, + org.eclipse.osee.framework.ui.skynet.render.compare, + org.eclipse.osee.framework.ui.skynet.results, + org.eclipse.osee.framework.ui.skynet.results.chart, + org.eclipse.osee.framework.ui.skynet.results.example, + org.eclipse.osee.framework.ui.skynet.results.html, + org.eclipse.osee.framework.ui.skynet.results.table, + org.eclipse.osee.framework.ui.skynet.results.table.xresults, + org.eclipse.osee.framework.ui.skynet.search, + org.eclipse.osee.framework.ui.skynet.skywalker, + org.eclipse.osee.framework.ui.skynet.skywalker.arttype, + org.eclipse.osee.framework.ui.skynet.user.perspective, + org.eclipse.osee.framework.ui.skynet.util, + org.eclipse.osee.framework.ui.skynet.util.email, + org.eclipse.osee.framework.ui.skynet.util.filteredTree, + org.eclipse.osee.framework.ui.skynet.widgets, + org.eclipse.osee.framework.ui.skynet.widgets.dialog, + org.eclipse.osee.framework.ui.skynet.widgets.util, + org.eclipse.osee.framework.ui.skynet.widgets.xBranch, + org.eclipse.osee.framework.ui.skynet.widgets.xHistory, + org.eclipse.osee.framework.ui.skynet.widgets.xbargraph, + org.eclipse.osee.framework.ui.skynet.widgets.xmerge, + org.eclipse.osee.framework.ui.skynet.widgets.xnavigate, + org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet, + org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column, org.eclipse.osee.framework.ui.swt, org.eclipse.osee.framework.ui.ws, org.eclipse.osee.jaxrs.client, -- cgit v1.2.3