diff options
Diffstat (limited to 'plugins')
16 files changed, 267 insertions, 143 deletions
diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF index d81c95913a6..d038dcc95fb 100644 --- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF @@ -6,14 +6,14 @@ Bundle-Version: 0.17.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.cache;version="[11.0,15)", - com.lowagie.text;version="2.1.7", - com.lowagie.text.html;version="2.1.7", - com.lowagie.text.rtf.table;version="2.1.7", +Import-Package: com.google.common.cache, + com.lowagie.text, + com.lowagie.text.html, + com.lowagie.text.rtf.table, com.sun.jersey.core.header;version="1.18.0", javax.ws.rs, javax.ws.rs.core, - javax.ws.rs.ext;version="1.1.1", + javax.ws.rs.ext, org.apache.commons.lang, org.eclipse.core.runtime, org.eclipse.osee.ats.api, diff --git a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF index 4cd2544906b..4341b3c48fe 100644 --- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF @@ -5,8 +5,11 @@ Bundle-SymbolicName: org.eclipse.osee.cache.admin Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" -Import-Package: org.eclipse.osee.framework.jdk.core.type +Import-Package: com.google.common.base, + com.google.common.cache, + com.google.common.collect, + com.google.common.util.concurrent, + org.eclipse.osee.framework.jdk.core.type Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.cache.admin Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF index 7d7a0b5d697..b53c1949e29 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -6,7 +6,11 @@ Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="4.11.0", - org.mockito;bundle-version="1.9.0", - org.hamcrest.core -Import-Package: org.eclipse.osee.framework.database.init +Import-Package: org.eclipse.osee.framework.core.util, + org.eclipse.osee.framework.database.init, + org.junit, + org.junit.runner, + org.junit.runners, + org.mockito, + org.mockito.invocation, + org.mockito.stubbing diff --git a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF index f1fe1b4989f..a3a375b3752 100644 --- a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF @@ -6,30 +6,22 @@ Bundle-Version: 0.17.0.qualifier Bundle-Activator: org.eclipse.osee.coverage.internal.Activator Bundle-Vendor: Eclipse Open System Engineering Environment Eclipse-ExtensibleAPI: true -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, +Bundle-ActivationPolicy: lazy +Import-Package: com.google.common.collect, + com.lowagie.text, + com.lowagie.text.pdf, + org.apache.commons.lang, + org.eclipse.core.commands, org.eclipse.core.resources, - org.eclipse.core.filesystem, - org.eclipse.osee.framework.jdk.core, - org.eclipse.ui.ide, - org.eclipse.search, - org.eclipse.osee.framework.plugin.core, - org.eclipse.osee.framework.ui.plugin, - org.eclipse.osee.framework.database, - org.eclipse.ui.forms, + org.eclipse.core.runtime, + org.eclipse.core.runtime.jobs, + org.eclipse.jface.action, + org.eclipse.jface.dialogs, + org.eclipse.jface.resource, + org.eclipse.jface.viewers, + org.eclipse.jface.window, org.eclipse.nebula.widgets.xviewer, - org.eclipse.osee.framework.ui.skynet, - org.eclipse.ui.workbench.texteditor, - org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.framework.core, - org.eclipse.osee.framework.messaging, - org.apache.commons.lang;bundle-version="2.4.0", org.eclipse.osee.coverage.help.ui, - org.eclipse.osee.framework.help.ui -Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.collect, - com.lowagie.text;version="2.1.7", - com.lowagie.text.pdf;version="2.1.7", org.eclipse.osee.framework.access, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, @@ -39,22 +31,45 @@ Import-Package: com.google.common.collect, org.eclipse.osee.framework.core.model.event, org.eclipse.osee.framework.core.model.type, org.eclipse.osee.framework.core.operation, + org.eclipse.osee.framework.core.threading, + 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.io, + org.eclipse.osee.framework.jdk.core.util.io.xml, + org.eclipse.osee.framework.jdk.core.util.xml, org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.messaging, + 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.attribute, + 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.linking, org.eclipse.osee.framework.skynet.core.relation, 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.word, + 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.action, + org.eclipse.osee.framework.ui.skynet.action.browser, org.eclipse.osee.framework.ui.skynet.artifact.editor, org.eclipse.osee.framework.ui.skynet.blam, + org.eclipse.osee.framework.ui.skynet.blam.sections, org.eclipse.osee.framework.ui.skynet.branch, org.eclipse.osee.framework.ui.skynet.cm, org.eclipse.osee.framework.ui.skynet.commandHandlers, + org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers, org.eclipse.osee.framework.ui.skynet.render, org.eclipse.osee.framework.ui.skynet.results, org.eclipse.osee.framework.ui.skynet.results.html, @@ -62,11 +77,35 @@ Import-Package: com.google.common.collect, org.eclipse.osee.framework.ui.skynet.search, org.eclipse.osee.framework.ui.skynet.templates, 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.xnavigate, - org.eclipse.osee.framework.ui.swt + org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet, + org.eclipse.osee.framework.ui.swt, + org.eclipse.search.ui, + org.eclipse.swt, + org.eclipse.swt.browser, + org.eclipse.swt.custom, + org.eclipse.swt.events, + org.eclipse.swt.graphics, + org.eclipse.swt.layout, + org.eclipse.swt.program, + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.contexts, + org.eclipse.ui.dialogs, + org.eclipse.ui.forms, + org.eclipse.ui.forms.editor, + org.eclipse.ui.forms.widgets, + org.eclipse.ui.part, + org.eclipse.ui.services, + org.osgi.framework, + org.osgi.util.tracker Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.osee.coverage, org.eclipse.osee.coverage.blam, diff --git a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF index d0092ef060e..f0ee6a13aa9 100644 --- a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.osee.display.presenter Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.osee.display.api, +Import-Package: com.google.common.collect, + org.eclipse.osee.display.api, org.eclipse.osee.display.api.components, org.eclipse.osee.display.api.data, org.eclipse.osee.display.api.search, @@ -24,5 +25,3 @@ Import-Package: org.eclipse.osee.display.api, org.eclipse.osee.orcs.search, org.eclipse.osee.orcs.utility Export-Package: org.eclipse.osee.display.presenter -Require-Bundle: org.eclipse.core.runtime, - com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF index b516bb71380..1db6cb0bffb 100644 --- a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF @@ -6,8 +6,9 @@ Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.osee.executor.admin -Import-Package: org.eclipse.osee.event, +Import-Package: com.google.common.collect, + com.google.common.util.concurrent, + org.eclipse.osee.event, org.eclipse.osee.logger Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy -Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF index f877db958ea..df179aa5c20 100644 --- a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.osee.framework.access;singleton:=true Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.core.resources, +Import-Package: com.google.common.cache, + org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, @@ -40,4 +41,3 @@ Eclipse-ExtensibleAPI: true Export-Package: org.eclipse.osee.framework.access, org.eclipse.osee.framework.access.internal.data Service-Component: OSGI-INF/*.xml -Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF index b8916315bcc..b217c586db0 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF @@ -1,10 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Servlet Plug-in -Bundle-SymbolicName: org.eclipse.osee.framework.manager.servlet;singleton:=true +Bundle-SymbolicName: org.eclipse.osee.framework.manager.servlet Bundle-Version: 0.17.0.qualifier Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.osee.event, +Import-Package: com.google.common.base, + com.google.common.collect, + javax.servlet, + javax.servlet.http, + org.eclipse.core.runtime, + org.eclipse.core.runtime.jobs, + org.eclipse.osee.event, org.eclipse.osee.executor.admin, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, @@ -38,6 +44,3 @@ Import-Package: org.eclipse.osee.event, org.osgi.util.tracker Service-Component: OSGI-INF/*.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.core.runtime, - javax.servlet;bundle-version="2.5.0", - com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index 6a764c1d90c..44cb7da95a2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -6,58 +6,76 @@ Bundle-Version: 0.17.0.qualifier Eclipse-ExtensibleAPI: true Bundle-Activator: org.eclipse.osee.framework.ui.skynet.internal.Activator Service-Component: OSGI-INF/*.xml -Require-Bundle: javax.mail.glassfish, - org.eclipse.birt.chart.engine, - org.eclipse.compare, - org.eclipse.core.expressions, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.debug.ui, - org.eclipse.help, - org.eclipse.jface, - org.eclipse.jface.text, - org.eclipse.nebula.widgets.xviewer, - org.eclipse.osee.framework.plugin.core, - org.eclipse.osee.framework.skynet.core, - org.eclipse.osee.framework.ui.plugin, - org.eclipse.osee.framework.ui.swt, - org.eclipse.search, - org.eclipse.ui, - org.eclipse.ui.forms, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.ui.workbench.texteditor, - org.eclipse.zest.core, - org.eclipse.osee.framework.jdk.core, - org.eclipse.osee.framework.ui.ws, - org.eclipse.osee.framework.help.ui, - org.eclipse.osee.framework.access, - org.eclipse.core.filesystem, - org.eclipse.osee.framework.core, - com.google.guava;bundle-version="[11.0.0,15.0.0)", - org.eclipse.xtext.ui;bundle-version="2.3.1" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: com.lowagie.text;version="2.1.7", - com.lowagie.text.html;version="2.1.7", - com.lowagie.text.pdf;version="2.1.7", - com.lowagie.text.rtf;version="2.1.7", +Import-Package: com.google.common.base, + com.google.common.cache, + com.google.common.collect, + com.lowagie.text, + com.lowagie.text.html, + com.lowagie.text.pdf, + com.lowagie.text.rtf, + javax.mail, + javax.mail.internet, org.apache.commons.io, - org.apache.commons.lang;version="2.4.0", - org.apache.commons.lang.mutable;version="2.4.0", - org.apache.xml.serialize;version="2.9.0", + org.apache.commons.lang, + org.apache.commons.lang.mutable, + org.eclipse.birt.chart.device, + org.eclipse.birt.chart.exception, + org.eclipse.birt.chart.factory, + org.eclipse.birt.chart.model, + org.eclipse.birt.chart.model.attribute, + org.eclipse.birt.chart.model.attribute.impl, + org.eclipse.birt.chart.model.component, + org.eclipse.birt.chart.model.component.impl, + org.eclipse.birt.chart.model.data, + org.eclipse.birt.chart.model.data.impl, + org.eclipse.birt.chart.model.impl, + org.eclipse.birt.chart.model.layout, + org.eclipse.birt.chart.model.type, + org.eclipse.birt.chart.model.type.impl, + org.eclipse.birt.chart.util, + org.eclipse.birt.core.exception, + org.eclipse.compare, + org.eclipse.compare.structuremergeviewer, + org.eclipse.core.commands, + org.eclipse.core.commands.common, + org.eclipse.core.filesystem, org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.core.runtime.jobs, + org.eclipse.core.runtime.preferences, + org.eclipse.debug.core, + org.eclipse.emf.common.util, + org.eclipse.emf.ecore, + org.eclipse.emf.ecore.resource, + org.eclipse.emf.ecore.resource.impl, + org.eclipse.equinox.app;version="1.1.0", org.eclipse.jdt.annotation, org.eclipse.jdt.core, org.eclipse.jdt.core.search, + org.eclipse.jface.action, + org.eclipse.jface.dialogs, + org.eclipse.jface.fieldassist, + org.eclipse.jface.operation, + org.eclipse.jface.preference, + org.eclipse.jface.resource, + org.eclipse.jface.text, + org.eclipse.jface.text.source, + org.eclipse.jface.util, + org.eclipse.jface.viewers, + org.eclipse.jface.window, + org.eclipse.jface.wizard, 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.framework.access, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.client.server, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, - org.eclipse.osee.framework.core.message, org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.access, org.eclipse.osee.framework.core.model.cache, @@ -71,19 +89,93 @@ Import-Package: com.lowagie.text;version="2.1.7", org.eclipse.osee.framework.database, org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.database.operation, + org.eclipse.osee.framework.help.ui, org.eclipse.osee.framework.jdk.core.text.change, - org.eclipse.osee.framework.jdk.core.text.rules, 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.streams, org.eclipse.osee.framework.jdk.core.util.io.xml, org.eclipse.osee.framework.jdk.core.util.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.operation, + 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.email, + 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.importing, + org.eclipse.osee.framework.skynet.core.importing.operations, + org.eclipse.osee.framework.skynet.core.importing.parsers, + org.eclipse.osee.framework.skynet.core.importing.resolvers, + org.eclipse.osee.framework.skynet.core.linking, + org.eclipse.osee.framework.skynet.core.preferences, + org.eclipse.osee.framework.skynet.core.relation, + org.eclipse.osee.framework.skynet.core.relation.order, + 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.skynet.core.word, + 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.swt, + org.eclipse.osee.framework.ui.swt.styledText, + org.eclipse.osee.framework.ui.ws, org.eclipse.osee.orcs.rest.client, + org.eclipse.search.ui, + org.eclipse.search.ui.text, + org.eclipse.swt, + org.eclipse.swt.browser, + org.eclipse.swt.custom, + org.eclipse.swt.dnd, + org.eclipse.swt.events, + org.eclipse.swt.graphics, + org.eclipse.swt.layout, + org.eclipse.swt.program, + org.eclipse.swt.widgets, + org.eclipse.ui, + org.eclipse.ui.actions, + org.eclipse.ui.commands, + org.eclipse.ui.contexts, + org.eclipse.ui.dialogs, + org.eclipse.ui.forms, + org.eclipse.ui.forms.editor, + org.eclipse.ui.forms.events, + org.eclipse.ui.forms.widgets, + org.eclipse.ui.handlers, + org.eclipse.ui.ide, + org.eclipse.ui.internal, + org.eclipse.ui.internal.dialogs, + org.eclipse.ui.menus, + org.eclipse.ui.part, + org.eclipse.ui.preferences, + org.eclipse.ui.progress, + org.eclipse.ui.texteditor, + org.eclipse.ui.views.contentoutline, + org.eclipse.xtext.resource, + org.eclipse.xtext.ui.editor, + org.eclipse.xtext.ui.editor.embedded, + org.eclipse.xtext.ui.editor.outline.impl, + org.eclipse.zest.core.viewers, + org.eclipse.zest.core.widgets, org.eclipse.zest.layouts, - org.eclipse.zest.layouts.algorithms + org.eclipse.zest.layouts.algorithms, + org.mozilla.javascript, + org.osgi.framework, + org.osgi.service.packageadmin, + org.osgi.service.prefs;version="1.1.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.osee.framework.ui.skynet, org.eclipse.osee.framework.ui.skynet.Import, @@ -158,3 +250,4 @@ Export-Package: org.eclipse.osee.framework.ui.skynet, 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 +Require-Bundle: org.eclipse.ui.workbench diff --git a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF index a6d3bb173a5..72e7544ba90 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF @@ -6,12 +6,18 @@ Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.orcs.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.core.runtime, +Import-Package: com.google.common.util.concurrent, + org.eclipse.core.runtime, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.model.mocks, - org.eclipse.osee.framework.resource.management.util -Require-Bundle: org.junit, - org.mockito;bundle-version="1.9.0", + org.eclipse.osee.framework.core.model.type, + org.eclipse.osee.framework.resource.management.util, org.hamcrest.core, - org.objenesis + org.junit, + org.junit.rules, + org.junit.runner, + org.junit.runners, + org.mockito, + org.mockito.invocation, + org.mockito.stubbing diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF index 849a2ad1bf6..ba3cacab109 100644 --- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF @@ -7,7 +7,9 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Service-Component: OSGI-INF/*.xml Import-Package: com.google.common.base, - org.eclipse.emf.common.notify, + com.google.common.collect, + com.google.common.io, + org.eclipse.core.runtime, org.eclipse.emf.common.util, org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, @@ -22,9 +24,11 @@ Import-Package: com.google.common.base, org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.model.change, - org.eclipse.osee.framework.core.model.type, org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.core.util, + org.eclipse.osee.framework.jdk.core.type, + org.eclipse.osee.framework.jdk.core.util, + org.eclipse.osee.framework.jdk.core.util.io.xml, org.eclipse.osee.framework.resource.management, org.eclipse.osee.logger, org.eclipse.osee.orcs, @@ -36,7 +40,4 @@ Import-Package: com.google.common.base, Export-Package: org.eclipse.osee.orcs.core, org.eclipse.osee.orcs.core.ds, org.eclipse.osee.orcs.core.ds.criteria -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.osee.framework.jdk.core, - com.google.guava;bundle-version="[11.0.0,15.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF index 1cae3f29469..86f49a0c8de 100644 --- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF @@ -6,25 +6,20 @@ Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Service-Component: OSGI-INF/*.xml -Import-Package: org.eclipse.core.runtime, - org.eclipse.emf.common.notify, - org.eclipse.emf.common.util, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.util, +Import-Package: com.google.common.base, + com.google.common.collect, + com.google.common.io, + org.eclipse.core.runtime, org.eclipse.osee.console.admin, org.eclipse.osee.database.schema, org.eclipse.osee.event, org.eclipse.osee.executor.admin, org.eclipse.osee.framework.core.data, - org.eclipse.osee.framework.core.dsl, - org.eclipse.osee.framework.core.dsl.oseeDsl, - org.eclipse.osee.framework.core.dsl.oseeDsl.util, 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.model.change, - org.eclipse.osee.framework.core.model.type, org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.core.util, @@ -49,8 +44,6 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.orcs.core.ds.criteria, org.eclipse.osee.orcs.data, org.eclipse.osee.orcs.search, - org.eclipse.osee.orcs.utility, org.osgi.framework Bundle-ActivationPolicy: lazy -Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" Export-Package: org.eclipse.osee.orcs.db.internal.search.tagger diff --git a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF index 814951bf4e2..30abe367489 100644 --- a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF @@ -4,32 +4,18 @@ Bundle-Name: ORCS Integration Test Bundle-SymbolicName: org.eclipse.osee.orcs.test Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment -Fragment-Host: org.eclipse.osee.orcs;bundle-version="0.10.2.qualifier" +Fragment-Host: org.eclipse.osee.orcs Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.osee.event, - org.eclipse.osee.executor.admin, - 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, +Import-Package: com.google.common.base, + com.google.common.collect, + org.eclipse.osee.event, org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.database, - org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.orcs, - org.eclipse.osee.orcs.core.ds, - org.eclipse.osee.orcs.data, + org.eclipse.osee.logger, org.eclipse.osee.orcs.db.mock, - org.eclipse.osee.orcs.search, - org.eclipse.osee.orcs.transaction, - org.eclipse.osee.orcs.utility, + org.hamcrest.core, + org.junit, + org.junit.rules, + org.junit.runner, + org.junit.runners, org.osgi.service.event -Require-Bundle: org.junit, - org.eclipse.equinox.event, - org.eclipse.core.runtime, - org.eclipse.osee.event.osgi, - org.eclipse.osee.logger, - org.eclipse.osee.framework.database, - org.eclipse.osee.framework.core.model, - com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.orcs.test/pom.xml b/plugins/org.eclipse.osee.orcs.test/pom.xml index 41077b89d38..af6e052de8b 100644 --- a/plugins/org.eclipse.osee.orcs.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.test/pom.xml @@ -34,11 +34,11 @@ <artifactId>org.eclipse.osee.database.schema</artifactId> <version>0.0.0</version> </dependency> - <!-- <dependency> + <dependency> <type>eclipse-plugin</type> <artifactId>org.eclipse.osee.event.osgi</artifactId> <version>0.0.0</version> - </dependency>--> + </dependency> <!-- <dependency> <type>eclipse-plugin</type> <artifactId>org.eclipse.osee.event</artifactId> @@ -144,11 +144,11 @@ <artifactId>org.eclipse.equinox.ds</artifactId> <version>0.0.0</version> </dependency> - <!-- <dependency> + <dependency> <type>eclipse-plugin</type> <artifactId>org.eclipse.equinox.event</artifactId> <version>0.0.0</version> - </dependency> --> + </dependency> <dependency> <type>eclipse-plugin</type> <artifactId>org.eclipse.equinox.preferences</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java index 6b0efcc653e..f8d26e91533 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java @@ -56,7 +56,6 @@ import org.eclipse.osee.orcs.search.QueryBuilder; import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.transaction.TransactionBuilder; import org.eclipse.osee.orcs.transaction.TransactionFactory; -import org.hamcrest.CoreMatchers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -662,8 +661,8 @@ public class OrcsTransactionTest { ArtifactId art2 = tx1.createArtifact(CoreArtifactTypes.User, "User Artifact"); thrown.expect(OseeArgumentException.class); - thrown.expectMessage(CoreMatchers.startsWith("Relation validity error for [artifact type[Component]")); - thrown.expectMessage(CoreMatchers.endsWith("only items of type [User] are allowed")); + thrown.expectMessage("Relation validity error for [artifact type[Component]"); + thrown.expectMessage("only items of type [User] are allowed"); tx1.relate(art2, CoreRelationTypes.Users_User, art1); } diff --git a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF index de9b4da278e..1e76d3b228a 100644 --- a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF @@ -5,15 +5,13 @@ Bundle-SymbolicName: org.eclipse.osee.orcs Bundle-Version: 0.17.0.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.osee.executor.admin, +Import-Package: org.eclipse.core.runtime, + org.eclipse.osee.executor.admin, 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.model.change, - org.eclipse.osee.framework.core.model.type, - org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.resource.management @@ -23,5 +21,4 @@ Export-Package: org.eclipse.osee.orcs, org.eclipse.osee.orcs.statistics, org.eclipse.osee.orcs.transaction, org.eclipse.osee.orcs.utility -Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy |