Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-04-24 12:35:53 +0000
committerjmisinco2015-04-24 12:35:53 +0000
commit8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b (patch)
treeffe0acb742f047e5cecc78247a361efa0cd03e8a /plugins/org.eclipse.osee.jaxrs.server
parente336a127c7645b5e1f076336d35ebbe494208fef (diff)
downloadorg.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.gz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.xz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.zip
feature: Luna, Java8, Tycho 0.22
Diffstat (limited to 'plugins/org.eclipse.osee.jaxrs.server')
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java3
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java5
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java3
4 files changed, 8 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
index 44628af1980..a9e0927f59d 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
Bundle-Name: OSEE JAX-RS Server (Incubation)
Bundle-SymbolicName: org.eclipse.osee.jaxrs.server
Bundle-Version: 0.22.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
Osee-Template: OSEE-INF/templates/*.html
-Import-Package: com.google.common.cache;version="[11.0.0,15.0.0)",
- com.google.common.io;version="[11.0.0,15.0.0)",
- javax.annotation;version="1.2.0",
- javax.annotation.security;version="1.2.0",
- javax.servlet;version="2.6.0",
- javax.servlet.http;version="2.6.0",
+Import-Package: com.google.common.cache,
+ com.google.common.io,
+ javax.annotation,
+ javax.annotation.security,
+ javax.servlet,
+ javax.servlet.http,
javax.ws.rs;version="2.0.0",
javax.ws.rs.client;version="2.0.0",
javax.ws.rs.container;version="2.0.0",
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java
index 5523fdcc71b..679b282e769 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/resources/JaxRsStaticResourceRequestFilter.java
@@ -16,9 +16,7 @@ import java.io.OutputStream;
import java.net.URLConnection;
import java.util.Date;
import java.util.List;
-import javax.annotation.Priority;
import javax.servlet.ServletContext;
-import javax.ws.rs.Priorities;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -40,7 +38,6 @@ import org.eclipse.osee.jaxrs.server.internal.JaxRsResourceManager.Resource;
* @author Roberto E. Escobar
*/
@PreMatching
-@Priority(Priorities.USER)
@Provider
public class JaxRsStaticResourceRequestFilter implements ContainerRequestFilter {
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java
index 1e04ad143a6..c8c83305abc 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java
@@ -12,9 +12,7 @@ package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider;
import static org.eclipse.osee.jaxrs.server.internal.security.oauth2.OAuthUtil.newAuthorizationRequiredResponse;
import java.net.URI;
-import javax.annotation.Priority;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Priorities;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.HttpHeaders;
@@ -37,11 +35,10 @@ import org.eclipse.osee.logger.Log;
* This filter allows for JAX-RS APIs to be shared between OAuth access
* and when the resource owner accesses the API without using OAuth.
* </pre>
- *
+ *
* @author Roberto E. Escobar
*/
@PreMatching
-@Priority(Priorities.AUTHENTICATION)
public class OAuth2RequestFilter extends OAuthRequestFilter {
private final Log logger;
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java
index 7a826301239..35aed4eb494 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OseeAuthorizingFilter.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.jaxrs.server.internal.security.oauth2.provider;
-import javax.annotation.Priority;
-import javax.ws.rs.Priorities;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
@@ -26,7 +24,6 @@ import org.eclipse.osee.jaxrs.server.internal.JaxRsResourceManager.Resource;
*/
@Provider
-@Priority(Priorities.AUTHORIZATION)
public class OseeAuthorizingFilter extends SimpleAuthorizingFilter {
private AbstractAuthorizingInInterceptor interceptor;

Back to the top