Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java12
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/OAuth2RequestFilter.java2
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java
index 3ddc8b585d9..f1c5692f397 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/JaxRsResourceManager.java
@@ -36,19 +36,19 @@ import org.osgi.framework.BundleListener;
/**
* Class responsible for managing static web resources contributed by bundles.
- *
+ *
* <pre>
* Contributions are specified in the bundle's MANIFEST.MF file using the following header and syntax:
- *
+ *
* <b>Osee-JaxRs-Resource:</b> <i>path_to_resource<i><b>;path=</b><i>web_address</i><b>,</b> ...
- *
+ *
* Example:
* <b>Osee-JaxRs-Resource:</b> <i>/web/js/*<i><b>;path=</b><i>/lib</i>
- *
+ *
* Make all files in <b>/web/js/</b> available through <b>/lib/</b>.
* Therefore, if we have a file - /web/js/script.js it will be available at /lib/script.js
* </pre>
- *
+ *
* @author Roberto E. Escobar
*/
public final class JaxRsResourceManager implements BundleListener {
@@ -114,7 +114,7 @@ public final class JaxRsResourceManager implements BundleListener {
public Resource findResource(ContainerRequestContext requestContext) {
UriInfo uriInfo = requestContext.getUriInfo();
- String path = uriInfo.getPath(false);
+ String path = uriInfo.getAbsolutePath().getPath();
Resource resource = getResource(path);
if (resource == null) {
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 aac8a792f88..db25a0c72a5 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
@@ -92,7 +92,7 @@ public class OAuth2RequestFilter extends OAuthRequestFilter {
public void filter(ContainerRequestContext context) {
boolean isSecurePath = isPathSecure(context);
UriInfo uriInfo = context.getUriInfo();
- String path = uriInfo.getPath();
+ String path = uriInfo.getAbsolutePath().getPath();
if (isSecurePath && path.contains("oauth2") || path.contains("accounts/self")) {
if (isResourceOwnerRequest(context)) {
handleResourceOwnerRequest(context);

Back to the top