feature[ats_ATS66217]: Add stages to server build

Add build module display during build
Break server build into separate stages
Fix cross module dependencies so we can build the
server in stages

Change-Id: Ice4edd805267edb33b0550a6c5f4fe46166b0c05

25 files changed, 366 insertions, 34 deletions

diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
index 6283147a46d..287d907596a 100644
--- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -44,7 +44,6 @@ Import-Package: com.lowagie.text,
  org.eclipse.osee.framework.core.exception,
  org.eclipse.osee.framework.core.model,
  org.eclipse.osee.framework.core.model.cache,
- org.eclipse.osee.framework.core.server,
  org.eclipse.osee.framework.core.util,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/ArchiveCollector.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/ArchiveCollector.java
index a1757c0dff1..718b1e1b08a 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/ArchiveCollector.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/ArchiveCollector.java
@@ -27,8 +27,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 import org.eclipse.osee.ats.rest.internal.build.report.model.AtsElementData;
+import org.eclipse.osee.ats.rest.internal.build.report.util.InputFilesUtil;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.server.OseeServerProperties;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -39,9 +39,6 @@ import org.eclipse.osee.logger.Log;
  */
 public class ArchiveCollector {
 
-   private static final String CHANGE_REPORTS_PATH = "/atsData/changeReports/";
-
-   private final String serverData = OseeServerProperties.getOseeApplicationServerData(null);
    private final Map<String, String> urlToEntryName = new LinkedHashMap<String, String>();
    private final Set<String> pcrIds = new LinkedHashSet<String>();
    private final String baseUrl;
@@ -118,13 +115,12 @@ public class ArchiveCollector {
       }
 
       for (String pcrId : pcrIds) {
-         String pcrFileName = pcrId + ".xml";
-         File file = new File(serverData + CHANGE_REPORTS_PATH + pcrFileName);
+         File file = InputFilesUtil.getChangeReportFile(pcrId);
          if (file.exists()) {
             FileInputStream fis = null;
             try {
                fis = new FileInputStream(file);
-               zout.putNextEntry(new ZipEntry("changeReports/" + pcrFileName));
+               zout.putNextEntry(new ZipEntry("changeReports/" + file.getName()));
                Lib.inputStreamToOutputStream(fis, zout);
                zout.closeEntry();
             } catch (IOException ex) {
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/util/InputFilesUtil.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/util/InputFilesUtil.java
index 47283e96ce1..cbbd63de8f3 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/util/InputFilesUtil.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/build/report/util/InputFilesUtil.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.rest.internal.build.report.util;
 
 import java.io.File;
 import org.eclipse.osee.ats.rest.internal.build.report.model.AtsElementData;
-import org.eclipse.osee.framework.core.server.OseeServerProperties;
 
 /**
  * @author John Misinco
@@ -23,6 +22,8 @@ public class InputFilesUtil {
       // utility
    }
 
+   private static final String CHANGE_REPORTS_PATH = "/atsData/changeReports/";
+
    public static File getBuildFile() {
       return new File(getBaseFileLocation() + AtsElementData.ATS_BUILD_DATA_XML);
    }
@@ -39,8 +40,12 @@ public class InputFilesUtil {
       return new File(String.format("%s/changeReports/%s_ids.txt", getBaseFileLocation(), rpcr));
    }
 
+   public static File getChangeReportFile(String pcrId) {
+      return new File(getBaseFileLocation() + CHANGE_REPORTS_PATH + pcrId + ".xml");
+   }
+
    private static String getBaseFileLocation() {
-      return OseeServerProperties.getOseeApplicationServerData(null) + AtsElementData.ATS_DATA;
+      return System.getProperty("osee.application.server.data", null) + AtsElementData.ATS_DATA;
    }
 
 }
diff --git a/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF
index 124466bf2d9..080fb2cd04f 100644
--- a/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.authentication.admin/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.authentication.admin
 Bundle-Version: 0.18.0.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
+Import-Package: org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.logger,
  org.osgi.framework
diff --git a/plugins/org.eclipse.osee.disposition.p2/.project b/plugins/org.eclipse.osee.disposition.p2/.project
new file mode 100644
index 00000000000..b61e8897771
--- /dev/null
+++ b/plugins/org.eclipse.osee.disposition.p2/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osee.disposition.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.disposition.p2/category.xml b/plugins/org.eclipse.osee.disposition.p2/category.xml
new file mode 100644
index 00000000000..286ac01c427
--- /dev/null
+++ b/plugins/org.eclipse.osee.disposition.p2/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.osee.xats.feature_0.18.0.qualifier.jar" id="org.eclipse.osee.disposition.feature" version="0.18.0.qualifier">
+      <category name="org.eclipse.osee.disposition"/>
+   </feature>
+   <feature url="features/org.eclipse.osee.disposition.feature.source_0.18.0.qualifier.jar" id="org.eclipse.osee.disposition.feature.source" version="0.18.0.qualifier">
+      <category name="org.eclipse.osee.disposition"/>
+   </feature>
+   <category-def name="org.eclipse.osee.disposition" label="Eclipse OSEE X ATS - (Incubation)">
+      <description>
+         Eclipse OSEE Disposition - (Incubation)
+      </description>
+   </category-def>
+</site>
diff --git a/plugins/org.eclipse.osee.disposition.p2/pom.xml b/plugins/org.eclipse.osee.disposition.p2/pom.xml
new file mode 100644
index 00000000000..616e739bb54
--- /dev/null
+++ b/plugins/org.eclipse.osee.disposition.p2/pom.xml
@@ -0,0 +1,18 @@
+<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.disposition.parent</artifactId>
+		<version>0.18.0-SNAPSHOT</version>
+		<relativePath>../../plugins/org.eclipse.osee.disposition.parent</relativePath>
+	</parent>
+
+	<artifactId>org.eclipse.osee.disposition.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>OSEE Disposition - p2 Site (Incubation)</name>
+	<version>0.18.0-SNAPSHOT</version>
+
+</project>
diff --git a/plugins/org.eclipse.osee.disposition.parent/pom.xml b/plugins/org.eclipse.osee.disposition.parent/pom.xml
index 48845eff503..3eb24bc2a31 100644
--- a/plugins/org.eclipse.osee.disposition.parent/pom.xml
+++ b/plugins/org.eclipse.osee.disposition.parent/pom.xml
@@ -23,16 +23,17 @@
 		<module>../../plugins/org.eclipse.osee.disposition.rest.test</module>
 		
 		<module>../../features/org.eclipse.osee.disposition.feature</module>
+		<module>../../plugins/org.eclipse.osee.disposition.p2</module>
 	</modules>
 
 
 	<profiles>
 		<profile>
-			<id>osee-dispo-stage-only</id>
+			<id>osee-disposition-stage</id>
 			<activation>
 				<property>
 					<name>osee-build-stage</name>
-					<value>osee-dispo</value>
+					<value>osee-disposition</value>
 				</property>
 			</activation>
 			<modules>
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
index 45fbe35017f..6bdfa96d629 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.message.test/META-INF/MANIFEST.MF
@@ -8,5 +8,4 @@ Fragment-Host: org.eclipse.osee.framework.core.message
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit
 Import-Package: org.eclipse.osee.framework.core.model.change,
- org.eclipse.osee.framework.core.model.mocks,
  org.eclipse.osee.framework.jdk.core.util
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java
index 4c2d131845e..838d6e2b321 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.framework.core.message.test.data;
 import java.util.ArrayList;
 import java.util.Collection;
 import org.eclipse.osee.framework.core.message.BranchCommitResponse;
+import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
index 633032abe52..f64fa423edb 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
@@ -14,12 +14,12 @@ import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse;
 import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
+import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.message.test.mocks.MockOseeDataAccessor;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Compare;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockDataFactory.java
new file mode 100644
index 00000000000..37b52b9902e
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockDataFactory.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.core.message.test.mocks;
+
+import java.util.Date;
+import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
+import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.model.cache.BranchCache;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public final class MockDataFactory {
+
+   private MockDataFactory() {
+      // Utility Class
+   }
+
+   public static TransactionRecord createTransaction(int index, int branchUuid) {
+      TransactionDetailsType type =
+         TransactionDetailsType.values()[Math.abs(index % TransactionDetailsType.values().length)];
+      int value = index;
+      if (value == 0) {
+         value++;
+      }
+      MockOseeDataAccessor<Long, Branch> accessor = new MockOseeDataAccessor<Long, Branch>();
+      BranchCache cache = new BranchCache(accessor);
+      return new TransactionRecord(value * 47, branchUuid, "comment_" + value, new Date(), value * 37, value * 42,
+         type, cache);
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
index 634a5dc81ce..3f5566f947b 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
@@ -19,12 +19,12 @@ import org.eclipse.osee.framework.core.message.internal.DataTranslationService;
 import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitResponseTranslator;
 import org.eclipse.osee.framework.core.message.internal.translation.TransactionRecordTranslator;
 import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
+import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.message.test.mocks.MockOseeDataAccessor;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.core.translation.ITranslator;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
index d4ad862df91..39509744015 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
@@ -16,12 +16,12 @@ import java.util.List;
 import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse;
 import org.eclipse.osee.framework.core.message.internal.translation.TransactionCacheUpdateResponseTranslator;
 import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
+import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.message.test.mocks.MockOseeDataAccessor;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.translation.ITranslator;
 import org.junit.Assert;
 import org.junit.runner.RunWith;
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
index afc6dec6435..2384e5cf664 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
@@ -15,12 +15,12 @@ import java.util.Collection;
 import java.util.List;
 import org.eclipse.osee.framework.core.message.internal.translation.TransactionRecordTranslator;
 import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
+import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.message.test.mocks.MockOseeDataAccessor;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
 import org.eclipse.osee.framework.core.translation.ITranslator;
 import org.junit.Assert;
 import org.junit.runner.RunWith;
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
index 0f30ecb6d9d..c1028aacc18 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.server.test/META-INF/MANIFEST.MF
@@ -10,5 +10,4 @@ Require-Bundle: org.junit,
  org.mockito;bundle-version="1.9.0",
  org.hamcrest.core
 Import-Package: org.eclipse.osee.framework.core.model.cache,
- org.eclipse.osee.framework.core.model.mocks,
  org.eclipse.osee.framework.core.model.type
diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml
index d4fd8a18297..d2a326fc7ff 100644
--- a/plugins/org.eclipse.osee.parent/pom.xml
+++ b/plugins/org.eclipse.osee.parent/pom.xml
@@ -59,7 +59,7 @@
 
 		<osee-create-help-docs>true</osee-create-help-docs>
 		<rest-output-directory>${project.build.directory}/../REST-INF</rest-output-directory>
-		
+
 		<osee-application-server-launch-ant>../../plugins/org.eclipse.osee.parent/tools/osee-application-server.xml</osee-application-server-launch-ant>
 	</properties>
 
@@ -592,7 +592,7 @@
 			<activation>
 				<property>
 					<name>osee-build-stage</name>
-					<value>!osee-server</value>
+					<value>!osee-all-server</value>
 				</property>
 			</activation>
 			<properties>
@@ -673,7 +673,27 @@
 			<activation>
 				<property>
 					<name>osee-build-stage</name>
-					<value>osee-server</value>
+					<value>osee-all-server</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
+			</properties>
+			<repositories>
+				<repository>
+					<id>eclipse-ip</id>
+					<layout>p2</layout>
+					<url>${eclipse-ip-site}</url>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>osee-x-core</id>
+			<activation>
+				<property>
+					<name>osee-build-stage</name>
+					<value>osee-x-core</value>
 				</property>
 			</activation>
 			<properties>
@@ -689,11 +709,37 @@
 		</profile>
 
 		<profile>
-			<id>osee-dispo</id>
+			<id>osee-orcs</id>
 			<activation>
 				<property>
 					<name>osee-build-stage</name>
-					<value>osee-dispo</value>
+					<value>osee-orcs</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
+				<osee-xcore-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site>
+			</properties>
+			<repositories>
+				<repository>
+					<id>eclipse-ip</id>
+					<layout>p2</layout>
+					<url>${eclipse-ip-site}</url>
+				</repository>
+				<repository>
+					<id>osee-xcore</id>
+					<layout>p2</layout>
+					<url>${osee-xcore-site}</url>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>osee-disposition</id>
+			<activation>
+				<property>
+					<name>osee-build-stage</name>
+					<value>osee-disposition</value>
 				</property>
 			</activation>
 			<properties>
@@ -721,6 +767,82 @@
 		</profile>
 
 		<profile>
+			<id>osee-x-ats</id>
+			<activation>
+				<property>
+					<name>osee-build-stage</name>
+					<value>osee-x-ats</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
+				<osee-xcore-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site>
+				<osee-orcs-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.orcs.p2/target/repository</osee-orcs-site>
+			</properties>
+			<repositories>
+				<repository>
+					<id>eclipse-ip</id>
+					<layout>p2</layout>
+					<url>${eclipse-ip-site}</url>
+				</repository>
+				<repository>
+					<id>osee-xcore</id>
+					<layout>p2</layout>
+					<url>${osee-xcore-site}</url>
+				</repository>
+				<repository>
+					<id>osee-orcs</id>
+					<layout>p2</layout>
+					<url>${osee-orcs-site}</url>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>osee-x-server</id>
+			<activation>
+				<property>
+					<name>osee-build-stage</name>
+					<value>osee-x-server</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
+				<osee-xcore-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site>
+				<osee-orcs-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.orcs.p2/target/repository</osee-orcs-site>
+				<osee-disposition-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.disposition.p2/target/repository</osee-disposition-site>
+				<osee-xats-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.ats.p2/target/repository</osee-xats-site>
+			</properties>
+			<repositories>
+				<repository>
+					<id>eclipse-ip</id>
+					<layout>p2</layout>
+					<url>${eclipse-ip-site}</url>
+				</repository>
+				<repository>
+					<id>osee-xcore</id>
+					<layout>p2</layout>
+					<url>${osee-xcore-site}</url>
+				</repository>
+				<repository>
+					<id>osee-orcs</id>
+					<layout>p2</layout>
+					<url>${osee-orcs-site}</url>
+				</repository>
+				<repository>
+					<id>osee-disposition</id>
+					<layout>p2</layout>
+					<url>${osee-disposition-site}</url>
+				</repository>
+				<repository>
+					<id>osee-xats</id>
+					<layout>p2</layout>
+					<url>${osee-xats-site}</url>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
 			<id>osee-client-runtime</id>
 			<activation>
 				<property>
diff --git a/plugins/org.eclipse.osee.support.maven/modules-client.txt b/plugins/org.eclipse.osee.support.maven/modules-client.txt
new file mode 100644
index 00000000000..0cf1be07c54
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.maven/modules-client.txt
@@ -0,0 +1,5 @@
+             ------------------>[ote]---------------------->| 
+            |                                               |
+[runtime]-->|-->[osee-client]-->[ats-client]-->[coverage]-->|-->[client-all]
+            |                                               |
+             ---------------------------------------------->|
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.support.maven/modules-server.txt b/plugins/org.eclipse.osee.support.maven/modules-server.txt
new file mode 100644
index 00000000000..1c1cf7917f9
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.maven/modules-server.txt
@@ -0,0 +1,5 @@
+             --->[orcs]--->[dispo]--->| 
+            |          |              |
+[x-core]--->|          --->[x-ats]--->|--->[x-server]
+            |                         |
+             ------------------------>|
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.support.maven/osee-build.xml b/plugins/org.eclipse.osee.support.maven/osee-build.xml
index 6806bdab518..d1079ef5960 100644
--- a/plugins/org.eclipse.osee.support.maven/osee-build.xml
+++ b/plugins/org.eclipse.osee.support.maven/osee-build.xml
@@ -9,7 +9,7 @@
 		<echo>--------------------------------------------------------------</echo>
 		<echo>OSEE BUILD - Build Stage</echo>
 		<echo>--------------------------------------------------------------</echo>
-		<property name="input-arguments" value="all,all-ide,server,runtime,ote,osee-client,coverage,ats-client,products" />
+		<property name="input-arguments" value="all,all-ide,all-server,x-core,orcs,dispo,x-ats,x-server,runtime,ote,osee-client,coverage,ats-client,products" />
 		<input message="${tab}[input] Select build to perform?" validargs="${input-arguments}" defaultvalue="${default-osee-build-stage}" addproperty="input-osee-build-stage">
 			<handler classname="org.apache.tools.ant.input.DefaultInputHandler" />
 		</input>
@@ -24,10 +24,30 @@
 				<property name="osee-build-stage" value="osee-all-ide" />
 				<property name="osee-build-directory" value="org.eclipse.osee.ide.parent" />
 			</case>
-			<case value="server">
-				<property name="osee-build-stage" value="osee-server" />
+			<case value="all-server">
+				<property name="osee-build-stage" value="osee-all-server" />
 				<property name="osee-build-directory" value="org.eclipse.osee.x.parent" />
 			</case>
+			<case value="x-core">
+				<property name="osee-build-stage" value="osee-x-core" />
+				<property name="osee-build-directory" value="org.eclipse.osee.x.core.parent" />
+			</case>
+			<case value="orcs">
+				<property name="osee-build-stage" value="osee-orcs" />
+				<property name="osee-build-directory" value="org.eclipse.osee.orcs.parent" />
+			</case>
+			<case value="dispo">
+				<property name="osee-build-stage" value="osee-disposition" />
+				<property name="osee-build-directory" value="org.eclipse.osee.disposition.parent" />
+			</case>
+			<case value="x-ats">
+				<property name="osee-build-stage" value="osee-x-ats" />
+				<property name="osee-build-directory" value="org.eclipse.osee.x.ats.parent" />
+			</case>
+			<case value="x-server">
+				<property name="osee-build-stage" value="osee-x-server" />
+				<property name="osee-build-directory" value="org.eclipse.osee.x.server.parent" />
+			</case>			
 			<case value="runtime">
 				<property name="osee-build-stage" value="osee-client-runtime" />
 				<property name="osee-build-directory" value="org.eclipse.osee.runtime.parent" />
@@ -48,7 +68,7 @@
 				<property name="osee-build-stage" value="osee-ats-client" />
 				<property name="osee-build-directory" value="org.eclipse.osee.ats.parent" />
 			</case>
-			<case value="products">
+			<case value="client-all">
 				<property name="osee-build-stage" value="osee-client-products" />
 				<property name="osee-build-directory" value="org.eclipse.osee.client.all.parent" />
 			</case>
@@ -82,7 +102,7 @@
 				<var name="build-options" value="${build-options} -Declipse-ip-site=&quot;${input-org-eclipse-ip-site-path}&quot;" />
 			</then>
 		</if>
-		
+
 		<!--	SKIP HELP BUILD -->
 		<input message="${tab}[input] Build OSEE Help?" validargs="y,n" defaultvalue="${default-build-osee-help}" addproperty="input-build-osee-help">
 			<handler classname="org.apache.tools.ant.input.DefaultInputHandler" />
@@ -192,6 +212,28 @@
 		</propertyfile>
 	</target>
 
+	<target name="stages">
+		<loadresource property="modules-server">
+			<file file="modules-server.txt" />
+		</loadresource>
+		<loadresource property="modules-client">
+			<file file="modules-client.txt" />
+		</loadresource>
+		<echo>--------------------------------------------------------------</echo>
+		<echo> OSEE ALL - [all] </echo>			
+		<echo>--------------------------------------------------------------</echo>
+		<echo> SERVER   - [all-server] </echo>
+		<echo/>
+		<echo>${modules-server}</echo>
+		<echo/>
+		<echo>--------------------------------------------------------------</echo>
+		<echo> CLIENT   - [all-ide] </echo>
+		<echo/>
+		<echo>${modules-client}</echo>
+		<echo/>
+		<echo>--------------------------------------------------------------</echo>
+	</target>
+
 	<target name="execute-build">
 		<echo>--------------------------------------------------------------</echo>
 		<echo>OSEE BUILD - Execute</echo>
@@ -208,7 +250,7 @@
 	<!-- *************************************************************** -->
 	<!--   MAIN                                                          -->
 	<!-- *************************************************************** -->
-	<target name="run" depends="init,load-settings,get-inputs,save-settings,execute-build" />
+	<target name="run" depends="init,load-settings,stages,get-inputs,save-settings,execute-build" />
 
 	<!-- *************************************************************** -->
 	<!--   MAVEN MACRO                                                   -->
diff --git a/plugins/org.eclipse.osee.x.ats.p2/.project b/plugins/org.eclipse.osee.x.ats.p2/.project
new file mode 100644
index 00000000000..b566b1b5c6b
--- /dev/null
+++ b/plugins/org.eclipse.osee.x.ats.p2/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osee.x.ats.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.x.ats.p2/category.xml b/plugins/org.eclipse.osee.x.ats.p2/category.xml
new file mode 100644
index 00000000000..f64c87ca2cd
--- /dev/null
+++ b/plugins/org.eclipse.osee.x.ats.p2/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.osee.x.ats.feature_0.18.0.qualifier.jar" id="org.eclipse.osee.x.ats.feature" version="0.18.0.qualifier">
+      <category name="org.eclipse.osee.x.ats"/>
+   </feature>
+   <feature url="features/org.eclipse.osee.x.ats.feature.source_0.18.0.qualifier.jar" id="org.eclipse.osee.x.ats.feature.source" version="0.18.0.qualifier">
+      <category name="org.eclipse.osee.x.ats"/>
+   </feature>
+   <category-def name="org.eclipse.osee.x.ats" label="Eclipse OSEE X ATS - (Incubation)">
+      <description>
+         Eclipse OSEE X ATS - (Incubation)
+      </description>
+   </category-def>
+</site>
diff --git a/plugins/org.eclipse.osee.x.ats.p2/pom.xml b/plugins/org.eclipse.osee.x.ats.p2/pom.xml
new file mode 100644
index 00000000000..439c20aeff6
--- /dev/null
+++ b/plugins/org.eclipse.osee.x.ats.p2/pom.xml
@@ -0,0 +1,18 @@
+<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.18.0-SNAPSHOT</version>
+		<relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath>
+	</parent>
+
+	<artifactId>org.eclipse.osee.x.ats.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>OSEE X ATS - p2 Site (Incubation)</name>
+	<version>0.18.0-SNAPSHOT</version>
+
+</project>
diff --git a/plugins/org.eclipse.osee.x.ats.parent/pom.xml b/plugins/org.eclipse.osee.x.ats.parent/pom.xml
index 82606f62a19..d80047bddbd 100644
--- a/plugins/org.eclipse.osee.x.ats.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.ats.parent/pom.xml
@@ -29,6 +29,7 @@
 		<module>../../plugins/org.eclipse.osee.ats.rest</module>
 
 		<module>../../features/org.eclipse.osee.x.ats.feature</module>
+		<module>../../plugins/org.eclipse.osee.x.ats.p2</module>
 	</modules>
 
 </project>
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml
index 8c211c2a2a0..330af739ae6 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml
@@ -19,10 +19,10 @@
 	<modules>
 		<module>../../plugins/org.eclipse.osee.define.report</module>
 		<module>../../plugins/org.eclipse.osee.define.report.test</module>
-		
+
 		<module>../../plugins/org.eclipse.osee.app</module>
 		<module>../../plugins/org.eclipse.osee.app.test</module>
-		
+
 		<module>../../plugins/org.eclipse.osee.framework.authentication.ldap.core</module>
 		<module>../../plugins/org.eclipse.osee.framework.core.server</module>
 		<module>../../plugins/org.eclipse.osee.framework.core.server.test</module>
@@ -42,4 +42,24 @@
 		<module>../../plugins/org.eclipse.osee.x.server.integration.tests</module>
 	</modules>
 
+	<profiles>
+		<profile>
+			<id>osee-x-server-stage</id>
+			<activation>
+				<property>
+					<name>osee-build-stage</name>
+					<value>osee-x-server</value>
+				</property>
+			</activation>
+			<!-- Add features required to generate source features -->
+			<modules>
+				<module>../../features/org.eclipse.osee.x.core.external.feature</module>
+				<module>../../features/org.eclipse.osee.x.core.feature</module>
+				<module>../../features/org.eclipse.osee.orcs.feature</module>
+				<module>../../features/org.eclipse.osee.disposition.feature</module>
+				<module>../../features/org.eclipse.osee.x.ats.feature</module>
+			</modules>
+		</profile>
+	</profiles>
+
 </project>