Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2018-08-20 14:37:01 -0400
committermegumi.telles2018-09-10 15:03:08 -0400
commit791c2082f9a3c086257e9213544c9769f571c7b6 (patch)
treeb7499d5ccf5ae66147d171459a738608590ff3c5
parentb9ccb28275dd04d94a3e5997eb423d9f578a529e (diff)
downloadorg.eclipse.osee-791c2082f9a3c086257e9213544c9769f571c7b6.tar.gz
org.eclipse.osee-791c2082f9a3c086257e9213544c9769f571c7b6.tar.xz
org.eclipse.osee-791c2082f9a3c086257e9213544c9769f571c7b6.zip
WIP - Upgrade to Photonupgrade_photon
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/feature.xml13
-rw-r--r--features/org.eclipse.osee.core.server.external.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.core.server.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.dep.feature/feature.xml107
-rw-r--r--features/org.eclipse.osee.dep.feature/pom.xml40
-rw-r--r--features/org.eclipse.osee.external.feature/feature.xml41
-rw-r--r--features/org.eclipse.osee.external.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.framework.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.framework.ui.feature/pom.xml1
-rw-r--r--features/org.eclipse.osee.server.external.feature/feature.xml29
-rw-r--r--features/org.eclipse.osee.server.external.feature/pom.xml1
-rw-r--r--plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileService.java342
-rw-r--r--plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.dep.parent/pom.xml21
-rw-r--r--plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OseeInf.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OsgiUtil.java2
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagerTest.java20
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/ResourceManager.java16
-rw-r--r--plugins/org.eclipse.osee.framework.server.ide/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java10
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java6
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java9
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java16
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java6
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java21
-rw-r--r--plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/IndexedResource.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java11
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java1
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiServiceFieldAnnotationHandler.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallable.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/IndexerDataSourceImpl.java46
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/TextStreamTagger.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/XmlTagger.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/util/AttributeDataMatcher.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.parent/pom.xml3
-rw-r--r--plugins/org.eclipse.osee.support.config/TargetPlatform.target1348
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch6
68 files changed, 1769 insertions, 564 deletions
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index 9c6236a026..e6fd62ff96 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -554,5 +554,18 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osgi.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.felix.scr"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.osee.core.server.external.feature/pom.xml b/features/org.eclipse.osee.core.server.external.feature/pom.xml
index 71f5de8a8d..58dd8450b6 100644
--- a/features/org.eclipse.osee.core.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/pom.xml
@@ -45,6 +45,7 @@
<plugin id="org.eclipse.jetty.servlet" />
<plugin id="org.eclipse.jetty.util" />
<plugin id="ch.qos.logback.slf4j" />
+ <plugin id="com.google.guava" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.core.server.feature/pom.xml b/features/org.eclipse.osee.core.server.feature/pom.xml
index a9b897da12..7a2c9f12ed 100644
--- a/features/org.eclipse.osee.core.server.feature/pom.xml
+++ b/features/org.eclipse.osee.core.server.feature/pom.xml
@@ -26,6 +26,7 @@
<configuration>
<excludes>
<plugin id="org.eclipse.osee.logback.config" />
+ <plugin id="com.google.guava" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index 144595de8e..e148d771dd 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -22,7 +22,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.graphiti.source.feature"
+ id="org.eclipse.graphiti.feature.source"
version="0.0.0"/>
<includes
@@ -266,7 +266,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.core.source.feature"
+ id="org.eclipse.ecf.core.feature.source"
version="0.0.0"/>
<includes
@@ -274,7 +274,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.core.ssl.source.feature"
+ id="org.eclipse.ecf.core.ssl.feature.source"
version="0.0.0"/>
<includes
@@ -282,7 +282,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.filetransfer.source.feature"
+ id="org.eclipse.ecf.filetransfer.feature.source"
version="0.0.0"/>
<includes
@@ -290,7 +290,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.filetransfer.ssl.source.feature"
+ id="org.eclipse.ecf.filetransfer.ssl.feature.source"
version="0.0.0"/>
<includes
@@ -298,7 +298,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"
+ id="org.eclipse.ecf.filetransfer.httpclient4.feature.source"
version="0.0.0"/>
<includes
@@ -306,7 +306,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"
+ id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source"
version="0.0.0"/>
<includes
@@ -322,6 +322,8 @@
<import plugin="javax.xml"/>
<import plugin="javax.servlet" version="3.0.0" match="equivalent"/>
<import plugin="org.eclipse.osgi"/>
+ <import plugin="org.eclipse.osgi.util"/>
+ <import plugin="org.eclipse.osgi.compatibility.state"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.jobs"/>
<import plugin="org.eclipse.core.contenttype"/>
@@ -375,6 +377,34 @@
unpack="false"/>
<plugin
+ id="com.google.inject.multibindings"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.gwt.servlet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.gwtjsonrpc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.gwtorm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="com.jcraft.jsch"
download-size="0"
install-size="0"
@@ -593,13 +623,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.team.svn.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.xtext"
download-size="0"
install-size="0"
@@ -635,13 +658,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.xtext.junit4"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.xtext.ui"
download-size="0"
install-size="0"
@@ -1013,12 +1029,6 @@
unpack="false"/>
<plugin
- id="org.junit"
- download-size="0"
- install-size="0"
- version="4.11.0"/>
-
- <plugin
id="org.eclipse.emf.transaction"
download-size="0"
install-size="0"
@@ -1572,28 +1582,35 @@
unpack="false"/>
<plugin
- id="org.eclipse.gmf.tooling.runtime"
+ id="org.eclipse.gmf.runtime.common.ui.action.ide"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.gmf.runtime.common.ui.action.ide"
+ id="org.eclipse.ocl.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ocl.common"
+ id="org.eclipse.ocl.ecore"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ocl.ecore"
+ id="org.eclipse.ocl.examples.emf.validation.validity.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ocl.examples.emf.validation.validity"
download-size="0"
install-size="0"
version="0.0.0"
@@ -1858,4 +1875,32 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.nebula.widgets.cdatetime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.services"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.osee.dep.feature/pom.xml b/features/org.eclipse.osee.dep.feature/pom.xml
index 458f0204b9..db3276dc87 100644
--- a/features/org.eclipse.osee.dep.feature/pom.xml
+++ b/features/org.eclipse.osee.dep.feature/pom.xml
@@ -39,18 +39,18 @@
<plugin id="javax.ws.rs" />
<plugin id="javax.wsdl" />
<plugin id="com.google.gson" />
+ <plugin id="com.google.guava" />
<plugin id="org.eclipse.xtext" />
<plugin id="org.antlr.runtime" />
<plugin id="org.cyberneko.html" />
<plugin id="org.apache.commons.io" />
<plugin id="org.apache.commons.cli" />
<plugin id="org.eclipse.team.svn" />
- <plugin id="org.eclipse.team.svn.core" />
<plugin id="ch.qos.logback.slf4j" />
<plugin id="org.jsoup" />
<plugin id="org.eclipse.swt" />
<plugin id="org.eclipse.wst.common.project.facet.core" />
- <plugin id="org.eclipse.wst.xml.core" />
+ <plugin id="org.eclipse.wst.xml.core" />
<plugin id="org.eclipse.wst.sse.core" />
<plugin id="org.eclipse.wst.common.uriresolver" />
<plugin id="org.eclipse.wst.common.core" />
@@ -59,22 +59,38 @@
<plugin id="org.eclipse.gmf.runtime.emf.clipboard.core" />
<plugin id="org.eclipse.gmf.runtime.emf.type.core" />
<plugin id="org.eclipse.gmf.runtime.emf.ui" />
+ <plugin id="org.eclipse.uml2.codegen.ecore" />
<plugin id="org.eclipse.uml2.uml" />
+ <plugin id="org.eclipse.uml2.uml.edit" />
+ <plugin id="org.eclipse.uml2.uml.editor" />
+ <plugin id="org.eclipse.uml2.uml.profile.standard" />
+ <plugin id="org.eclipse.uml2.uml.validation" />
+ <plugin id="org.eclipse.uml2.types" />
+ <plugin id="org.eclipse.uml2.common" />
+ <plugin id="org.eclipse.uml2.common.edit" />
<plugin id="org.eclipse.uml2.uml.resources" />
<plugin id="org.apache.batik.pdf" />
<plugin id="org.eclipse.ocl.common" />
- <plugin id="org.eclipse.ocl.ecore" />
+ <plugin id="org.eclipse.ocl.ecore" />
+ <plugin id="org.eclipse.ocl.examples.emf.validation.validity.ui" />
+ <plugin id="org.eclipse.ocl.examples.emf.validation.validity" />
+ <plugin id="org.eclipse.nebula.widgets.cdatetime" />
+ <plugin id="org.eclipse.nebula.widgets.ganttchart" />
<feature id="org.eclipse.graphiti.feature" />
- <feature id="org.eclipse.graphiti.source.feature" />
+ <feature id="org.eclipse.graphiti.feature.source" />
<feature id="org.eclipse.equinox.server.jetty" />
<feature id="org.eclipse.core.runtime.feature" />
<feature id="org.eclipse.xtext.sdk" />
<feature id="org.eclipse.emf" />
+ <feature id="org.eclipse.emf.doc" />
<feature id="org.eclipse.emf.mwe2.language.sdk" />
<feature id="org.eclipse.emf.mwe2.runtime.sdk" />
<feature id="org.eclipse.sdk" />
<feature id="org.eclipse.xtend.sdk" />
<feature id="org.eclipse.xtext.docs" />
+ <feature id="org.eclipse.xtext.runtime" />
+ <feature id="org.eclipse.xtext.xbase" />
+ <feature id="org.eclipse.xtext.ui" />
<feature id="org.eclipse.nebula.widgets.ganttchart.feature" />
<feature id="org.eclipse.nebula.widgets.xviewer.feature" />
<feature id="org.eclipse.equinox.executable" />
@@ -84,20 +100,20 @@
<feature id="org.eclipse.equinox.sdk" />
<feature id="org.eclipse.equinox.core.feature" />
<feature id="org.eclipse.equinox.compendium.sdk" />
- <feature id="org.eclipse.ecf.core.feature" />
+ <feature id="org.eclipse.ecf.core.feature" />
<feature id="org.eclipse.m2e.feature" />
- <feature id="org.eclipse.ecf.core.source.feature" />
+ <feature id="org.eclipse.ecf.core.feature.source" />
<feature id="org.eclipse.ecf.core.ssl.feature" />
- <feature id="org.eclipse.ecf.core.ssl.source.feature" />
+ <feature id="org.eclipse.ecf.core.ssl.feature.source" />
<feature id="org.eclipse.ecf.filetransfer.feature" />
- <feature id="org.eclipse.ecf.filetransfer.source.feature" />
+ <feature id="org.eclipse.ecf.filetransfer.feature.source" />
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" />
- <feature id="org.eclipse.ecf.filetransfer.ssl.source.feature" />
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" />
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature" />
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature" />
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature.source" />
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" />
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" />
- <feature id="org.eclipse.papyrus.sdk.feature" />
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" />
+ <feature id="org.eclipse.papyrus.sdk.feature" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml
index e3b31d82f0..f1c3dd6664 100644
--- a/features/org.eclipse.osee.external.feature/feature.xml
+++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -26,6 +26,8 @@
<import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.osgi.services"/>
+ <import plugin="org.eclipse.osgi.util"/>
+ <import plugin="org.eclipse.osgi.compatibility.state"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="javax.xml" version="1.3.4" match="compatible"/>
<import plugin="javax.servlet"/>
@@ -34,7 +36,7 @@
<import feature="org.eclipse.nebula.widgets.xviewer.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.nebula.widgets.ganttchart.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.graphiti.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.graphiti.source.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.graphiti.feature.source" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.papyrus.sdk.feature" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/>
<import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/>
@@ -46,7 +48,6 @@
<import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
<import plugin="javax.validation" version="1.1.0" match="greaterOrEqual"/>
<import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.team.svn.core"/>
</requires>
<plugin
@@ -477,4 +478,40 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osgi.services"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.event.osgi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.compatibility.state"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml
index 1660c4cfd2..840819ae14 100644
--- a/features/org.eclipse.osee.external.feature/pom.xml
+++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -38,6 +38,7 @@
<plugin id="org.apache.cxf.core.config" />
<plugin id="ch.qos.logback.slf4j" />
<plugin id="javax.ws.rs" />
+ <plugin id="com.google.guava" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.framework.feature/pom.xml b/features/org.eclipse.osee.framework.feature/pom.xml
index ace5047f65..10b83dcb29 100644
--- a/features/org.eclipse.osee.framework.feature/pom.xml
+++ b/features/org.eclipse.osee.framework.feature/pom.xml
@@ -29,6 +29,7 @@
<configuration>
<excludes>
<plugin id="org.eclipse.osee.framework.templates" />
+ <plugin id="com.google.guava" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.framework.ui.feature/pom.xml b/features/org.eclipse.osee.framework.ui.feature/pom.xml
index ed68c12985..490de2e24a 100644
--- a/features/org.eclipse.osee.framework.ui.feature/pom.xml
+++ b/features/org.eclipse.osee.framework.ui.feature/pom.xml
@@ -30,6 +30,7 @@
<excludes>
<plugin id="org.eclipse.osee.framework.ui.product" />
<plugin id="org.eclipse.osee.framework.dev.help.ui" />
+ <plugin id="com.google.guava" />
</excludes>
</configuration>
</execution>
diff --git a/features/org.eclipse.osee.server.external.feature/feature.xml b/features/org.eclipse.osee.server.external.feature/feature.xml
index eab3dcef7f..4423edc303 100644
--- a/features/org.eclipse.osee.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.server.external.feature/feature.xml
@@ -25,6 +25,7 @@
<import plugin="org.apache.mina.core"/>
<import plugin="javax.xml"/>
<import plugin="org.eclipse.osgi"/>
+ <import plugin="org.eclipse.osgi.util"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.jobs"/>
<import plugin="org.eclipse.core.contenttype"/>
@@ -558,4 +559,32 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osgi.services"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.ds"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.felix.scr"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.osee.server.external.feature/pom.xml b/features/org.eclipse.osee.server.external.feature/pom.xml
index 691ea29af6..0663a7b77f 100644
--- a/features/org.eclipse.osee.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.server.external.feature/pom.xml
@@ -28,6 +28,7 @@
<plugin id="org.aopalliance" />
<plugin id="javax.servlet" />
<plugin id="com.google.gson" />
+ <plugin id="com.google.guava" />
<plugin id="org.eclipse.jetty.http" />
<plugin id="org.eclipse.jetty.io" />
<plugin id="org.eclipse.jetty.security" />
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileService.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileService.java
deleted file mode 100644
index f5ff2378d8..0000000000
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileService.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 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.impl.internal.agile;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.ats.api.agile.IAgileBacklog;
-import org.eclipse.osee.ats.api.agile.IAgileFeatureGroup;
-import org.eclipse.osee.ats.api.agile.IAgileItem;
-import org.eclipse.osee.ats.api.agile.IAgileService;
-import org.eclipse.osee.ats.api.agile.IAgileSprint;
-import org.eclipse.osee.ats.api.agile.IAgileTeam;
-import org.eclipse.osee.ats.api.agile.JaxAgileBacklog;
-import org.eclipse.osee.ats.api.agile.JaxAgileFeatureGroup;
-import org.eclipse.osee.ats.api.agile.JaxAgileItem;
-import org.eclipse.osee.ats.api.agile.JaxAgileTeam;
-import org.eclipse.osee.ats.api.agile.JaxNewAgileTeam;
-import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.api.data.AtsRelationTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
-import org.eclipse.osee.ats.impl.IAtsServer;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
-import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.transaction.TransactionBuilder;
-
-/**
- * @author Donald G. Dunne
- */
-public class AgileService implements IAgileService {
-
- private final Log logger;
- private final IAtsServer atsServer;
-
- public AgileService(Log logger, IAtsServer atsServer) {
- this.logger = logger;
- this.atsServer = atsServer;
- }
-
- /********************************
- ** Agile Team
- ***********************************/
- @Override
- public IAgileTeam getAgileTeam(Object artifact) {
- return AgileFactory.getAgileTeam(logger, atsServer, artifact);
- }
-
- @Override
- public IAgileTeam getAgileTeam(long uuid) {
- IAgileTeam team = null;
- ArtifactReadable teamArt = atsServer.getArtifactByUuid(uuid);
- if (teamArt != null) {
- team = getAgileTeam(teamArt);
- }
- return team;
- }
-
- @Override
- public IAgileTeam getAgileTeamById(long teamUuid) {
- IAgileTeam team = null;
- ArtifactReadable artifact = getArtifact(teamUuid);
- if (artifact != null) {
- team = getAgileTeam(artifact);
- }
- return team;
- }
-
- @Override
- public IAgileTeam createAgileTeam(JaxNewAgileTeam newTeam) {
- return AgileFactory.createAgileTeam(logger, atsServer, newTeam);
- }
-
- @Override
- public IAgileTeam updateAgileTeam(JaxAgileTeam team) {
- return AgileFactory.updateAgileTeam(logger, atsServer, team);
- }
-
- @Override
- public void deleteAgileTeam(long uuid) {
- ArtifactReadable team = atsServer.getArtifactByUuid(uuid);
- if (!team.isOfType(AtsArtifactTypes.AgileTeam)) {
- throw new OseeArgumentException("UUID %d is not a valid Agile Team", uuid);
- }
- TransactionBuilder transaction =
- atsServer.getOrcsApi().getTransactionFactory().createTransaction(AtsUtilCore.getAtsBranch(), team,
- "Delete Agile Team");
- deleteRecurse(transaction, team.getChildren());
- transaction.deleteArtifact(team);
- transaction.commit();
- }
-
- private void deleteRecurse(TransactionBuilder transaction, ResultSet<ArtifactReadable> resultSet) {
- Iterator<ArtifactReadable> iterator = resultSet.iterator();
- while (iterator.hasNext()) {
- ArtifactReadable art = iterator.next();
- deleteRecurse(transaction, art.getChildren());
- transaction.deleteArtifact(art);
- }
- }
-
- @Override
- public Collection<IAgileTeam> getTeams() {
- List<IAgileTeam> teams = new ArrayList<IAgileTeam>();
- for (ArtifactReadable teamArt : atsServer.getQuery().andTypeEquals(AtsArtifactTypes.AgileTeam).getResults()) {
- teams.add(getAgileTeam(teamArt));
- }
- return teams;
- }
-
- /********************************
- ** Agile Feature Group
- ***********************************/
- @Override
- public IAgileFeatureGroup getAgileFeatureGroup(Object artifact) {
- return AgileFactory.getAgileFeatureGroup(logger, atsServer, artifact);
- }
-
- @Override
- public void deleteAgileFeatureGroup(long uuid) {
- ArtifactReadable featureGroup = atsServer.getArtifactByUuid(uuid);
- if (!featureGroup.isOfType(AtsArtifactTypes.AgileFeatureGroup)) {
- throw new OseeArgumentException("UUID %d is not a valid Agile Feature Group", uuid);
- }
- TransactionBuilder transaction =
- atsServer.getOrcsApi().getTransactionFactory().createTransaction(AtsUtilCore.getAtsBranch(), featureGroup,
- "Delete Agile Feature Group");
- transaction.deleteArtifact(featureGroup);
- transaction.commit();
- }
-
- @Override
- public IAgileFeatureGroup createAgileFeatureGroup(long teamUuid, String name, String guid, Long uuid) {
- return AgileFactory.createAgileFeatureGroup(logger, atsServer, teamUuid, name, guid, uuid);
- }
-
- @Override
- public IAgileFeatureGroup createAgileFeatureGroup(JaxAgileFeatureGroup newFeatureGroup) {
- return AgileFactory.createAgileFeatureGroup(logger, atsServer, newFeatureGroup);
- }
-
- @Override
- public Collection<IAgileFeatureGroup> getAgileFeatureGroups(IAgileTeam team) {
- List<IAgileFeatureGroup> groups = new LinkedList<IAgileFeatureGroup>();
- ArtifactReadable artifact = (ArtifactReadable) team.getStoreObject();
- for (ArtifactReadable groupArt : artifact.getRelated(AtsRelationTypes.AgileTeamToFeatureGroup_FeatureGroup)) {
- groups.add(atsServer.getConfigItemFactory().getAgileFeatureGroup(groupArt));
- }
- return groups;
- }
-
- @Override
- public IAgileBacklog getBacklogForTeam(long teamUuid) {
- IAgileBacklog backlog = null;
- ArtifactReadable teamArt =
- atsServer.getQuery().andUuid(Long.valueOf(teamUuid).intValue()).getResults().getAtMostOneOrNull();
- ArtifactReadable backlogArt =
- teamArt.getRelated(AtsRelationTypes.AgileTeamToBacklog_Backlog).getAtMostOneOrNull();
- if (backlogArt != null) {
- backlog = getAgileBacklog(backlogArt);
- }
- return backlog;
- }
-
- /********************************
- ** Agile Sprint
- ***********************************/
- @Override
- public IAgileSprint getAgileSprint(Object artifact) {
- return AgileFactory.getAgileSprint(logger, atsServer, artifact);
- }
-
- @Override
- public IAgileSprint createAgileSprint(long teamUuid, String name, String guid, Long uuid) {
- return AgileFactory.createAgileSprint(logger, atsServer, teamUuid, name, guid, uuid);
- }
-
- private ArtifactReadable getArtifact(long uuid) {
- return atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andUuid(
- new Long(uuid).intValue()).getResults().getAtMostOneOrNull();
- }
-
- @Override
- public Collection<IAgileSprint> getSprintsForTeam(long teamUuid) {
- List<IAgileSprint> sprints = new ArrayList<IAgileSprint>();
- ArtifactReadable team = getArtifact(teamUuid);
- for (ArtifactReadable sprintArt : team.getRelated(AtsRelationTypes.AgileTeamToSprint_Sprint)) {
- sprints.add(getAgileSprint(sprintArt));
- }
- return sprints;
- }
-
- @Override
- public Collection<IAgileSprint> getAgileSprints(IAgileTeam team) {
- List<IAgileSprint> sprints = new LinkedList<IAgileSprint>();
- ArtifactReadable artifact = (ArtifactReadable) team.getStoreObject();
- for (ArtifactReadable groupArt : artifact.getRelated(AtsRelationTypes.AgileTeamToSprint_Sprint)) {
- sprints.add(atsServer.getWorkItemFactory().getAgileSprint(groupArt));
- }
- return sprints;
- }
-
- @Override
- public IAgileSprint getAgileSprint(long sprintUuid) {
- ArtifactReadable artifact = getArtifact(sprintUuid);
- return getAgileSprint(artifact);
- }
-
- @Override
- public Collection<IAgileItem> getItems(IAgileSprint sprint) {
- List<IAgileItem> items = new LinkedList<IAgileItem>();
- ArtifactReadable sprintArt = (ArtifactReadable) sprint.getStoreObject();
- for (ArtifactReadable art : sprintArt.getRelated(AtsRelationTypes.AgileSprintToItem_AtsItem)) {
- if (art.isOfType(AtsArtifactTypes.AbstractWorkflowArtifact)) {
- items.add(atsServer.getWorkItemFactory().getAgileItem(art));
- } else {
- throw new OseeStateException("Inavlid artifact [%s] in backlog. Only workflows are allowed, not [%s]",
- AtsUtilCore.toStringWithId(art), art.getArtifactType().getName());
- }
- }
- return items;
- }
-
- /********************************
- ** Agile Backlog
- ***********************************/
- @Override
- public IAgileBacklog getAgileBacklog(Object artifact) {
- return AgileFactory.getAgileBacklog(logger, atsServer, artifact);
- }
-
- @Override
- public IAgileBacklog getAgileBacklog(IAgileTeam team) {
- ArtifactReadable teamFolder = AgileFolders.getTeamFolder(atsServer, team.getUuid());
- if (teamFolder == null) {
- return null;
- }
- ArtifactReadable backlogArt = teamFolder.getRelated(AtsRelationTypes.AgileTeamToBacklog_Backlog).getOneOrNull();
- if (backlogArt == null) {
- return null;
- }
- return new AgileBacklog(logger, atsServer, backlogArt);
- }
-
- @Override
- public IAgileBacklog getAgileBacklog(long uuid) {
- IAgileBacklog backlog = null;
- ArtifactReadable teamArt = atsServer.getArtifactByUuid(uuid);
- if (teamArt != null) {
- backlog = getAgileBacklog(teamArt);
- }
- return backlog;
- }
-
- @Override
- public IAgileBacklog createAgileBacklog(long teamUuid, String name, String guid, Long uuid) {
- return AgileFactory.createAgileBacklog(logger, atsServer, teamUuid, name, guid, uuid);
- }
-
- @Override
- public IAgileBacklog updateAgileBacklog(JaxAgileBacklog updatedBacklog) {
- AgileBacklogWriter writer = new AgileBacklogWriter(atsServer, this, updatedBacklog);
- return writer.write();
- }
-
- @Override
- public JaxAgileItem updateItem(JaxAgileItem newItem) {
- AgileItemWriter writer = new AgileItemWriter(atsServer, this, newItem);
- return writer.write();
- }
-
- @Override
- public Collection<IAgileFeatureGroup> getAgileFeatureGroups(List<Long> uuids) {
- List<IAgileFeatureGroup> features = new LinkedList<IAgileFeatureGroup>();
- for (ArtifactReadable featureArt : atsServer.getArtifacts(uuids)) {
- features.add(atsServer.getConfigItemFactory().getAgileFeatureGroup(featureArt));
- }
- return features;
- }
-
- @Override
- public Collection<IAgileItem> getItems(IAgileBacklog backlog) {
- List<IAgileItem> items = new LinkedList<IAgileItem>();
- ArtifactReadable backlogArt = (ArtifactReadable) backlog.getStoreObject();
- for (ArtifactReadable art : backlogArt.getRelated(AtsRelationTypes.Goal_Member)) {
- if (art.isOfType(AtsArtifactTypes.AbstractWorkflowArtifact)) {
- items.add(atsServer.getWorkItemFactory().getAgileItem(art));
- } else {
- throw new OseeStateException("Inavlid artifact [%s] in backlog. Only workflows are allowed, not [%s]",
- AtsUtilCore.toStringWithId(art), art.getArtifactType().getName());
- }
- }
- return items;
- }
-
- @Override
- public Collection<IAgileFeatureGroup> getFeatureGroups(IAgileItem aItem) {
- List<IAgileFeatureGroup> groups = new LinkedList<IAgileFeatureGroup>();
- ArtifactReadable itemArt = atsServer.getArtifact(aItem);
- for (ArtifactReadable featureGroup : itemArt.getRelated(AtsRelationTypes.AgileFeatureToItem_FeatureGroup)) {
- groups.add(atsServer.getAgileService().getAgileFeatureGroup(featureGroup));
- }
- return groups;
- }
-
- @Override
- public IAgileSprint getSprint(IAgileItem item) {
- IAgileSprint sprint = null;
- ArtifactReadable itemArt = atsServer.getArtifact(item);
- ArtifactReadable sprintArt = itemArt.getRelated(AtsRelationTypes.AgileSprintToItem_Sprint).getAtMostOneOrNull();
- if (sprintArt != null) {
- sprint = atsServer.getWorkItemFactory().getAgileSprint(sprintArt);
- }
- return sprint;
- }
-
- @Override
- public void deleteSprint(long sprintUuid) {
- ArtifactReadable sprint = atsServer.getArtifactByUuid(sprintUuid);
- if (sprint != null) {
- TransactionBuilder transaction =
- atsServer.getOrcsApi().getTransactionFactory().createTransaction(AtsUtilCore.getAtsBranch(), sprint,
- "Delete Agile Sprint");
- transaction.deleteArtifact(sprint);
- transaction.commit();
- }
- }
-
-}
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 acccf1d19d..f31cb6dc10 100644
--- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.osee.cache.admin
Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.cache;version="15.0.0",
- com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.cache,
+ com.google.common.collect,
com.google.common.util.concurrent;version="15.0.0",
org.eclipse.osee.framework.jdk.core.type
Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
index 78a0de6849..c3efb62cac 100644
--- a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.nebula.widgets.xviewer,
org.eclipse.osee.framework.help.ui
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.collect,
com.google.common.net,
javax.ws.rs.client,
javax.ws.rs.core,
diff --git a/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF
index 5e59c4c543..31fc43d146 100644
--- a/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define.rest/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.osee.define.rest
Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.collect,
javax.ws.rs,
javax.ws.rs.core,
org.antlr.runtime,
diff --git a/plugins/org.eclipse.osee.dep.parent/pom.xml b/plugins/org.eclipse.osee.dep.parent/pom.xml
index 012505c563..986c007f8b 100644
--- a/plugins/org.eclipse.osee.dep.parent/pom.xml
+++ b/plugins/org.eclipse.osee.dep.parent/pom.xml
@@ -34,17 +34,21 @@
<jaxdoclet-version>0.9.0</jaxdoclet-version>
<maven-clean-version>2.5</maven-clean-version>
- <platform-version-name>neon</platform-version-name>
+ <platform-version-name>photon</platform-version-name>
<!-- <orbit-version>R20150124073747</orbit-version> -->
<orbit-version>R20160520211859</orbit-version>
- <subversive-version>1.0</subversive-version>
+<!-- <orbit-version>R20180606145124</orbit-version> -->
+ <subversive-version>4.0</subversive-version>
<polarion-version>3.0</polarion-version>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site>
- <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
+ <!-- <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> -->
+ <eclipse-site> http://mirror.switch.ch/eclipse/releases/${platform-version-name}</eclipse-site>
<eclipse-ip-site>https://github.com/osee-dev/osee.external.releases/raw/master/org.eclipse.ip</eclipse-ip-site>
- <nebula-site>http://download.eclipse.org/nebula/snapshot</nebula-site>
- <papyrus-site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/${platform-version-name}</papyrus-site>
+<!-- <nebula-site>http://download.eclipse.org/nebula/snapshot</nebula-site> -->
+ <nebula-site>http://download.eclipse.org/nebula/releases/2.0.0</nebula-site>
+ <papyrus-site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/${platform-version-name}</papyrus-site>
+ <subversive-site>http://download.eclipse.org/technology/subversive/${subversive-version}/update-site</subversive-site>
</properties>
<licenses>
@@ -87,10 +91,15 @@
<layout>p2</layout>
<url>${nebula-site}</url>
</repository>
- <repository>
+ <repository>
<id>papyrus</id>
<layout>p2</layout>
<url>${papyrus-site}</url>
+ </repository>
+ <repository>
+ <id>subversive</id>
+ <layout>p2</layout>
+ <url>${subversive-site}</url>
</repository>
</repositories>
<build>
diff --git a/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target b/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
index cd1db14222..b456c75121 100644
--- a/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
+++ b/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
@@ -4,7 +4,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.osee.dep.feature.feature.group"/>
<unit id="org.eclipse.osee.dep.feature.source.feature.group"/>
-<repository location="file:${OSEE_REPO}/plugins/org.eclipse.osee.dep.p2/target/repository/"/>
+<repository location="file:C:/UserData/git-dev-latest/org.eclipse.osee/plugins/org.eclipse.osee.dep.p2/target/repository/"/>
</location>
</locations>
</target>
diff --git a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
index 6beb135379..be852d0fbe 100644
--- a/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.disposition.rest/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
Osee-JaxRs-Resource: /OSEE-INF/web/*;path=/dispo
Import-Package:
- com.google.common.collect;version="15.0.0",
+ com.google.common.collect,
javax.annotation.security;version="1.2.0",
javax.ws.rs,
javax.ws.rs.core,
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 0b94c49642..1d3e130bc1 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,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.access;singleton:=true
Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.cache;version="15.0.0",
+Import-Package: com.google.common.cache,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java
index 11c4692e31..50441a6c51 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.mocks;
+import java.util.Dictionary;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
@@ -45,4 +46,9 @@ public class MockServiceReference implements ServiceReference {
return 0;
}
+ @Override
+ public Dictionary getProperties() {
+ return null;
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
index 01fb195bf4..e98560bf69 100644
--- a/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Activator: org.eclipse.osee.framework.core.internal.Activator
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.collect;version="15.0.0",
- com.google.common.util.concurrent;version="15.0.0",
+Import-Package: com.google.common.collect,
+ com.google.common.util.concurrent,
org.antlr.runtime,
org.antlr.runtime.tree,
org.apache.commons.httpclient,
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OseeInf.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OseeInf.java
index c2a3f68f7e..1566b3b116 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OseeInf.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OseeInf.java
@@ -54,10 +54,20 @@ public class OseeInf {
public static URL getResourceAsUrl(String path, Class<?> clazz) {
Bundle bundle = FrameworkUtil.getBundle(clazz);
- URL url = bundle.getEntry("OSEE-INF" + File.separator + path);
+ String inf = "OSEE-INF/" + path;
+
+ URL url = null;
+ try {
+ System.out.println("XXXXXXXXXXXXX2f " + clazz.getClassLoader().toString());
+ url = bundle.getResource(inf);
+ } catch (Exception ex) {
+ System.out.println("XXXXXXXXXXXXX2x " + clazz.getClassLoader().toString());
+ }
+
try {
return FileLocator.toFileURL(url);
} catch (Exception ex) {
+ System.out.println("XXXXXXXXXXXXX1.5 " + inf + " " + ex.getLocalizedMessage());
throw new OseeCoreException(ex, "Error getting resource [%s] as file", path);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OsgiUtil.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OsgiUtil.java
index 2922245264..ba1fecc72a 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OsgiUtil.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/OsgiUtil.java
@@ -14,7 +14,9 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.internal.Activator;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagerTest.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagerTest.java
index 647efa823b..279f0e119a 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagerTest.java
@@ -62,14 +62,6 @@ public class ResourceManagerTest {
// testFileURL =
// getClass().getClassLoader().getResource("org/eclipse/osee/framework/resource/management/test/TestFile.txt");
// }
- @Test
- public void testAddRemoveProvider() {
- ResourceManager resourceManagerX = new ResourceManager();
- IResourceProvider provider1 = new ResourceProviderAdaptor();
- Assert.assertTrue(resourceManagerX.addResourceProvider(provider1));
- Assert.assertFalse(resourceManagerX.addResourceProvider(provider1)); // Add again
- Assert.assertTrue(resourceManagerX.removeResourceProvider(provider1));
- }
@Test
public void testExists() {
@@ -114,21 +106,21 @@ public class ResourceManagerTest {
public void testAddAndRemove() {
ResourceManager testManager = new ResourceManager();
- Assert.assertTrue(testManager.addResourceLocatorProvider(provider1));
- Assert.assertTrue(testManager.addResourceLocatorProvider(provider2));
+ testManager.addResourceLocatorProvider(provider1);
+ testManager.addResourceLocatorProvider(provider2);
Assert.assertEquals(2, testManager.getProtocols().size());
- Assert.assertFalse(testManager.addResourceLocatorProvider(provider2)); // Add the same one again
+ testManager.addResourceLocatorProvider(provider2);
Assert.assertEquals(2, testManager.getProtocols().size());
- Assert.assertTrue(testManager.removeResourceLocatorProvider(provider1));
+ testManager.removeResourceLocatorProvider(provider1);
Assert.assertEquals(1, testManager.getProtocols().size());
- Assert.assertFalse(testManager.removeResourceLocatorProvider(provider1));// Remove the same one again
+ testManager.removeResourceLocatorProvider(provider1);
Assert.assertEquals(1, testManager.getProtocols().size());
- Assert.assertTrue(testManager.removeResourceLocatorProvider(provider2));
+ testManager.removeResourceLocatorProvider(provider2);
Assert.assertEquals(0, testManager.getProtocols().size());
}
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/ResourceManager.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/ResourceManager.java
index 36b4f7363b..2d4afad54c 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/ResourceManager.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/ResourceManager.java
@@ -50,12 +50,12 @@ public class ResourceManager implements IResourceManager {
locator, Arrays.deepToString(resourceProviders.toArray()));
}
- public boolean addResourceProvider(IResourceProvider resourceProvider) {
- return resourceProviders.add(resourceProvider);
+ public void addResourceProvider(IResourceProvider resourceProvider) {
+ resourceProviders.add(resourceProvider);
}
- public boolean removeResourceProvider(IResourceProvider resourceProvider) {
- return resourceProviders.remove(resourceProvider);
+ public void removeResourceProvider(IResourceProvider resourceProvider) {
+ resourceProviders.remove(resourceProvider);
}
@Override
@@ -95,12 +95,12 @@ public class ResourceManager implements IResourceManager {
return protocols;
}
- public boolean addResourceLocatorProvider(IResourceLocatorProvider resourceLocatorProvider) {
- return this.resourceLocatorProviders.add(resourceLocatorProvider);
+ public void addResourceLocatorProvider(IResourceLocatorProvider resourceLocatorProvider) {
+ this.resourceLocatorProviders.add(resourceLocatorProvider);
}
- public boolean removeResourceLocatorProvider(IResourceLocatorProvider resourceLocatorProvider) {
- return this.resourceLocatorProviders.remove(resourceLocatorProvider);
+ public void removeResourceLocatorProvider(IResourceLocatorProvider resourceLocatorProvider) {
+ this.resourceLocatorProviders.remove(resourceLocatorProvider);
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.server.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.ide/META-INF/MANIFEST.MF
index 861e4e8c7f..f0d0821f7a 100644
--- a/plugins/org.eclipse.osee.framework.server.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.server.ide/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: OSEE Server Ide Plug-in
Bundle-SymbolicName: org.eclipse.osee.framework.server.ide
Bundle-Version: 0.26.0.qualifier
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.collect,
javax.servlet,
javax.servlet.http,
javax.ws.rs,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
index 6eac33439d..2b5fb7decc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
@@ -47,8 +47,8 @@ Export-Package: org.eclipse.osee.framework.skynet.core,
org.eclipse.osee.framework.skynet.core.validation,
org.eclipse.osee.framework.skynet.core.word
Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: com.google.common.collect;version="15.0.0",
- com.google.common.io;version="15.0.0",
+Import-Package: com.google.common.collect,
+ com.google.common.io,
javax.ws.rs.client;version="2.0.0",
javax.ws.rs.core;version="2.0.0",
javax.ws.rs.ext;version="2.0.0",
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
index e43fc940d1..6a430c7b1f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.internal;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
@@ -42,7 +42,7 @@ import org.eclipse.osee.orcs.rest.model.TypesEndpoint;
public class ClientCachingServiceProxy implements IOseeCachingService {
public static interface TypesLoader {
- void loadTypes(IOseeCachingService service, InputSupplier<? extends InputStream> supplier);
+ void loadTypes(IOseeCachingService service, ByteSource supplier);
}
private JdbcService jdbcService;
@@ -138,9 +138,9 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
@Override
public void reloadTypes() {
DslToTypeLoader typesLoader = new DslToTypeLoader(branchCache);
- typesLoader.loadTypes(this, new InputSupplier<InputStream>() {
+ typesLoader.loadTypes(this, new ByteSource() {
@Override
- public InputStream getInput() {
+ public InputStream openStream() {
OseeLog.log(Activator.class, Level.INFO, "Loading All type caches <<<<<<<<<<<<<<<<<<<<<<");
TypesEndpoint typesEndpoint = oseeClient.getTypesEndpoint();
try {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
index 3b8db5e611..884da6cdb9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.internal;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -86,11 +86,11 @@ public class DslToTypeLoader implements TypesLoader {
}
@Override
- public void loadTypes(IOseeCachingService caches, InputSupplier<? extends InputStream> supplier) {
+ public void loadTypes(IOseeCachingService caches, ByteSource supplier) {
OseeDslResource loadModel;
InputStream inputStream = null;
try {
- inputStream = supplier.getInput();
+ inputStream = supplier.openStream();
loadModel = OseeDslResourceUtil.loadModel("osee:/text.osee", inputStream);
} catch (Exception ex) {
throw OseeCoreException.wrap(ex);
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 b37f93c1c6..ce7b7a41a6 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
@@ -8,9 +8,9 @@ Bundle-Activator: org.eclipse.osee.framework.ui.skynet.internal.Activator
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.cache;version="15.0.0",
- com.google.common.collect;version="15.0.0",
+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,
diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
index 3dd2252235..a35e6592d1 100644
--- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java
@@ -108,7 +108,7 @@ public final class ImageManager {
public static ImageDescriptor createImageDescriptor(String symbolicBundleName, String imageFileName) {
return AbstractUIPlugin.imageDescriptorFromPlugin(symbolicBundleName,
- "OSEE-INF/images" + File.separator + imageFileName);
+ "OSEE-INF/images/" + imageFileName);
}
public static KeyedImage createKeyedImage(String imageKey, ImageDescriptor descriptor) {
diff --git a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
index 8628007a56..9aa24627c1 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.cache;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.cache,
javax.servlet,
javax.servlet.http,
javax.ws.rs;version="2.0.0",
diff --git a/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java
index eebdef28e1..28102f420e 100644
--- a/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.jaxrs.server.internal;
import static org.junit.Assert.fail;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException;
/**
* Unit Test for {@link RestResourceConcatenator}
- *
+ *
* @author David W. Miller
*/
public class RestResourceConcatenatorTest {
@@ -195,10 +195,10 @@ public class RestResourceConcatenatorTest {
}
- private static InputSupplier<InputStream> testSupplier(final String input) {
- return new InputSupplier<InputStream>() {
+ private static ByteSource testSupplier(final String input) {
+ return new ByteSource() {
@Override
- public InputStream getInput() throws IOException {
+ public InputStream openStream() throws IOException {
return Lib.stringToInputStream(input);
}
};
diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
index 605a1b7630..3d6db447f8 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
Osee-Template: OSEE-INF/templates/*.html
-Import-Package: com.google.common.cache;version="15.0.0",
- com.google.common.io;version="15.0.0",
+Import-Package: com.google.common.cache,
+ com.google.common.io,
javax.annotation,
javax.annotation.security,
javax.servlet,
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java
index cde27888cd..2328b2fc65 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/RestResourceConcatenator.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.internal.ext;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -47,11 +47,11 @@ public class RestResourceConcatenator {
return String.format("%s Object: \n contents {%s}\n", this.getClass().getName(), getResources());
}
- public void addResource(InputSupplier<? extends InputStream> supplier) throws IOException {
+ public void addResource(ByteSource supplier) throws IOException {
Conditions.checkNotNull(supplier, "InputStreamSupplier");
InputStream is = null;
try {
- is = supplier.getInput();
+ is = supplier.openStream();
processResource(Lib.inputStreamToString(is));
} finally {
Lib.close(is);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java
index 6c338dac10..62dd30cfa9 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/ClientProvider.java
@@ -10,8 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider;
-import com.google.common.io.InputSupplier;
-import java.io.InputStream;
+import com.google.common.io.ByteSource;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.eclipse.osee.account.admin.OseePrincipal;
@@ -28,6 +27,6 @@ public interface ClientProvider extends ClientLogoUriResolver {
Client createClient(UriInfo uriInfo, OseePrincipal principal, ClientFormData data);
- InputSupplier<InputStream> getClientLogoSupplier(UriInfo uriInfo, String applicationGuid);
+ ByteSource getClientLogoSupplier(UriInfo uriInfo, String applicationGuid);
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java
index 4fdb25fa0d..fa3913b2b2 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ApplicationClient.java
@@ -10,8 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters;
-import com.google.common.io.InputSupplier;
-import java.io.InputStream;
+import com.google.common.io.ByteSource;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.jaxrs.server.security.OAuthClient;
@@ -26,7 +25,7 @@ public class ApplicationClient extends Client implements OAuthClient {
private final long clientUuid;
private final long subjectId;
private final String guid;
- private InputSupplier<InputStream> logoSupplier;
+ private ByteSource logoSupplier;
public ApplicationClient(long clientUuid, long subjectId, String guid) {
super();
@@ -79,11 +78,11 @@ public class ApplicationClient extends Client implements OAuthClient {
}
@Override
- public InputSupplier<InputStream> getApplicationLogoSupplier() {
+ public ByteSource getApplicationLogoSupplier() {
return logoSupplier;
}
- public void setApplicationLogoSupplier(InputSupplier<InputStream> logoSupplier) {
+ public void setApplicationLogoSupplier(ByteSource logoSupplier) {
this.logoSupplier = logoSupplier;
}
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java
index 7b05b218f1..723dcbd993 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/ClientProviderImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.adapters
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -141,9 +141,9 @@ public class ClientProviderImpl implements ClientProvider {
client.setApplicationCertificates(data.getCertificates());
client.setApplicationLogoUri(data.getLogoUri());
if (data.isLogoAvailable()) {
- InputSupplier<InputStream> logoSupplier = new InputSupplier<InputStream>() {
+ ByteSource logoSupplier = new ByteSource() {
@Override
- public InputStream getInput() {
+ public InputStream openStream() {
return data.getLogoContent();
}
};
@@ -168,9 +168,9 @@ public class ClientProviderImpl implements ClientProvider {
}
@Override
- public InputSupplier<InputStream> getClientLogoSupplier(UriInfo uriInfo, String applicationGuid) {
+ public ByteSource getClientLogoSupplier(UriInfo uriInfo, String applicationGuid) {
OAuthClient client = storage.getClientByClientGuid(applicationGuid);
- InputSupplier<InputStream> supplier = null;
+ ByteSource supplier = null;
if (client.hasApplicationLogoSupplier()) {
supplier = client.getApplicationLogoSupplier();
} else {
@@ -184,11 +184,11 @@ public class ClientProviderImpl implements ClientProvider {
return supplier;
}
- private InputSupplier<InputStream> newSupplier(final String uri) {
- return new InputSupplier<InputStream>() {
+ private ByteSource newSupplier(final String uri) {
+ return new ByteSource() {
@Override
- public InputStream getInput() throws IOException {
+ public InputStream openStream() throws IOException {
CachedOutputStream cos;
try {
cos = logosCache.get(uri);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java
index 1d1a81217b..298c334b93 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/endpoints/ClientEndpoint.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider.endpoints;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -44,11 +44,11 @@ public class ClientEndpoint extends AbstractClientService {
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
- InputSupplier<InputStream> supplier = getDataProvider().getClientLogoSupplier(uriInfo, applicationGuid);
+ ByteSource supplier = getDataProvider().getClientLogoSupplier(uriInfo, applicationGuid);
if (supplier != null) {
InputStream inputStream = null;
try {
- inputStream = supplier.getInput();
+ inputStream = supplier.openStream();
Lib.inputStreamToOutputStream(inputStream, outputStream);
} finally {
Lib.close(inputStream);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java
index 4517c801b5..112c9a883f 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/security/OAuthClient.java
@@ -10,8 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.security;
-import com.google.common.io.InputSupplier;
-import java.io.InputStream;
+import com.google.common.io.ByteSource;
import java.util.List;
import java.util.Map;
import org.eclipse.osee.framework.jdk.core.type.Identity;
@@ -53,6 +52,6 @@ public interface OAuthClient extends Identity<String> {
boolean hasApplicationLogoSupplier();
- InputSupplier<InputStream> getApplicationLogoSupplier();
+ ByteSource getApplicationLogoSupplier();
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
index 7c028adc60..abd222df38 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.io;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.io,
org.codehaus.jackson.type,
org.eclipse.jdt.annotation,
org.eclipse.osee.account.admin,
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
index c3ab06e3d3..dc34a6e1fc 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.account.admin.internal.oauth;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.InputStream;
import java.util.Collections;
import java.util.List;
@@ -26,10 +26,11 @@ import org.eclipse.osee.orcs.data.ArtifactReadable;
/**
* @author Roberto E. Escobar
*/
-public class ClientArtifact extends BaseIdentity<String> implements OAuthClient, InputSupplier<InputStream> {
+public class ClientArtifact extends BaseIdentity<String> implements OAuthClient {
private final ArtifactReadable artifact;
private final OAuthClientCredential credential;
+ private ByteSource logoSupplier;
public ClientArtifact(ArtifactReadable artifact, OAuthClientCredential credential) {
super(artifact.getGuid());
@@ -123,11 +124,14 @@ public class ClientArtifact extends BaseIdentity<String> implements OAuthClient,
}
@Override
- public InputSupplier<InputStream> getApplicationLogoSupplier() {
- return this;
+ public ByteSource getApplicationLogoSupplier() {
+ return logoSupplier;
+ }
+
+ public void setApplicationLogoSupplier(ByteSource supplier) {
+ this.logoSupplier = supplier;
}
- @Override
public InputStream getInput() {
return artifact.getSoleAttributeValue(CoreAttributeTypes.ImageContent);
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
index 6eb3a4e0f5..1ff0442245 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
@@ -20,7 +20,7 @@ import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUT
import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_CLIENT_PROPERTIES;
import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_CLIENT_WEBSITE_URI;
import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_TYPES;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -119,10 +119,10 @@ public class ClientStorage {
tx.setAttributesFromStrings(artId, OAUTH_CLIENT_AUTHORIZED_SCOPE, data.getRegisteredScopes());
//@formatter:on
- InputSupplier<InputStream> supplier = data.getApplicationLogoSupplier();
+ ByteSource supplier = data.getApplicationLogoSupplier();
if (supplier != null) {
try {
- tx.setSoleAttributeValue(artId, CoreAttributeTypes.ImageContent, supplier.getInput());
+ tx.setSoleAttributeValue(artId, CoreAttributeTypes.ImageContent, supplier.openStream());
} catch (Exception ex) {
throw new OseeCoreException(ex, "Error reading logo data for [%s]", artId);
}
@@ -145,12 +145,12 @@ public class ClientStorage {
return newQuery().andUuid(OAUTH_TYPES.getUuid()).andTypeEquals(OAUTH_TYPES.getArtifactTypeId()).getResults();
}
- public ArtifactId storeTypes(InputSupplier<? extends InputStream> resource) {
+ public ArtifactId storeTypes(ByteSource resource) {
TransactionBuilder tx = newTransaction(null, "Initialize OAuth Type Definitions");
ArtifactId artifactId = tx.createArtifact(OAUTH_TYPES);
InputStream stream = null;
try {
- stream = resource.getInput();
+ stream = resource.openStream();
tx.setSoleAttributeFromStream(artifactId, CoreAttributeTypes.UriGeneralStringData, stream);
} catch (IOException ex) {
throw new OseeCoreException(ex);
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
index d8e7a4ff5d..65f02d5660 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.account.admin.internal.oauth;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -59,7 +59,7 @@ public class ClientStorageProvider extends LazyObject<ClientStorage> {
ClientStorage clientStorage = new ClientStorage(logger, orcsApi, storageBranch);
if (!clientStorage.typesExist()) {
- InputSupplier<InputStream> newTypesSupplier = newTypesSupplier();
+ ByteSource newTypesSupplier = newTypesSupplier();
ArtifactReadable typeArt = (ArtifactReadable) clientStorage.storeTypes(newTypesSupplier);
TransactionBuilder tx = orcsApi.getTransactionFactory().createTransaction(COMMON, SystemUser.OseeSystem,
@@ -77,11 +77,11 @@ public class ClientStorageProvider extends LazyObject<ClientStorage> {
return new FutureTask<ClientStorage>(callable);
}
- private InputSupplier<InputStream> newTypesSupplier() {
- return new InputSupplier<InputStream>() {
+ private ByteSource newTypesSupplier() {
+ return new ByteSource() {
@Override
- public InputStream getInput() throws IOException {
+ public InputStream openStream() throws IOException {
URL resource = OseeInf.getResourceAsUrl(OAUTH_TYPES_DEFITIONS, getClass());
return new BufferedInputStream(resource.openStream());
}
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 0436d48a85..71d84129d7 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,7 +6,7 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.orcs.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.util.concurrent;version="15.0.0",
+Import-Package: com.google.common.util.concurrent,
org.eclipse.core.runtime,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model.cache,
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
index 01ab9f74f0..7fb1811d75 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
@@ -21,8 +21,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import com.google.common.io.Resources;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -107,7 +106,7 @@ public class OrcsTypesTest {
//@formatter:on
private OrcsTypes orcsTypes;
- private List<InputSupplier<? extends InputStream>> resources;
+ private List<ByteSource> resources;
private Multimap<BranchId, BranchId> branchHierachies;
private OrcsTypesModule module;
@@ -946,24 +945,24 @@ public class OrcsTypesTest {
assertEquals(message, true, actual.containsAll(asList));
}
- private static InputSupplier<? extends InputStream> getResource(String resourcePath) {
+ private static ByteSource getResource(String resourcePath) {
URL resource = Resources.getResource(OrcsTypesTest.class, resourcePath);
- return Resources.newInputStreamSupplier(resource);
+ return Resources.asByteSource(resource);
}
- private static InputSupplier<? extends InputStream> asInput(final String data) {
- return new InputSupplier<InputStream>() {
+ private static ByteSource asInput(final String data) {
+ return new ByteSource() {
@Override
- public InputStream getInput() throws java.io.IOException {
+ public InputStream openStream() throws java.io.IOException {
return new ByteArrayInputStream(data.getBytes("UTF-8"));
}
};
}
private static final class MultiResource implements IResource {
- private final Iterable<? extends InputSupplier<? extends InputStream>> suppliers;
+ private final Iterable<? extends ByteSource> suppliers;
private final URI resourceUri;
- public MultiResource(URI resourceUri, Iterable<? extends InputSupplier<? extends InputStream>> suppliers) {
+ public MultiResource(URI resourceUri, Iterable<? extends ByteSource> suppliers) {
super();
this.suppliers = suppliers;
this.resourceUri = resourceUri;
@@ -972,7 +971,7 @@ public class OrcsTypesTest {
@Override
public InputStream getContent() {
try {
- return ByteStreams.join(suppliers).getInput();
+ return ByteSource.concat(suppliers).openStream();
} catch (IOException ex) {
throw OseeCoreException.wrap(ex);
}
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 529ce59efa..05a0b2aa71 100644
--- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.collect;version="15.0.0",
- com.google.common.io;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.collect,
+ com.google.common.io,
org.codehaus.jackson;version="1.9.13",
org.codehaus.jackson.map;version="1.9.13",
org.codehaus.jackson.map.module;version="1.9.13",
@@ -51,3 +51,4 @@ Export-Package: org.eclipse.osee.orcs.core,
org.eclipse.osee.orcs.core.ds.criteria,
org.eclipse.osee.orcs.core.internal.tuple
Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/IndexedResource.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/IndexedResource.java
index 1c844d413d..9db2a48196 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/IndexedResource.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/IndexedResource.java
@@ -10,17 +10,19 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.ds;
-import com.google.common.io.InputSupplier;
+import java.io.IOException;
import java.io.InputStream;
import org.eclipse.osee.framework.core.data.GammaId;
/**
* @author Roberto E. Escobar
*/
-public interface IndexedResource extends InputSupplier<InputStream> {
+public interface IndexedResource {
GammaId getGammaId();
long getTypeUuid();
+ InputStream getResourceInput() throws IOException;
+
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java
index dd7005dffb..bdb974b699 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java
@@ -89,6 +89,17 @@ public class CreateSystemBranches {
CoreArtifactTypes.XViewerGlobalCustomization.getName());
ArtifactId dataRightsArt = tx.createArtifact(CoreArtifactTokens.DataRightsFooters);
+
+
+
+ try {
+ Thread.sleep(5000);
+ String resourceContents = OseeInf.getResourceContents("Unspecified.xml", getClass());
+ System.out.println("QQQQQQQQQQQQQQQQQQ " + resourceContents);
+ } catch (Exception ex) {
+ System.out.println("QQQQQQQQQQQQQQQQQQa " + ex);
+ }
+
tx.createAttribute(dataRightsArt, CoreAttributeTypes.GeneralStringData,
OseeInf.getResourceContents("Unspecified.xml", getClass()));
tx.createAttribute(dataRightsArt, CoreAttributeTypes.GeneralStringData,
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
index 7b9041008f..dee2551c46 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Import-Package: org.eclipse.osee.event,
org.eclipse.osee.framework.jdk.core.util.annotation,
org.eclipse.osee.jdbc,
org.eclipse.osee.logger,
+ org.eclipse.osee.orcs,
org.json,
org.junit,
org.junit.rules,
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java
index b28ac5b84a..fb4758301a 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.orcs.db.mock;
import org.eclipse.osee.event.EventService;
import org.eclipse.osee.framework.core.executor.ExecutorAdmin;
import org.eclipse.osee.logger.Log;
+import org.eclipse.osee.orcs.OrcsApi;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.osgi.service.event.EventAdmin;
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiServiceFieldAnnotationHandler.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiServiceFieldAnnotationHandler.java
index cc3b5d8007..561e00c3b6 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiServiceFieldAnnotationHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiServiceFieldAnnotationHandler.java
@@ -21,8 +21,9 @@ public class OsgiServiceFieldAnnotationHandler extends AbstractFieldAnnotationHa
@Override
public void handleAnnotation(OsgiService annotation, Object object, Field field) throws Exception {
- Object service = OsgiUtil.getService(field.getType());
- injectToFields(annotation, object, field, service);
+ Thread.sleep(1000);
+ Object service = OsgiUtil.getService(field.getType());
+ injectToFields(annotation, object, field, service);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
index 078904a9e3..4f5ca408a3 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
@@ -95,7 +95,7 @@ public class IndexingTaskDatabaseTxCallableTest {
verify(logger, times(1)).error("Field has invalid tagger[%s] provider and cannot be tagged - [Gamma: %s]", null,
GammaId.valueOf(2L));
- verify(tagger, times(1)).tagIt(Matchers.eq(resource1), Matchers.any(TagCollector.class));
+ verify(tagger, times(1)).tagIt(Matchers.eq(resource1.getResourceInput()), Matchers.any(TagCollector.class));
}
}
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 8803228b8b..fc21d5313d 100644
--- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.collect;version="15.0.0",
- com.google.common.io;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.collect,
+ com.google.common.io,
javax.ws.rs,
javax.ws.rs.core,
javax.ws.rs.ext,
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallable.java
index 52dac9a734..6da6244192 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallable.java
@@ -135,7 +135,7 @@ public final class IndexingTaskDatabaseTxCallable extends AbstractDatastoreTxCal
String taggerId = getTaggerIdByTypeUuid(typeUuid);
if (taggingEngine.hasTagger(taggerId)) {
Tagger tagger = taggingEngine.getTagger(taggerId);
- tagger.tagIt(source, tagCollector);
+ tagger.tagIt(source.getResourceInput(), tagCollector);
if (isStorageAllowed(toStore)) {
getLogger().debug("Stored a - [%s] - connectionId[%s] - [%s]", getTagQueueQueryId(), connection,
toStore);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/IndexerDataSourceImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/IndexerDataSourceImpl.java
index d727c1eeba..cb07f8e0c4 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/IndexerDataSourceImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/IndexerDataSourceImpl.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.search.indexer.data;
+import com.google.common.io.ByteSource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -28,7 +29,7 @@ import org.eclipse.osee.orcs.db.internal.resource.ResourceConstants;
/**
* @author Roberto E. Escobar
*/
-public class IndexerDataSourceImpl implements IndexedResource {
+public class IndexerDataSourceImpl extends ByteSource implements IndexedResource {
private final IResourceManager resourceManager;
@@ -84,25 +85,6 @@ public class IndexerDataSourceImpl implements IndexedResource {
}
@Override
- public InputStream getInput() throws IOException {
- InputStream toReturn = null;
- if (isUriValid()) {
- try {
- PropertyStore options = new PropertyStore();
- options.put(StandardOptions.DecompressOnAquire.name(), true);
- IResourceLocator locator = resourceManager.getResourceLocator(getUri());
- IResource resource = resourceManager.acquire(locator, options);
- toReturn = resource.getContent();
- } catch (OseeCoreException ex) {
- throw new IOException(ex);
- }
- } else if (Strings.isValid(getStringValue())) {
- toReturn = new ByteArrayInputStream(getStringValue().getBytes("UTF-8"));
- }
- return toReturn;
- }
-
- @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -135,4 +117,28 @@ public class IndexerDataSourceImpl implements IndexedResource {
return "IndexerDataSourceImpl [id=" + id + ", typeUuid=" + typeUuid + ", gammaId=" + gammaId + ", uri=" + uri + ", value=" + value + "]";
}
+ @Override
+ public InputStream getResourceInput() throws IOException {
+ return openStream();
+ }
+
+ @Override
+ public InputStream openStream() throws IOException {
+ InputStream toReturn = null;
+ if (isUriValid()) {
+ try {
+ PropertyStore options = new PropertyStore();
+ options.put(StandardOptions.DecompressOnAquire.name(), true);
+ IResourceLocator locator = resourceManager.getResourceLocator(getUri());
+ IResource resource = resourceManager.acquire(locator, options);
+ toReturn = resource.getContent();
+ } catch (OseeCoreException ex) {
+ throw new IOException(ex);
+ }
+ } else if (Strings.isValid(getStringValue())) {
+ toReturn = new ByteArrayInputStream(getStringValue().getBytes("UTF-8"));
+ }
+ return toReturn;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger.java
index 563f9611a4..bd21daaa18 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.search.tagger;
-import com.google.common.io.InputSupplier;
import java.io.InputStream;
import java.util.List;
import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -21,8 +20,8 @@ import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
*/
public interface Tagger {
- void tagIt(InputSupplier<? extends InputStream> provider, TagCollector collector) throws Exception;
+ void tagIt(InputStream provider, TagCollector collector) throws Exception;
- List<MatchLocation> find(InputSupplier<? extends InputStream> provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception;
+ List<MatchLocation> find(InputStream provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/TextStreamTagger.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/TextStreamTagger.java
index 539474628c..86f03bc59b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/TextStreamTagger.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/TextStreamTagger.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.search.tagger;
-import com.google.common.io.InputSupplier;
import java.io.InputStream;
import java.util.Collections;
import java.util.List;
@@ -29,10 +28,10 @@ public class TextStreamTagger extends AbstractTagger {
}
@Override
- public void tagIt(InputSupplier<? extends InputStream> provider, TagCollector collector) throws Exception {
+ public void tagIt(InputStream provider, TagCollector collector) throws Exception {
InputStream inputStream = null;
try {
- inputStream = provider.getInput();
+ inputStream = provider;
getTagProcessor().collectFromInputStream(inputStream, collector);
} finally {
Lib.close(inputStream);
@@ -40,12 +39,12 @@ public class TextStreamTagger extends AbstractTagger {
}
@Override
- public List<MatchLocation> find(InputSupplier<? extends InputStream> provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception {
+ public List<MatchLocation> find(InputStream provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception {
List<MatchLocation> toReturn;
if (Strings.isValid(toSearch)) {
InputStream inputStream = null;
try {
- inputStream = provider.getInput();
+ inputStream = provider;
toReturn = getMatcher().findInStream(inputStream, toSearch, matchAllLocations, options);
} finally {
Lib.close(inputStream);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/XmlTagger.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/XmlTagger.java
index 4100344024..8400ee1d54 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/XmlTagger.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/tagger/XmlTagger.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.search.tagger;
-import com.google.common.io.InputSupplier;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
@@ -31,7 +30,7 @@ public class XmlTagger extends AbstractTagger {
}
@Override
- public void tagIt(InputSupplier<? extends InputStream> provider, TagCollector collector) throws Exception {
+ public void tagIt(InputStream provider, TagCollector collector) throws Exception {
InputStream inputStream = null;
try {
inputStream = getStream(provider);
@@ -42,7 +41,7 @@ public class XmlTagger extends AbstractTagger {
}
@Override
- public List<MatchLocation> find(InputSupplier<? extends InputStream> provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception {
+ public List<MatchLocation> find(InputStream provider, String toSearch, boolean matchAllLocations, QueryOption... options) throws Exception {
List<MatchLocation> toReturn;
if (Strings.isValid(toSearch)) {
InputStream inputStream = null;
@@ -58,7 +57,7 @@ public class XmlTagger extends AbstractTagger {
return toReturn;
}
- private InputStream getStream(InputSupplier<? extends InputStream> provider) throws IOException {
- return new XmlTextInputStream(provider.getInput());
+ private InputStream getStream(InputStream provider) throws IOException {
+ return new XmlTextInputStream(provider);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/util/AttributeDataMatcher.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/util/AttributeDataMatcher.java
index f23395b8e9..680d849f32 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/util/AttributeDataMatcher.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/util/AttributeDataMatcher.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.orcs.db.internal.search.util;
import com.google.common.collect.Lists;
+import com.google.common.io.ByteSource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -98,7 +99,7 @@ public class AttributeDataMatcher {
try {
List<MatchLocation> matched = Lists.newLinkedList();
for (String toMatch : valuesToMatch) {
- matched.addAll(tagger.find(source, toMatch, true, options));
+ matched.addAll(tagger.find(source.getResourceInput(), toMatch, true, options));
}
return matched;
} catch (Exception ex) {
@@ -125,7 +126,7 @@ public class AttributeDataMatcher {
return value;
}
- private final class AttributeIndexedResource implements IndexedResource {
+ private final class AttributeIndexedResource extends ByteSource implements IndexedResource {
private final AttributeData<?> attrData;
public AttributeIndexedResource(AttributeData<?> attrData) {
@@ -144,7 +145,12 @@ public class AttributeDataMatcher {
}
@Override
- public InputStream getInput() throws IOException {
+ public InputStream getResourceInput() throws IOException {
+ return openStream();
+ }
+
+ @Override
+ public InputStream openStream() throws IOException {
InputStream stream = null;
DataProxy<?> dataProxy = attrData.getDataProxy();
if (dataProxy instanceof BinaryDataProxy) {
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java
index 39ffbb0df6..29f0f54706 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java
@@ -24,15 +24,19 @@ import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
+import org.junit.runners.MethodSorters;
/**
* Test case for {@link OrcsValidationHelperAdapter}
*
* @author Donald G. Dunne
*/
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class OrcsValidationHelperAdapterTest {
@Rule
@@ -52,7 +56,7 @@ public class OrcsValidationHelperAdapterTest {
public static void cleanup() throws Exception {
OseeClassDatabase.cleanup();
}
-
+
@Test
public void testIsBranchExists() {
Assert.assertTrue(helper.isBranchExists(COMMON));
@@ -78,6 +82,7 @@ public class OrcsValidationHelperAdapterTest {
@Test
public void testIsArtifactTypeExist() {
+ System.out.println("testIsArtifactTypeExist ");
Assert.assertTrue(helper.isArtifactTypeExist(CoreArtifactTypes.User.getGuid()));
Assert.assertFalse(helper.isArtifactTypeExist(999999L));
@@ -85,6 +90,7 @@ public class OrcsValidationHelperAdapterTest {
@Test
public void testIsRelationTypeExist() {
+ System.out.println("testIsRelationTypeExist ");
Assert.assertTrue(helper.isRelationTypeExist(CoreRelationTypes.Default_Hierarchical__Child.getGuid()));
Assert.assertFalse(helper.isRelationTypeExist(999999L));
@@ -92,6 +98,7 @@ public class OrcsValidationHelperAdapterTest {
@Test
public void testIsAttributeTypeExists() {
+ System.out.println("testIsAttributeTypeExists ");
Assert.assertTrue(helper.isAttributeTypeExists(CoreAttributeTypes.StaticId.getId()));
Assert.assertFalse(helper.isAttributeTypeExists(999999L));
diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
index 507f7c60c4..df75040476 100644
--- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.collect,
com.google.common.net,
javax.ws.rs,
javax.ws.rs.core,
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java
index 58e7e8b0eb..30aeb7390c 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java
@@ -27,8 +27,8 @@ public class OrcsValidationHelperAdapter implements IOrcsValidationHelper {
private final OrcsTypes orcsTypes;
public OrcsValidationHelperAdapter(OrcsApi orcsApi) {
- queryFactory = orcsApi.getQueryFactory();
- orcsTypes = orcsApi.getOrcsTypes();
+ queryFactory = orcsApi.getQueryFactory();
+ orcsTypes = orcsApi.getOrcsTypes();
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
index bbb964667c..c5d69c46fd 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0",
org.eclipse.xtext.generator
-Import-Package: com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.collect,
org.apache.log4j,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util
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 6de3d28af5..d47fac284d 100644
--- a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.orcs
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="15.0.0",
- com.google.common.collect;version="15.0.0",
+Import-Package: com.google.common.base,
+ com.google.common.collect,
org.eclipse.osee.event,
org.eclipse.osee.framework.core.services,
org.eclipse.osee.jdbc,
diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml
index e812f12bee..5d88549646 100644
--- a/plugins/org.eclipse.osee.parent/pom.xml
+++ b/plugins/org.eclipse.osee.parent/pom.xml
@@ -52,7 +52,8 @@
<platform-version-name>mars</platform-version-name>
<!-- <orbit-version>R20150124073747</orbit-version> -->
- <orbit-version>R20130517111416</orbit-version>
+ <!-- <orbit-version>R20130517111416</orbit-version> -->
+ <orbit-version>R20180606145124</orbit-version>
<subversive-version>1.0</subversive-version>
<polarion-version>3.0</polarion-version>
diff --git a/plugins/org.eclipse.osee.support.config/TargetPlatform.target b/plugins/org.eclipse.osee.support.config/TargetPlatform.target
new file mode 100644
index 0000000000..a945a54125
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.config/TargetPlatform.target
@@ -0,0 +1,1348 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="TargetPlatform" sequenceNumber="8">
+<locations>
+<location path="C:\UserData\git-dev-latest\org.eclipse.osee\plugins\org.eclipse.osee.dep.p2\target\repository" type="Directory"/>
+<location path="C:\UserData\git-dev-latest\org.eclipse.osee" type="Directory"/>
+</locations>
+<includeBundles>
+<plugin id="ca.odell.glazedlists"/>
+<plugin id="ch.qos.logback.classic"/>
+<plugin id="ch.qos.logback.classic.source"/>
+<plugin id="ch.qos.logback.core"/>
+<plugin id="ch.qos.logback.core.source"/>
+<plugin id="ch.qos.logback.slf4j"/>
+<plugin id="com.ctc.wstx"/>
+<plugin id="com.ctc.wstx.source"/>
+<plugin id="com.google.gson"/>
+<plugin id="com.google.guava"/>
+<plugin id="com.google.gwt.servlet"/>
+<plugin id="com.google.gwt.servlet.source"/>
+<plugin id="com.google.gwtjsonrpc"/>
+<plugin id="com.google.gwtjsonrpc.source"/>
+<plugin id="com.google.gwtorm"/>
+<plugin id="com.google.gwtorm.source"/>
+<plugin id="com.google.inject"/>
+<plugin id="com.google.inject.multibindings"/>
+<plugin id="com.google.inject.multibindings.source"/>
+<plugin id="com.google.inject.source"/>
+<plugin id="com.ibm.icu"/>
+<plugin id="com.ibm.icu.source"/>
+<plugin id="com.jcraft.jsch"/>
+<plugin id="com.jcraft.jsch.source"/>
+<plugin id="com.jcraft.jzlib"/>
+<plugin id="com.lowagie.text"/>
+<plugin id="com.lowagie.text.source"/>
+<plugin id="com.sun.el"/>
+<plugin id="com.sun.el.source"/>
+<plugin id="com.sun.xml.fastinfoset"/>
+<plugin id="com.sun.xml.fastinfoset.source"/>
+<plugin id="groovy"/>
+<plugin id="groovy.source"/>
+<plugin id="javaewah"/>
+<plugin id="javax.activation"/>
+<plugin id="javax.activation.source"/>
+<plugin id="javax.annotation" version="1.2.0.v201808201447-DEV"/>
+<plugin id="javax.annotation" version="1.2.0.v201602091430"/>
+<plugin id="javax.annotation.source" version="1.2.0.v201602091430"/>
+<plugin id="javax.annotation.source" version="1.2.0.v201808201447-DEV"/>
+<plugin id="javax.el"/>
+<plugin id="javax.el.source"/>
+<plugin id="javax.inject"/>
+<plugin id="javax.inject.source"/>
+<plugin id="javax.mail.glassfish"/>
+<plugin id="javax.mail.glassfish.source"/>
+<plugin id="javax.servlet" version="3.0.0.v201112011016"/>
+<plugin id="javax.servlet" version="3.1.0.v201410161800"/>
+<plugin id="javax.servlet.jsp"/>
+<plugin id="javax.servlet.jsp.source"/>
+<plugin id="javax.servlet.source" version="3.1.0.v201410161800"/>
+<plugin id="javax.validation"/>
+<plugin id="javax.validation.source"/>
+<plugin id="javax.ws.rs"/>
+<plugin id="javax.ws.rs.source"/>
+<plugin id="javax.wsdl"/>
+<plugin id="javax.xml"/>
+<plugin id="lpg.runtime.java"/>
+<plugin id="lpg.runtime.java.source"/>
+<plugin id="net.jini"/>
+<plugin id="org.antlr.runtime"/>
+<plugin id="org.antlr.runtime.source"/>
+<plugin id="org.aopalliance"/>
+<plugin id="org.apache.ant"/>
+<plugin id="org.apache.ant.source"/>
+<plugin id="org.apache.aries.blueprint"/>
+<plugin id="org.apache.aries.blueprint.annotation"/>
+<plugin id="org.apache.aries.blueprint.annotation.source"/>
+<plugin id="org.apache.aries.blueprint.source"/>
+<plugin id="org.apache.aries.proxy"/>
+<plugin id="org.apache.aries.proxy.source"/>
+<plugin id="org.apache.aries.quiesce"/>
+<plugin id="org.apache.aries.quiesce.source"/>
+<plugin id="org.apache.aries.util"/>
+<plugin id="org.apache.aries.util.source"/>
+<plugin id="org.apache.batik.bridge"/>
+<plugin id="org.apache.batik.bridge.source"/>
+<plugin id="org.apache.batik.constants"/>
+<plugin id="org.apache.batik.constants.source"/>
+<plugin id="org.apache.batik.css" version="1.6.0.v201011041432"/>
+<plugin id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
+<plugin id="org.apache.batik.css.source" version="1.6.0.v201011041432"/>
+<plugin id="org.apache.batik.dom"/>
+<plugin id="org.apache.batik.dom.source"/>
+<plugin id="org.apache.batik.dom.svg"/>
+<plugin id="org.apache.batik.dom.svg.source"/>
+<plugin id="org.apache.batik.ext.awt"/>
+<plugin id="org.apache.batik.ext.awt.source"/>
+<plugin id="org.apache.batik.i18n"/>
+<plugin id="org.apache.batik.i18n.source"/>
+<plugin id="org.apache.batik.parser"/>
+<plugin id="org.apache.batik.parser.source"/>
+<plugin id="org.apache.batik.pdf"/>
+<plugin id="org.apache.batik.svggen"/>
+<plugin id="org.apache.batik.svggen.source"/>
+<plugin id="org.apache.batik.transcoder"/>
+<plugin id="org.apache.batik.transcoder.source"/>
+<plugin id="org.apache.batik.util" version="1.6.0.v201011041432"/>
+<plugin id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
+<plugin id="org.apache.batik.util.gui"/>
+<plugin id="org.apache.batik.util.gui.source"/>
+<plugin id="org.apache.batik.util.source" version="1.6.0.v201011041432"/>
+<plugin id="org.apache.batik.xml"/>
+<plugin id="org.apache.batik.xml.source"/>
+<plugin id="org.apache.commons.cli"/>
+<plugin id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
+<plugin id="org.apache.commons.codec.source" version="1.9.0.v20170208-1614"/>
+<plugin id="org.apache.commons.compress"/>
+<plugin id="org.apache.commons.dbcp"/>
+<plugin id="org.apache.commons.dbcp.source"/>
+<plugin id="org.apache.commons.httpclient"/>
+<plugin id="org.apache.commons.httpclient.source"/>
+<plugin id="org.apache.commons.io"/>
+<plugin id="org.apache.commons.io.source"/>
+<plugin id="org.apache.commons.jxpath"/>
+<plugin id="org.apache.commons.jxpath.source"/>
+<plugin id="org.apache.commons.lang"/>
+<plugin id="org.apache.commons.lang.source"/>
+<plugin id="org.apache.commons.lang3"/>
+<plugin id="org.apache.commons.lang3.source"/>
+<plugin id="org.apache.commons.logging"/>
+<plugin id="org.apache.commons.logging.source"/>
+<plugin id="org.apache.commons.net"/>
+<plugin id="org.apache.commons.net.source"/>
+<plugin id="org.apache.commons.pool"/>
+<plugin id="org.apache.commons.pool.source"/>
+<plugin id="org.apache.cxf.core"/>
+<plugin id="org.apache.cxf.core.config"/>
+<plugin id="org.apache.cxf.core.source"/>
+<plugin id="org.apache.cxf.jaxrs.client"/>
+<plugin id="org.apache.cxf.jaxrs.client.source"/>
+<plugin id="org.apache.cxf.jaxrs.frontend"/>
+<plugin id="org.apache.cxf.jaxrs.frontend.source"/>
+<plugin id="org.apache.cxf.jaxrs.model.wadl"/>
+<plugin id="org.apache.cxf.jaxrs.model.wadl.source"/>
+<plugin id="org.apache.cxf.jaxrs.provider"/>
+<plugin id="org.apache.cxf.jaxrs.provider.source"/>
+<plugin id="org.apache.cxf.rs.security.oauth2"/>
+<plugin id="org.apache.cxf.rs.security.oauth2.source"/>
+<plugin id="org.apache.cxf.transport.http"/>
+<plugin id="org.apache.cxf.transport.http.source"/>
+<plugin id="org.apache.felix.gogo.command"/>
+<plugin id="org.apache.felix.gogo.command.source"/>
+<plugin id="org.apache.felix.gogo.runtime"/>
+<plugin id="org.apache.felix.gogo.runtime.source"/>
+<plugin id="org.apache.felix.gogo.shell"/>
+<plugin id="org.apache.felix.gogo.shell.source"/>
+<plugin id="org.apache.felix.scr"/>
+<plugin id="org.apache.felix.scr.source"/>
+<plugin id="org.apache.httpcomponents.httpclient"/>
+<plugin id="org.apache.httpcomponents.httpclient.source"/>
+<plugin id="org.apache.httpcomponents.httpcore"/>
+<plugin id="org.apache.httpcomponents.httpcore.source"/>
+<plugin id="org.apache.jasper.glassfish"/>
+<plugin id="org.apache.jasper.glassfish.source"/>
+<plugin id="org.apache.log4j"/>
+<plugin id="org.apache.log4j.source"/>
+<plugin id="org.apache.lucene.analyzers-common"/>
+<plugin id="org.apache.lucene.analyzers-common.source"/>
+<plugin id="org.apache.lucene.analyzers-smartcn"/>
+<plugin id="org.apache.lucene.analyzers-smartcn.source"/>
+<plugin id="org.apache.lucene.core"/>
+<plugin id="org.apache.lucene.core.source"/>
+<plugin id="org.apache.mina.core"/>
+<plugin id="org.apache.mina.core.source"/>
+<plugin id="org.apache.oro"/>
+<plugin id="org.apache.oro.source"/>
+<plugin id="org.apache.sshd.core"/>
+<plugin id="org.apache.sshd.core.source"/>
+<plugin id="org.apache.ws.commons.schema"/>
+<plugin id="org.apache.ws.commons.schema.source"/>
+<plugin id="org.apache.xerces"/>
+<plugin id="org.apache.xml.resolver"/>
+<plugin id="org.apache.xml.serializer"/>
+<plugin id="org.apache.xmlgraphics"/>
+<plugin id="org.apache.xmlgraphics.source"/>
+<plugin id="org.apiguardian"/>
+<plugin id="org.apiguardian.source"/>
+<plugin id="org.codehaus.jackson.core"/>
+<plugin id="org.codehaus.jackson.core.source"/>
+<plugin id="org.codehaus.jackson.jaxrs"/>
+<plugin id="org.codehaus.jackson.jaxrs.source"/>
+<plugin id="org.codehaus.jackson.mapper"/>
+<plugin id="org.codehaus.jackson.mapper.source"/>
+<plugin id="org.codehaus.jackson.xc"/>
+<plugin id="org.codehaus.jackson.xc.source"/>
+<plugin id="org.codehaus.stax2"/>
+<plugin id="org.codehaus.stax2.source"/>
+<plugin id="org.cyberneko.html"/>
+<plugin id="org.databene.contiperf"/>
+<plugin id="org.databene.contiperf.source"/>
+<plugin id="org.eclipse.ant.core"/>
+<plugin id="org.eclipse.ant.core.source"/>
+<plugin id="org.eclipse.ant.launching"/>
+<plugin id="org.eclipse.ant.launching.source"/>
+<plugin id="org.eclipse.ant.ui"/>
+<plugin id="org.eclipse.ant.ui.source"/>
+<plugin id="org.eclipse.compare"/>
+<plugin id="org.eclipse.compare.core"/>
+<plugin id="org.eclipse.compare.core.source"/>
+<plugin id="org.eclipse.compare.source"/>
+<plugin id="org.eclipse.compare.win32"/>
+<plugin id="org.eclipse.compare.win32.source"/>
+<plugin id="org.eclipse.core.commands"/>
+<plugin id="org.eclipse.core.commands.source"/>
+<plugin id="org.eclipse.core.contenttype"/>
+<plugin id="org.eclipse.core.contenttype.source"/>
+<plugin id="org.eclipse.core.databinding"/>
+<plugin id="org.eclipse.core.databinding.beans"/>
+<plugin id="org.eclipse.core.databinding.beans.source"/>
+<plugin id="org.eclipse.core.databinding.observable"/>
+<plugin id="org.eclipse.core.databinding.observable.source"/>
+<plugin id="org.eclipse.core.databinding.property"/>
+<plugin id="org.eclipse.core.databinding.property.source"/>
+<plugin id="org.eclipse.core.databinding.source"/>
+<plugin id="org.eclipse.core.expressions"/>
+<plugin id="org.eclipse.core.expressions.source"/>
+<plugin id="org.eclipse.core.externaltools"/>
+<plugin id="org.eclipse.core.externaltools.source"/>
+<plugin id="org.eclipse.core.filebuffers"/>
+<plugin id="org.eclipse.core.filebuffers.source"/>
+<plugin id="org.eclipse.core.filesystem"/>
+<plugin id="org.eclipse.core.filesystem.linux.x86"/>
+<plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
+<plugin id="org.eclipse.core.filesystem.macosx"/>
+<plugin id="org.eclipse.core.filesystem.source"/>
+<plugin id="org.eclipse.core.filesystem.win32.x86"/>
+<plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
+<plugin id="org.eclipse.core.jobs"/>
+<plugin id="org.eclipse.core.jobs.source"/>
+<plugin id="org.eclipse.core.net"/>
+<plugin id="org.eclipse.core.net.linux.x86"/>
+<plugin id="org.eclipse.core.net.linux.x86_64"/>
+<plugin id="org.eclipse.core.net.source"/>
+<plugin id="org.eclipse.core.net.win32.x86_64"/>
+<plugin id="org.eclipse.core.resources"/>
+<plugin id="org.eclipse.core.resources.source"/>
+<plugin id="org.eclipse.core.resources.win32.x86_64"/>
+<plugin id="org.eclipse.core.runtime"/>
+<plugin id="org.eclipse.core.runtime.source"/>
+<plugin id="org.eclipse.core.variables"/>
+<plugin id="org.eclipse.core.variables.source"/>
+<plugin id="org.eclipse.debug.core"/>
+<plugin id="org.eclipse.debug.core.source"/>
+<plugin id="org.eclipse.debug.ui"/>
+<plugin id="org.eclipse.debug.ui.source"/>
+<plugin id="org.eclipse.draw2d"/>
+<plugin id="org.eclipse.e4.core.commands"/>
+<plugin id="org.eclipse.e4.core.commands.source"/>
+<plugin id="org.eclipse.e4.core.contexts"/>
+<plugin id="org.eclipse.e4.core.contexts.source"/>
+<plugin id="org.eclipse.e4.core.di"/>
+<plugin id="org.eclipse.e4.core.di.annotations"/>
+<plugin id="org.eclipse.e4.core.di.annotations.source"/>
+<plugin id="org.eclipse.e4.core.di.extensions"/>
+<plugin id="org.eclipse.e4.core.di.extensions.source"/>
+<plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
+<plugin id="org.eclipse.e4.core.di.extensions.supplier.source"/>
+<plugin id="org.eclipse.e4.core.di.source"/>
+<plugin id="org.eclipse.e4.core.services"/>
+<plugin id="org.eclipse.e4.core.services.source"/>
+<plugin id="org.eclipse.e4.emf.xpath"/>
+<plugin id="org.eclipse.e4.emf.xpath.source"/>
+<plugin id="org.eclipse.e4.ui.bindings"/>
+<plugin id="org.eclipse.e4.ui.bindings.source"/>
+<plugin id="org.eclipse.e4.ui.css.core"/>
+<plugin id="org.eclipse.e4.ui.css.core.source"/>
+<plugin id="org.eclipse.e4.ui.css.swt"/>
+<plugin id="org.eclipse.e4.ui.css.swt.source"/>
+<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
+<plugin id="org.eclipse.e4.ui.css.swt.theme.source"/>
+<plugin id="org.eclipse.e4.ui.di"/>
+<plugin id="org.eclipse.e4.ui.di.source"/>
+<plugin id="org.eclipse.e4.ui.dialogs"/>
+<plugin id="org.eclipse.e4.ui.dialogs.source"/>
+<plugin id="org.eclipse.e4.ui.model.workbench"/>
+<plugin id="org.eclipse.e4.ui.model.workbench.source"/>
+<plugin id="org.eclipse.e4.ui.services"/>
+<plugin id="org.eclipse.e4.ui.services.source"/>
+<plugin id="org.eclipse.e4.ui.swt.gtk"/>
+<plugin id="org.eclipse.e4.ui.swt.gtk.source"/>
+<plugin id="org.eclipse.e4.ui.widgets"/>
+<plugin id="org.eclipse.e4.ui.widgets.source"/>
+<plugin id="org.eclipse.e4.ui.workbench"/>
+<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.addons.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench3"/>
+<plugin id="org.eclipse.e4.ui.workbench3.source"/>
+<plugin id="org.eclipse.ecf"/>
+<plugin id="org.eclipse.ecf.filetransfer"/>
+<plugin id="org.eclipse.ecf.filetransfer.source"/>
+<plugin id="org.eclipse.ecf.identity"/>
+<plugin id="org.eclipse.ecf.identity.source"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.source"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.source"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
+<plugin id="org.eclipse.ecf.provider.filetransfer.ssl.source"/>
+<plugin id="org.eclipse.ecf.source"/>
+<plugin id="org.eclipse.ecf.ssl"/>
+<plugin id="org.eclipse.ecf.ssl.source"/>
+<plugin id="org.eclipse.egit"/>
+<plugin id="org.eclipse.egit.core"/>
+<plugin id="org.eclipse.egit.core.source"/>
+<plugin id="org.eclipse.egit.doc"/>
+<plugin id="org.eclipse.egit.gitflow.source"/>
+<plugin id="org.eclipse.egit.gitflow.ui.source"/>
+<plugin id="org.eclipse.egit.mylyn.ui.source"/>
+<plugin id="org.eclipse.egit.ui"/>
+<plugin id="org.eclipse.egit.ui.source"/>
+<plugin id="org.eclipse.emf"/>
+<plugin id="org.eclipse.emf.ant"/>
+<plugin id="org.eclipse.emf.ant.source"/>
+<plugin id="org.eclipse.emf.cheatsheets"/>
+<plugin id="org.eclipse.emf.codegen"/>
+<plugin id="org.eclipse.emf.codegen.ecore"/>
+<plugin id="org.eclipse.emf.codegen.ecore.source"/>
+<plugin id="org.eclipse.emf.codegen.ecore.ui"/>
+<plugin id="org.eclipse.emf.codegen.ecore.ui.source"/>
+<plugin id="org.eclipse.emf.codegen.source"/>
+<plugin id="org.eclipse.emf.codegen.ui"/>
+<plugin id="org.eclipse.emf.codegen.ui.source"/>
+<plugin id="org.eclipse.emf.common"/>
+<plugin id="org.eclipse.emf.common.source"/>
+<plugin id="org.eclipse.emf.common.ui"/>
+<plugin id="org.eclipse.emf.common.ui.source"/>
+<plugin id="org.eclipse.emf.compare"/>
+<plugin id="org.eclipse.emf.compare.source"/>
+<plugin id="org.eclipse.emf.converter"/>
+<plugin id="org.eclipse.emf.converter.source"/>
+<plugin id="org.eclipse.emf.databinding"/>
+<plugin id="org.eclipse.emf.databinding.edit"/>
+<plugin id="org.eclipse.emf.databinding.edit.source"/>
+<plugin id="org.eclipse.emf.databinding.source"/>
+<plugin id="org.eclipse.emf.doc"/>
+<plugin id="org.eclipse.emf.ecore"/>
+<plugin id="org.eclipse.emf.ecore.change"/>
+<plugin id="org.eclipse.emf.ecore.change.edit"/>
+<plugin id="org.eclipse.emf.ecore.change.edit.source"/>
+<plugin id="org.eclipse.emf.ecore.change.source"/>
+<plugin id="org.eclipse.emf.ecore.edit"/>
+<plugin id="org.eclipse.emf.ecore.edit.source"/>
+<plugin id="org.eclipse.emf.ecore.editor"/>
+<plugin id="org.eclipse.emf.ecore.editor.source"/>
+<plugin id="org.eclipse.emf.ecore.source"/>
+<plugin id="org.eclipse.emf.ecore.xmi"/>
+<plugin id="org.eclipse.emf.ecore.xmi.source"/>
+<plugin id="org.eclipse.emf.edit"/>
+<plugin id="org.eclipse.emf.edit.source"/>
+<plugin id="org.eclipse.emf.edit.ui"/>
+<plugin id="org.eclipse.emf.edit.ui.source"/>
+<plugin id="org.eclipse.emf.exporter"/>
+<plugin id="org.eclipse.emf.exporter.source"/>
+<plugin id="org.eclipse.emf.importer"/>
+<plugin id="org.eclipse.emf.importer.ecore"/>
+<plugin id="org.eclipse.emf.importer.ecore.source"/>
+<plugin id="org.eclipse.emf.importer.java"/>
+<plugin id="org.eclipse.emf.importer.java.source"/>
+<plugin id="org.eclipse.emf.importer.rose"/>
+<plugin id="org.eclipse.emf.importer.rose.source"/>
+<plugin id="org.eclipse.emf.importer.source"/>
+<plugin id="org.eclipse.emf.mapping"/>
+<plugin id="org.eclipse.emf.mapping.ecore"/>
+<plugin id="org.eclipse.emf.mapping.ecore.editor"/>
+<plugin id="org.eclipse.emf.mapping.ecore.editor.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.ui"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.ui.source"/>
+<plugin id="org.eclipse.emf.mapping.source"/>
+<plugin id="org.eclipse.emf.mapping.ui"/>
+<plugin id="org.eclipse.emf.mapping.ui.source"/>
+<plugin id="org.eclipse.emf.mwe.core"/>
+<plugin id="org.eclipse.emf.mwe.core.source"/>
+<plugin id="org.eclipse.emf.mwe.ui"/>
+<plugin id="org.eclipse.emf.mwe.utils"/>
+<plugin id="org.eclipse.emf.mwe.utils.source"/>
+<plugin id="org.eclipse.emf.mwe2.language"/>
+<plugin id="org.eclipse.emf.mwe2.language.source"/>
+<plugin id="org.eclipse.emf.mwe2.language.ui"/>
+<plugin id="org.eclipse.emf.mwe2.language.ui.source"/>
+<plugin id="org.eclipse.emf.mwe2.launch"/>
+<plugin id="org.eclipse.emf.mwe2.launch.source"/>
+<plugin id="org.eclipse.emf.mwe2.launch.ui"/>
+<plugin id="org.eclipse.emf.mwe2.launch.ui.source"/>
+<plugin id="org.eclipse.emf.mwe2.lib"/>
+<plugin id="org.eclipse.emf.mwe2.lib.source"/>
+<plugin id="org.eclipse.emf.mwe2.runtime"/>
+<plugin id="org.eclipse.emf.mwe2.runtime.source"/>
+<plugin id="org.eclipse.emf.transaction"/>
+<plugin id="org.eclipse.emf.transaction.source"/>
+<plugin id="org.eclipse.emf.transaction.ui"/>
+<plugin id="org.eclipse.emf.transaction.ui.source"/>
+<plugin id="org.eclipse.emf.validation"/>
+<plugin id="org.eclipse.emf.validation.ocl"/>
+<plugin id="org.eclipse.emf.validation.ocl.source"/>
+<plugin id="org.eclipse.emf.validation.source"/>
+<plugin id="org.eclipse.emf.validation.ui"/>
+<plugin id="org.eclipse.emf.validation.ui.source"/>
+<plugin id="org.eclipse.emf.workspace"/>
+<plugin id="org.eclipse.emf.workspace.source"/>
+<plugin id="org.eclipse.emf.workspace.ui"/>
+<plugin id="org.eclipse.emf.workspace.ui.source"/>
+<plugin id="org.eclipse.equinox.app"/>
+<plugin id="org.eclipse.equinox.app.source"/>
+<plugin id="org.eclipse.equinox.bidi"/>
+<plugin id="org.eclipse.equinox.bidi.source"/>
+<plugin id="org.eclipse.equinox.cm"/>
+<plugin id="org.eclipse.equinox.cm.source"/>
+<plugin id="org.eclipse.equinox.common"/>
+<plugin id="org.eclipse.equinox.common.source"/>
+<plugin id="org.eclipse.equinox.concurrent"/>
+<plugin id="org.eclipse.equinox.concurrent.source"/>
+<plugin id="org.eclipse.equinox.console"/>
+<plugin id="org.eclipse.equinox.console.jaas.fragment"/>
+<plugin id="org.eclipse.equinox.console.source"/>
+<plugin id="org.eclipse.equinox.console.ssh"/>
+<plugin id="org.eclipse.equinox.console.ssh.source"/>
+<plugin id="org.eclipse.equinox.coordinator"/>
+<plugin id="org.eclipse.equinox.coordinator.source"/>
+<plugin id="org.eclipse.equinox.device"/>
+<plugin id="org.eclipse.equinox.device.source"/>
+<plugin id="org.eclipse.equinox.ds"/>
+<plugin id="org.eclipse.equinox.ds.source"/>
+<plugin id="org.eclipse.equinox.event"/>
+<plugin id="org.eclipse.equinox.event.source"/>
+<plugin id="org.eclipse.equinox.frameworkadmin"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.equinox.source"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.source"/>
+<plugin id="org.eclipse.equinox.http.jetty"/>
+<plugin id="org.eclipse.equinox.http.jetty.source"/>
+<plugin id="org.eclipse.equinox.http.registry"/>
+<plugin id="org.eclipse.equinox.http.registry.source"/>
+<plugin id="org.eclipse.equinox.http.servlet"/>
+<plugin id="org.eclipse.equinox.http.servlet.source"/>
+<plugin id="org.eclipse.equinox.http.servletbridge"/>
+<plugin id="org.eclipse.equinox.http.servletbridge.source"/>
+<plugin id="org.eclipse.equinox.io"/>
+<plugin id="org.eclipse.equinox.io.source"/>
+<plugin id="org.eclipse.equinox.ip"/>
+<plugin id="org.eclipse.equinox.ip.source"/>
+<plugin id="org.eclipse.equinox.jsp.jasper"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.registry.source"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.source"/>
+<plugin id="org.eclipse.equinox.launcher"/>
+<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
+<plugin id="org.eclipse.equinox.launcher.source"/>
+<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+<plugin id="org.eclipse.equinox.log.stream"/>
+<plugin id="org.eclipse.equinox.log.stream.source"/>
+<plugin id="org.eclipse.equinox.metatype"/>
+<plugin id="org.eclipse.equinox.metatype.source"/>
+<plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+<plugin id="org.eclipse.equinox.p2.artifact.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.console"/>
+<plugin id="org.eclipse.equinox.p2.console.source"/>
+<plugin id="org.eclipse.equinox.p2.core"/>
+<plugin id="org.eclipse.equinox.p2.core.source"/>
+<plugin id="org.eclipse.equinox.p2.director"/>
+<plugin id="org.eclipse.equinox.p2.director.app"/>
+<plugin id="org.eclipse.equinox.p2.director.app.source"/>
+<plugin id="org.eclipse.equinox.p2.director.source"/>
+<plugin id="org.eclipse.equinox.p2.directorywatcher"/>
+<plugin id="org.eclipse.equinox.p2.directorywatcher.source"/>
+<plugin id="org.eclipse.equinox.p2.discovery"/>
+<plugin id="org.eclipse.equinox.p2.discovery.compatibility"/>
+<plugin id="org.eclipse.equinox.p2.discovery.compatibility.source"/>
+<plugin id="org.eclipse.equinox.p2.discovery.source"/>
+<plugin id="org.eclipse.equinox.p2.engine"/>
+<plugin id="org.eclipse.equinox.p2.engine.source"/>
+<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
+<plugin id="org.eclipse.equinox.p2.extensionlocation.source"/>
+<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+<plugin id="org.eclipse.equinox.p2.garbagecollector.source"/>
+<plugin id="org.eclipse.equinox.p2.installer"/>
+<plugin id="org.eclipse.equinox.p2.installer.source"/>
+<plugin id="org.eclipse.equinox.p2.jarprocessor"/>
+<plugin id="org.eclipse.equinox.p2.jarprocessor.source"/>
+<plugin id="org.eclipse.equinox.p2.metadata"/>
+<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+<plugin id="org.eclipse.equinox.p2.metadata.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.metadata.source"/>
+<plugin id="org.eclipse.equinox.p2.operations"/>
+<plugin id="org.eclipse.equinox.p2.operations.source"/>
+<plugin id="org.eclipse.equinox.p2.publisher"/>
+<plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
+<plugin id="org.eclipse.equinox.p2.publisher.eclipse.source"/>
+<plugin id="org.eclipse.equinox.p2.publisher.source"/>
+<plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
+<plugin id="org.eclipse.equinox.p2.reconciler.dropins.source"/>
+<plugin id="org.eclipse.equinox.p2.repository"/>
+<plugin id="org.eclipse.equinox.p2.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.repository.tools"/>
+<plugin id="org.eclipse.equinox.p2.repository.tools.source"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse.source"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.natives.source"/>
+<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
+<plugin id="org.eclipse.equinox.p2.transport.ecf.source"/>
+<plugin id="org.eclipse.equinox.p2.ui"/>
+<plugin id="org.eclipse.equinox.p2.ui.admin"/>
+<plugin id="org.eclipse.equinox.p2.ui.admin.rcp"/>
+<plugin id="org.eclipse.equinox.p2.ui.admin.rcp.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.admin.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.discovery"/>
+<plugin id="org.eclipse.equinox.p2.ui.discovery.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.importexport"/>
+<plugin id="org.eclipse.equinox.p2.ui.importexport.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.source"/>
+<plugin id="org.eclipse.equinox.p2.updatechecker"/>
+<plugin id="org.eclipse.equinox.p2.updatechecker.source"/>
+<plugin id="org.eclipse.equinox.p2.updatesite"/>
+<plugin id="org.eclipse.equinox.p2.updatesite.source"/>
+<plugin id="org.eclipse.equinox.preferences"/>
+<plugin id="org.eclipse.equinox.preferences.source"/>
+<plugin id="org.eclipse.equinox.region"/>
+<plugin id="org.eclipse.equinox.region.source"/>
+<plugin id="org.eclipse.equinox.registry"/>
+<plugin id="org.eclipse.equinox.registry.source"/>
+<plugin id="org.eclipse.equinox.security"/>
+<plugin id="org.eclipse.equinox.security.linux.x86_64"/>
+<plugin id="org.eclipse.equinox.security.linux.x86_64.source"/>
+<plugin id="org.eclipse.equinox.security.macosx"/>
+<plugin id="org.eclipse.equinox.security.macosx.source"/>
+<plugin id="org.eclipse.equinox.security.source"/>
+<plugin id="org.eclipse.equinox.security.ui"/>
+<plugin id="org.eclipse.equinox.security.ui.source"/>
+<plugin id="org.eclipse.equinox.security.win32.x86_64"/>
+<plugin id="org.eclipse.equinox.security.win32.x86_64.source"/>
+<plugin id="org.eclipse.equinox.servletbridge"/>
+<plugin id="org.eclipse.equinox.servletbridge.source"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator.source"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.source"/>
+<plugin id="org.eclipse.equinox.supplement"/>
+<plugin id="org.eclipse.equinox.supplement.source"/>
+<plugin id="org.eclipse.equinox.transforms.hook"/>
+<plugin id="org.eclipse.equinox.transforms.hook.source"/>
+<plugin id="org.eclipse.equinox.transforms.xslt"/>
+<plugin id="org.eclipse.equinox.transforms.xslt.source"/>
+<plugin id="org.eclipse.equinox.useradmin"/>
+<plugin id="org.eclipse.equinox.useradmin.source"/>
+<plugin id="org.eclipse.equinox.util"/>
+<plugin id="org.eclipse.equinox.util.source"/>
+<plugin id="org.eclipse.equinox.weaving.caching"/>
+<plugin id="org.eclipse.equinox.weaving.caching.j9"/>
+<plugin id="org.eclipse.equinox.weaving.caching.j9.source"/>
+<plugin id="org.eclipse.equinox.weaving.caching.source"/>
+<plugin id="org.eclipse.equinox.weaving.hook"/>
+<plugin id="org.eclipse.equinox.weaving.hook.source"/>
+<plugin id="org.eclipse.equinox.wireadmin"/>
+<plugin id="org.eclipse.equinox.wireadmin.source"/>
+<plugin id="org.eclipse.gef"/>
+<plugin id="org.eclipse.gef.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.core"/>
+<plugin id="org.eclipse.gmf.runtime.common.core.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.action"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.action.ide"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.action.ide.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.action.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.printing"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.printing.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services.action"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services.action.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services.properties"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services.properties.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.services.source"/>
+<plugin id="org.eclipse.gmf.runtime.common.ui.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.core"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.core.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.actions"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.actions.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.printing"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.printing.render"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.printing.render.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.printing.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.properties"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.properties.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.providers"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.providers.ide"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.providers.ide.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.providers.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.render"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.render.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.source"/>
+<plugin id="org.eclipse.gmf.runtime.diagram.ui.source"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui.render"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui.render.awt"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui.render.awt.source"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui.render.source"/>
+<plugin id="org.eclipse.gmf.runtime.draw2d.ui.source"/>
+<plugin id="org.eclipse.gmf.runtime.emf.clipboard.core"/>
+<plugin id="org.eclipse.gmf.runtime.emf.commands.core"/>
+<plugin id="org.eclipse.gmf.runtime.emf.commands.core.source"/>
+<plugin id="org.eclipse.gmf.runtime.emf.core"/>
+<plugin id="org.eclipse.gmf.runtime.emf.type.core"/>
+<plugin id="org.eclipse.gmf.runtime.emf.ui"/>
+<plugin id="org.eclipse.gmf.runtime.emf.ui.properties"/>
+<plugin id="org.eclipse.gmf.runtime.emf.ui.properties.source"/>
+<plugin id="org.eclipse.gmf.runtime.gef.ui"/>
+<plugin id="org.eclipse.gmf.runtime.gef.ui.source"/>
+<plugin id="org.eclipse.gmf.runtime.notation"/>
+<plugin id="org.eclipse.gmf.runtime.notation.edit"/>
+<plugin id="org.eclipse.gmf.runtime.notation.edit.source"/>
+<plugin id="org.eclipse.gmf.runtime.notation.source"/>
+<plugin id="org.eclipse.graphiti"/>
+<plugin id="org.eclipse.graphiti.mm"/>
+<plugin id="org.eclipse.graphiti.mm.source"/>
+<plugin id="org.eclipse.graphiti.pattern"/>
+<plugin id="org.eclipse.graphiti.pattern.source"/>
+<plugin id="org.eclipse.graphiti.source"/>
+<plugin id="org.eclipse.graphiti.ui"/>
+<plugin id="org.eclipse.graphiti.ui.source"/>
+<plugin id="org.eclipse.help"/>
+<plugin id="org.eclipse.help.base"/>
+<plugin id="org.eclipse.help.base.source"/>
+<plugin id="org.eclipse.help.source"/>
+<plugin id="org.eclipse.help.ui"/>
+<plugin id="org.eclipse.help.ui.source"/>
+<plugin id="org.eclipse.help.webapp"/>
+<plugin id="org.eclipse.help.webapp.source"/>
+<plugin id="org.eclipse.jdt"/>
+<plugin id="org.eclipse.jdt.annotation" version="2.2.0.v20180417-0931"/>
+<plugin id="org.eclipse.jdt.annotation" version="1.1.200.v20171205-1334"/>
+<plugin id="org.eclipse.jdt.annotation.source" version="2.2.0.v20180417-0931"/>
+<plugin id="org.eclipse.jdt.annotation.source" version="1.1.200.v20171205-1334"/>
+<plugin id="org.eclipse.jdt.apt.core"/>
+<plugin id="org.eclipse.jdt.apt.core.source"/>
+<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
+<plugin id="org.eclipse.jdt.apt.pluggable.core.source"/>
+<plugin id="org.eclipse.jdt.apt.ui"/>
+<plugin id="org.eclipse.jdt.apt.ui.source"/>
+<plugin id="org.eclipse.jdt.compiler.apt"/>
+<plugin id="org.eclipse.jdt.compiler.apt.source"/>
+<plugin id="org.eclipse.jdt.compiler.tool"/>
+<plugin id="org.eclipse.jdt.compiler.tool.source"/>
+<plugin id="org.eclipse.jdt.core"/>
+<plugin id="org.eclipse.jdt.core.manipulation"/>
+<plugin id="org.eclipse.jdt.core.manipulation.source"/>
+<plugin id="org.eclipse.jdt.core.source"/>
+<plugin id="org.eclipse.jdt.debug"/>
+<plugin id="org.eclipse.jdt.debug.source"/>
+<plugin id="org.eclipse.jdt.debug.ui"/>
+<plugin id="org.eclipse.jdt.debug.ui.source"/>
+<plugin id="org.eclipse.jdt.doc.isv"/>
+<plugin id="org.eclipse.jdt.doc.user"/>
+<plugin id="org.eclipse.jdt.junit"/>
+<plugin id="org.eclipse.jdt.junit.core"/>
+<plugin id="org.eclipse.jdt.junit.core.source"/>
+<plugin id="org.eclipse.jdt.junit.runtime"/>
+<plugin id="org.eclipse.jdt.junit.runtime.source"/>
+<plugin id="org.eclipse.jdt.junit.source"/>
+<plugin id="org.eclipse.jdt.junit4.runtime"/>
+<plugin id="org.eclipse.jdt.junit4.runtime.source"/>
+<plugin id="org.eclipse.jdt.junit5.runtime"/>
+<plugin id="org.eclipse.jdt.junit5.runtime.source"/>
+<plugin id="org.eclipse.jdt.launching"/>
+<plugin id="org.eclipse.jdt.launching.macosx"/>
+<plugin id="org.eclipse.jdt.launching.macosx.source"/>
+<plugin id="org.eclipse.jdt.launching.source"/>
+<plugin id="org.eclipse.jdt.launching.ui.macosx"/>
+<plugin id="org.eclipse.jdt.launching.ui.macosx.source"/>
+<plugin id="org.eclipse.jdt.ui"/>
+<plugin id="org.eclipse.jdt.ui.source"/>
+<plugin id="org.eclipse.jem.util"/>
+<plugin id="org.eclipse.jetty.continuation"/>
+<plugin id="org.eclipse.jetty.continuation.source"/>
+<plugin id="org.eclipse.jetty.http"/>
+<plugin id="org.eclipse.jetty.http.source"/>
+<plugin id="org.eclipse.jetty.io"/>
+<plugin id="org.eclipse.jetty.io.source"/>
+<plugin id="org.eclipse.jetty.security"/>
+<plugin id="org.eclipse.jetty.security.source"/>
+<plugin id="org.eclipse.jetty.server"/>
+<plugin id="org.eclipse.jetty.server.source"/>
+<plugin id="org.eclipse.jetty.servlet"/>
+<plugin id="org.eclipse.jetty.servlet.source"/>
+<plugin id="org.eclipse.jetty.util"/>
+<plugin id="org.eclipse.jetty.util.source"/>
+<plugin id="org.eclipse.jface"/>
+<plugin id="org.eclipse.jface.databinding"/>
+<plugin id="org.eclipse.jface.databinding.source"/>
+<plugin id="org.eclipse.jface.source"/>
+<plugin id="org.eclipse.jface.text"/>
+<plugin id="org.eclipse.jface.text.source"/>
+<plugin id="org.eclipse.jgit"/>
+<plugin id="org.eclipse.jgit.archive"/>
+<plugin id="org.eclipse.jsch.core"/>
+<plugin id="org.eclipse.jsch.core.source"/>
+<plugin id="org.eclipse.jsch.ui"/>
+<plugin id="org.eclipse.jsch.ui.source"/>
+<plugin id="org.eclipse.ltk.core.refactoring"/>
+<plugin id="org.eclipse.ltk.core.refactoring.source"/>
+<plugin id="org.eclipse.ltk.ui.refactoring"/>
+<plugin id="org.eclipse.ltk.ui.refactoring.source"/>
+<plugin id="org.eclipse.m2e.archetype.common"/>
+<plugin id="org.eclipse.m2e.binaryproject"/>
+<plugin id="org.eclipse.m2e.binaryproject.ui"/>
+<plugin id="org.eclipse.m2e.core"/>
+<plugin id="org.eclipse.m2e.core.ui"/>
+<plugin id="org.eclipse.m2e.discovery"/>
+<plugin id="org.eclipse.m2e.editor"/>
+<plugin id="org.eclipse.m2e.editor.xml"/>
+<plugin id="org.eclipse.m2e.importer"/>
+<plugin id="org.eclipse.m2e.jdt"/>
+<plugin id="org.eclipse.m2e.jdt.ui"/>
+<plugin id="org.eclipse.m2e.launching"/>
+<plugin id="org.eclipse.m2e.lifecyclemapping.defaults"/>
+<plugin id="org.eclipse.m2e.maven.indexer"/>
+<plugin id="org.eclipse.m2e.maven.runtime"/>
+<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple"/>
+<plugin id="org.eclipse.m2e.model.edit"/>
+<plugin id="org.eclipse.m2e.profiles.core"/>
+<plugin id="org.eclipse.m2e.profiles.ui"/>
+<plugin id="org.eclipse.m2e.refactoring"/>
+<plugin id="org.eclipse.m2e.scm"/>
+<plugin id="org.eclipse.m2e.sourcelookup"/>
+<plugin id="org.eclipse.m2e.sourcelookup.ui"/>
+<plugin id="org.eclipse.m2e.workspace.cli"/>
+<plugin id="org.eclipse.m2m.qvt.oml"/>
+<plugin id="org.eclipse.m2m.qvt.oml.common"/>
+<plugin id="org.eclipse.m2m.qvt.oml.common.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.cst.parser"/>
+<plugin id="org.eclipse.m2m.qvt.oml.cst.parser.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.ecore.imperativeocl"/>
+<plugin id="org.eclipse.m2m.qvt.oml.ecore.imperativeocl.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.emf.util"/>
+<plugin id="org.eclipse.m2m.qvt.oml.emf.util.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.project"/>
+<plugin id="org.eclipse.m2m.qvt.oml.project.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.runtime"/>
+<plugin id="org.eclipse.m2m.qvt.oml.runtime.source"/>
+<plugin id="org.eclipse.m2m.qvt.oml.source"/>
+<plugin id="org.eclipse.nebula.cwt"/>
+<plugin id="org.eclipse.nebula.widgets.cdatetime"/>
+<plugin id="org.eclipse.nebula.widgets.ganttchart"/>
+<plugin id="org.eclipse.nebula.widgets.ganttchart.source"/>
+<plugin id="org.eclipse.nebula.widgets.nattable.core"/>
+<plugin id="org.eclipse.nebula.widgets.nattable.extension.glazedlists"/>
+<plugin id="org.eclipse.nebula.widgets.nattable.extension.nebula"/>
+<plugin id="org.eclipse.nebula.widgets.richtext"/>
+<plugin id="org.eclipse.nebula.widgets.xviewer"/>
+<plugin id="org.eclipse.nebula.widgets.xviewer.core"/>
+<plugin id="org.eclipse.nebula.widgets.xviewer.core.source"/>
+<plugin id="org.eclipse.nebula.widgets.xviewer.source"/>
+<plugin id="org.eclipse.ocl"/>
+<plugin id="org.eclipse.ocl.common"/>
+<plugin id="org.eclipse.ocl.common.ui"/>
+<plugin id="org.eclipse.ocl.common.ui.source"/>
+<plugin id="org.eclipse.ocl.ecore"/>
+<plugin id="org.eclipse.ocl.examples.debug"/>
+<plugin id="org.eclipse.ocl.examples.debug.source"/>
+<plugin id="org.eclipse.ocl.examples.debug.vm"/>
+<plugin id="org.eclipse.ocl.examples.debug.vm.source"/>
+<plugin id="org.eclipse.ocl.examples.debug.vm.ui"/>
+<plugin id="org.eclipse.ocl.examples.debug.vm.ui.source"/>
+<plugin id="org.eclipse.ocl.examples.emf.validation.validity"/>
+<plugin id="org.eclipse.ocl.examples.emf.validation.validity.ui"/>
+<plugin id="org.eclipse.ocl.examples.ui"/>
+<plugin id="org.eclipse.ocl.examples.ui.source"/>
+<plugin id="org.eclipse.ocl.examples.xtext.console"/>
+<plugin id="org.eclipse.ocl.examples.xtext.console.source"/>
+<plugin id="org.eclipse.ocl.pivot"/>
+<plugin id="org.eclipse.ocl.pivot.source"/>
+<plugin id="org.eclipse.ocl.pivot.ui"/>
+<plugin id="org.eclipse.ocl.pivot.ui.source"/>
+<plugin id="org.eclipse.ocl.pivot.uml"/>
+<plugin id="org.eclipse.ocl.pivot.uml.source"/>
+<plugin id="org.eclipse.ocl.source"/>
+<plugin id="org.eclipse.ocl.xtext.base"/>
+<plugin id="org.eclipse.ocl.xtext.base.source"/>
+<plugin id="org.eclipse.ocl.xtext.base.ui"/>
+<plugin id="org.eclipse.ocl.xtext.base.ui.source"/>
+<plugin id="org.eclipse.ocl.xtext.completeocl"/>
+<plugin id="org.eclipse.ocl.xtext.completeocl.source"/>
+<plugin id="org.eclipse.ocl.xtext.completeocl.ui"/>
+<plugin id="org.eclipse.ocl.xtext.completeocl.ui.source"/>
+<plugin id="org.eclipse.ocl.xtext.essentialocl"/>
+<plugin id="org.eclipse.ocl.xtext.essentialocl.source"/>
+<plugin id="org.eclipse.ocl.xtext.essentialocl.ui"/>
+<plugin id="org.eclipse.ocl.xtext.essentialocl.ui.source"/>
+<plugin id="org.eclipse.ocl.xtext.markup"/>
+<plugin id="org.eclipse.ocl.xtext.markup.source"/>
+<plugin id="org.eclipse.ocl.xtext.markup.ui"/>
+<plugin id="org.eclipse.ocl.xtext.markup.ui.source"/>
+<plugin id="org.eclipse.ocl.xtext.oclinecore"/>
+<plugin id="org.eclipse.ocl.xtext.oclinecore.source"/>
+<plugin id="org.eclipse.ocl.xtext.oclinecore.ui"/>
+<plugin id="org.eclipse.ocl.xtext.oclinecore.ui.source"/>
+<plugin id="org.eclipse.ocl.xtext.oclstdlib"/>
+<plugin id="org.eclipse.ocl.xtext.oclstdlib.source"/>
+<plugin id="org.eclipse.ocl.xtext.oclstdlib.ui"/>
+<plugin id="org.eclipse.ocl.xtext.oclstdlib.ui.source"/>
+<plugin id="org.eclipse.osee.account.admin"/>
+<plugin id="org.eclipse.osee.account.admin.test"/>
+<plugin id="org.eclipse.osee.account.rest"/>
+<plugin id="org.eclipse.osee.account.rest.client"/>
+<plugin id="org.eclipse.osee.account.rest.model"/>
+<plugin id="org.eclipse.osee.account.rest.test"/>
+<plugin id="org.eclipse.osee.activity"/>
+<plugin id="org.eclipse.osee.activity.api"/>
+<plugin id="org.eclipse.osee.app"/>
+<plugin id="org.eclipse.osee.app.test"/>
+<plugin id="org.eclipse.osee.ats"/>
+<plugin id="org.eclipse.osee.ats.api"/>
+<plugin id="org.eclipse.osee.ats.client.demo"/>
+<plugin id="org.eclipse.osee.ats.client.integration.tests"/>
+<plugin id="org.eclipse.osee.ats.core"/>
+<plugin id="org.eclipse.osee.ats.core.test"/>
+<plugin id="org.eclipse.osee.ats.demo.api"/>
+<plugin id="org.eclipse.osee.ats.dsl"/>
+<plugin id="org.eclipse.osee.ats.dsl.integration"/>
+<plugin id="org.eclipse.osee.ats.dsl.integration.test"/>
+<plugin id="org.eclipse.osee.ats.dsl.ui"/>
+<plugin id="org.eclipse.osee.ats.help.ui"/>
+<plugin id="org.eclipse.osee.ats.help.ui.test"/>
+<plugin id="org.eclipse.osee.ats.rest"/>
+<plugin id="org.eclipse.osee.ats.rest.test"/>
+<plugin id="org.eclipse.osee.ats.rest.test.db"/>
+<plugin id="org.eclipse.osee.authentication.admin"/>
+<plugin id="org.eclipse.osee.authentication.admin.test"/>
+<plugin id="org.eclipse.osee.authentication.ldap"/>
+<plugin id="org.eclipse.osee.authentication.ldap.test"/>
+<plugin id="org.eclipse.osee.authorization.admin"/>
+<plugin id="org.eclipse.osee.authorization.admin.test"/>
+<plugin id="org.eclipse.osee.cache.admin"/>
+<plugin id="org.eclipse.osee.cache.admin.test"/>
+<plugin id="org.eclipse.osee.client.demo"/>
+<plugin id="org.eclipse.osee.client.integration.tests"/>
+<plugin id="org.eclipse.osee.client.test.framework"/>
+<plugin id="org.eclipse.osee.config.admin"/>
+<plugin id="org.eclipse.osee.config.admin.test"/>
+<plugin id="org.eclipse.osee.console.admin"/>
+<plugin id="org.eclipse.osee.console.admin.test"/>
+<plugin id="org.eclipse.osee.define.api"/>
+<plugin id="org.eclipse.osee.define.ide"/>
+<plugin id="org.eclipse.osee.define.ide.test"/>
+<plugin id="org.eclipse.osee.define.rest"/>
+<plugin id="org.eclipse.osee.define.rest.test"/>
+<plugin id="org.eclipse.osee.disposition.rest"/>
+<plugin id="org.eclipse.osee.disposition.rest.model"/>
+<plugin id="org.eclipse.osee.disposition.rest.test"/>
+<plugin id="org.eclipse.osee.doors.connector.core"/>
+<plugin id="org.eclipse.osee.doors.connector.ui"/>
+<plugin id="org.eclipse.osee.event"/>
+<plugin id="org.eclipse.osee.event.osgi"/>
+<plugin id="org.eclipse.osee.framework.access"/>
+<plugin id="org.eclipse.osee.framework.access.provider"/>
+<plugin id="org.eclipse.osee.framework.access.test"/>
+<plugin id="org.eclipse.osee.framework.authentication.ldap.core"/>
+<plugin id="org.eclipse.osee.framework.branch.gantt"/>
+<plugin id="org.eclipse.osee.framework.core"/>
+<plugin id="org.eclipse.osee.framework.core.client"/>
+<plugin id="org.eclipse.osee.framework.core.dsl"/>
+<plugin id="org.eclipse.osee.framework.core.dsl.integration"/>
+<plugin id="org.eclipse.osee.framework.core.dsl.integration.test"/>
+<plugin id="org.eclipse.osee.framework.core.dsl.ui"/>
+<plugin id="org.eclipse.osee.framework.core.dsl.ui.integration"/>
+<plugin id="org.eclipse.osee.framework.core.dsl.ui.integration.test"/>
+<plugin id="org.eclipse.osee.framework.core.model"/>
+<plugin id="org.eclipse.osee.framework.core.model.test"/>
+<plugin id="org.eclipse.osee.framework.core.server"/>
+<plugin id="org.eclipse.osee.framework.core.server.test"/>
+<plugin id="org.eclipse.osee.framework.core.test"/>
+<plugin id="org.eclipse.osee.framework.database.init"/>
+<plugin id="org.eclipse.osee.framework.dev.help.ui"/>
+<plugin id="org.eclipse.osee.framework.dev.help.ui.test"/>
+<plugin id="org.eclipse.osee.framework.help.ui"/>
+<plugin id="org.eclipse.osee.framework.help.ui.test"/>
+<plugin id="org.eclipse.osee.framework.jdk.core"/>
+<plugin id="org.eclipse.osee.framework.jdk.core.test"/>
+<plugin id="org.eclipse.osee.framework.lifecycle"/>
+<plugin id="org.eclipse.osee.framework.lifecycle.test"/>
+<plugin id="org.eclipse.osee.framework.logging"/>
+<plugin id="org.eclipse.osee.framework.logging.test"/>
+<plugin id="org.eclipse.osee.framework.messaging"/>
+<plugin id="org.eclipse.osee.framework.messaging.event.res"/>
+<plugin id="org.eclipse.osee.framework.messaging.event.res.test"/>
+<plugin id="org.eclipse.osee.framework.messaging.test"/>
+<plugin id="org.eclipse.osee.framework.plugin.core"/>
+<plugin id="org.eclipse.osee.framework.resource.management"/>
+<plugin id="org.eclipse.osee.framework.resource.management.test"/>
+<plugin id="org.eclipse.osee.framework.server.ide"/>
+<plugin id="org.eclipse.osee.framework.server.ide.api"/>
+<plugin id="org.eclipse.osee.framework.skynet.core"/>
+<plugin id="org.eclipse.osee.framework.skynet.core.test"/>
+<plugin id="org.eclipse.osee.framework.templates"/>
+<plugin id="org.eclipse.osee.framework.ui.branch.graph"/>
+<plugin id="org.eclipse.osee.framework.ui.data.model.editor"/>
+<plugin id="org.eclipse.osee.framework.ui.plugin"/>
+<plugin id="org.eclipse.osee.framework.ui.product"/>
+<plugin id="org.eclipse.osee.framework.ui.skynet"/>
+<plugin id="org.eclipse.osee.framework.ui.skynet.test"/>
+<plugin id="org.eclipse.osee.framework.ui.swt"/>
+<plugin id="org.eclipse.osee.framework.ui.ws"/>
+<plugin id="org.eclipse.osee.jaxrs"/>
+<plugin id="org.eclipse.osee.jaxrs.client"/>
+<plugin id="org.eclipse.osee.jaxrs.client.test"/>
+<plugin id="org.eclipse.osee.jaxrs.server"/>
+<plugin id="org.eclipse.osee.jaxrs.server.test"/>
+<plugin id="org.eclipse.osee.jdbc"/>
+<plugin id="org.eclipse.osee.jdbc.test"/>
+<plugin id="org.eclipse.osee.logback.config"/>
+<plugin id="org.eclipse.osee.logger"/>
+<plugin id="org.eclipse.osee.logger.slf4j"/>
+<plugin id="org.eclipse.osee.mail"/>
+<plugin id="org.eclipse.osee.mail.api"/>
+<plugin id="org.eclipse.osee.mail.test"/>
+<plugin id="org.eclipse.osee.orcs"/>
+<plugin id="org.eclipse.osee.orcs.account.admin"/>
+<plugin id="org.eclipse.osee.orcs.account.admin.test"/>
+<plugin id="org.eclipse.osee.orcs.authorization"/>
+<plugin id="org.eclipse.osee.orcs.core"/>
+<plugin id="org.eclipse.osee.orcs.core.test"/>
+<plugin id="org.eclipse.osee.orcs.db"/>
+<plugin id="org.eclipse.osee.orcs.db.mock"/>
+<plugin id="org.eclipse.osee.orcs.db.test"/>
+<plugin id="org.eclipse.osee.orcs.rest"/>
+<plugin id="org.eclipse.osee.orcs.rest.client"/>
+<plugin id="org.eclipse.osee.orcs.rest.model"/>
+<plugin id="org.eclipse.osee.orcs.rest.test"/>
+<plugin id="org.eclipse.osee.orcs.script.dsl"/>
+<plugin id="org.eclipse.osee.orcs.script.dsl.tests"/>
+<plugin id="org.eclipse.osee.orcs.script.dsl.ui"/>
+<plugin id="org.eclipse.osee.orcs.script.dsl.ui.integration"/>
+<plugin id="org.eclipse.osee.orcs.test"/>
+<plugin id="org.eclipse.osee.ote.define"/>
+<plugin id="org.eclipse.osee.ote.ui.define"/>
+<plugin id="org.eclipse.osee.server.application"/>
+<plugin id="org.eclipse.osee.server.integration.tests"/>
+<plugin id="org.eclipse.osee.support.test.util"/>
+<plugin id="org.eclipse.osee.template.engine"/>
+<plugin id="org.eclipse.osee.template.engine.test"/>
+<plugin id="org.eclipse.osee.vcast"/>
+<plugin id="org.eclipse.osee.web.ui"/>
+<plugin id="org.eclipse.osee.web.ui.test"/>
+<plugin id="org.eclipse.osgi"/>
+<plugin id="org.eclipse.osgi.compatibility.state"/>
+<plugin id="org.eclipse.osgi.compatibility.state.source"/>
+<plugin id="org.eclipse.osgi.services"/>
+<plugin id="org.eclipse.osgi.services.source"/>
+<plugin id="org.eclipse.osgi.source"/>
+<plugin id="org.eclipse.osgi.util"/>
+<plugin id="org.eclipse.osgi.util.source"/>
+<plugin id="org.eclipse.oss.ajax"/>
+<plugin id="org.eclipse.pde"/>
+<plugin id="org.eclipse.pde.api.tools"/>
+<plugin id="org.eclipse.pde.api.tools.annotations"/>
+<plugin id="org.eclipse.pde.api.tools.annotations.source"/>
+<plugin id="org.eclipse.pde.api.tools.source"/>
+<plugin id="org.eclipse.pde.api.tools.ui"/>
+<plugin id="org.eclipse.pde.api.tools.ui.source"/>
+<plugin id="org.eclipse.pde.build"/>
+<plugin id="org.eclipse.pde.build.source"/>
+<plugin id="org.eclipse.pde.core"/>
+<plugin id="org.eclipse.pde.core.source"/>
+<plugin id="org.eclipse.pde.doc.user"/>
+<plugin id="org.eclipse.pde.ds.annotations"/>
+<plugin id="org.eclipse.pde.ds.annotations.source"/>
+<plugin id="org.eclipse.pde.ds.core"/>
+<plugin id="org.eclipse.pde.ds.core.source"/>
+<plugin id="org.eclipse.pde.ds.lib"/>
+<plugin id="org.eclipse.pde.ds.lib.source"/>
+<plugin id="org.eclipse.pde.ds.ui"/>
+<plugin id="org.eclipse.pde.ds.ui.source"/>
+<plugin id="org.eclipse.pde.ds1_2.lib"/>
+<plugin id="org.eclipse.pde.ds1_2.lib.source"/>
+<plugin id="org.eclipse.pde.genericeditor.extension"/>
+<plugin id="org.eclipse.pde.genericeditor.extension.source"/>
+<plugin id="org.eclipse.pde.junit.runtime"/>
+<plugin id="org.eclipse.pde.junit.runtime.source"/>
+<plugin id="org.eclipse.pde.launching"/>
+<plugin id="org.eclipse.pde.launching.source"/>
+<plugin id="org.eclipse.pde.runtime"/>
+<plugin id="org.eclipse.pde.runtime.source"/>
+<plugin id="org.eclipse.pde.ua.core"/>
+<plugin id="org.eclipse.pde.ua.core.source"/>
+<plugin id="org.eclipse.pde.ua.ui"/>
+<plugin id="org.eclipse.pde.ua.ui.source"/>
+<plugin id="org.eclipse.pde.ui"/>
+<plugin id="org.eclipse.pde.ui.source"/>
+<plugin id="org.eclipse.pde.ui.templates"/>
+<plugin id="org.eclipse.pde.ui.templates.source"/>
+<plugin id="org.eclipse.persistence.antlr"/>
+<plugin id="org.eclipse.persistence.asm"/>
+<plugin id="org.eclipse.persistence.core"/>
+<plugin id="org.eclipse.persistence.moxy"/>
+<plugin id="org.eclipse.platform"/>
+<plugin id="org.eclipse.platform.doc.isv"/>
+<plugin id="org.eclipse.platform.doc.user"/>
+<plugin id="org.eclipse.platform.source"/>
+<plugin id="org.eclipse.rcp"/>
+<plugin id="org.eclipse.sdk"/>
+<plugin id="org.eclipse.search"/>
+<plugin id="org.eclipse.search.source"/>
+<plugin id="org.eclipse.swt"/>
+<plugin id="org.eclipse.swt.cocoa.macosx.x86_64"/>
+<plugin id="org.eclipse.swt.cocoa.macosx.x86_64.source"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86.source"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86_64.source"/>
+<plugin id="org.eclipse.swt.win32.win32.x86"/>
+<plugin id="org.eclipse.swt.win32.win32.x86.source"/>
+<plugin id="org.eclipse.swt.win32.win32.x86_64"/>
+<plugin id="org.eclipse.swt.win32.win32.x86_64.source"/>
+<plugin id="org.eclipse.team.core"/>
+<plugin id="org.eclipse.team.core.source"/>
+<plugin id="org.eclipse.team.genericeditor.diff.extension"/>
+<plugin id="org.eclipse.team.genericeditor.diff.extension.source"/>
+<plugin id="org.eclipse.team.svn"/>
+<plugin id="org.eclipse.team.ui"/>
+<plugin id="org.eclipse.team.ui.source"/>
+<plugin id="org.eclipse.text"/>
+<plugin id="org.eclipse.text.source"/>
+<plugin id="org.eclipse.tools.layout.spy"/>
+<plugin id="org.eclipse.tools.layout.spy.source"/>
+<plugin id="org.eclipse.ui"/>
+<plugin id="org.eclipse.ui.browser"/>
+<plugin id="org.eclipse.ui.browser.source"/>
+<plugin id="org.eclipse.ui.cheatsheets"/>
+<plugin id="org.eclipse.ui.cheatsheets.source"/>
+<plugin id="org.eclipse.ui.cocoa"/>
+<plugin id="org.eclipse.ui.cocoa.source"/>
+<plugin id="org.eclipse.ui.console"/>
+<plugin id="org.eclipse.ui.console.source"/>
+<plugin id="org.eclipse.ui.editors"/>
+<plugin id="org.eclipse.ui.editors.source"/>
+<plugin id="org.eclipse.ui.externaltools"/>
+<plugin id="org.eclipse.ui.externaltools.source"/>
+<plugin id="org.eclipse.ui.forms"/>
+<plugin id="org.eclipse.ui.forms.source"/>
+<plugin id="org.eclipse.ui.genericeditor"/>
+<plugin id="org.eclipse.ui.genericeditor.source"/>
+<plugin id="org.eclipse.ui.ide"/>
+<plugin id="org.eclipse.ui.ide.application"/>
+<plugin id="org.eclipse.ui.ide.application.source"/>
+<plugin id="org.eclipse.ui.ide.source"/>
+<plugin id="org.eclipse.ui.intro"/>
+<plugin id="org.eclipse.ui.intro.quicklinks"/>
+<plugin id="org.eclipse.ui.intro.quicklinks.source"/>
+<plugin id="org.eclipse.ui.intro.source"/>
+<plugin id="org.eclipse.ui.intro.universal"/>
+<plugin id="org.eclipse.ui.intro.universal.source"/>
+<plugin id="org.eclipse.ui.monitoring"/>
+<plugin id="org.eclipse.ui.monitoring.source"/>
+<plugin id="org.eclipse.ui.navigator"/>
+<plugin id="org.eclipse.ui.navigator.resources"/>
+<plugin id="org.eclipse.ui.navigator.resources.source"/>
+<plugin id="org.eclipse.ui.navigator.source"/>
+<plugin id="org.eclipse.ui.net"/>
+<plugin id="org.eclipse.ui.net.source"/>
+<plugin id="org.eclipse.ui.source"/>
+<plugin id="org.eclipse.ui.themes"/>
+<plugin id="org.eclipse.ui.themes.source"/>
+<plugin id="org.eclipse.ui.trace"/>
+<plugin id="org.eclipse.ui.trace.source"/>
+<plugin id="org.eclipse.ui.views"/>
+<plugin id="org.eclipse.ui.views.log"/>
+<plugin id="org.eclipse.ui.views.log.source"/>
+<plugin id="org.eclipse.ui.views.properties.tabbed"/>
+<plugin id="org.eclipse.ui.views.properties.tabbed.source"/>
+<plugin id="org.eclipse.ui.views.source"/>
+<plugin id="org.eclipse.ui.win32"/>
+<plugin id="org.eclipse.ui.win32.source"/>
+<plugin id="org.eclipse.ui.workbench"/>
+<plugin id="org.eclipse.ui.workbench.source"/>
+<plugin id="org.eclipse.ui.workbench.texteditor"/>
+<plugin id="org.eclipse.ui.workbench.texteditor.source"/>
+<plugin id="org.eclipse.uml2.codegen.ecore"/>
+<plugin id="org.eclipse.uml2.common"/>
+<plugin id="org.eclipse.uml2.common.edit"/>
+<plugin id="org.eclipse.uml2.types"/>
+<plugin id="org.eclipse.uml2.uml"/>
+<plugin id="org.eclipse.uml2.uml.edit"/>
+<plugin id="org.eclipse.uml2.uml.editor"/>
+<plugin id="org.eclipse.uml2.uml.profile.standard"/>
+<plugin id="org.eclipse.uml2.uml.resources"/>
+<plugin id="org.eclipse.uml2.uml.validation"/>
+<plugin id="org.eclipse.update.configurator"/>
+<plugin id="org.eclipse.update.configurator.source"/>
+<plugin id="org.eclipse.wst.common.core"/>
+<plugin id="org.eclipse.wst.common.emf"/>
+<plugin id="org.eclipse.wst.common.environment"/>
+<plugin id="org.eclipse.wst.common.frameworks"/>
+<plugin id="org.eclipse.wst.common.frameworks.ui"/>
+<plugin id="org.eclipse.wst.common.project.facet.core"/>
+<plugin id="org.eclipse.wst.common.ui"/>
+<plugin id="org.eclipse.wst.common.uriresolver"/>
+<plugin id="org.eclipse.wst.sse.core"/>
+<plugin id="org.eclipse.wst.sse.ui"/>
+<plugin id="org.eclipse.wst.validation"/>
+<plugin id="org.eclipse.wst.validation.ui"/>
+<plugin id="org.eclipse.wst.xml.core"/>
+<plugin id="org.eclipse.wst.xml.ui"/>
+<plugin id="org.eclipse.wst.xsd.core"/>
+<plugin id="org.eclipse.xpand"/>
+<plugin id="org.eclipse.xpand.activities"/>
+<plugin id="org.eclipse.xpand.activities.source"/>
+<plugin id="org.eclipse.xpand.source"/>
+<plugin id="org.eclipse.xsd"/>
+<plugin id="org.eclipse.xsd.source"/>
+<plugin id="org.eclipse.xtend"/>
+<plugin id="org.eclipse.xtend.check.ui"/>
+<plugin id="org.eclipse.xtend.check.ui.source"/>
+<plugin id="org.eclipse.xtend.core"/>
+<plugin id="org.eclipse.xtend.core.source"/>
+<plugin id="org.eclipse.xtend.doc"/>
+<plugin id="org.eclipse.xtend.examples"/>
+<plugin id="org.eclipse.xtend.ide"/>
+<plugin id="org.eclipse.xtend.ide.common"/>
+<plugin id="org.eclipse.xtend.ide.common.source"/>
+<plugin id="org.eclipse.xtend.ide.source"/>
+<plugin id="org.eclipse.xtend.lib"/>
+<plugin id="org.eclipse.xtend.lib.macro"/>
+<plugin id="org.eclipse.xtend.lib.macro.source"/>
+<plugin id="org.eclipse.xtend.lib.source"/>
+<plugin id="org.eclipse.xtend.m2e"/>
+<plugin id="org.eclipse.xtend.m2e.source"/>
+<plugin id="org.eclipse.xtend.profiler"/>
+<plugin id="org.eclipse.xtend.profiler.source"/>
+<plugin id="org.eclipse.xtend.shared.ui"/>
+<plugin id="org.eclipse.xtend.shared.ui.source"/>
+<plugin id="org.eclipse.xtend.source"/>
+<plugin id="org.eclipse.xtend.standalone"/>
+<plugin id="org.eclipse.xtend.standalone.source"/>
+<plugin id="org.eclipse.xtend.typesystem.emf"/>
+<plugin id="org.eclipse.xtend.typesystem.emf.source"/>
+<plugin id="org.eclipse.xtend.typesystem.emf.ui"/>
+<plugin id="org.eclipse.xtend.typesystem.emf.ui.source"/>
+<plugin id="org.eclipse.xtend.ui"/>
+<plugin id="org.eclipse.xtend.ui.source"/>
+<plugin id="org.eclipse.xtend.util.stdlib"/>
+<plugin id="org.eclipse.xtend.util.stdlib.source"/>
+<plugin id="org.eclipse.xtext"/>
+<plugin id="org.eclipse.xtext.activities"/>
+<plugin id="org.eclipse.xtext.activities.source"/>
+<plugin id="org.eclipse.xtext.builder"/>
+<plugin id="org.eclipse.xtext.builder.source"/>
+<plugin id="org.eclipse.xtext.builder.standalone"/>
+<plugin id="org.eclipse.xtext.builder.standalone.source"/>
+<plugin id="org.eclipse.xtext.common.types"/>
+<plugin id="org.eclipse.xtext.common.types.edit"/>
+<plugin id="org.eclipse.xtext.common.types.edit.source"/>
+<plugin id="org.eclipse.xtext.common.types.shared"/>
+<plugin id="org.eclipse.xtext.common.types.shared.jdt38"/>
+<plugin id="org.eclipse.xtext.common.types.shared.jdt38.source"/>
+<plugin id="org.eclipse.xtext.common.types.shared.source"/>
+<plugin id="org.eclipse.xtext.common.types.source"/>
+<plugin id="org.eclipse.xtext.common.types.ui"/>
+<plugin id="org.eclipse.xtext.common.types.ui.source"/>
+<plugin id="org.eclipse.xtext.doc"/>
+<plugin id="org.eclipse.xtext.ecore"/>
+<plugin id="org.eclipse.xtext.ecore.source"/>
+<plugin id="org.eclipse.xtext.generator"/>
+<plugin id="org.eclipse.xtext.generator.source"/>
+<plugin id="org.eclipse.xtext.ide"/>
+<plugin id="org.eclipse.xtext.ide.source"/>
+<plugin id="org.eclipse.xtext.idea.generator"/>
+<plugin id="org.eclipse.xtext.idea.generator.source"/>
+<plugin id="org.eclipse.xtext.java"/>
+<plugin id="org.eclipse.xtext.java.source"/>
+<plugin id="org.eclipse.xtext.junit4"/>
+<plugin id="org.eclipse.xtext.junit4.source"/>
+<plugin id="org.eclipse.xtext.logging"/>
+<plugin id="org.eclipse.xtext.logging.source"/>
+<plugin id="org.eclipse.xtext.m2e"/>
+<plugin id="org.eclipse.xtext.m2e.source"/>
+<plugin id="org.eclipse.xtext.purexbase"/>
+<plugin id="org.eclipse.xtext.purexbase.ide"/>
+<plugin id="org.eclipse.xtext.purexbase.ide.source"/>
+<plugin id="org.eclipse.xtext.purexbase.source"/>
+<plugin id="org.eclipse.xtext.purexbase.ui"/>
+<plugin id="org.eclipse.xtext.purexbase.ui.source"/>
+<plugin id="org.eclipse.xtext.smap"/>
+<plugin id="org.eclipse.xtext.smap.source"/>
+<plugin id="org.eclipse.xtext.source"/>
+<plugin id="org.eclipse.xtext.testing"/>
+<plugin id="org.eclipse.xtext.testing.source"/>
+<plugin id="org.eclipse.xtext.ui"/>
+<plugin id="org.eclipse.xtext.ui.codemining"/>
+<plugin id="org.eclipse.xtext.ui.codemining.source"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ide"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ide.source"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.source"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui.source"/>
+<plugin id="org.eclipse.xtext.ui.ecore"/>
+<plugin id="org.eclipse.xtext.ui.ecore.source"/>
+<plugin id="org.eclipse.xtext.ui.shared"/>
+<plugin id="org.eclipse.xtext.ui.shared.source"/>
+<plugin id="org.eclipse.xtext.ui.source"/>
+<plugin id="org.eclipse.xtext.ui.testing"/>
+<plugin id="org.eclipse.xtext.ui.testing.source"/>
+<plugin id="org.eclipse.xtext.util"/>
+<plugin id="org.eclipse.xtext.util.source"/>
+<plugin id="org.eclipse.xtext.xbase"/>
+<plugin id="org.eclipse.xtext.xbase.ide"/>
+<plugin id="org.eclipse.xtext.xbase.ide.source"/>
+<plugin id="org.eclipse.xtext.xbase.junit"/>
+<plugin id="org.eclipse.xtext.xbase.junit.source"/>
+<plugin id="org.eclipse.xtext.xbase.lib"/>
+<plugin id="org.eclipse.xtext.xbase.lib.source"/>
+<plugin id="org.eclipse.xtext.xbase.source"/>
+<plugin id="org.eclipse.xtext.xbase.testing"/>
+<plugin id="org.eclipse.xtext.xbase.testing.source"/>
+<plugin id="org.eclipse.xtext.xbase.ui"/>
+<plugin id="org.eclipse.xtext.xbase.ui.source"/>
+<plugin id="org.eclipse.xtext.xbase.ui.testing"/>
+<plugin id="org.eclipse.xtext.xbase.ui.testing.source"/>
+<plugin id="org.eclipse.xtext.xtext.generator"/>
+<plugin id="org.eclipse.xtext.xtext.generator.source"/>
+<plugin id="org.eclipse.xtext.xtext.ide"/>
+<plugin id="org.eclipse.xtext.xtext.ide.source"/>
+<plugin id="org.eclipse.xtext.xtext.ui"/>
+<plugin id="org.eclipse.xtext.xtext.ui.examples"/>
+<plugin id="org.eclipse.xtext.xtext.ui.graph"/>
+<plugin id="org.eclipse.xtext.xtext.ui.graph.source"/>
+<plugin id="org.eclipse.xtext.xtext.ui.source"/>
+<plugin id="org.eclipse.xtext.xtext.wizard"/>
+<plugin id="org.eclipse.xtext.xtext.wizard.source"/>
+<plugin id="org.eclipse.xwt"/>
+<plugin id="org.eclipse.xwt.source"/>
+<plugin id="org.eclipse.zest.core"/>
+<plugin id="org.eclipse.zest.core.source"/>
+<plugin id="org.eclipse.zest.layouts"/>
+<plugin id="org.eclipse.zest.layouts.source"/>
+<plugin id="org.eclipselabs.xtext.utils.unittesting"/>
+<plugin id="org.eclipselabs.xtext.utils.unittesting.source"/>
+<plugin id="org.flywaydb.core"/>
+<plugin id="org.flywaydb.core.source"/>
+<plugin id="org.h2"/>
+<plugin id="org.h2.source"/>
+<plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+<plugin id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
+<plugin id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.library"/>
+<plugin id="org.hamcrest.library.source"/>
+<plugin id="org.hsqldb"/>
+<plugin id="org.hsqldb.source"/>
+<plugin id="org.json"/>
+<plugin id="org.jsoup"/>
+<plugin id="org.junit"/>
+<plugin id="org.junit.jupiter.api"/>
+<plugin id="org.junit.jupiter.api.source"/>
+<plugin id="org.junit.jupiter.engine"/>
+<plugin id="org.junit.jupiter.engine.source"/>
+<plugin id="org.junit.jupiter.migrationsupport"/>
+<plugin id="org.junit.jupiter.migrationsupport.source"/>
+<plugin id="org.junit.jupiter.params"/>
+<plugin id="org.junit.jupiter.params.source"/>
+<plugin id="org.junit.platform.commons"/>
+<plugin id="org.junit.platform.commons.source"/>
+<plugin id="org.junit.platform.engine"/>
+<plugin id="org.junit.platform.engine.source"/>
+<plugin id="org.junit.platform.launcher"/>
+<plugin id="org.junit.platform.launcher.source"/>
+<plugin id="org.junit.platform.runner"/>
+<plugin id="org.junit.platform.runner.source"/>
+<plugin id="org.junit.platform.suite.api"/>
+<plugin id="org.junit.platform.suite.api.source"/>
+<plugin id="org.junit.source"/>
+<plugin id="org.junit.vintage.engine"/>
+<plugin id="org.junit.vintage.engine.source"/>
+<plugin id="org.mockito"/>
+<plugin id="org.mockito.source"/>
+<plugin id="org.mozilla.javascript"/>
+<plugin id="org.mozilla.javascript.source"/>
+<plugin id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
+<plugin id="org.objectweb.asm" version="3.3.1.v201105211655"/>
+<plugin id="org.objectweb.asm.source" version="6.1.1.v20180414-0329"/>
+<plugin id="org.objectweb.asm.source" version="3.3.1.v201105211655"/>
+<plugin id="org.objectweb.asm.tree"/>
+<plugin id="org.objectweb.asm.tree.source"/>
+<plugin id="org.objenesis"/>
+<plugin id="org.objenesis.source"/>
+<plugin id="org.opentest4j"/>
+<plugin id="org.opentest4j.source"/>
+<plugin id="org.osgi.service.blueprint"/>
+<plugin id="org.osgi.service.blueprint.source"/>
+<plugin id="org.sat4j.core"/>
+<plugin id="org.sat4j.pb"/>
+<plugin id="org.slf4j.api"/>
+<plugin id="org.slf4j.api.source"/>
+<plugin id="org.slf4j.jcl"/>
+<plugin id="org.slf4j.jcl.source"/>
+<plugin id="org.tukaani.xz"/>
+<plugin id="org.tukaani.xz.source"/>
+<plugin id="org.w3c.css.sac"/>
+<plugin id="org.w3c.css.sac.source"/>
+<plugin id="org.w3c.dom.events"/>
+<plugin id="org.w3c.dom.events.source"/>
+<plugin id="org.w3c.dom.smil"/>
+<plugin id="org.w3c.dom.smil.source"/>
+<plugin id="org.w3c.dom.svg"/>
+<plugin id="org.w3c.dom.svg.source"/>
+<plugin id="org.xerial.sqlite"/>
+<plugin id="org.xerial.sqlite.source"/>
+<plugin id="rest.assured"/>
+<plugin id="rest.assured.source"/>
+</includeBundles>
+<environment>
+<os>win32</os>
+<ws>win32</ws>
+<arch>x86_64</arch>
+<nl>en_US</nl>
+</environment>
+</target>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
index 1d8b90dcb6..9264fb5d81 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<setAttribute key="additional_plugins">
-<setEntry value="com.google.guava:15.0.0.v201403281430:default:false"/>
+<setEntry value="com.google.guava:21.0.0.v20170206-1425:default:false"/>
</setAttribute>
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
@@ -25,11 +25,11 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dlogback.configurationFile=C:\UserData\logback-dev.xml&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.hsql.json&quot;"/>
<stringAttribute key="pde.version" value="3.3"/>
<setAttribute key="selected_features">
-<setEntry value="org.eclipse.osee.disposition.feature:default"/>
-<setEntry value="org.eclipse.osee.orcs.feature:default"/>
<setEntry value="org.eclipse.osee.ats.server.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.external.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.feature:default"/>
+<setEntry value="org.eclipse.osee.disposition.feature:default"/>
+<setEntry value="org.eclipse.osee.orcs.feature:default"/>
<setEntry value="org.eclipse.osee.server.external.feature:default"/>
<setEntry value="org.eclipse.osee.server.feature:default"/>
<setEntry value="org.eclipse.osee.server.legacy.feature:default"/>

Back to the top