More properties file fixes.

terraframe · Apr 25, 2015 · 6411785 · 6411785
1 parent 73865fd
commit 6411785
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/geodashboard-web/src/deployed/resources/runwaysdk/platform.properties b/geodashboard-web/src/deployed/resources/runwaysdk/platform.properties
@@ -2,4 +2,5 @@
 # This file provides platform-level properties overrides.
 
 deploy.root=/usr/share/tomcat6
-database.name=ideiq
+environment=deployed
+container.lib=${deploy.root}/lib
diff --git a/geodashboard-web/src/main/resources/runwaysdk/common.properties b/geodashboard-web/src/main/resources/runwaysdk/common.properties
@@ -78,9 +78,6 @@ deploy.server.src=${deploy.src}/server
 deploy.client.src=${deploy.src}/client
 deploy.common.src=${deploy.src}/common
 
-container.url=http://localhost:8080/${project.build.finalName}
-container.webinf.url=${container.url}/WEB-INF
-container.app.url=testValue
 container.lib=${basedir}/target/cargo/installs/apache-tomcat-6.0.37/apache-tomcat-6.0.37/lib
 
 deploy.username=framework

diff --git a/geodashboard-web/src/main/resources/runwaysdk/server.properties b/geodashboard-web/src/main/resources/runwaysdk/server.properties
@@ -41,14 +41,14 @@ memoryOnlyCache=true
 # Assumes memory only cache is false. Sets the limit of the global cache in memory.  Additional objects will spill to disk.
 globalCache.memorySize=2000
 globalCache.cacheName=globalCache
-globalCache.cacheFileLocation=${project.basedir}/cache/globalCache
+globalCache.cacheFileLocation=${deploy.path}/cache/globalCache
 
 # Sets the limit of the transaction cache in memory.  Additional objects will spill to disk.
 transactionCache.memorySize=5
 transactionCache.diskstore.size=500
 transactionCache.memoryOnly=true
 transactionCache.cacheName=transactionCache
-transactionCache.cacheFileLocation=${project.basedir}/cache/transactionCache
+transactionCache.cacheFileLocation=${deploy.path}/cache/transactionCache
 
 # Initial capacity for the cache containing all objects with an application lock
 transaction.lockedObject.bucketSize=200