diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameter.java b/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameter.java index 1525201..431f074 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameter.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/resolver/UriResolverReaderParameter.java @@ -51,9 +51,11 @@ public class UriResolverReaderParameter { * @throws Exception * */ - public UriResolverReaderParameter() throws Exception { + public UriResolverReaderParameter(String scope) throws Exception { - ScopeProvider.instance.set("/gcube/devsec"); + logger.trace("UriResolverReaderParameter is istancing with scope: "+scope); + + ScopeProvider.instance.set(scope); XQuery query = queryFor(ServiceEndpoint.class); @@ -218,9 +220,11 @@ public class UriResolverReaderParameter { public static void main(String[] args) throws Exception { - logger.trace(new UriResolverReaderParameter()); - UriResolverReaderParameter uriResolver = new UriResolverReaderParameter(); + String scope = "/gcube/devsec"; + logger.trace(new UriResolverReaderParameter(scope)); + + UriResolverReaderParameter uriResolver = new UriResolverReaderParameter(scope); String fileName = "Wikipedia_logo_silver.png"; diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java index 10aec49..b31083e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java @@ -302,12 +302,13 @@ public class WsUtil { public static UriResolverReaderParameter getUriResolver(HttpSession httpSession) { ASLSession session = getAslSession(httpSession); + UriResolverReaderParameter uriResolver = null; try{ uriResolver = (UriResolverReaderParameter) session.getAttribute(WsUtil.URI_RESOLVER_SERVICE); if(uriResolver==null){ - uriResolver = new UriResolverReaderParameter(); + uriResolver = new UriResolverReaderParameter(session.getScope().toString()); session.setAttribute(URI_RESOLVER_SERVICE, uriResolver); } diff --git a/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java b/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java index d8cb1c2..e4ccc8b 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java +++ b/src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java @@ -162,12 +162,13 @@ public class UriResolverReaderRR { try{ + String scope = "/gcube/devsec"; Workspace workspace = HomeLibrary .getHomeManagerFactory() .getHomeManager() .getHome("francesco.mangiacrapa", - GCUBEScope.getScope("/gcube/devsec")) + GCUBEScope.getScope(scope)) .getWorkspace(); GWTWorkspaceBuilder builder = new GWTWorkspaceBuilder(); @@ -183,7 +184,7 @@ public class UriResolverReaderRR { System.out.println("smpUri "+smpUri); System.out.println("get uriResolver..."); - UriResolverReaderParameter uriResolver = new UriResolverReaderParameter(); + UriResolverReaderParameter uriResolver = new UriResolverReaderParameter(scope); String url = uriResolver.resolveAsUriRequest(smpUri, "testResponse!@#$$%^^&&.html", folderItem.getMimeType(), true); System.out.println("url econded: "+url);