Binaries v20180321-0748I20180323-0355 I20180322-2000 I20180322-0645 I20180322-0225 I20180321-2000

author: genie.releng 2018-03-21 11:48:25 +0000
committer: genie.releng 2018-03-21 11:48:25 +0000
commit: d0479e5a34b972b9e7160de6f078f35e52f351e4 (patch)
tree: 224d876fa4505bdea8f22e7969d399348803458a /bundles/org.eclipse.equinox.launcher.gtk.linux.x86
parent: 7f501fd42d8270f8f518606b0f995ffc85f4e075 (diff)
download: rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.tar.gz
rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.tar.xz
rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.zip
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
index 7331dcee0..d07d44e89 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
@@ -14,4 +14,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20180124-0926
+binaryTag=v20180321-0748
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index 9a6d28a8a8c..27019d9fbdc 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -947,13 +947,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osee.server.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.osee.console.admin"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.osee.core.server.feature/feature.xml b/features/org.eclipse.osee.core.server.feature/feature.xml
index bf64ff1355f..82ace23ad3e 100644
--- a/features/org.eclipse.osee.core.server.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.feature/feature.xml
@@ -783,13 +783,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osee.server.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="ch.qos.logback.slf4j"
          download-size="0"
          install-size="0"
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 847f26aa667..9974d5ee10d 100644
--- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
@@ -36,6 +36,7 @@ Import-Package: com.fasterxml.jackson.core,
  org.eclipse.osee.framework.core.model.cache,
  org.eclipse.osee.framework.core.model.change,
  org.eclipse.osee.framework.core.model.dto,
+ org.eclipse.osee.framework.core.server,
  org.eclipse.osee.framework.core.util,
  org.eclipse.osee.framework.core.util.result,
  org.eclipse.osee.framework.jdk.core.result,
@@ -53,6 +54,7 @@ Import-Package: com.fasterxml.jackson.core,
  org.eclipse.osee.orcs,
  org.eclipse.osee.orcs.core.ds,
  org.eclipse.osee.orcs.data,
+ org.eclipse.osee.orcs.health,
  org.eclipse.osee.orcs.rest.model,
  org.eclipse.osee.orcs.rest.model.search.artifact,
  org.eclipse.osee.orcs.rest.model.writer,
diff --git a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/images/greenDot.png b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/images/greenDot.png
index f3fb7ca6f6c..f3fb7ca6f6c 100644
--- a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/images/greenDot.png
+++ b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/images/greenDot.png
diff --git a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/images/redDot.png b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/images/redDot.png
index 2ca93a13276..2ca93a13276 100644
--- a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/images/redDot.png
+++ b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/images/redDot.png
diff --git a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/main.html b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/main.html
index 320f993d54c..320f993d54c 100644
--- a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/main.html
+++ b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/main.html
diff --git a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/psef.txt b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/psef.txt
index aeae458391c..aeae458391c 100644
--- a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/psef.txt
+++ b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/psef.txt
diff --git a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/top.txt b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/top.txt
index 90e030ba4a2..90e030ba4a2 100644
--- a/plugins/org.eclipse.osee.server.application/OSEE-INF/web/status/top.txt
+++ b/plugins/org.eclipse.osee.orcs.rest/OSEE-INF/web/health/top.txt
diff --git a/plugins/org.eclipse.osee.server.application/OSGI-INF/osee.server.application.xml b/plugins/org.eclipse.osee.orcs.rest/OSGI-INF/osee.server.application.xml
index a0bf72689d8..0eebd721805 100644
--- a/plugins/org.eclipse.osee.server.application/OSGI-INF/osee.server.application.xml
+++ b/plugins/org.eclipse.osee.orcs.rest/OSGI-INF/osee.server.application.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop">
-   <implementation class="org.eclipse.osee.server.application.ServerApplication"/>
+   <implementation class="org.eclipse.osee.orcs.rest.internal.health.ServerApplication"/>
    <service>
       <provide interface="javax.ws.rs.core.Application"/>
    </service>
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/HealthLinksMain.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/HealthLinksMain.java
index 509f6eedce4..58184bf6fd2 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/HealthLinksMain.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/HealthLinksMain.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  **********************************************************************/
-package org.eclipse.osee.server.application.internal.model;
+package org.eclipse.osee.orcs.rest.internal.health;
 
 import org.eclipse.osee.framework.core.util.JsonUtil;
 import org.eclipse.osee.orcs.health.HealthLinks;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/ServerApplication.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/ServerApplication.java
index da6ddaf9a0a..e53a7a5fe4d 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/ServerApplication.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/ServerApplication.java
@@ -11,7 +11,7 @@
  *     Boeing - initial API and implementation
  **********************************************************************/
 
-package org.eclipse.osee.server.application;
+package org.eclipse.osee.orcs.rest.internal.health;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -24,7 +24,6 @@ import org.eclipse.osee.framework.core.server.IApplicationServerManager;
 import org.eclipse.osee.framework.core.server.IAuthenticationManager;
 import org.eclipse.osee.jdbc.JdbcService;
 import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.server.application.internal.ServerHealthEndpointImpl;
 
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/ServerHealthEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/ServerHealthEndpointImpl.java
index 85830f69acf..786cb8cbb85 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/ServerHealthEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/ServerHealthEndpointImpl.java
@@ -11,7 +11,7 @@
  *     Boeing - initial API and implementation
  **********************************************************************/
 
-package org.eclipse.osee.server.application.internal;
+package org.eclipse.osee.orcs.rest.internal.health;
 
 import java.util.List;
 import java.util.Map;
@@ -44,14 +44,14 @@ import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.health.HealthLink;
 import org.eclipse.osee.orcs.health.HealthLinks;
 import org.eclipse.osee.orcs.health.ServerStatus;
-import org.eclipse.osee.server.application.internal.operations.BuildServerStatusOperation;
-import org.eclipse.osee.server.application.internal.operations.ServerBalancerStatusTable;
-import org.eclipse.osee.server.application.internal.operations.ServerProcesses;
-import org.eclipse.osee.server.application.internal.operations.ServerStatusActiveMq;
-import org.eclipse.osee.server.application.internal.operations.ServerStatusOverviewTable;
-import org.eclipse.osee.server.application.internal.operations.ServerStatusTable;
-import org.eclipse.osee.server.application.internal.operations.ServerStatusTop;
-import org.eclipse.osee.server.application.internal.operations.UsageOperations;
+import org.eclipse.osee.orcs.rest.internal.health.operations.BuildServerStatusOperation;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerBalancerStatusTable;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerProcesses;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerStatusActiveMq;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerStatusOverviewTable;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerStatusTable;
+import org.eclipse.osee.orcs.rest.internal.health.operations.ServerStatusTop;
+import org.eclipse.osee.orcs.rest.internal.health.operations.UsageOperations;
 
 /**
  * @author Donald G. Dunne
@@ -117,7 +117,7 @@ public final class ServerHealthEndpointImpl {
    @GET
    @Produces(MediaType.TEXT_HTML)
    public String get() {
-      String mainHtml = OseeInf.getResourceContents("web/status/main.html", ServerHealthEndpointImpl.class);
+      String mainHtml = OseeInf.getResourceContents("web/health/main.html", ServerHealthEndpointImpl.class);
       StringBuffer sb = new StringBuffer();
       HealthLinks links = getLinks();
       for (HealthLink link : links.getLinks()) {
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/BuildServerStatusOperation.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/BuildServerStatusOperation.java
index 4dd1c8853e8..51c228d55e7 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/BuildServerStatusOperation.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/BuildServerStatusOperation.java
@@ -11,7 +11,7 @@
  *     Boeing - initial API and implementation
  **********************************************************************/
 
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/OseeResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/OseeResource.java
index 7c7a0d3af1d..57bdf44505c 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/OseeResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/OseeResource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 /**
  * @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerBalancerStatusTable.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerBalancerStatusTable.java
index 6fe14ec8449..455d9ab3f54 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerBalancerStatusTable.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerBalancerStatusTable.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerProcesses.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerProcesses.java
index 9b6b7e55a76..9f4444a7667 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerProcesses.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerProcesses.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.InputStream;
 import org.eclipse.osee.framework.core.util.OseeInf;
@@ -24,7 +24,7 @@ public class ServerProcesses {
       StringBuilder sb = new StringBuilder();
       if (Lib.isWindows()) {
          sb.append("<h3>ps -ef is not available for windows (example below)</h3>");
-         String str = OseeInf.getResourceContents("web/status/psef.txt", ServerProcesses.class);
+         String str = OseeInf.getResourceContents("web/health/psef.txt", ServerProcesses.class);
          str = String.format("<pre>%s</pre>", str);
          sb.append(str);
       } else {
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerProcessesOperation.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerProcessesOperation.java
index e059397622e..09d8d7ef9ab 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerProcessesOperation.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerProcessesOperation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusActiveMq.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusActiveMq.java
index 7c44ffd2d1a..9b580d9fee2 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusActiveMq.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusActiveMq.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import org.eclipse.osee.framework.core.server.IApplicationServerManager;
 import org.eclipse.osee.framework.core.server.OseeInfo;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusOverviewTable.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusOverviewTable.java
index 2f15c835e44..c1a2b0ac627 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusOverviewTable.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusOverviewTable.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusTable.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusTable.java
index eda062ae24b..bdf869de5ea 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusTable.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusTable.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusTop.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusTop.java
index 7b0d3d7b354..45e1597dc07 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerStatusTop.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerStatusTop.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.io.InputStream;
 import org.eclipse.osee.framework.core.util.OseeInf;
@@ -24,7 +24,7 @@ public class ServerStatusTop {
       StringBuilder sb = new StringBuilder();
       if (Lib.isWindows()) {
          sb.append("<h3>Top is not available for windows (example below)</h3>");
-         String str = OseeInf.getResourceContents("web/status/top.txt", ServerStatusTop.class);
+         String str = OseeInf.getResourceContents("web/health/top.txt", ServerStatusTop.class);
          str = String.format("<pre>%s</pre>", str);
          sb.append(str);
       } else {
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerUtils.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerUtils.java
index 8516b0f3e47..a3102299cfd 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/ServerUtils.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/ServerUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/UsageOperations.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/UsageOperations.java
index 9a01a23660b..1c959fbed23 100644
--- a/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/UsageOperations.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/health/operations/UsageOperations.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  **********************************************************************/
-package org.eclipse.osee.server.application.internal.operations;
+package org.eclipse.osee.orcs.rest.internal.health.operations;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugins/org.eclipse.osee.server.application/.classpath b/plugins/org.eclipse.osee.server.application/.classpath
deleted file mode 100644
index 1fa3e6803d3..00000000000
--- a/plugins/org.eclipse.osee.server.application/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.server.application/.project b/plugins/org.eclipse.osee.server.application/.project
deleted file mode 100644
index b2215c8f5a9..00000000000
--- a/plugins/org.eclipse.osee.server.application/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osee.server.application</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF
deleted file mode 100644
index 5df3cce1c21..00000000000
--- a/plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Server Application
-Bundle-SymbolicName: org.eclipse.osee.server.application;singleton:=true
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Service-Component: OSGI-INF/*.xml
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Osee-JaxRs-Resource: OSEE-INF/web/*;path=/server
-Import-Package: com.fasterxml.jackson.annotation,
- javax.ws.rs,
- javax.ws.rs.client,
- javax.ws.rs.core,
- org.eclipse.osee.activity.api,
- org.eclipse.osee.framework.core,
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- 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,
- org.eclipse.osee.jdbc,
- org.eclipse.osee.logger,
- org.eclipse.osee.orcs,
- org.eclipse.osee.orcs.health,
- org.eclipse.osee.orcs.search
-Require-Bundle: org.eclipse.osee.framework.jdk.core
diff --git a/plugins/org.eclipse.osee.server.application/build.properties b/plugins/org.eclipse.osee.server.application/build.properties
deleted file mode 100644
index f6362c7e7c6..00000000000
--- a/plugins/org.eclipse.osee.server.application/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               OSEE-INF/
diff --git a/plugins/org.eclipse.osee.server.application/pom.xml b/plugins/org.eclipse.osee.server.application/pom.xml
deleted file mode 100644
index 7160346681b..00000000000
--- a/plugins/org.eclipse.osee.server.application/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.server.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.osee.server.application</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>OSEE Server Application - (Incubation)</name>
-
-</project>
diff --git a/plugins/org.eclipse.osee.server.parent/pom.xml b/plugins/org.eclipse.osee.server.parent/pom.xml
index 23c139f2a67..591d3fedecf 100644
--- a/plugins/org.eclipse.osee.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.server.parent/pom.xml
@@ -161,9 +161,6 @@
 					../../plugins/org.eclipse.osee.framework.server.ide.api
 				</module>
 				<module>
-					../../plugins/org.eclipse.osee.server.application
-				</module>
-				<module>
 					../../plugins/org.eclipse.osee.server.p2
 				</module>
 				<module>
diff --git a/plugins/org.eclipse.osee.x.parent/pom.xml b/plugins/org.eclipse.osee.x.parent/pom.xml
index 8f7b81548c2..64e8a333397 100644
--- a/plugins/org.eclipse.osee.x.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.parent/pom.xml
@@ -22,6 +22,5 @@
 		<module>../../plugins/org.eclipse.osee.disposition.parent</module>
 		<module>../../plugins/org.eclipse.osee.ats.server.parent</module>
 		<module>../../plugins/org.eclipse.osee.server.parent</module>
-		<module>../../plugins/org.eclipse.osee.server.application</module>
 	</modules>
 </project>
author	genie.releng	2018-03-21 11:48:25 +0000
committer	genie.releng	2018-03-21 11:48:25 +0000
commit	d0479e5a34b972b9e7160de6f078f35e52f351e4 (patch)
tree	224d876fa4505bdea8f22e7969d399348803458a /bundles/org.eclipse.equinox.launcher.gtk.linux.x86
parent	7f501fd42d8270f8f518606b0f995ffc85f4e075 (diff)
download	rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.tar.gz rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.tar.xz rt.equinox.framework-d0479e5a34b972b9e7160de6f078f35e52f351e4.zip