diff --git a/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java b/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java index 11c2d1788..601de77d1 100644 --- a/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java +++ b/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeSkin.java @@ -129,8 +129,11 @@ public String toString() params.put(ResourceRequestHandler.COMPRESS_QN, compress ? "min" : ""); params.put(WebAppController.HANDLER_PARAM, "skin"); params.put(ResourceRequestHandler.RESOURCE_QN, resource); + StringBuilder url = new StringBuilder(); - context.renderURL(params, new URIWriter(url, MimeType.PLAIN)); + URIWriter writer = new URIWriter(url, MimeType.PLAIN); + writer.append("/" + service.portalContainerName); + context.renderURL(params, writer); // return url.toString(); diff --git a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java index af4895905..7ceb5625e 100644 --- a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java +++ b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java @@ -129,7 +129,10 @@ public String toString() params.put(ResourceRequestHandler.COMPRESS_QN, compress ? "min" : ""); params.put(WebAppController.HANDLER_PARAM, "skin"); params.put(ResourceRequestHandler.RESOURCE_QN, resource); + StringBuilder url = new StringBuilder(); + URIWriter writer = new URIWriter(url, MimeType.PLAIN); + writer.append("/" + service_.portalContainerName); context.renderURL(params, new URIWriter(url, MimeType.PLAIN)); // diff --git a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinResourceRequestHandler.java b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinResourceRequestHandler.java index 3635cffb9..43d8b501d 100644 --- a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinResourceRequestHandler.java +++ b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinResourceRequestHandler.java @@ -8,6 +8,7 @@ import org.gatein.common.logging.LoggerFactory; import org.gatein.portal.controller.resource.ResourceRequestHandler; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; @@ -45,16 +46,13 @@ public String getHandlerName() } @Override - public boolean execute(final ControllerContext context) throws Exception + public boolean execute(final ControllerContext context, HttpServletRequest request, final HttpServletResponse response) throws Exception { String compressParam = context.getParameter(ResourceRequestHandler.COMPRESS_QN); boolean compress = "min".equals(compressParam); - // - final HttpServletResponse response = context.getResponse(); - // Check if cached resource has not been modifed, return 304 code - long ifModifiedSince = context.getRequest().getDateHeader(IF_MODIFIED_SINCE); + long ifModifiedSince = request.getDateHeader(IF_MODIFIED_SINCE); long cssLastModified = skinService.getLastModified(context); if (isNotModified(ifModifiedSince, cssLastModified)) { diff --git a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java index 8186bb8e7..64e06a993 100644 --- a/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java +++ b/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java @@ -914,8 +914,11 @@ private void processCSSRecursively(ControllerContext context, Appendable appenda params.put(ResourceRequestHandler.COMPRESS_QN, merge ? "min" : ""); params.put(WebAppController.HANDLER_PARAM, "skin"); params.put(ResourceRequestHandler.RESOURCE_QN, resource); - StringBuilder embeddedPath = new StringBuilder(); - context.renderURL(params, new URIWriter(embeddedPath, MimeType.PLAIN)); + + StringBuilder embeddedPath = new StringBuilder(); + URIWriter writer = new URIWriter(embeddedPath, MimeType.PLAIN); + writer.append("/" + portalContainerName); + context.renderURL(params, writer); // strReplace.append(matcher.group(1)); diff --git a/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java b/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java index 7af92b6a3..e552316e0 100644 --- a/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java +++ b/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java @@ -289,7 +289,7 @@ public static ControllerContext newControllerContext(Router router, String reque { parameters = matcher.next(); } - return new ControllerContext(null, router, request, null, parameters); + return new ControllerContext(router, parameters); } catch (MalformedURLException e) { diff --git a/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java b/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java index 0d7a5ae7a..e3cdb73b9 100644 --- a/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java +++ b/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java @@ -34,7 +34,6 @@ import org.exoplatform.component.test.web.WebAppImpl; import org.exoplatform.container.PortalContainer; import org.exoplatform.test.mocks.servlet.MockServletContext; -import org.exoplatform.test.mocks.servlet.MockServletRequest; import org.exoplatform.web.ControllerContext; import org.exoplatform.web.application.javascript.JavascriptConfigParser; import org.exoplatform.web.application.javascript.JavascriptConfigService; @@ -153,7 +152,7 @@ public void testGroupingScript() throws Exception public void testGetJSConfig() throws Exception { - JSONObject config = jsService.getJSConfig(CONTROLLER_CONTEXT, null); + JSONObject config = jsService.getJSConfig(CONTROLLER_CONTEXT, null, ""); //All SCRIPTS and remote resource have to had dependencies declared in shim configuration JSONObject shim = config.getJSONObject("shim"); @@ -187,12 +186,12 @@ public void testGetJSConfig() throws Exception public void testGenerateURL() throws Exception { ResourceId remote1 = new ResourceId(ResourceScope.SHARED, "remote1"); - String remoteURL = jsService.generateURL(CONTROLLER_CONTEXT, remote1, false, null); + String remoteURL = jsService.generateURL(CONTROLLER_CONTEXT, remote1, false, null, ""); //Return remote module/script url as it's declared in gatein-resources.xml assertEquals("http://js/remote1.js", remoteURL); ResourceId module1 = new ResourceId(ResourceScope.SHARED, "module1"); - remoteURL = jsService.generateURL(CONTROLLER_CONTEXT, module1, false, null); + remoteURL = jsService.generateURL(CONTROLLER_CONTEXT, module1, false, null, ""); assertEquals("mock_url_of_module1.js", remoteURL); } diff --git a/pom.xml b/pom.xml index a7395a979..1b65e4c16 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.5.0-CR1 2.3.0-CR1 1.15.0-CR1 - 2.0.2.Final-gatein-2 + 2.0.2-CP02-SNAPSHOT 1.1.1.Final-gatein-2 2.1.0.Beta01 2.3.0.Beta02