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 9410e064c2f..a940a049c40 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 ad32c83a788..ad32c83a788 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 df0a553a903..2f8ecd64c2f 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 3ee978d45d0..02c08bd4125 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 34d2e4d2dad..34d2e4d2dad 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 f603737a36c..4a6aa952d87 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 00619e4ea66..7900479682d 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 6692d5f5b6e..0668851ff26 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 a486bc56de8..645aeb2d625 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 84e2ecc1809..6c063e8ee06 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 d83b8a6bfad..b975b8732f9 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 ad32c83a788..ad32c83a788 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 18e7360282a..9a67a65965e 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 563831d3634..423be072bd9 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 d5fed99b267..ceeb783b31d 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 @@