diff options
| author | donald.g.dunne | 2015-12-15 17:06:41 +0000 |
|---|---|---|
| committer | Ryan T. Baldwin | 2015-12-15 17:06:41 +0000 |
| commit | fad7bd1e56e6d597fa440de342e1f03f7b3a27e6 (patch) | |
| tree | 0b03718c15643af17bb7116a1d7d775a835446ce /plugins | |
| parent | cf9d7aa1e28328df42ec44a6275962bf9762cf4f (diff) | |
| download | org.eclipse.osee-fad7bd1e56e6d597fa440de342e1f03f7b3a27e6.tar.gz org.eclipse.osee-fad7bd1e56e6d597fa440de342e1f03f7b3a27e6.tar.xz org.eclipse.osee-fad7bd1e56e6d597fa440de342e1f03f7b3a27e6.zip | |
feature[ats_ATS263323]: Remove org.eclipse.osee.ats.impl
Change-Id: I153abd7f2d3473c169fca0e173c125c1f24098af
Diffstat (limited to 'plugins')
133 files changed, 276 insertions, 384 deletions
diff --git a/plugins/org.eclipse.osee.ats.impl/.classpath b/plugins/org.eclipse.osee.ats.impl/.classpath deleted file mode 100644 index 1fa3e6803d3..00000000000 --- a/plugins/org.eclipse.osee.ats.impl/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/plugins/org.eclipse.osee.ats.impl/.project b/plugins/org.eclipse.osee.ats.impl/.project deleted file mode 100644 index cb8076cd128..00000000000 --- a/plugins/org.eclipse.osee.ats.impl/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.osee.ats.impl</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ds.core.builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF deleted file mode 100644 index 20fe4f35309..00000000000 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ /dev/null @@ -1,52 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: ATS Implementation (Incubation) -Bundle-SymbolicName: org.eclipse.osee.ats.impl;singleton:=true -Bundle-Version: 0.24.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.cache;version="15.0.0", - javax.ws.rs;version="2.0.0", - javax.ws.rs.core;version="2.0.0", - org.codehaus.jackson;version="1.9.13", - org.codehaus.jackson.annotate;version="1.9.13", - org.codehaus.jackson.map;version="1.9.13", - org.eclipse.core.runtime, - org.eclipse.osee.ats.core.ai, - org.eclipse.osee.ats.core.config, - org.eclipse.osee.ats.core.insertion, - org.eclipse.osee.ats.core.model.impl, - org.eclipse.osee.ats.core.query, - org.eclipse.osee.ats.core.review, - org.eclipse.osee.ats.core.users, - org.eclipse.osee.ats.core.util, - org.eclipse.osee.ats.core.version, - org.eclipse.osee.ats.core.workdef, - org.eclipse.osee.ats.core.workflow, - org.eclipse.osee.ats.core.workflow.state, - org.eclipse.osee.framework.core.data, - org.eclipse.osee.framework.core.enums, - org.eclipse.osee.framework.core.exception, - org.eclipse.osee.framework.core.model, - org.eclipse.osee.framework.core.model.type, - org.eclipse.osee.framework.core.util, - org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.framework.logging, - org.eclipse.osee.jaxrs, - org.eclipse.osee.jaxrs.mvc, - org.eclipse.osee.jdbc, - org.eclipse.osee.logger, - org.eclipse.osee.mail.api, - org.eclipse.osee.orcs, - org.eclipse.osee.orcs.data, - org.eclipse.osee.orcs.rest.client, - org.eclipse.osee.orcs.search, - org.eclipse.osee.orcs.transaction -Service-Component: OSGI-INF/*.xml -Bundle-Vendor: Eclipse Open System Engineering Environment -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.osee.ats.impl, - org.eclipse.osee.ats.impl.config, - org.eclipse.osee.ats.impl.util, - org.eclipse.osee.ats.impl.workitem -Require-Bundle: org.eclipse.osee.ats.api diff --git a/plugins/org.eclipse.osee.ats.impl/build.properties b/plugins/org.eclipse.osee.ats.impl/build.properties deleted file mode 100644 index 3bfe9a1da92..00000000000 --- a/plugins/org.eclipse.osee.ats.impl/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/,\ - src/ -source.. = src/ diff --git a/plugins/org.eclipse.osee.ats.impl/pom.xml b/plugins/org.eclipse.osee.ats.impl/pom.xml deleted file mode 100644 index 81145327988..00000000000 --- a/plugins/org.eclipse.osee.ats.impl/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.ats.parent</artifactId> - <version>0.24.0-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath> - </parent> - - <artifactId>org.eclipse.osee.ats.impl</artifactId> - <packaging>eclipse-plugin</packaging> - <name>OSEE ATS Server Impl (Incubation)</name> - - <build> - <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> - <resources> - <resource> - <directory>src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> - -</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.impl.test/.classpath b/plugins/org.eclipse.osee.ats.rest.test/.classpath index 1fa3e6803d3..1fa3e6803d3 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/.classpath +++ b/plugins/org.eclipse.osee.ats.rest.test/.classpath diff --git a/plugins/org.eclipse.osee.ats.impl.test/.project b/plugins/org.eclipse.osee.ats.rest.test/.project index 317add82a5e..0bf7b7980f9 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/.project +++ b/plugins/org.eclipse.osee.ats.rest.test/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.osee.ats.impl.test</name> + <name>org.eclipse.osee.ats.rest.test</name> <comment></comment> <projects> </projects> diff --git a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF index 59b5e6dd7e9..f6f6b59e234 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest.test/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ATS Work Definition Impl Test (Incubation) -Bundle-SymbolicName: org.eclipse.osee.ats.impl.test +Bundle-Name: ATS Work Definition Rest Test (Incubation) +Bundle-SymbolicName: org.eclipse.osee.ats.rest.test Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-Version: 0.24.0.qualifier -Fragment-Host: org.eclipse.osee.ats.impl +Fragment-Host: org.eclipse.osee.ats.rest Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.emf.common.util, org.eclipse.osee.ats.api.workdef, diff --git a/plugins/org.eclipse.osee.ats.impl.test/build.properties b/plugins/org.eclipse.osee.ats.rest.test/build.properties index 34d2e4d2dad..34d2e4d2dad 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/build.properties +++ b/plugins/org.eclipse.osee.ats.rest.test/build.properties diff --git a/plugins/org.eclipse.osee.ats.impl.test/pom.xml b/plugins/org.eclipse.osee.ats.rest.test/pom.xml index c0d8894c75a..b07020bf59a 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/pom.xml +++ b/plugins/org.eclipse.osee.ats.rest.test/pom.xml @@ -10,7 +10,7 @@ <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath> </parent> - <artifactId>org.eclipse.osee.ats.impl.test</artifactId> + <artifactId>org.eclipse.osee.ats.rest.test</artifactId> <packaging>eclipse-test-plugin</packaging> <name>OSEE ATS Server Impl Test(Incubation)</name> @@ -21,8 +21,8 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <testSuite>org.eclipse.osee.ats.impl.test</testSuite> - <testClass>org.eclipse.osee.ats.impl.AllAtsImplTestSuite</testClass> + <testSuite>org.eclipse.osee.ats.rest.test</testSuite> + <testClass>org.eclipse.osee.ats.rest.AllAtsImplTestSuite</testClass> </configuration> </plugin> </plugins> diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/AllAtsImplTestSuite.java index 4e2bea2cf7f..478eb776141 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/AllAtsImplTestSuite.java +++ b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/AllAtsImplTestSuite.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl; +package org.eclipse.osee.ats.rest; -import org.eclipse.osee.ats.impl.internal.notify.AtsImpl_Notify_Suite; -import org.eclipse.osee.ats.impl.util.AtsImpl_Util_Suite; +import org.eclipse.osee.ats.rest.internal.notify.AtsImpl_Notify_Suite; +import org.eclipse.osee.ats.rest.util.AtsImpl_Util_Suite; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/notify/AtsImpl_Notify_Suite.java b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/internal/notify/AtsImpl_Notify_Suite.java index 5638a54a986..32eada2527a 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/notify/AtsImpl_Notify_Suite.java +++ b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/internal/notify/AtsImpl_Notify_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/notify/WorkItemNotificationProcessorTest.java b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessorTest.java index a940e6182f0..d1933a77c7e 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/notify/WorkItemNotificationProcessorTest.java +++ b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessorTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -33,7 +33,8 @@ import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.notify.WorkItemNotificationProcessor; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsApi; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/util/AtsImpl_Util_Suite.java b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/util/AtsImpl_Util_Suite.java index 58b4c5da8fa..ef4c16e3bd7 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/util/AtsImpl_Util_Suite.java +++ b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/util/AtsImpl_Util_Suite.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.util; +package org.eclipse.osee.ats.rest.util; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.junit.AfterClass; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/util/WorkflowRuleRunnerTest.java b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/util/WorkflowRuleRunnerTest.java index bab286de20e..eb84bca2ebc 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/util/WorkflowRuleRunnerTest.java +++ b/plugins/org.eclipse.osee.ats.rest.test/src/org/eclipse/osee/ats/rest/util/WorkflowRuleRunnerTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.util; +package org.eclipse.osee.ats.rest.util; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -31,7 +31,8 @@ import org.eclipse.osee.ats.api.workdef.RuleEventType; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.WorkflowRuleRunner; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF index 6f2fea3671c..f82f5ff1135 100644 --- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Osee Ats Rest(Incubation) +Bundle-Name: Osee Ats Rest (Incubation) Bundle-SymbolicName: org.eclipse.osee.ats.rest Bundle-Version: 0.24.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -9,7 +9,8 @@ Service-Component: OSGI-INF/*.xml Osee-JaxRs-Resource: /web/*;path=/ats/cpa/ui, OSEE-INF/web/*;path=/ats Osee-Template: OSEE-INF/templates/*.html -Import-Package: com.google.gson;version="2.1.0", +Import-Package: com.google.common.cache, + com.google.gson;version="2.1.0", com.lowagie.text, com.lowagie.text.html, com.lowagie.text.rtf.table, @@ -17,30 +18,39 @@ Import-Package: com.google.gson;version="2.1.0", javax.ws.rs.core, javax.ws.rs.ext, org.codehaus.jackson;version="1.9.13", + org.codehaus.jackson.annotate;version="1.9.13", org.codehaus.jackson.map;version="1.9.13", + org.eclipse.core.runtime;version="3.5.0", + org.eclipse.osee.ats.core.ai, org.eclipse.osee.ats.core.column, org.eclipse.osee.ats.core.config, org.eclipse.osee.ats.core.cpa, + org.eclipse.osee.ats.core.insertion, + org.eclipse.osee.ats.core.model.impl, + org.eclipse.osee.ats.core.query, + org.eclipse.osee.ats.core.review, org.eclipse.osee.ats.core.users, org.eclipse.osee.ats.core.util, + org.eclipse.osee.ats.core.version, + org.eclipse.osee.ats.core.workdef, + org.eclipse.osee.ats.core.workflow, org.eclipse.osee.ats.core.workflow.state, org.eclipse.osee.ats.core.workflow.transition, - org.eclipse.osee.ats.impl, - org.eclipse.osee.ats.impl.config, - org.eclipse.osee.ats.impl.util, - org.eclipse.osee.ats.impl.workitem, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.change, org.eclipse.osee.framework.core.util, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.io.xml, + org.eclipse.osee.framework.logging, org.eclipse.osee.jaxrs, org.eclipse.osee.jaxrs.mvc, org.eclipse.osee.jdbc, org.eclipse.osee.logger, + org.eclipse.osee.mail.api, org.eclipse.osee.orcs, org.eclipse.osee.orcs.data, org.eclipse.osee.orcs.search, @@ -50,3 +60,5 @@ Import-Package: com.google.gson;version="2.1.0", org.json, org.osgi.framework;version="1.7.0" Require-Bundle: org.eclipse.osee.ats.api +Export-Package: org.eclipse.osee.ats.rest, + org.eclipse.osee.ats.rest.util diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.attribute.resolver.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.attribute.resolver.xml index f255056c8b9..890ab0db0d0 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.attribute.resolver.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.attribute.resolver.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop"> - <implementation class="org.eclipse.osee.ats.impl.internal.util.AtsAttributeResolverServiceImpl"/> + <implementation class="org.eclipse.osee.ats.rest.internal.util.AtsAttributeResolverServiceImpl"/> <service> <provide interface="org.eclipse.osee.ats.api.workdef.IAttributeResolver"/> </service> diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.no.op.notifier.service.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.no.op.notifier.service.xml index af0eecd9329..d209c6aae48 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.no.op.notifier.service.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.no.op.notifier.service.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"> - <implementation class="org.eclipse.osee.ats.impl.internal.notify.NoOpAtsNotifierServiceImpl"/> + <implementation class="org.eclipse.osee.ats.rest.internal.notify.NoOpAtsNotifierServiceImpl"/> <service> - <provide interface="org.eclipse.osee.ats.impl.internal.notify.IAtsNotifierServer"/> + <provide interface="org.eclipse.osee.ats.rest.util.IAtsNotifierServer"/> </service> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.notification.service.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.notification.service.xml index e88cb8f86be..f795758bc57 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.notification.service.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.notification.service.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"> - <implementation class="org.eclipse.osee.ats.impl.internal.notify.AtsNotifierServiceImpl"/> - <service> - <provide interface="org.eclipse.osee.ats.impl.internal.notify.IAtsNotifierServer"/> - </service> + <implementation class="org.eclipse.osee.ats.rest.internal.notify.AtsNotifierServiceImpl"/> <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> <reference bind="setMailService" cardinality="1..1" interface="org.eclipse.osee.mail.api.MailService" name="MailService" policy="static"/> <reference bind="setUserService" cardinality="1..1" interface="org.eclipse.osee.ats.api.user.IAtsUserService" name="IAtsUserService" policy="static"/> + <service> + <provide interface="org.eclipse.osee.ats.rest.util.IAtsNotifierServer"/> + </service> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml index 762f940d456..4715d64c385 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.rest.application.xml @@ -6,6 +6,6 @@ </service> <reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/> <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> <reference bind="setCpaServiceRegistry" cardinality="1..1" interface="org.eclipse.osee.ats.rest.internal.cpa.CpaServiceRegistry" name="CpaServiceRegistry" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.server.service.xml index 66617a0a915..2dcccb79fba 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.server.service.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop"> - <implementation class="org.eclipse.osee.ats.impl.internal.AtsServerImpl"/> + <implementation class="org.eclipse.osee.ats.rest.internal.AtsServerImpl"/> <service> - <provide interface="org.eclipse.osee.ats.impl.IAtsServer"/> + <provide interface="org.eclipse.osee.ats.rest.IAtsServer"/> </service> - <reference bind="addNotifier" cardinality="1..n" interface="org.eclipse.osee.ats.impl.internal.notify.IAtsNotifierServer" name="IAtsNotifierServer" policy="dynamic" unbind="removeNotifier"/> + <reference bind="addNotifier" cardinality="1..n" interface="org.eclipse.osee.ats.rest.util.IAtsNotifierServer" name="IAtsNotifierServer" policy="dynamic" unbind="removeNotifier"/> <reference bind="addAtsDatabaseConversion" cardinality="0..n" interface="org.eclipse.osee.ats.api.util.IAtsDatabaseConversion" name="IAtsDatabaseConversion" policy="dynamic" unbind="removeAtsDatabaseConversion"/> <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> <reference bind="setJdbcService" cardinality="1..1" interface="org.eclipse.osee.jdbc.JdbcService" name="JdbcService" policy="static" target="(osgi.binding=orcs.jdbc.service)"/> diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.user.service.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.user.service.xml index 36dc1047db1..fa5f987c084 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.user.service.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.user.service.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop"> - <implementation class="org.eclipse.osee.ats.impl.internal.user.AtsUserServiceImpl"/> + <implementation class="org.eclipse.osee.ats.rest.internal.user.AtsUserServiceImpl"/> <service> <provide interface="org.eclipse.osee.ats.api.user.IAtsUserService"/> </service> diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.workdef.store.service.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.workdef.store.service.xml index 044375303ca..b06da9113db 100644 --- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.workdef.store.service.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/ats.workdef.store.service.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" > - <implementation class="org.eclipse.osee.ats.impl.internal.workdef.AtsWorkDefinitionStoreImpl"/> + <implementation class="org.eclipse.osee.ats.rest.internal.workdef.AtsWorkDefinitionStoreImpl"/> <service> <provide interface="org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionStore"/> </service> diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/config.json.writer.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/config.json.writer.xml index 602ec02fd88..4f438ab0b68 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/config.json.writer.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/config.json.writer.xml @@ -5,5 +5,5 @@ <provide interface="java.lang.Object"/> <provide interface="javax.ws.rs.ext.MessageBodyWriter"/> </service> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/configs.json.writer.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/configs.json.writer.xml index 55995042a71..db6a05664b5 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/configs.json.writer.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/configs.json.writer.xml @@ -5,5 +5,5 @@ <provide interface="java.lang.Object"/> <provide interface="javax.ws.rs.ext.MessageBodyWriter"/> </service> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItem.json.writer.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItem.json.writer.xml index 078ed3772f6..494182e75a0 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItem.json.writer.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItem.json.writer.xml @@ -5,5 +5,5 @@ <provide interface="java.lang.Object"/> <provide interface="javax.ws.rs.ext.MessageBodyWriter"/> </service> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItems.json.writer.xml b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItems.json.writer.xml index 781f60b6453..0f8e8c019be 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItems.json.writer.xml +++ b/plugins/org.eclipse.osee.ats.rest/OSGI-INF/workItems.json.writer.xml @@ -5,5 +5,5 @@ <provide interface="java.lang.Object"/> <provide interface="javax.ws.rs.ext.MessageBodyWriter"/> </service> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/IAtsServer.java index 89ccf067753..f9c060c8154 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/IAtsServer.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl; +package org.eclipse.osee.ats.rest; import java.util.Collection; import java.util.List; @@ -33,6 +33,7 @@ import org.eclipse.osee.ats.api.workflow.log.IAtsLogFactory; import org.eclipse.osee.ats.api.workflow.state.IAtsStateFactory; import org.eclipse.osee.ats.core.config.IAtsConfigProvider; import org.eclipse.osee.ats.core.util.IAtsActionFactory; +import org.eclipse.osee.ats.rest.util.IArtifactProvider; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.orcs.OrcsApi; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java index a8a522e50e4..c292e3f96aa 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java @@ -14,7 +14,7 @@ import java.util.HashSet; import java.util.Set; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.agile.AgileEndpointImpl; import org.eclipse.osee.ats.rest.internal.config.ActionableItemResource; import org.eclipse.osee.ats.rest.internal.config.AtsConfigEndpointImpl; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java index 26aaddd963e..32b2ebcdc0d 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal; +package org.eclipse.osee.ats.rest.internal; import java.util.ArrayList; import java.util.Collection; @@ -65,30 +65,30 @@ import org.eclipse.osee.ats.core.util.IAtsActionFactory; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionAdminImpl; import org.eclipse.osee.ats.core.workflow.AtsWorkItemServiceImpl; import org.eclipse.osee.ats.core.workflow.TeamWorkflowProviders; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.agile.AgileService; -import org.eclipse.osee.ats.impl.internal.convert.ConvertBaselineGuidToBaselineUuid; -import org.eclipse.osee.ats.impl.internal.convert.ConvertFavoriteBranchGuidToUuid; -import org.eclipse.osee.ats.impl.internal.notify.AtsNotificationEventProcessor; -import org.eclipse.osee.ats.impl.internal.notify.AtsNotifierServiceImpl; -import org.eclipse.osee.ats.impl.internal.notify.IAtsNotifierServer; -import org.eclipse.osee.ats.impl.internal.notify.WorkItemNotificationProcessor; -import org.eclipse.osee.ats.impl.internal.query.AtsQueryServiceIimpl; -import org.eclipse.osee.ats.impl.internal.util.ArtifactResolverImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsArtifactConfigCache; -import org.eclipse.osee.ats.impl.internal.util.AtsAttributeResolverServiceImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsBranchServiceImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsRelationResolverServiceImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsReviewServiceImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsStoreServiceImpl; -import org.eclipse.osee.ats.impl.internal.util.AtsWorkDefinitionCacheProvider; -import org.eclipse.osee.ats.impl.internal.workitem.AtsProgramService; -import org.eclipse.osee.ats.impl.internal.workitem.AtsTaskService; -import org.eclipse.osee.ats.impl.internal.workitem.AtsTeamDefinitionService; -import org.eclipse.osee.ats.impl.internal.workitem.AtsVersionServiceImpl; -import org.eclipse.osee.ats.impl.internal.workitem.ChangeTypeUtil; -import org.eclipse.osee.ats.impl.internal.workitem.ConfigItemFactory; -import org.eclipse.osee.ats.impl.internal.workitem.WorkItemFactory; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.agile.AgileService; +import org.eclipse.osee.ats.rest.internal.convert.ConvertBaselineGuidToBaselineUuid; +import org.eclipse.osee.ats.rest.internal.convert.ConvertFavoriteBranchGuidToUuid; +import org.eclipse.osee.ats.rest.internal.notify.AtsNotificationEventProcessor; +import org.eclipse.osee.ats.rest.internal.notify.AtsNotifierServiceImpl; +import org.eclipse.osee.ats.rest.internal.notify.WorkItemNotificationProcessor; +import org.eclipse.osee.ats.rest.internal.query.AtsQueryServiceIimpl; +import org.eclipse.osee.ats.rest.internal.util.ArtifactResolverImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsArtifactConfigCache; +import org.eclipse.osee.ats.rest.internal.util.AtsAttributeResolverServiceImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsBranchServiceImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsRelationResolverServiceImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsReviewServiceImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsStoreServiceImpl; +import org.eclipse.osee.ats.rest.internal.util.AtsWorkDefinitionCacheProvider; +import org.eclipse.osee.ats.rest.internal.util.ChangeTypeUtil; +import org.eclipse.osee.ats.rest.internal.workitem.AtsProgramService; +import org.eclipse.osee.ats.rest.internal.workitem.AtsTaskService; +import org.eclipse.osee.ats.rest.internal.workitem.AtsTeamDefinitionService; +import org.eclipse.osee.ats.rest.internal.workitem.AtsVersionServiceImpl; +import org.eclipse.osee.ats.rest.internal.workitem.ConfigItemFactory; +import org.eclipse.osee.ats.rest.internal.workitem.WorkItemFactory; +import org.eclipse.osee.ats.rest.util.IAtsNotifierServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java index 4f156291ee6..b1c48d7f9b2 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java @@ -40,7 +40,7 @@ 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.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.jdk.core.type.ClassBasedResourceToken; import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFactory.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileFactory.java index 5283fe21d16..be207cb0f36 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFactory.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileFactory.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile; import java.util.Arrays; import java.util.Date; @@ -28,8 +28,13 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileBacklog; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileFeatureGroup; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileSprint; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileTeam; +import org.eclipse.osee.ats.rest.internal.agile.util.AgileFolders; +import org.eclipse.osee.ats.rest.internal.util.AtsChangeSet; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.util.GUID; 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.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileService.java index 41f06397361..88db7b54e27 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileService.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileService.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile; import java.util.ArrayList; import java.util.Collection; @@ -30,7 +30,11 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; 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.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileBacklog; +import org.eclipse.osee.ats.rest.internal.agile.util.AgileBacklogWriter; +import org.eclipse.osee.ats.rest.internal.agile.util.AgileFolders; +import org.eclipse.osee.ats.rest.internal.agile.util.AgileItemWriter; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreBranches; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java index 771ec38d43e..50ca855660f 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; import java.util.TreeMap; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.ResourceToken; import org.eclipse.osee.framework.jdk.core.type.ResultSet; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileBacklog.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileBacklog.java index a61a350b9df..a626bb9f19b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileBacklog.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileBacklog.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.model; import org.eclipse.osee.ats.api.agile.IAgileBacklog; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.workitem.WorkItem; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.workitem.model.WorkItem; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFeatureGroup.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileFeatureGroup.java index a3c71687931..2cfe82accc6 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFeatureGroup.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileFeatureGroup.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.model; import org.eclipse.osee.ats.api.agile.IAgileFeatureGroup; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.model.impl.AtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileItem.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileItem.java index e8ad9e3607b..77e587a579c 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileItem.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileItem.java @@ -8,11 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.model; import org.eclipse.osee.ats.api.agile.IAgileItem; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.workitem.WorkItem; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.workitem.model.WorkItem; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileSprint.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileSprint.java index 53e973f6ad7..75a720a706b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileSprint.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileSprint.java @@ -8,12 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.model; import org.eclipse.osee.ats.api.agile.IAgileSprint; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.workitem.WorkItem; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.workitem.model.WorkItem; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileTeam.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileTeam.java index c2feaa6aa79..5778d967c34 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileTeam.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/model/AgileTeam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.model; import java.util.ArrayList; import java.util.List; @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.agile.IAgileTeam; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.model.impl.AtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileBacklogWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileBacklogWriter.java index 6cfaef6cc5c..8c3743c9bbe 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileBacklogWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileBacklogWriter.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.util; import org.eclipse.osee.ats.api.agile.AgileUtil; import org.eclipse.osee.ats.api.agile.IAgileBacklog; @@ -18,8 +18,8 @@ import org.eclipse.osee.ats.api.agile.JaxAgileBacklog; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.AtsChangeSet; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFolders.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileFolders.java index e3a9fe6799c..d1a51f782a7 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileFolders.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileFolders.java @@ -8,13 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.util; import org.eclipse.osee.ats.api.agile.AgileUtil; import org.eclipse.osee.ats.api.data.AtsArtifactToken; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.AtsChangeSet; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileItemWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileItemWriter.java index 194fe7230e7..212a8f9cc04 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/agile/AgileItemWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/util/AgileItemWriter.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.agile; +package org.eclipse.osee.ats.rest.internal.agile.util; import java.util.Collection; import java.util.LinkedList; @@ -19,8 +19,8 @@ import org.eclipse.osee.ats.api.agile.IAgileSprint; import org.eclipse.osee.ats.api.agile.JaxAgileItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.AtsChangeSet; import org.eclipse.osee.orcs.data.ArtifactReadable; /** diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ActionableItemResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ActionableItemResource.java index 59dd29108d9..2f79bfa3150 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ActionableItemResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ActionableItemResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java index e7fe014ae95..ee8cd114837 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java @@ -33,7 +33,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.JaxAtsWorkDef; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.data.TokenFactory; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/BaseConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java index 48a5fc8b3ea..2370a05e114 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/BaseConfigEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.config; +package org.eclipse.osee.ats.rest.internal.config; import java.net.URI; import java.util.List; @@ -25,7 +25,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactToken; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java index 5df1f7d1f34..e5f2a28ccfa 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigJsonWriter.java @@ -27,7 +27,7 @@ import org.eclipse.osee.ats.api.insertion.IAtsInsertionActivity; import org.eclipse.osee.ats.api.program.IAtsProgram; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.jaxrs.mvc.IdentityView; @@ -49,7 +49,7 @@ public class ConfigJsonWriter implements MessageBodyWriter<IAtsConfigObject> { } public void start() { - jsonFactory = org.eclipse.osee.ats.impl.config.JsonFactory.create(); + jsonFactory = org.eclipse.osee.ats.rest.util.JsonFactory.create(); } public void stop() { diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigsJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigsJsonWriter.java index edc2cfa6dca..db7a3558471 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigsJsonWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConfigsJsonWriter.java @@ -14,7 +14,7 @@ import javax.ws.rs.ext.Provider; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.eclipse.osee.ats.api.IAtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.jaxrs.mvc.IdentityView; import org.eclipse.osee.orcs.data.AttributeTypes; @@ -33,7 +33,7 @@ public class ConfigsJsonWriter implements MessageBodyWriter<Collection<IAtsConfi } public void start() { - jsonFactory = org.eclipse.osee.ats.impl.config.JsonFactory.create(); + jsonFactory = org.eclipse.osee.ats.rest.util.JsonFactory.create(); } public void stop() { diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertCreateUpdateAtsConfig.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertCreateUpdateAtsConfig.java index 33247710d9a..710f1397c71 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertCreateUpdateAtsConfig.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertCreateUpdateAtsConfig.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.rest.internal.config; import org.eclipse.osee.ats.api.util.IAtsDatabaseConversion; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; /** diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertResource.java index b5de2c53de9..af191872ee5 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertResource.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; import org.eclipse.osee.ats.api.util.IAtsDatabaseConversion; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.util.RestUtil; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryEndpointImpl.java index 416df774813..4e691e22b6f 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryEndpointImpl.java @@ -23,8 +23,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.program.ProgramEndpointApi; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.BaseConfigEndpointImpl; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryResource.java index be2394da63e..a3bae72ca4c 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/CountryResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityEndpointImpl.java index 086b3014b39..efdaf9dbfa0 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityEndpointImpl.java @@ -23,8 +23,7 @@ import org.eclipse.osee.ats.api.insertion.InsertionActivityEndpointApi; import org.eclipse.osee.ats.api.insertion.JaxInsertionActivity; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.BaseConfigEndpointImpl; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityResource.java index eacfdd21186..01c7dd1ff94 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionActivityResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionEndpointImpl.java index 8f2b81deed5..5011f424d39 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionEndpointImpl.java @@ -24,8 +24,7 @@ import org.eclipse.osee.ats.api.insertion.InsertionEndpointApi; import org.eclipse.osee.ats.api.insertion.JaxInsertion; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.BaseConfigEndpointImpl; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionResource.java index de46f4bd4a8..8ef86b5e035 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/InsertionResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramEndpointImpl.java index 646834e683d..7f391363bc1 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramEndpointImpl.java @@ -24,8 +24,7 @@ import org.eclipse.osee.ats.api.program.JaxProgram; import org.eclipse.osee.ats.api.program.ProgramEndpointApi; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.BaseConfigEndpointImpl; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramResource.java index b6983d94f2d..f5e6a4f3d03 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ProgramResource.java @@ -34,8 +34,8 @@ import org.eclipse.osee.ats.api.insertion.IAtsInsertion; import org.eclipse.osee.ats.api.insertion.IAtsInsertionActivity; import org.eclipse.osee.ats.api.insertion.JaxInsertion; import org.eclipse.osee.ats.api.insertion.JaxInsertionActivity; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.jdk.core.type.ResultSet; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ReportResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ReportResource.java index 30fdb39b1e4..9a1101ec45b 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ReportResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ReportResource.java @@ -27,7 +27,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.ModificationType; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/TeamResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/TeamResource.java index 1599c7b7687..24ab6a079a7 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/TeamResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/TeamResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java index 083ea796fba..1092598482e 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.util.ColorColumns; import org.eclipse.osee.ats.core.column.ColorTeamColumn; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.util.RestUtil; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/VersionResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/VersionResource.java index 5913cfd8a07..02b3ac65ace 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/VersionResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/VersionResource.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.rest.internal.config; import javax.ws.rs.Path; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.config.AbstractConfigResource; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.AbstractConfigResource; /** * Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AbstractConvertGuidToUuid.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/AbstractConvertGuidToUuid.java index e31928c166e..14efe0a4599 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AbstractConvertGuidToUuid.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/AbstractConvertGuidToUuid.java @@ -8,11 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.convert; +package org.eclipse.osee.ats.rest.internal.convert; import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; import org.eclipse.osee.ats.api.util.IAtsDatabaseConversion; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java index 73b9b761a86..1042e8ebd3b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java @@ -8,13 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.convert; +package org.eclipse.osee.ats.rest.internal.convert; import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertFavoriteBranchGuidToUuid.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertFavoriteBranchGuidToUuid.java index 477e970da42..1620e591c26 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertFavoriteBranchGuidToUuid.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertFavoriteBranchGuidToUuid.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.convert; +package org.eclipse.osee.ats.rest.internal.convert; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaDuplicator.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaDuplicator.java index 0153f5cd487..56a375a84d7 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaDuplicator.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaDuplicator.java @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.workflow.transition.TransitionManager; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java index 6f62919e607..4cb6fd6685c 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java @@ -34,7 +34,7 @@ import org.eclipse.osee.ats.api.cpa.DecisionUpdate; import org.eclipse.osee.ats.api.cpa.DuplicateCpa; import org.eclipse.osee.ats.api.cpa.IAtsCpaService; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.jaxrs.OseeWebApplicationException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaUtil.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaUtil.java index 81d4deeda6a..ff2a73e058f 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaUtil.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaUtil.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.rest.internal.cpa; import javax.ws.rs.core.UriBuilder; import org.eclipse.osee.ats.core.cpa.CpaFactory; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; /** * @author Donald G. dunne diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionLoader.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionLoader.java index b7902ecc0dc..37638faf194 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionLoader.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionLoader.java @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.cpa.CpaFactory; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.Conditions; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionUpdater.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionUpdater.java index 6e8e60abfe0..76b0dc977a7 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionUpdater.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/DecisionUpdater.java @@ -25,7 +25,7 @@ import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionFactory; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/AtsNotificationEventProcessor.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotificationEventProcessor.java index 7453f238f94..1911ac526d7 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/AtsNotificationEventProcessor.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotificationEventProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import java.util.List; import org.eclipse.osee.ats.api.notify.AtsNotificationCollector; @@ -16,6 +16,7 @@ import org.eclipse.osee.ats.api.notify.AtsNotificationEvent; import org.eclipse.osee.ats.api.notify.AtsWorkItemNotificationEvent; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; +import org.eclipse.osee.ats.rest.util.IAtsNotifierServer; import org.eclipse.osee.framework.jdk.core.util.EmailUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/AtsNotifierServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifierServiceImpl.java index b77490a8cb6..cc64f1c5e86 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/AtsNotifierServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifierServiceImpl.java @@ -8,11 +8,12 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import java.util.Collection; import org.eclipse.osee.ats.api.notify.AtsNotificationEvent; import org.eclipse.osee.ats.api.user.IAtsUserService; +import org.eclipse.osee.ats.rest.util.IAtsNotifierServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.mail.api.MailService; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifyEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifyEndpointImpl.java index 983e56136b3..d548720d0da 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifyEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/AtsNotifyEndpointImpl.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.rest.internal.notify; import javax.ws.rs.core.Response; import org.eclipse.osee.ats.api.notify.AtsNotificationCollector; import org.eclipse.osee.ats.api.notify.AtsNotifyEndpointApi; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/NoOpAtsNotifierServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/NoOpAtsNotifierServiceImpl.java index 8be1b4e26f7..6aa93b22640 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/NoOpAtsNotifierServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/NoOpAtsNotifierServiceImpl.java @@ -8,10 +8,11 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import java.util.Collection; import org.eclipse.osee.ats.api.notify.AtsNotificationEvent; +import org.eclipse.osee.ats.rest.util.IAtsNotifierServer; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/SendNotificationEvents.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/SendNotificationEvents.java index 598d7aa7941..474c73d287f 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/SendNotificationEvents.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/SendNotificationEvents.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/WorkItemNotificationProcessor.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java index ade057c4e2f..af3aaf3b02d 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/WorkItemNotificationProcessor.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/notify/WorkItemNotificationProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.internal.notify; import java.util.ArrayList; import java.util.Arrays; @@ -36,7 +36,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.review.UserRoleManager; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.users.AtsUsersUtility; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.EmailUtil; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java index 8014d21e4db..f768228d4d5 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.query; +package org.eclipse.osee.ats.rest.internal.query; import java.util.ArrayList; import java.util.Collection; @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.query.AbstractAtsQueryImpl; import org.eclipse.osee.ats.core.query.AtsAttributeQuery; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.HasLocalId; import org.eclipse.osee.framework.core.data.IArtifactType; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryServiceIimpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryServiceIimpl.java index bf2f3820404..951fbb7fc33 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/query/AtsQueryServiceIimpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryServiceIimpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.query; +package org.eclipse.osee.ats.rest.internal.query; import java.util.Collection; import java.util.ArrayList; @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.api.query.IAtsWorkItemFilter; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workflow.WorkItemType; import org.eclipse.osee.ats.core.query.AtsWorkItemFilter; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/user/AtsUser.java index 654be5a8008..d4ffab8f92c 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/user/AtsUser.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.user; +package org.eclipse.osee.ats.rest.internal.user; import javax.xml.bind.annotation.XmlRootElement; import org.codehaus.jackson.annotate.JsonIgnore; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUserServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/user/AtsUserServiceImpl.java index 161964f6f01..955bd949fc2 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUserServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/user/AtsUserServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.user; +package org.eclipse.osee.ats.rest.internal.user; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java index 09121d8235a..a846af0425c 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java @@ -26,7 +26,7 @@ import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeWrappedException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/ArtifactResolverImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ArtifactResolverImpl.java index 1db808492c5..cdcb36b8404 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/ArtifactResolverImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ArtifactResolverImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsArtifactConfigCache.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsArtifactConfigCache.java index 3b6bd36aaf7..f513deb7465 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsArtifactConfigCache.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsArtifactConfigCache.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.List; import java.util.concurrent.Callable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsAttributeResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsAttributeResolverServiceImpl.java index c170ec1e9ea..63c7cd6b5e2 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsAttributeResolverServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsAttributeResolverServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsBranchServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java index a7538b4f1bc..7bb709db67d 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsBranchServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java index b5e0d4523c8..81d224afea9 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsChangeSet.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.Collection; import java.util.HashSet; @@ -27,8 +27,7 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsStateFactory; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.util.AbstractAtsChangeSet; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.util.WorkflowRuleRunner; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.AttributeId; import org.eclipse.osee.framework.core.data.IArtifactType; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsRelationResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java index c43a4f09338..99c230b8b5b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsRelationResolverServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; @@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.workdef.IRelationResolver; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsReviewServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsReviewServiceImpl.java index 3065cd8b033..d8116471b05 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsReviewServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsReviewServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; @@ -25,8 +25,8 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; -import org.eclipse.osee.ats.impl.IArtifactProvider; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.util.IArtifactProvider; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsStoreServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsStoreServiceImpl.java index fc14f3a5287..f69060db9ea 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsStoreServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsStoreServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; @@ -27,7 +27,7 @@ import org.eclipse.osee.ats.api.workflow.log.IAtsLogFactory; import org.eclipse.osee.ats.api.workflow.state.IAtsStateFactory; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.orcs.data.ArtifactReadable; /** diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsWorkDefinitionCacheProvider.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsWorkDefinitionCacheProvider.java index 38049e4f91f..56f99c24bda 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AtsWorkDefinitionCacheProvider.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsWorkDefinitionCacheProvider.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.concurrent.Callable; import java.util.concurrent.FutureTask; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeIdWrapper.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeIdWrapper.java index 47bbe64969d..d048808a949 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeIdWrapper.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeIdWrapper.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import org.eclipse.osee.ats.api.workflow.IAttribute; import org.eclipse.osee.framework.core.data.AttributeId; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeTypeToXWidgetName.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeTypeToXWidgetName.java index da3eebce697..bbc34a7c3d8 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeTypeToXWidgetName.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeTypeToXWidgetName.java @@ -1,4 +1,4 @@ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeWrapper.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeWrapper.java index 12f6e59cf7e..29e214e817b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/AttributeWrapper.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AttributeWrapper.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import org.eclipse.osee.ats.api.workflow.IAttribute; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ChangeTypeUtil.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ChangeTypeUtil.java index 242c26b4982..9ded7a27f2f 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ChangeTypeUtil.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ChangeTypeUtil.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.util; import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/LoadAtsWorkDefinitionCacheCallable.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/LoadAtsWorkDefinitionCacheCallable.java index 884afe638b0..8b4d29ddd33 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/util/LoadAtsWorkDefinitionCacheCallable.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/LoadAtsWorkDefinitionCacheCallable.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.concurrent.Callable; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/RestUtil.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/RestUtil.java index bba383d73ca..26b2e8ff5d0 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/RestUtil.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/RestUtil.java @@ -18,7 +18,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriBuilder; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.AtsApplication; import org.eclipse.osee.framework.jdk.core.type.ViewModel; import org.eclipse.osee.framework.jdk.core.util.Lib; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/util/WorkflowRuleRunner.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/WorkflowRuleRunner.java index 83f5b329d5d..672e605f3ba 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/util/WorkflowRuleRunner.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/WorkflowRuleRunner.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.util; +package org.eclipse.osee.ats.rest.internal.util; import java.util.List; import java.util.logging.Level; @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.workdef.IExecutableRule; import org.eclipse.osee.ats.api.workdef.RuleEventType; import org.eclipse.osee.ats.api.workdef.RunRuleResults; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.logging.OseeLog; /** diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workdef/AtsWorkDefinitionStoreImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workdef/AtsWorkDefinitionStoreImpl.java index 7a1f71dc09a..09d744389ba 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workdef/AtsWorkDefinitionStoreImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workdef/AtsWorkDefinitionStoreImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workdef; +package org.eclipse.osee.ats.rest.internal.workdef; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ActionUiResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ActionUiResource.java index 945739fb4c8..b5cd1ae4633 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ActionUiResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ActionUiResource.java @@ -21,7 +21,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.util.ActionPage; import org.eclipse.osee.ats.rest.internal.util.RestUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java index 80eaf5141d3..de0e1bd9b0a 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java @@ -36,7 +36,7 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.AtsActionEndpointApi; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.util.RestUtil; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsProgramService.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsProgramService.java index a2cf45ab5e5..2664e10ac48 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsProgramService.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsProgramService.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -29,7 +29,7 @@ import org.eclipse.osee.ats.api.program.IAtsProgram; import org.eclipse.osee.ats.api.program.IAtsProgramService; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsRuleEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsRuleEndpointImpl.java index 9f34299b7e4..a0c5add60ef 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsRuleEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsRuleEndpointImpl.java @@ -29,8 +29,8 @@ import org.eclipse.osee.ats.api.workdef.RunRuleData; import org.eclipse.osee.ats.api.workdef.RunRuleResults; import org.eclipse.osee.ats.api.workflow.AtsRuleEndpointApi; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.util.WorkflowRuleRunner; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.WorkflowRuleRunner; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskEndpointImpl.java index c79091af1c9..b4ed84aa079 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskEndpointImpl.java @@ -24,8 +24,7 @@ import org.eclipse.osee.ats.api.task.NewTaskDatas; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.WorkItemType; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.workitem.CreateTasksOperation; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsTaskService.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskService.java index 88eee934db4..7260849ac37 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsTaskService.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTaskService.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import java.util.Collection; import java.util.Date; @@ -24,8 +24,7 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.workitem.CreateTasksOperation; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsTeamDefinitionService.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTeamDefinitionService.java index d78bf0074fa..018aef52de6 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsTeamDefinitionService.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsTeamDefinitionService.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import java.util.ArrayList; import java.util.Collection; @@ -14,7 +14,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.impl.internal.AtsServerImpl; +import org.eclipse.osee.ats.rest.internal.AtsServerImpl; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsVersionServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsVersionServiceImpl.java index 3d607b7c977..158cf755588 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsVersionServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsVersionServiceImpl.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.core.version.AbstractAtsVersionServiceImpl; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java index 4b4a6aed719..3f1ac67c788 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java @@ -32,7 +32,7 @@ import org.eclipse.osee.ats.api.util.ColorTeam; import org.eclipse.osee.ats.api.util.ColorTeams; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.WorkItemType; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ConfigItemFactory.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ConfigItemFactory.java index dcc0b39bbaf..d6eb3d9dac5 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ConfigItemFactory.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/ConfigItemFactory.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import org.eclipse.osee.ats.api.IAtsConfigObject; import org.eclipse.osee.ats.api.agile.IAgileFeatureGroup; @@ -30,8 +30,11 @@ import org.eclipse.osee.ats.core.config.Program; import org.eclipse.osee.ats.core.insertion.Insertion; import org.eclipse.osee.ats.core.insertion.InsertionActivity; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.util.AtsChangeSet; +import org.eclipse.osee.ats.rest.internal.workitem.model.ActionableItem; +import org.eclipse.osee.ats.rest.internal.workitem.model.TeamDefinition; +import org.eclipse.osee.ats.rest.internal.workitem.model.Version; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/workitem/CreateTasksOperation.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java index e660beb6316..1d785c4a95b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/workitem/CreateTasksOperation.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.WorkItemType; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsUtilCore; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/StateResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/StateResource.java index 0e1a4fe875c..d894a817c40 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/StateResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/StateResource.java @@ -25,7 +25,7 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.workflow.transition.TransitionFactory; import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.util.RestUtil; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItemFactory.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemFactory.java index adf72aad4cd..adfb663f1c4 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItemFactory.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemFactory.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.agile.IAgileBacklog; @@ -22,10 +22,15 @@ import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsGoal; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.impl.internal.action.Action; -import org.eclipse.osee.ats.impl.internal.agile.AgileBacklog; -import org.eclipse.osee.ats.impl.internal.agile.AgileSprint; +import org.eclipse.osee.ats.rest.IAtsServer; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileBacklog; +import org.eclipse.osee.ats.rest.internal.agile.model.AgileSprint; +import org.eclipse.osee.ats.rest.internal.workitem.model.Action; +import org.eclipse.osee.ats.rest.internal.workitem.model.DecisionReview; +import org.eclipse.osee.ats.rest.internal.workitem.model.Goal; +import org.eclipse.osee.ats.rest.internal.workitem.model.PeerToPeerReview; +import org.eclipse.osee.ats.rest.internal.workitem.model.Task; +import org.eclipse.osee.ats.rest.internal.workitem.model.TeamWorkflow; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.logger.Log; @@ -111,7 +116,7 @@ public class WorkItemFactory implements IAtsWorkItemFactory { ArtifactReadable artRead = (ArtifactReadable) artifact; if (artRead.isOfType(AtsArtifactTypes.AbstractWorkflowArtifact)) { item = - new org.eclipse.osee.ats.impl.internal.agile.AgileItem(logger, atsServer, (ArtifactReadable) artifact); + new org.eclipse.osee.ats.rest.internal.agile.model.AgileItem(logger, atsServer, (ArtifactReadable) artifact); } } return item; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java index 1c222e88d20..c482b54afed 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java @@ -26,7 +26,7 @@ import org.codehaus.jackson.JsonProcessingException; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.ats.rest.internal.config.ConfigJsonWriter; import org.eclipse.osee.ats.rest.internal.util.ActionPage; import org.eclipse.osee.ats.rest.internal.util.RestUtil; @@ -50,7 +50,7 @@ public class WorkItemJsonWriter implements MessageBodyWriter<IAtsWorkItem> { } public void start() { - jsonFactory = org.eclipse.osee.ats.impl.config.JsonFactory.create(); + jsonFactory = org.eclipse.osee.ats.rest.util.JsonFactory.create(); } public void stop() { diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemsJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemsJsonWriter.java index caea2438b05..afb4c74bdb5 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemsJsonWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemsJsonWriter.java @@ -23,7 +23,7 @@ import javax.ws.rs.ext.Provider; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.jaxrs.mvc.IdentityView; import org.eclipse.osee.orcs.data.AttributeTypes; @@ -43,7 +43,7 @@ public class WorkItemsJsonWriter implements MessageBodyWriter<Collection<IAtsWor } public void start() { - jsonFactory = org.eclipse.osee.ats.impl.config.JsonFactory.create(); + jsonFactory = org.eclipse.osee.ats.rest.util.JsonFactory.create(); } public void stop() { diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AbstractReview.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/AbstractReview.java index 7ed8b90e328..bb64a555627 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AbstractReview.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/AbstractReview.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.review.IAtsAbstractReview; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/action/Action.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Action.java index e0f4ee849d1..6c6c381d0bb 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/action/Action.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Action.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.action; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.model.impl.AtsObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ActionableItem.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/ActionableItem.java index d43da30c6d6..80d8011b66e 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/ActionableItem.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/ActionableItem.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.ArrayList; import java.util.Collection; @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.model.impl.AtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.ResultSet; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/DecisionReview.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/DecisionReview.java index 07920d23d37..ae83f1169e1 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/DecisionReview.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/DecisionReview.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import org.eclipse.osee.ats.api.review.IAtsDecisionReview; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Goal.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Goal.java index 6e24eb8e8c4..3869a8e0657 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Goal.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Goal.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import org.eclipse.osee.ats.api.workflow.IAtsGoal; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/PeerToPeerReview.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/PeerToPeerReview.java index d75f99a3271..b11e9920e51 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/PeerToPeerReview.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/PeerToPeerReview.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Task.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Task.java index 5bddce0fffd..190955b27a5 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Task.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Task.java @@ -8,10 +8,10 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import org.eclipse.osee.ats.api.workflow.IAtsTask; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/TeamDefinition.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/TeamDefinition.java index 0d2980bcede..5fb5bb1d87d 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/TeamDefinition.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/TeamDefinition.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.version.VersionLockedType; import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.model.impl.AtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/TeamWorkflow.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/TeamWorkflow.java index b07c29580df..a37b63a1422 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/TeamWorkflow.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/TeamWorkflow.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Version.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Version.java index 3c1e27ee70a..0f68f9b6347 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/Version.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/Version.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.ArrayList; import java.util.Date; @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.model.impl.AtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/WorkItem.java index 515e9508d5f..038df26900b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/model/WorkItem.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.workitem; +package org.eclipse.osee.ats.rest.internal.workitem.model; import java.util.Date; import java.util.List; @@ -28,7 +28,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.log.IAtsLog; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.model.impl.AtsObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/AbstractConfigResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/AbstractConfigResource.java index 35c414f66c1..11394b01e18 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/AbstractConfigResource.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/AbstractConfigResource.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.config; +package org.eclipse.osee.ats.rest.util; import java.util.ArrayList; import java.util.List; @@ -18,7 +18,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.eclipse.osee.ats.api.IAtsConfigObject; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.jaxrs.mvc.IdentityView; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IArtifactProvider.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/IArtifactProvider.java index 9e684113098..5693db3a78b 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IArtifactProvider.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/IArtifactProvider.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl; +package org.eclipse.osee.ats.rest.util; import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.core.data.ArtifactId; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/IAtsNotifierServer.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/IAtsNotifierServer.java index eb06276487f..9af2a56da9d 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/notify/IAtsNotifierServer.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/IAtsNotifierServer.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.internal.notify; +package org.eclipse.osee.ats.rest.util; import java.util.Collection; import org.eclipse.osee.ats.api.notify.AtsNotificationEvent; diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/JsonFactory.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/JsonFactory.java index 02e4dfb79bf..5a5aad6acab 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/config/JsonFactory.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/util/JsonFactory.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.impl.config; +package org.eclipse.osee.ats.rest.util; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF index 669f764e85f..e4afb719720 100644 --- a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Import-Package: com.google.common.base;version="15.0.0", org.eclipse.osee.ats.core.config, org.eclipse.osee.ats.core.users, org.eclipse.osee.ats.core.util, - org.eclipse.osee.ats.impl, + org.eclipse.osee.ats.rest, org.eclipse.osee.define.report.api, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.define.report/OSGI-INF/osee.define.report.xml b/plugins/org.eclipse.osee.define.report/OSGI-INF/osee.define.report.xml index ef0b2f00887..da1d8791bb1 100644 --- a/plugins/org.eclipse.osee.define.report/OSGI-INF/osee.define.report.xml +++ b/plugins/org.eclipse.osee.define.report/OSGI-INF/osee.define.report.xml @@ -23,5 +23,5 @@ <property name="osee.trace.myII.Ada_Code.secondary.regexs" type="String">(SRS)?\d*\s*([^;]+) .+ </property> - <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.impl.IAtsServer" name="IAtsServer" policy="static"/> + <reference bind="setAtsServer" cardinality="1..1" interface="org.eclipse.osee.ats.rest.IAtsServer" name="IAtsServer" policy="static"/> </scr:component> diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/WordUpdateEndpointImpl.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/WordUpdateEndpointImpl.java index 71efe26c33d..5d93a5427a7 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/WordUpdateEndpointImpl.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/WordUpdateEndpointImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.define.report; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.define.report.api.WordUpdateChange; import org.eclipse.osee.define.report.api.WordUpdateData; import org.eclipse.osee.define.report.api.WordUpdateEndpoint; diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/OseeReportApplication.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/OseeReportApplication.java index e3a365c16fa..8b1e983b990 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/OseeReportApplication.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/OseeReportApplication.java @@ -16,7 +16,7 @@ import java.util.Set; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; import org.eclipse.osee.app.OseeAppResourceTokens; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.define.report.WordUpdateEndpointImpl; import org.eclipse.osee.define.report.api.DefineApi; import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry; diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java index 984b73416f5..513bd829432 100644 --- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java +++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java @@ -29,7 +29,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.NewActionAdapter; import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.define.report.api.WordArtifactChange; import org.eclipse.osee.define.report.api.WordUpdateChange; import org.eclipse.osee.define.report.api.WordUpdateData; @@ -229,8 +229,7 @@ public class WordUpdateArtifact { private IAtsTeamWorkflow getSafetyWorkflow(ArtifactReadable workflowArt) { Conditions.checkNotNull(workflowArt, "work flow artifact"); IAtsTeamWorkflow safetyWorkflow = null; - ArtifactReadable safetyActionableItemArt = - atsServer.getArtifact(AtsArtifactToken.SafetyActionableItem.getUuid()); + ArtifactReadable safetyActionableItemArt = atsServer.getArtifact(AtsArtifactToken.SafetyActionableItem.getUuid()); IAtsTeamWorkflow teamWf = atsServer.getWorkItemFactory().getTeamWf(workflowArt); IAtsActionableItem actionableItem = atsServer.getConfigItemFactory().getActionableItem(safetyActionableItemArt); for (IAtsTeamWorkflow sibling : atsServer.getActionFactory().getSiblingTeamWorkflows(teamWf)) { @@ -262,13 +261,13 @@ public class WordUpdateArtifact { teamWorkflow = atsServer.getActionFactory().createTeamWorkflow(action, teamDef, java.util.Collections.singleton(ai), null, changes, new Date(), createdBy, new NewActionAdapter() { - @Override - public void teamCreated(IAtsAction action, IAtsTeamWorkflow teamWf, IAtsChangeSet changes) throws OseeCoreException { - changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.Description, - "Review System Safety Changes for the associated RPCR to Complete the Workflow"); - } + @Override + public void teamCreated(IAtsAction action, IAtsTeamWorkflow teamWf, IAtsChangeSet changes) throws OseeCoreException { + changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.Description, + "Review System Safety Changes for the associated RPCR to Complete the Workflow"); + } - }); + }); changes.setSoleAttributeValue(teamWorkflow, CoreAttributeTypes.Name, "Safety Workflow for " + teamWf.getAtsId()); changes.execute(); diff --git a/plugins/org.eclipse.osee.x.ats.parent/pom.xml b/plugins/org.eclipse.osee.x.ats.parent/pom.xml index 58644e00b58..475da995640 100644 --- a/plugins/org.eclipse.osee.x.ats.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.ats.parent/pom.xml @@ -26,10 +26,8 @@ <module>../../plugins/org.eclipse.osee.ats.core</module> <module>../../plugins/org.eclipse.osee.ats.core.test</module> - <module>../../plugins/org.eclipse.osee.ats.impl</module> - <module>../../plugins/org.eclipse.osee.ats.impl.test</module> - <module>../../plugins/org.eclipse.osee.ats.rest</module> + <module>../../plugins/org.eclipse.osee.ats.rest.test</module> <module>../../features/org.eclipse.osee.x.ats.feature</module> <module>../../plugins/org.eclipse.osee.x.ats.p2</module> |