5 files changed, 21 insertions, 27 deletions

diff --git a/features/org.eclipse.osee.core.runtime.feature/build.properties b/features/org.eclipse.osee.core.runtime.feature/build.properties
index fc7011debf3..f52d5391566 100644
--- a/features/org.eclipse.osee.core.runtime.feature/build.properties
+++ b/features/org.eclipse.osee.core.runtime.feature/build.properties
@@ -5,3 +5,4 @@ bin.includes = feature.xml,\
                build.properties

 generate.feature@org.eclipse.osee.core.feature.source = org.eclipse.osee.core.feature

 generate.feature@org.eclipse.osee.core.ui.feature.source = org.eclipse.osee.core.ui.feature

+generate.feature@org.eclipse.osee.core.plugin.feature.source = org.eclipse.osee.core.plugin.feature

diff --git a/features/org.eclipse.osee.core.runtime.feature/feature.xml b/features/org.eclipse.osee.core.runtime.feature/feature.xml
index 78abc698c7e..3839d3118d5 100644
--- a/features/org.eclipse.osee.core.runtime.feature/feature.xml
+++ b/features/org.eclipse.osee.core.runtime.feature/feature.xml
@@ -30,11 +30,19 @@
          version="0.0.0"/>

          

    <includes

+         id="org.eclipse.osee.core.plugin.feature"

+         version="0.0.0"/>

+         

+   <includes

          id="org.eclipse.osee.core.feature.source"

          version="0.0.0"/>

 

    <includes

          id="org.eclipse.osee.core.ui.feature.source"

          version="0.0.0"/>

-         

+

+   <includes

+         id="org.eclipse.osee.core.plugin.feature.source"

+         version="0.0.0"/>         

+             

 </feature>

diff --git a/features/org.eclipse.osee.framework.server.feature/feature.xml b/features/org.eclipse.osee.framework.server.feature/feature.xml
index d20b3159403..dfa7d1dd2c7 100644
--- a/features/org.eclipse.osee.framework.server.feature/feature.xml
+++ b/features/org.eclipse.osee.framework.server.feature/feature.xml
@@ -18,17 +18,14 @@
    </license>

 

    <requires>

-      <import plugin="org.apache.commons.codec"/>

-      <import plugin="org.apache.commons.httpclient"/>

-      <import plugin="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual"/>

-      <import plugin="org.apache.xerces"/>

       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.jobs" version="3.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.osgi"/>

-      <import plugin="com.lowagie.text" version="2.1.7" match="greaterOrEqual"/>

+      <import plugin="org.junit4"/>

       <import plugin="org.eclipse.osgi.services"/>

       <import plugin="org.eclipse.equinox.app"/>

       <import plugin="javax.servlet"/>

+      <import plugin="com.lowagie.text" version="2.1.7" match="greaterOrEqual"/>

       <import plugin="org.apache.derby" version="10.5.1" match="greaterOrEqual"/>

       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>

       <import plugin="org.eclipse.xtext" version="1.0.0" match="greaterOrEqual"/>

@@ -42,13 +39,6 @@
    </requires>

 

    <plugin

-         id="org.eclipse.osee.framework.jdk.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.osee.framework.branch.management"

          download-size="0"

          install-size="0"

@@ -56,13 +46,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.osee.framework.core"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.osee.framework.resource.locator.attribute"

          download-size="0"

          install-size="0"

@@ -112,13 +95,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.osee.framework.logging"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.osee.framework.manager.servlet"

          download-size="0"

          install-size="0"

diff --git a/features/org.eclipse.osee.server.feature/build.properties b/features/org.eclipse.osee.server.feature/build.properties
index 67f5a3e5e8a..c7528039089 100644
--- a/features/org.eclipse.osee.server.feature/build.properties
+++ b/features/org.eclipse.osee.server.feature/build.properties
@@ -4,3 +4,4 @@ bin.includes = feature.xml,\
                license.html

 generate.feature@org.eclipse.osee.server.feature.source = org.eclipse.osee.server.feature

 generate.feature@org.eclipse.osee.framework.server.feature.source = org.eclipse.osee.framework.server.feature

+generate.feature@org.eclipse.osee.core.feature.source = org.eclipse.osee.core.feature
\ No newline at end of file
diff --git a/features/org.eclipse.osee.server.feature/feature.xml b/features/org.eclipse.osee.server.feature/feature.xml
index 4eafef6c309..c9e4b300368 100644
--- a/features/org.eclipse.osee.server.feature/feature.xml
+++ b/features/org.eclipse.osee.server.feature/feature.xml
@@ -33,6 +33,14 @@
          id="org.eclipse.osee.framework.server.external.feature"

          version="0.0.0"/>

 

+   <includes

+         id="org.eclipse.osee.core.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.osee.core.feature.source"

+         version="0.0.0"/>

+

    <plugin

          id="org.eclipse.osee.demo.db.connection"

          download-size="0"