Merge branch 'dev' of github.com:appirio-tech/direct-app into dev

Author: skyhit

build-dependencies.xml

@@ -209,6 +209,8 @@
         <copy file="${spell_check.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${shared.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${tcwebcommon.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${tccache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+
     	<copy file="${topcoder_security_groups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${review_application_management.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${project_payment_calculator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -236,6 +238,8 @@
         <copy file="${commons-dbcp.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-discovery.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-pool.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-pool2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jedis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${confluence-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${httpProxyPackage.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ifxjdbcx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -712,4 +716,4 @@
     some of the targets of this build file. -->
     <import file="${basedir}/build-override.xml" optional="true"/>
 
-</project>
+</project>

build.xml

@@ -1,19 +1,22 @@
-cache.primary     = @cache.primary@
-#cache.secondary   = 63.118.154.182:8502
-
-# allow at most 25000 items in the cache
-cache.size        = 25000
-# sync every 10 seconds
-cache.synctime    = 10000
-
-# check every minute
-cache.expirecheck =  60000
-# expire after 10 hours
-cache.expiretime  =  3600000
-
-
-host_url = @host_url@
-jndi_name = TCCache
-cache_admin_jndi_name = TCCacheAdmin
-cache_client_class=com.topcoder.web.common.cache.JbossCacheClient
-
+cache.primary     = @cache.primary@
+#cache.secondary   = 63.118.154.182:8502
+
+# allow at most 25000 items in the cache
+cache.size        = 25000
+# sync every 10 seconds
+cache.synctime    = 10000
+
+# check every minute
+cache.expirecheck =  60000
+# expire after 10 hours
+cache.expiretime  =  3600000
+
+
+host_url = @host_url@
+jndi_name = TCCache
+cache_admin_jndi_name = TCCacheAdmin
+
+cache_client_class=@cache_client_class@
+
+redis.uri=@redis_uri@
+redis.timeout=2000