Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.osee.x.core.feature/feature.xml14
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/.classpath (renamed from plugins/org.eclipse.osee.rest.admin.test/.classpath)0
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/.project (renamed from plugins/org.eclipse.osee.rest.admin.test/.project)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.osee.rest.admin.test/META-INF/MANIFEST.MF)11
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/build.properties (renamed from plugins/org.eclipse.osee.rest.admin.test/build.properties)0
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/pom.xml (renamed from plugins/org.eclipse.osee.rest.admin.test/pom.xml)8
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/JaxRsServerInternalTestSuite.java (renamed from plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestAdminInternalTestSuite.java)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java (renamed from plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenatorTest.java)3
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/FiltersTestSuite.java (renamed from plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/FiltersTestSuite.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImplTest.java (renamed from plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java)3
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/test/JaxRsServerTestSuite.java (renamed from plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/RestAdminTestSuite.java)8
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/.classpath (renamed from plugins/org.eclipse.osee.rest.admin/.classpath)0
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/.project (renamed from plugins/org.eclipse.osee.rest.admin/.project)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/OSGI-INF/jaxrs.application.manager.xml (renamed from plugins/org.eclipse.osee.rest.admin/OSGI-INF/rest.manager.xml)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/build.properties (renamed from plugins/org.eclipse.osee.rest.admin/build.properties)0
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/pom.xml (renamed from plugins/org.eclipse.osee.rest.admin/pom.xml)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleHttpContext.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleHttpContext.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleWadlGeneratorConfig.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleWadlGeneratorConfig.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/GenericExceptionMapper.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ObjectProvider.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/ObjectProvider.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestComponentFactory.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestComponentFactory.java)8
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenator.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenator.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServiceUtils.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServiceUtils.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletContainer.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletContainer.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletManager.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletManager.java)6
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletRegistry.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletRegistry.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/SecurityContextProvider.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/SecurityContextProvider.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecureResourceFilterFactory.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java)2
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextFilter.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextFilter.java)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImpl.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java)4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/ApplicationsResource.java (renamed from plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java)6
-rw-r--r--plugins/org.eclipse.osee.x.core.parent/pom.xml4
33 files changed, 61 insertions, 60 deletions
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index 9410e064c2..a940a049c4 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -88,13 +88,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.rest.admin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.event"
download-size="0"
install-size="0"
@@ -166,6 +159,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.osee.jaxrs.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.osee.account.admin"
download-size="0"
install-size="0"
diff --git a/plugins/org.eclipse.osee.rest.admin.test/.classpath b/plugins/org.eclipse.osee.jaxrs.server.test/.classpath
index ad32c83a78..ad32c83a78 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/.classpath
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/.classpath
diff --git a/plugins/org.eclipse.osee.rest.admin.test/.project b/plugins/org.eclipse.osee.jaxrs.server.test/.project
index df0a553a90..2f8ecd64c2 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/.project
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.rest.admin.test</name>
+ <name>org.eclipse.osee.jaxrs.server.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.rest.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF
index 3ee978d45d..02c08bd412 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/META-INF/MANIFEST.MF
@@ -1,15 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Rest Admin Test
-Bundle-SymbolicName: org.eclipse.osee.rest.admin.test
+Bundle-Name: OSEE JAX-RS Server Test (Incubation)
+Bundle-SymbolicName: org.eclipse.osee.jaxrs.server.test
Bundle-Version: 0.17.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
-Fragment-Host: org.eclipse.osee.rest.admin
+Fragment-Host: org.eclipse.osee.jaxrs.server
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: junit.framework;version="3.8.2",
- org.hamcrest.core,
+Import-Package: org.hamcrest.core,
org.junit,
- org.junit.rules;version="4.11.0",
+ org.junit.rules,
org.junit.runner,
org.junit.runners,
org.mockito;bundle-version="1.9.0",
diff --git a/plugins/org.eclipse.osee.rest.admin.test/build.properties b/plugins/org.eclipse.osee.jaxrs.server.test/build.properties
index 34d2e4d2da..34d2e4d2da 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/build.properties
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/build.properties
diff --git a/plugins/org.eclipse.osee.rest.admin.test/pom.xml b/plugins/org.eclipse.osee.jaxrs.server.test/pom.xml
index f603737a36..4a6aa952d8 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/pom.xml
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/pom.xml
@@ -10,9 +10,9 @@
<relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.rest.admin.test</artifactId>
+ <artifactId>org.eclipse.osee.jaxrs.server.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <name>OSEE Rest Admin Test - (Incubation)</name>
+ <name>OSEE JAX-RS Server Test - (Incubation)</name>
<build>
<plugins>
@@ -21,8 +21,8 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <testSuite>org.eclipse.osee.rest.admin.test</testSuite>
- <testClass>org.eclipse.osee.rest.admin.RestAdminTestSuite</testClass>
+ <testSuite>org.eclipse.osee.jaxrs.server.test</testSuite>
+ <testClass>org.eclipse.osee.jaxrs.server.test.JaxRsServerTestSuite</testClass>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestAdminInternalTestSuite.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/JaxRsServerInternalTestSuite.java
index 00619e4ea6..7900479682 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestAdminInternalTestSuite.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/JaxRsServerInternalTestSuite.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,6 +18,6 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({RestResourceConcatenatorTest.class})
-public class RestAdminInternalTestSuite {
+public class JaxRsServerInternalTestSuite {
// Test Suite
}
diff --git a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenatorTest.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java
index 6692d5f5b6..0668851ff2 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenatorTest.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenatorTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import static org.junit.Assert.fail;
import java.io.IOException;
@@ -17,6 +17,7 @@ import java.io.UnsupportedEncodingException;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.jaxrs.server.internal.RestResourceConcatenator;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/FiltersTestSuite.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/FiltersTestSuite.java
index a486bc56de..645aeb2d62 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/FiltersTestSuite.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/FiltersTestSuite.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.filters;
+package org.eclipse.osee.jaxrs.server.internal.filters;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImplTest.java
index 84e2ecc180..6c063e8ee0 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImplTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.filters;
+package org.eclipse.osee.jaxrs.server.internal.filters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,6 +25,7 @@ import org.eclipse.osee.authorization.admin.Authorization;
import org.eclipse.osee.authorization.admin.AuthorizationAdmin;
import org.eclipse.osee.authorization.admin.AuthorizationRequest;
import org.eclipse.osee.jaxrs.OseeWebApplicationException;
+import org.eclipse.osee.jaxrs.server.internal.filters.SecurityContextProviderImpl;
import org.eclipse.osee.logger.Log;
import org.junit.Before;
import org.junit.Rule;
diff --git a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/RestAdminTestSuite.java b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/test/JaxRsServerTestSuite.java
index d83b8a6bfa..b975b8732f 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/RestAdminTestSuite.java
+++ b/plugins/org.eclipse.osee.jaxrs.server.test/src/org/eclipse/osee/jaxrs/server/test/JaxRsServerTestSuite.java
@@ -8,9 +8,9 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin;
+package org.eclipse.osee.jaxrs.server.test;
-import org.eclipse.osee.rest.admin.internal.RestAdminInternalTestSuite;
+import org.eclipse.osee.jaxrs.server.internal.JaxRsServerInternalTestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,7 +18,7 @@ import org.junit.runners.Suite;
* @author David W. Miller
*/
@RunWith(Suite.class)
-@Suite.SuiteClasses({RestAdminInternalTestSuite.class})
-public class RestAdminTestSuite {
+@Suite.SuiteClasses({JaxRsServerInternalTestSuite.class})
+public class JaxRsServerTestSuite {
// Test Suite
}
diff --git a/plugins/org.eclipse.osee.rest.admin/.classpath b/plugins/org.eclipse.osee.jaxrs.server/.classpath
index ad32c83a78..ad32c83a78 100644
--- a/plugins/org.eclipse.osee.rest.admin/.classpath
+++ b/plugins/org.eclipse.osee.jaxrs.server/.classpath
diff --git a/plugins/org.eclipse.osee.rest.admin/.project b/plugins/org.eclipse.osee.jaxrs.server/.project
index 18e7360282..9a67a65965 100644
--- a/plugins/org.eclipse.osee.rest.admin/.project
+++ b/plugins/org.eclipse.osee.jaxrs.server/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.rest.admin</name>
+ <name>org.eclipse.osee.jaxrs.server</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
index 563831d363..423be072bd 100644
--- a/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Rest Application Manager (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.rest.admin
+Bundle-Name: OSEE JAX-RS Server (Incubation)
+Bundle-SymbolicName: org.eclipse.osee.jaxrs.server
Bundle-Version: 0.17.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.rest.admin/OSGI-INF/rest.manager.xml b/plugins/org.eclipse.osee.jaxrs.server/OSGI-INF/jaxrs.application.manager.xml
index d5fed99b26..ceeb783b31 100644
--- a/plugins/org.eclipse.osee.rest.admin/OSGI-INF/rest.manager.xml
+++ b/plugins/org.eclipse.osee.jaxrs.server/OSGI-INF/jaxrs.application.manager.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" enabled="true" immediate="true" name="org.eclipse.osee.rest.admin.internal.RestServletManager">
- <implementation class="org.eclipse.osee.rest.admin.internal.RestServletManager"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true">
+ <implementation class="org.eclipse.osee.jaxrs.server.internal.RestServletManager"/>
<reference interface="org.osgi.service.http.HttpService" name="HttpService"
cardinality="1..1"
diff --git a/plugins/org.eclipse.osee.rest.admin/build.properties b/plugins/org.eclipse.osee.jaxrs.server/build.properties
index 6210e849b5..6210e849b5 100644
--- a/plugins/org.eclipse.osee.rest.admin/build.properties
+++ b/plugins/org.eclipse.osee.jaxrs.server/build.properties
diff --git a/plugins/org.eclipse.osee.rest.admin/pom.xml b/plugins/org.eclipse.osee.jaxrs.server/pom.xml
index dcd41536bf..5dc7217d89 100644
--- a/plugins/org.eclipse.osee.rest.admin/pom.xml
+++ b/plugins/org.eclipse.osee.jaxrs.server/pom.xml
@@ -10,9 +10,9 @@
<relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.rest.admin</artifactId>
+ <artifactId>org.eclipse.osee.jaxrs.server</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>OSEE Rest Admin - (Incubation)</name>
+ <name>OSEE JAX-RS Server - (Incubation)</name>
<build>
<!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleHttpContext.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleHttpContext.java
index aad7daa00f..6169f91ef4 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleHttpContext.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleHttpContext.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.net.URL;
import javax.servlet.http.HttpServletRequest;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleWadlGeneratorConfig.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleWadlGeneratorConfig.java
index 3fd5f0480b..3911c64af5 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/BundleWadlGeneratorConfig.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/BundleWadlGeneratorConfig.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/GenericExceptionMapper.java
index ab564ec01c..941a298f2f 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/GenericExceptionMapper.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/ObjectProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ObjectProvider.java
index ad9cc22e3b..99aaf392c7 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/ObjectProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ObjectProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
/**
* @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestComponentFactory.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestComponentFactory.java
index e0676feb3b..5870d61e69 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestComponentFactory.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestComponentFactory.java
@@ -8,16 +8,16 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.eclipse.osee.jaxrs.server.internal.filters.SecureResourceFilterFactory;
+import org.eclipse.osee.jaxrs.server.internal.filters.SecurityContextFilter;
+import org.eclipse.osee.jaxrs.server.internal.resources.ApplicationsResource;
import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.rest.admin.internal.filters.SecureResourceFilterFactory;
-import org.eclipse.osee.rest.admin.internal.filters.SecurityContextFilter;
-import org.eclipse.osee.rest.admin.internal.resources.ApplicationsResource;
import org.osgi.framework.Bundle;
import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.api.core.ResourceConfig;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenator.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenator.java
index cf5092f86d..0e96e54e0f 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestResourceConcatenator.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestResourceConcatenator.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServiceUtils.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServiceUtils.java
index 1a7262be03..cad00f0689 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServiceUtils.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServiceUtils.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.util.Collection;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletContainer.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletContainer.java
index 0b614a1a11..43e1044362 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletContainer.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletContainer.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.util.Map;
import java.util.Set;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletManager.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletManager.java
index 9ad013bc0b..4a961dce79 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletManager.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletManager.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.util.HashSet;
import java.util.Set;
@@ -20,9 +20,9 @@ import javax.ws.rs.core.Application;
import org.eclipse.osee.authorization.admin.AuthorizationAdmin;
import org.eclipse.osee.executor.admin.CancellableCallable;
import org.eclipse.osee.executor.admin.ExecutorAdmin;
+import org.eclipse.osee.jaxrs.server.internal.filters.SecurityContextFilter;
+import org.eclipse.osee.jaxrs.server.internal.filters.SecurityContextProviderImpl;
import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.rest.admin.internal.filters.SecurityContextFilter;
-import org.eclipse.osee.rest.admin.internal.filters.SecurityContextProviderImpl;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpService;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletRegistry.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletRegistry.java
index 1607aa228c..d4e24da8eb 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/RestServletRegistry.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/RestServletRegistry.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import java.util.Iterator;
import java.util.concurrent.Callable;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/SecurityContextProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/SecurityContextProvider.java
index 5c8203886f..927e9c04a5 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/SecurityContextProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/SecurityContextProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal;
+package org.eclipse.osee.jaxrs.server.internal;
import javax.ws.rs.core.SecurityContext;
import com.sun.jersey.api.core.HttpRequestContext;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecureResourceFilterFactory.java
index 564c1ba9a9..3aafaa8277 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecureResourceFilterFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.filters;
+package org.eclipse.osee.jaxrs.server.internal.filters;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextFilter.java
index b31f108ed4..a50be71487 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextFilter.java
@@ -8,11 +8,11 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.filters;
+package org.eclipse.osee.jaxrs.server.internal.filters;
import javax.ws.rs.core.SecurityContext;
import javax.ws.rs.ext.Provider;
-import org.eclipse.osee.rest.admin.internal.SecurityContextProvider;
+import org.eclipse.osee.jaxrs.server.internal.SecurityContextProvider;
import com.sun.jersey.spi.container.ContainerRequest;
import com.sun.jersey.spi.container.ContainerRequestFilter;
import com.sun.jersey.spi.container.ContainerResponseFilter;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImpl.java
index 42e8e49b87..7d2d677527 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/filters/SecurityContextProviderImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.filters;
+package org.eclipse.osee.jaxrs.server.internal.filters;
import java.security.Principal;
import java.text.ParseException;
@@ -22,8 +22,8 @@ import org.eclipse.osee.authorization.admin.AuthorizationRequest;
import org.eclipse.osee.authorization.admin.AuthorizationRequestBuilder;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.jaxrs.OseeWebApplicationException;
+import org.eclipse.osee.jaxrs.server.internal.SecurityContextProvider;
import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.rest.admin.internal.SecurityContextProvider;
import com.sun.jersey.api.core.HttpRequestContext;
/**
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/ApplicationsResource.java
index f88474587f..5cd18ceef8 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/ApplicationsResource.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.rest.admin.internal.resources;
+package org.eclipse.osee.jaxrs.server.internal.resources;
import java.util.ArrayList;
import java.util.Arrays;
@@ -20,8 +20,8 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import org.eclipse.osee.jaxrs.ApplicationInfo;
-import org.eclipse.osee.rest.admin.internal.ObjectProvider;
-import org.eclipse.osee.rest.admin.internal.RestServiceUtils;
+import org.eclipse.osee.jaxrs.server.internal.ObjectProvider;
+import org.eclipse.osee.jaxrs.server.internal.RestServiceUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml
index 9780df966a..38e47ad53d 100644
--- a/plugins/org.eclipse.osee.x.core.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml
@@ -68,8 +68,8 @@
<module>../../plugins/org.eclipse.osee.display.mvp.test</module>
<module>../../plugins/org.eclipse.osee.jaxrs</module>
- <module>../../plugins/org.eclipse.osee.rest.admin</module>
- <module>../../plugins/org.eclipse.osee.rest.admin.test</module>
+ <module>../../plugins/org.eclipse.osee.jaxrs.server</module>
+ <module>../../plugins/org.eclipse.osee.jaxrs.server.test</module>
<module>../../plugins/org.eclipse.osee.rest.client</module>
<module>../../plugins/org.eclipse.osee.account.rest.model</module>

Back to the top