refactor: Rename osee.rest.model to osee.jaxrs

Change-Id: I57f5766987b99fa5384285167f58abd9326a080d

22 files changed, 37 insertions, 34 deletions

diff --git a/features/org.eclipse.osee.core.feature/feature.xml b/features/org.eclipse.osee.core.feature/feature.xml
index c6525196878..bb2b76edf79 100644
--- a/features/org.eclipse.osee.core.feature/feature.xml
+++ b/features/org.eclipse.osee.core.feature/feature.xml
@@ -84,7 +84,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osee.rest.model"
+         id="org.eclipse.osee.jaxrs"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index 677c037c654..9410e064c2f 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -159,7 +159,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osee.rest.model"
+         id="org.eclipse.osee.jaxrs"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF
index 40db9689cbc..d42ce2f3fd1 100644
--- a/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.account.rest.client/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Import-Package: com.google.inject,
  org.eclipse.osee.account.rest.model,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.rest.client,
- org.eclipse.osee.rest.model
+ org.eclipse.osee.jaxrs
 Export-Package: org.eclipse.osee.account.rest.client
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Require-Bundle: org.codehaus.jackson.core;bundle-version="1.9.2",
diff --git a/plugins/org.eclipse.osee.rest.model/.classpath b/plugins/org.eclipse.osee.jaxrs/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.rest.model/.classpath
+++ b/plugins/org.eclipse.osee.jaxrs/.classpath
diff --git a/plugins/org.eclipse.osee.rest.model/.project b/plugins/org.eclipse.osee.jaxrs/.project
index 22c4b02bc16..82e8653cf00 100644
--- a/plugins/org.eclipse.osee.rest.model/.project
+++ b/plugins/org.eclipse.osee.jaxrs/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.osee.rest.model</name>
+	<name>org.eclipse.osee.jaxrs</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.osee.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF
index e7bc6cb479c..e867dfcf54d 100644
--- a/plugins/org.eclipse.osee.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs/META-INF/MANIFEST.MF
@@ -1,11 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Rest Model (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.rest.model
+Bundle-Name: OSEE JAX-RS (Incubation)
+Bundle-SymbolicName: org.eclipse.osee.jaxrs
 Bundle-Version: 0.17.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Open System Engineering Environment
-Export-Package: org.eclipse.osee.rest.model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
 Import-Package: javax.ws.rs,
  javax.ws.rs.core,
+ javax.ws.rs.ext,
  org.eclipse.osee.framework.jdk.core.util
+Export-Package: org.eclipse.osee.jaxrs
+
diff --git a/plugins/org.eclipse.osee.rest.model/build.properties b/plugins/org.eclipse.osee.jaxrs/build.properties
index 34d2e4d2dad..34d2e4d2dad 100644
--- a/plugins/org.eclipse.osee.rest.model/build.properties
+++ b/plugins/org.eclipse.osee.jaxrs/build.properties
diff --git a/plugins/org.eclipse.osee.rest.model/pom.xml b/plugins/org.eclipse.osee.jaxrs/pom.xml
index ea033be7aed..95251e2bcb3 100644
--- a/plugins/org.eclipse.osee.rest.model/pom.xml
+++ b/plugins/org.eclipse.osee.jaxrs/pom.xml
@@ -10,9 +10,9 @@
 		<relativePath>../../plugins/org.eclipse.osee.x.core.parent</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.osee.rest.model</artifactId>
+	<artifactId>org.eclipse.osee.jaxrs</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<name>OSEE Rest Model - (Incubation)</name>
+	<name>OSEE JAX-RS (Incubation)</name>
 
 	<build>
 		<!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
@@ -31,4 +31,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/ApplicationInfo.java b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/ApplicationInfo.java
index 71d6c345d91..046c1cbe6c0 100644
--- a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/ApplicationInfo.java
+++ b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/ApplicationInfo.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.rest.model;
+package org.eclipse.osee.jaxrs;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -21,14 +21,14 @@ public class ApplicationInfo {
    private String bundleName;
    private String version;
    private String applicationName;
-   private String context;
+   private String uri;
 
-   public String getContext() {
-      return context;
+   public String getUri() {
+      return uri;
    }
 
-   public void setContext(String context) {
-      this.context = context;
+   public void setUri(String uri) {
+      this.uri = uri;
    }
 
    public String getApplicationName() {
diff --git a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/ErrorResponse.java b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/ErrorResponse.java
index 47fe0bdaef0..0c8c44bf36d 100644
--- a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/ErrorResponse.java
+++ b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/ErrorResponse.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Boeing.
+ * Copyright (c) 2014 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
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.rest.model;
+package org.eclipse.osee.jaxrs;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/NoSecurityFilter.java b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/NoSecurityFilter.java
index dfe90c324d3..2ace0f9c1a0 100644
--- a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/NoSecurityFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/NoSecurityFilter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.rest.model;
+package org.eclipse.osee.jaxrs;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/OseeWebApplicationException.java b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OseeWebApplicationException.java
index eb3acba6a87..a9a120b05f2 100644
--- a/plugins/org.eclipse.osee.rest.model/src/org/eclipse/osee/rest/model/OseeWebApplicationException.java
+++ b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OseeWebApplicationException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Boeing.
+ * Copyright (c) 2014 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
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.rest.model;
+package org.eclipse.osee.jaxrs;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
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.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java
index 6802b884810..84e2ecc1809 100644
--- a/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java
+++ b/plugins/org.eclipse.osee.rest.admin.test/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImplTest.java
@@ -24,8 +24,8 @@ import javax.ws.rs.core.SecurityContext;
 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.logger.Log;
-import org.eclipse.osee.rest.model.OseeWebApplicationException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF
index 7b20c2c1f45..563831d3634 100644
--- a/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.rest.admin/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Import-Package: com.google.common.io,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.logger,
- org.eclipse.osee.rest.model,
+ org.eclipse.osee.jaxrs,
  org.osgi.framework,
  org.osgi.service.http
 Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java
index e374f773ca0..ab564ec01c5 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java
+++ b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/GenericExceptionMapper.java
@@ -16,9 +16,9 @@ import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
+import org.eclipse.osee.jaxrs.ErrorResponse;
+import org.eclipse.osee.jaxrs.OseeWebApplicationException;
 import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.rest.model.ErrorResponse;
-import org.eclipse.osee.rest.model.OseeWebApplicationException;
 
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java
index 95331a2d68a..564c1ba9a92 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java
+++ b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecureResourceFilterFactory.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.rest.admin.internal.filters;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.eclipse.osee.jaxrs.NoSecurityFilter;
 import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.rest.model.NoSecurityFilter;
 import com.sun.jersey.api.container.filter.servlet.RolesAllowedResourceFilterFactory;
 import com.sun.jersey.api.model.AbstractMethod;
 import com.sun.jersey.spi.container.ResourceFilter;
diff --git a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java
index f60af166411..42e8e49b870 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java
+++ b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/filters/SecurityContextProviderImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.osee.authorization.admin.AuthorizationAdmin;
 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.logger.Log;
 import org.eclipse.osee.rest.admin.internal.SecurityContextProvider;
-import org.eclipse.osee.rest.model.OseeWebApplicationException;
 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.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java
index e5dcbf1df6b..f88474587f5 100644
--- a/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java
+++ b/plugins/org.eclipse.osee.rest.admin/src/org/eclipse/osee/rest/admin/internal/resources/ApplicationsResource.java
@@ -19,9 +19,9 @@ import javax.ws.rs.Path;
 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.rest.model.ApplicationInfo;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
@@ -62,7 +62,7 @@ public class ApplicationsResource {
                info.setBundleName(bundleName);
                info.setVersion(bundleVersion);
                info.setApplicationName(componentName);
-               info.setContext(contextName);
+               info.setUri(contextName);
                toReturn.add(info);
             }
 
diff --git a/plugins/org.eclipse.osee.rest.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.rest.client/META-INF/MANIFEST.MF
index 1ef400a2776..f35f1441d3d 100644
--- a/plugins/org.eclipse.osee.rest.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.rest.client/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Import-Package: com.google.inject,
  org.eclipse.core.net.proxy,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.rest.model
+ org.eclipse.osee.jaxrs
 Export-Package: org.eclipse.osee.rest.client
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  javax.servlet;visibility:=reexport,
diff --git a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java b/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java
index 4af733c58fc..2aa0f467727 100644
--- a/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java
+++ b/plugins/org.eclipse.osee.rest.client/src/org/eclipse/osee/rest/client/internal/WebClientProviderImpl.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.rest.client.internal;
 import java.net.URI;
 import java.util.Map;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.jaxrs.ErrorResponse;
 import org.eclipse.osee.rest.client.WebClientProvider;
-import org.eclipse.osee.rest.model.ErrorResponse;
 import com.sun.jersey.api.client.AsyncWebResource;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/plugins/org.eclipse.osee.x.core.parent/pom.xml b/plugins/org.eclipse.osee.x.core.parent/pom.xml
index 1b9cb03005b..9780df966a6 100644
--- a/plugins/org.eclipse.osee.x.core.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.core.parent/pom.xml
@@ -67,7 +67,7 @@
 		<module>../../plugins/org.eclipse.osee.display.mvp</module>
 		<module>../../plugins/org.eclipse.osee.display.mvp.test</module>
 
-		<module>../../plugins/org.eclipse.osee.rest.model</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.rest.client</module>
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
index faf860da3c1..95c40a020e9 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Import-Package: org.apache.commons.lang.math,
  org.eclipse.osee.framework.core.exception,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.rest.client,
- org.eclipse.osee.rest.model
+ org.eclipse.osee.jaxrs