Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2016-08-05 12:01:57 -0400
committerdonald.g.dunne2016-09-01 20:21:21 -0400
commit3d3479c32dd88e397301d0f1878e048f3eebdace (patch)
tree797973fc07c17b745baf697f2f12defbc40f2685
parent4791dc347a2402a562146dcd780c37b25381cb42 (diff)
downloadorg.eclipse.osee-3d3479c32dd88e397301d0f1878e048f3eebdace.tar.gz
org.eclipse.osee-3d3479c32dd88e397301d0f1878e048f3eebdace.tar.xz
org.eclipse.osee-3d3479c32dd88e397301d0f1878e048f3eebdace.zip
refactor[ats_ATS307494]: Move ORCS writer to rest bundle
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/OrcsWriterEndpointTest.java13
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java (renamed from plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationByClassRule.java)5
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/OrcsWriterEndpoint.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/OrcsWriterToken.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterToken.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterInputConfig.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterInputConfig.java)3
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterRelationSide.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterRelationSide.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifact.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifact.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactToken.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactToken.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactType.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactType.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttribute.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttribute.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttributeType.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttributeType.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBase.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBase.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBranch.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBranch.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwCollector.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwCollector.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwNamedBase.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwNamedBase.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelation.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelation.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelationType.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelationType.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/pom.xml41
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/InternalTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidatorTest.java19
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java (renamed from plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapterTest.java)4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/IOrcsValidationHelper.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/IOrcsValidationHelper.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapter.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java23
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterEndpointImpl.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterExcelReader.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterExcelReader.java)4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterFactory.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterFactory.java)20
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForCreateUpdate.java)18
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForDelete.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForDelete.java)6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForSettings.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForSettings.java)6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterStreamingOutput.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterUtil.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterUtil.java)2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterWorkbookGenerator.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java (renamed from plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwFactory.java)9
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsScriptTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF5
50 files changed, 179 insertions, 135 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF
index eade1aedab..a21edb1936 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF
@@ -132,7 +132,7 @@ Import-Package: com.google.common.collect,
org.eclipse.osee.jaxrs,
org.eclipse.osee.jaxrs.client,
org.eclipse.osee.orcs.rest.model,
- org.eclipse.osee.orcs.writer.model.reader,
+ org.eclipse.osee.orcs.rest.model.writer.reader,
org.eclipse.osee.support.test.util,
org.osgi.framework,
org.osgi.service.event
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/OrcsWriterEndpointTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/OrcsWriterEndpointTest.java
index 3a1269807c..00a9bcdb08 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/OrcsWriterEndpointTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/OrcsWriterEndpointTest.java
@@ -26,9 +26,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.orcs.rest.model.OrcsWriterEndpoint;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwFactory;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
import org.junit.Before;
import org.junit.Test;
@@ -115,7 +115,12 @@ public class OrcsWriterEndpointTest extends AbstractRestTest {
OwCollector collector = getDefaultOwCollector();
collector.getCreate().clear();
collector.getUpdate().clear();
- collector.getDelete().add(OwFactory.createArtifactToken(artifact.getName(), artifact.getUuid()));
+ OwArtifactToken owToken = new OwArtifactToken();
+ owToken.setUuid(artifact.getUuid());
+ owToken.setName(artifact.getName());
+ String tokenStr = String.format("[%s]-[%d]", artifact.getName(), artifact.getUuid());
+ owToken.setData(tokenStr);
+ collector.getDelete().add(owToken);
Response response = writer.getOrcsWriterPersist(collector);
assertEquals(javax.ws.rs.core.Response.Status.OK.getStatusCode(), response.getStatus());
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
index 8a04cf14c1..ae42f14460 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
@@ -5,19 +5,23 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.db.mock
Bundle-Version: 0.24.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.osee.framework.core.data,
+Import-Package: org.eclipse.osee.event,
+ org.eclipse.osee.executor.admin,
+ org.eclipse.osee.framework.core.data,
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.annotation,
org.eclipse.osee.jdbc,
+ org.eclipse.osee.logger,
org.json,
org.junit,
org.junit.rules,
org.junit.runner,
org.junit.runners.model,
org.osgi.framework,
- org.osgi.service.cm
+ org.osgi.service.cm,
+ org.osgi.service.event;version="1.3.1"
Export-Package: org.eclipse.osee.orcs.db.mock
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.equinox.ds,
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationByClassRule.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java
index 35f4e444f9..ae57cee0d8 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationByClassRule.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OrcsIntegrationByClassRule.java
@@ -8,14 +8,11 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs;
+package org.eclipse.osee.orcs.db.mock;
import org.eclipse.osee.event.EventService;
import org.eclipse.osee.executor.admin.ExecutorAdmin;
import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
-import org.eclipse.osee.orcs.db.mock.OsgiRule;
-import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.osgi.service.event.EventAdmin;
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
index 1870c4ea81..4e5a043bea 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Bundle-Version: 0.24.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osee.orcs.rest.model,
- org.eclipse.osee.orcs.rest.model.search.artifact
+ org.eclipse.osee.orcs.rest.model.search.artifact,
+ org.eclipse.osee.orcs.rest.model.writer,
+ org.eclipse.osee.orcs.rest.model.writer.config,
+ org.eclipse.osee.orcs.rest.model.writer.reader
Import-Package: javax.annotation.security;version="1.2.0",
javax.ws.rs;version="2.0.0",
javax.ws.rs.core;version="2.0.0",
@@ -20,8 +23,5 @@ Import-Package: javax.annotation.security;version="1.2.0",
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.orcs.transaction,
- org.eclipse.osee.orcs.writer.model.config,
- org.eclipse.osee.orcs.writer.model.reader
+ org.eclipse.osee.framework.jdk.core.util
Require-Bundle: org.codehaus.jackson.mapper
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/OrcsWriterEndpoint.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/OrcsWriterEndpoint.java
index ad2ea2d917..a64b847093 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/OrcsWriterEndpoint.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/OrcsWriterEndpoint.java
@@ -18,8 +18,8 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.eclipse.osee.orcs.writer.model.config.OrcsWriterInputConfig;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.config.OrcsWriterInputConfig;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
/**
* @author Donald G. dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterToken.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/OrcsWriterToken.java
index 06258dbc30..596b4face8 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterToken.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/OrcsWriterToken.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.config;
+package org.eclipse.osee.orcs.rest.model.writer;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterInputConfig.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterInputConfig.java
index 0bddb8d710..d28b977d74 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterInputConfig.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterInputConfig.java
@@ -8,11 +8,12 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.config;
+package org.eclipse.osee.orcs.rest.model.writer.config;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
+import org.eclipse.osee.orcs.rest.model.writer.OrcsWriterToken;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterRelationSide.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterRelationSide.java
index 0013dc5fb1..9f637d9a8e 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/config/OrcsWriterRelationSide.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/config/OrcsWriterRelationSide.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.config;
+package org.eclipse.osee.orcs.rest.model.writer.config;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifact.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifact.java
index f3ec772aaa..e2772abc78 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifact.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifact.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import java.util.LinkedList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactToken.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactToken.java
index 27c9181714..bb8d7b1b8b 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactToken.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactToken.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactType.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactType.java
index 72869d1a52..ebbd345300 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwArtifactType.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwArtifactType.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttribute.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttribute.java
index bde0f9ae60..56f3d6cc72 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttribute.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttribute.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import java.util.LinkedList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttributeType.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttributeType.java
index 9b10509e21..e232c3dd7b 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwAttributeType.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwAttributeType.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBase.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBase.java
index c5c43f16d1..8bdddca9b5 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBase.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBase.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonSerialize;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBranch.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBranch.java
index f117345a87..74cb5cc015 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwBranch.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwBranch.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwCollector.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwCollector.java
index 2cec537a0d..b2d74ddf48 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwCollector.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwCollector.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import java.util.LinkedList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwNamedBase.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwNamedBase.java
index 24671945da..530abfeb01 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwNamedBase.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwNamedBase.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import org.eclipse.osee.framework.jdk.core.type.Named;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelation.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelation.java
index 154de3d7b4..3f7ef4307c 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelation.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelation.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelationType.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelationType.java
index 23c30299de..d93cbb8284 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwRelationType.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/writer/reader/OwRelationType.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.model.writer.reader;
import javax.xml.bind.annotation.XmlRootElement;
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF
index 1686306a46..54d320e6bb 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest.test/META-INF/MANIFEST.MF
@@ -12,5 +12,4 @@ Require-Bundle: org.junit,
org.objenesis
Import-Package: org.eclipse.osee.executor.admin,
org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.orcs.db.mock,
- org.eclipse.osee.orcs.writer
+ org.eclipse.osee.orcs.db.mock
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/pom.xml b/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
index 13a962e830..d3f60dc7a7 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
@@ -25,6 +25,47 @@
<testClass>org.eclipse.osee.orcs.rest.OrcsRestTestSuite</testClass>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.orcs.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.x.core.external.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.osee.x.core.feature</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.equinox.ds</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.osee.orcs.db.mock</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.equinox.registry</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/InternalTestSuite.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/InternalTestSuite.java
index 524baca39a..04ebfb2a79 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/InternalTestSuite.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/InternalTestSuite.java
@@ -18,6 +18,7 @@ import org.eclipse.osee.orcs.rest.internal.search.predicate.GuidsPredicateHandle
import org.eclipse.osee.orcs.rest.internal.search.predicate.IdsPredicateHandlerTest;
import org.eclipse.osee.orcs.rest.internal.search.predicate.IsOfTypePredicateHandlerTest;
import org.eclipse.osee.orcs.rest.internal.search.predicate.TypeEqualsPredicateHandlerTest;
+import org.eclipse.osee.orcs.rest.internal.writer.OrcsValidationHelperAdapterTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -30,6 +31,7 @@ import org.junit.runners.Suite;
AttributeTypePredicateHandlerTest.class,
ExistenceTypePredicateHandlerTest.class,
IdsPredicateHandlerTest.class,
+ OrcsValidationHelperAdapterTest.class,
GuidsPredicateHandlerTest.class,
IsOfTypePredicateHandlerTest.class,
TypeEqualsPredicateHandlerTest.class,
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidatorTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidatorTest.java
index 93c46c2973..70a23fb296 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidatorTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidatorTest.java
@@ -15,16 +15,15 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import java.util.Arrays;
import org.eclipse.osee.framework.core.util.XResultData;
-import org.eclipse.osee.orcs.writer.IOrcsValidationHelper;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttribute;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwBranch;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapterTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java
index 93ea84f70e..cfd7e83b3e 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapterTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapterTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON_ID;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
index f2bd98f4c7..4ee9126ccc 100644
--- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
@@ -41,12 +41,12 @@ Import-Package: com.google.common.base;version="15.0.0",
org.eclipse.osee.orcs.data,
org.eclipse.osee.orcs.rest.model,
org.eclipse.osee.orcs.rest.model.search.artifact,
+ org.eclipse.osee.orcs.rest.model.writer,
+ org.eclipse.osee.orcs.rest.model.writer.config,
+ org.eclipse.osee.orcs.rest.model.writer.reader,
org.eclipse.osee.orcs.search,
org.eclipse.osee.orcs.transaction,
org.eclipse.osee.orcs.utility,
- org.eclipse.osee.orcs.writer,
- org.eclipse.osee.orcs.writer.model.config,
- org.eclipse.osee.orcs.writer.model.reader,
org.osgi.service.event;version="1.3.1"
Osee-JaxRs-Resource: OSEE-INF/web/script/*;path=/orcs/script/ui,
OSEE-INF/web/example/*;path=/orcs/example/ui,
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/IOrcsValidationHelper.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/IOrcsValidationHelper.java
index 89855bae74..d20454340d 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/IOrcsValidationHelper.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/IOrcsValidationHelper.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java
index 6ce8423a4d..b2d02db777 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java
@@ -17,16 +17,14 @@ import java.util.Set;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.writer.IOrcsValidationHelper;
-import org.eclipse.osee.orcs.writer.OrcsValidationHelperAdapter;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttribute;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
index b990deb8b9..07937a669e 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
@@ -32,15 +32,15 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
import org.eclipse.osee.orcs.transaction.TransactionBuilder;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttribute;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java
index f8274eaaca..a9b212fd07 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsValidationHelperAdapter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsValidationHelperAdapter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON_ID;
import org.eclipse.osee.framework.core.data.IAttributeType;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java
index 896ff0854f..984ea58c8a 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java
@@ -28,18 +28,17 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.writer.model.config.OrcsWriterInputConfig;
-import org.eclipse.osee.orcs.writer.model.config.OrcsWriterRelationSide;
-import org.eclipse.osee.orcs.writer.model.config.OrcsWriterToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwBranch;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwFactory;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.OrcsWriterToken;
+import org.eclipse.osee.orcs.rest.model.writer.config.OrcsWriterInputConfig;
+import org.eclipse.osee.orcs.rest.model.writer.config.OrcsWriterRelationSide;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterEndpointImpl.java
index f13053c00d..e131125155 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterEndpointImpl.java
@@ -20,9 +20,8 @@ import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.rest.model.OrcsWriterEndpoint;
-import org.eclipse.osee.orcs.writer.OrcsWriterExcelReader;
-import org.eclipse.osee.orcs.writer.model.config.OrcsWriterInputConfig;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.config.OrcsWriterInputConfig;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterExcelReader.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterExcelReader.java
index 0a3df914b7..bb231a704e 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterExcelReader.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterExcelReader.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import java.io.IOException;
import java.io.InputStream;
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler;
import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterFactory.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterFactory.java
index 867f494a55..05e2692db1 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterFactory.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterFactory.java
@@ -8,21 +8,21 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttribute;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwBranch;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForCreateUpdate.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java
index 8736beec69..60111b5059 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForCreateUpdate.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import java.util.HashMap;
import java.util.Map;
@@ -19,14 +19,14 @@ 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.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifact;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttribute;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelation;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelation;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForDelete.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForDelete.java
index 92d1f2f752..9f51472d1f 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForDelete.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForDelete.java
@@ -8,14 +8,14 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForSettings.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForSettings.java
index f2793ac5c4..7284736985 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterSheetProcessorForSettings.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForSettings.java
@@ -8,14 +8,14 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor;
-import org.eclipse.osee.orcs.writer.model.reader.OwBranch;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterStreamingOutput.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterStreamingOutput.java
index e38bf40e1a..48a6eed5a6 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterStreamingOutput.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterStreamingOutput.java
@@ -15,7 +15,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import javax.ws.rs.core.StreamingOutput;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterUtil.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterUtil.java
index 9d95a68bb7..c8ec7b0432 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/OrcsWriterUtil.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer;
+package org.eclipse.osee.orcs.rest.internal.writer;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterWorkbookGenerator.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterWorkbookGenerator.java
index 747765b7c5..bb498fb2ce 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterWorkbookGenerator.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterWorkbookGenerator.java
@@ -22,14 +22,12 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelXmlWriter;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.writer.OrcsWriterUtil;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactToken;
-import org.eclipse.osee.orcs.writer.model.reader.OwArtifactType;
-import org.eclipse.osee.orcs.writer.model.reader.OwAttributeType;
-import org.eclipse.osee.orcs.writer.model.reader.OwBranch;
-import org.eclipse.osee.orcs.writer.model.reader.OwCollector;
-import org.eclipse.osee.orcs.writer.model.reader.OwFactory;
-import org.eclipse.osee.orcs.writer.model.reader.OwRelationType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwCollector;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwFactory.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
index 6e4528a3e9..5eb01a3f0c 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/writer/model/reader/OwFactory.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.orcs.writer.model.reader;
+package org.eclipse.osee.orcs.rest.internal.writer;
/**
* Donald G. Dunne
@@ -21,6 +21,13 @@ import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.OrcsApi;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactToken;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifactType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttribute;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwAttributeType;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwBranch;
+import org.eclipse.osee.orcs.rest.model.writer.reader.OwRelationType;
public class OwFactory {
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java
index 76da7edbb0..9d5b7d2aa7 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java
@@ -22,7 +22,6 @@ import org.eclipse.osee.orcs.api.OrcsScriptTest;
import org.eclipse.osee.orcs.api.OrcsTransactionTest;
import org.eclipse.osee.orcs.api.OrcsTupleTest;
import org.eclipse.osee.orcs.api.OrcsTxQueryTest;
-import org.eclipse.osee.orcs.writer.OrcsValidationHelperAdapterTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -32,7 +31,6 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
OrcsQueryTest.class,
- OrcsValidationHelperAdapterTest.class,
OrcsAttributeLoadingTest.class,
OrcsAttributeSearchTest.class,
OrcsBranchQueryTest.class,
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
index 16a47abe4c..1e7c042bd1 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
@@ -20,8 +20,8 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.search.QueryBuilder;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java
index 265198728b..d7d9ced9c9 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java
@@ -19,8 +19,8 @@ import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.search.QueryBuilder;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
index 6d3612fef7..726c17ef72 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
@@ -34,10 +34,10 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.OrcsBranch;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArchiveOperation;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.search.BranchQuery;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
index a1ef8779e8..053eefc096 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
@@ -44,10 +44,10 @@ import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.OrcsBranch;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.AttributeReadable;
import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.search.Match;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsScriptTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsScriptTest.java
index 596d4539af..eca1d4e148 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsScriptTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsScriptTest.java
@@ -19,7 +19,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import javax.script.SimpleScriptContext;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.junit.AfterClass;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
index e50bf2f350..0e954c66d0 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
@@ -49,11 +49,11 @@ import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.OrcsBranch;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.AttributeReadable;
import org.eclipse.osee.orcs.data.BranchReadable;
import org.eclipse.osee.orcs.data.TransactionReadable;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.search.QueryBuilder;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java
index 4f26fc7b6f..19d7d02d67 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.jdbc.JdbcException;
import org.eclipse.osee.orcs.KeyValueOps;
import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsIntegrationByClassRule;
+import org.eclipse.osee.orcs.db.mock.OrcsIntegrationByClassRule;
import org.eclipse.osee.orcs.db.mock.OseeClassDatabase;
import org.eclipse.osee.orcs.db.mock.OsgiService;
import org.eclipse.osee.orcs.transaction.TransactionBuilder;
diff --git a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF
index 80ab561e01..80648f2e63 100644
--- a/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs/META-INF/MANIFEST.MF
@@ -29,8 +29,5 @@ Export-Package: org.eclipse.osee.orcs,
org.eclipse.osee.orcs.search,
org.eclipse.osee.orcs.statistics,
org.eclipse.osee.orcs.transaction,
- org.eclipse.osee.orcs.utility,
- org.eclipse.osee.orcs.writer,
- org.eclipse.osee.orcs.writer.model.config,
- org.eclipse.osee.orcs.writer.model.reader
+ org.eclipse.osee.orcs.utility
Bundle-ActivationPolicy: lazy

Back to the top