Author: [email protected]
Date: Fri Oct 14 15:28:47 2011
New Revision: 1510
Log:
[AMDATUOPENSOCIAL-125] aligned config name of hostname and port, disabled
resource filtering
Modified:
trunk/amdatu-opensocial/config/pom.xml
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
Modified: trunk/amdatu-opensocial/config/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/config/pom.xml (original)
+++ trunk/amdatu-opensocial/config/pom.xml Fri Oct 14 15:28:47 2011
@@ -65,9 +65,13 @@
<build>
<resources>
+ <!-- Specifically disable resource filter for this artifact. The actual
+ replacement is one by the assembly artifact that includes it as a
+ dependency and we should honor that assembly's properties instead of
+ using our own -->
<resource>
<directory>src/main/resources</directory>
- <filtering>true</filtering>
+ <filtering>false</filtering>
<includes>
<include>*.cfg</include>
</includes>
Modified:
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
==============================================================================
---
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
(original)
+++
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
Fri Oct 14 15:28:47 2011
@@ -34,7 +34,7 @@
shindig.signing.state-key=
shindig.signing.key-name=amdatu_public_key
#shindig.signing.key-file=res://conf/oauthkey.pem
-shindig.signing.global-callback-url=http://${server.hostname}:${server.port}/gadgets/oauthcallback
+shindig.signing.global-callback-url=http://${amdatu.http.hostname}:${amdatu.http.port}/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.
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
