diff options
author | Roberto E. Escobar | 2014-05-29 21:02:10 +0000 |
---|---|---|
committer | Roberto E. Escobar | 2014-05-31 00:39:56 +0000 |
commit | 4f99b6fc8ba615602794f04029e7a81426488272 (patch) | |
tree | 8f1f884f67e118484257f5a50bdf47e0b9f539e0 /plugins/org.eclipse.osee.rest.admin | |
parent | c8b7354b8250458e647f4a96caef5e0ea1d0f884 (diff) | |
download | org.eclipse.osee-4f99b6fc8ba615602794f04029e7a81426488272.tar.gz org.eclipse.osee-4f99b6fc8ba615602794f04029e7a81426488272.tar.xz org.eclipse.osee-4f99b6fc8ba615602794f04029e7a81426488272.zip |
refactor: Rename osee.rest.model to osee.jaxrs
Change-Id: I57f5766987b99fa5384285167f58abd9326a080d
Diffstat (limited to 'plugins/org.eclipse.osee.rest.admin')
5 files changed, 7 insertions, 7 deletions
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); } |