Author: [email protected]
Date: Fri Oct 14 15:21:53 2011
New Revision: 1508
Log:
[AMDATUAUTH-105] Aligned properties and removed default properties which should
never be used on config artifact
Modified:
trunk/amdatu-auth/config/pom.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.cfg
Modified: trunk/amdatu-auth/config/pom.xml
==============================================================================
--- trunk/amdatu-auth/config/pom.xml (original)
+++ trunk/amdatu-auth/config/pom.xml Fri Oct 14 15:21:53 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-auth/config/src/main/resources/org.amdatu.auth.oauth.server.cfg
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.cfg
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.cfg
Fri Oct 14 15:21:53 2011
@@ -14,8 +14,8 @@
# under the License.
# The hostname and portnr
-hostname=${server.hostname}
-portnr=${server.port}
+hostname=${amdatu.http.hostname}
+portnr=${amdatu.http.port}
authorizeurl=/oauth-server/jsp/authorize.jsp
# The lifetime of an OAuth request is limited to request.timestamp.maxage.
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
