Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAB2A9DAB for ; Thu, 5 Jul 2012 14:39:26 +0000 (UTC) Received: (qmail 62332 invoked by uid 500); 5 Jul 2012 14:39:26 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 62287 invoked by uid 500); 5 Jul 2012 14:39:26 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 62274 invoked by uid 99); 5 Jul 2012 14:39:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 14:39:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 14:39:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 38AB923888CD; Thu, 5 Jul 2012 14:39:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357635 - in /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server: impl/atompub/ impl/browser/ shared/ Date: Thu, 05 Jul 2012 14:39:03 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120705143903.38AB923888CD@eris.apache.org> Author: fmui Date: Thu Jul 5 14:39:02 2012 New Revision: 1357635 URL: http://svn.apache.org/viewvc?rev=1357635&view=rev Log: Server: allow filters to set a different base URL Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java?rev=1357635&r1=1357634&r2=1357635&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java Thu Jul 5 14:39:02 2012 @@ -44,6 +44,7 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.server.NamespaceDefinitions; import org.apache.chemistry.opencmis.commons.server.ObjectInfo; import org.apache.chemistry.opencmis.commons.server.RenditionInfo; +import org.apache.chemistry.opencmis.server.shared.Dispatcher; /** * This class contains operations used by all services. @@ -85,6 +86,11 @@ public final class AtomPubUtils { * Compiles the base URL for links, collections and templates. */ public static UrlBuilder compileBaseUrl(HttpServletRequest request, String repositoryId) { + String baseUrl = (String) request.getAttribute(Dispatcher.BASE_URL_ATTRIBUTE); + if (baseUrl != null) { + return new UrlBuilder(baseUrl); + } + UrlBuilder url = new UrlBuilder(request.getScheme(), request.getServerName(), request.getServerPort(), null); url.addPath(request.getContextPath()); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java?rev=1357635&r1=1357634&r2=1357635&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java Thu Jul 5 14:39:02 2012 @@ -67,6 +67,7 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.server.CallContext; import org.apache.chemistry.opencmis.commons.server.CmisService; import org.apache.chemistry.opencmis.server.impl.CallContextImpl; +import org.apache.chemistry.opencmis.server.shared.Dispatcher; import org.apache.chemistry.opencmis.server.shared.HttpUtils; public class BrowserBindingUtils { @@ -93,6 +94,11 @@ public class BrowserBindingUtils { * Compiles the base URL for links, collections and templates. */ public static UrlBuilder compileBaseUrl(HttpServletRequest request) { + String baseUrl = (String) request.getAttribute(Dispatcher.BASE_URL_ATTRIBUTE); + if (baseUrl != null) { + return new UrlBuilder(baseUrl); + } + UrlBuilder url = new UrlBuilder(request.getScheme(), request.getServerName(), request.getServerPort(), null); url.addPath(request.getContextPath()); Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java?rev=1357635&r1=1357634&r2=1357635&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java Thu Jul 5 14:39:02 2012 @@ -41,6 +41,8 @@ public class Dispatcher implements Seria private static final long serialVersionUID = 1L; + public static final String BASE_URL_ATTRIBUTE= "org.apache.chemistry.opencmis.baseurl"; + public static final String METHOD_GET = "GET"; public static final String METHOD_POST = "POST"; public static final String METHOD_PUT = "PUT";