Return-Path: X-Original-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 555D79017 for ; Wed, 21 Sep 2011 14:28:16 +0000 (UTC) Received: (qmail 99428 invoked by uid 500); 21 Sep 2011 14:28:14 -0000 Delivered-To: apmail-incubator-rave-commits-archive@incubator.apache.org Received: (qmail 99393 invoked by uid 500); 21 Sep 2011 14:28:14 -0000 Mailing-List: contact rave-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rave-dev@incubator.apache.org Delivered-To: mailing list rave-commits@incubator.apache.org Received: (qmail 99319 invoked by uid 99); 21 Sep 2011 14:28:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2011 14:28:14 +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; Wed, 21 Sep 2011 14:28:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6DC9123888FD; Wed, 21 Sep 2011 14:27:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1173674 - /incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties Date: Wed, 21 Sep 2011 14:27:51 -0000 To: rave-commits@incubator.apache.org From: jasha@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110921142751.6DC9123888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jasha Date: Wed Sep 21 14:27:51 2011 New Revision: 1173674 URL: http://svn.apache.org/viewvc?rev=1173674&view=rev Log: RAVE-253 shindig.signing.global-callback-url is used both by Spring and by Guice but they have different placeholders. Host, port and protocol were already hard coded in Shindig. Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties?rev=1173674&r1=1173673&r2=1173674&view=diff ============================================================================== --- incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties (original) +++ incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties Wed Sep 21 14:27:51 2011 @@ -69,7 +69,7 @@ shindig.oauth.validator-max-timestamp-ag shindig.signing.state-key= shindig.signing.key-name= shindig.signing.key-file= -shindig.signing.global-callback-url=http://localhost:8080%contextRoot%/gadgets/oauthcallback +shindig.signing.global-callback-url=http://localhost:8080/gadgets/oauthcallback shindig.signing.enable-signed-callbacks=true # Set to true if you want to allow the use of 3-legged OAuth tokens when viewer != owner.