Author: nfilotto Date: 2009-10-05 07:06:46 -0400 (Mon, 05 Oct 2009) New Revision: 219 Modified: jcr/trunk/frameworks/command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/AbstractFCKConnector.java Log: EXOJCR-166: Support separated ear delivery Modified: jcr/trunk/frameworks/command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/AbstractFCKConnector.java =================================================================== --- jcr/trunk/frameworks/command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/AbstractFCKConnector.java 2009-10-05 11:05:46 UTC (rev 218) +++ jcr/trunk/frameworks/command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/AbstractFCKConnector.java 2009-10-05 11:06:46 UTC (rev 219) @@ -18,6 +18,9 @@ */ package org.exoplatform.frameworks.jcr.command.web.fckeditor; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.PortalContainer; import org.exoplatform.frameworks.jcr.command.web.GenericWebAppContext; /** @@ -65,7 +68,18 @@ */ protected String makeRESTPath(String repoName, String workspace, String resource) { - return "/rest/jcr/" + repoName + "/" + workspace + resource; + final StringBuilder sb = new StringBuilder(512); + ExoContainer container = ExoContainerContext.getCurrentContainerIfPresent(); + if (container instanceof PortalContainer) + { + PortalContainer pContainer = (PortalContainer)container; + sb.append('/').append(pContainer.getRestContextName()).append('/'); + } + else + { + sb.append('/').append(PortalContainer.DEFAULT_REST_CONTEXT_NAME).append('/'); + } + return sb.append("jcr/").append(repoName).append('/').append(workspace).append(resource).toString(); } }