From c255c9d31380a878cf5fd1670238b95fce85d0d9 Mon Sep 17 00:00:00 2001
From: deedee <dsyefria.gmail.com>
Date: Thu, 13 Apr 2017 10:45:52 +0000
Subject: [PATCH 1/2] - build_distui.xml used env var for jboss home -
 cache.properties used redis as default - add support for circleci

---
 .deploy/circleci/README    |  1 +
 build_distui.xml           | 10 +++++-----
 build_tc.xml               |  2 +-
 circle.yml                 | 14 +++++++++++++
 resources/cache.properties | 40 +++++++++++++++++++-------------------
 5 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 .deploy/circleci/README
 create mode 100644 circle.yml

diff --git a/.deploy/circleci/README b/.deploy/circleci/README
new file mode 100644
index 00000000000..ccc83d26270
--- /dev/null
+++ b/.deploy/circleci/README
@@ -0,0 +1 @@
+All files and directories under this directory will be copy to tc-website root on circleci env before build
diff --git a/build_distui.xml b/build_distui.xml
index ea15361eb91..2891cd71278 100644
--- a/build_distui.xml
+++ b/build_distui.xml
@@ -1,4 +1,5 @@
 <project name="topcoder" default="main" basedir=".">
+    <property environment="env"/>
     <property name="Name" value="TopCoder"/>
     <property name="build" value="build"/>
     <property name="war.dir" value="${build}/wars"/>
@@ -23,11 +24,10 @@
     <property name="common.jar" value="${bin}/tcwebcommon.jar"/>
     <property name="tccache.jar" value="${jars.dir}/tcs/tc_cache/1.0.0/tc_cache.jar"/>
     <property name="web" value="src/main/com/topcoder/web"/>
-    <property name="jboss_home" value="/home/distui/jboss-4.2.0.GA"/>
-    <property name="jboss_deploy" value="${jboss_home}/server/distui/deploy"/>
-    <property name="jboss_lib" value="${jboss_home}/server/distui/lib"/>
-    <property name="jboss_conf" value="${jboss_home}/server/distui/conf"/>
-    <property environment="env"/>
+    <property name="jboss_home" value="${env.JBOSS_HOME}"/>
+    <property name="jboss_deploy" value="${jboss_home}/server/all/deploy"/>
+    <property name="jboss_lib" value="${jboss_home}/server/all/lib"/>
+    <property name="jboss_conf" value="${jboss_home}/server/all/conf"/>
 
     <property name="deprecation" value="true"/>
     <property name="debug" value="true"/>
diff --git a/build_tc.xml b/build_tc.xml
index 99e73c79cee..e557f8a5de6 100644
--- a/build_tc.xml
+++ b/build_tc.xml
@@ -847,7 +847,7 @@
             <fileset dir="${jars.dir}/tcs/json_object/1.0">
                 <include name="json_object.jar"/>
             </fileset>
-            <fileset dir="${jars.dir}/tcs">
+            <fileset dir="${jars.dir}/tcs/ldap_sdk_interface/1.0.2">
                 <include name="ldap_sdk_interface.jar"/>
             </fileset>
             <fileset dir="${jars.dir}">
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000000..cf0f59c209b
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,14 @@
+machine:
+  services:
+    - docker
+
+checkout:
+  pre:
+    - git clone https://github.com/topcoder-platform/tc-website-glue glue
+    - git clone https://github.com/topcoder-platform/tc-website-shared shared
+    - git clone https://github.com/topcoder-platform/tc-website-external-artifacts
+
+
+test:
+  override:
+    - cp -Rf .deploy/circleci/* . && docker run -v ${HOME}:/root/tc-platform appiriodevops/tc-website:build
diff --git a/resources/cache.properties b/resources/cache.properties
index dc972fd0e86..2341322ab5f 100755
--- a/resources/cache.properties
+++ b/resources/cache.properties
@@ -1,33 +1,33 @@
-cache.primary     = localhost:8501
+#cache.primary     = localhost:8501
 #cache.secondary   = 63.118.154.182:8502
 
 # allow at most 25000 items in the cache
-cache.size        = 25000
+#cache.size        = 25000
 # sync every 10 seconds
-cache.synctime    = 10000
+#cache.synctime    = 10000
 
 # check every minute
-cache.expirecheck =  60000
+#cache.expirecheck =  60000
 # expire after 10 hours
-cache.expiretime  =  3600000
+#cache.expiretime  =  3600000
 
 ### Use the following configurations to use JBoss Cache as cache ###
 
-host_url = env.topcoder.com:2199
-jndi_name = TCCache
-cache_admin_jndi_name = TCCacheAdmin
-cache_client_class=com.topcoder.web.common.cache.JbossCacheClient
+#host_url = env.topcoder.com:2199
+#jndi_name = TCCache
+#cache_admin_jndi_name = TCCacheAdmin
+#cache_client_class=com.topcoder.web.common.cache.JbossCacheClient
 
 ### Use the following configurations to use REDIS as cache ###
-​
-#cache_client_class=com.topcoder.web.common.cache.RedisCacheClient
-#tc_subject_cache_address_class=com.topcoder.web.common.cache.address.TCSubjectAddress
-#request_cache_address_class=com.topcoder.web.common.cache.address.RequestAddress
-​
+#​
+cache_client_class=com.topcoder.web.common.cache.RedisCacheClient
+tc_subject_cache_address_class=com.topcoder.web.common.cache.address.TCSubjectAddress
+request_cache_address_class=com.topcoder.web.common.cache.address.RequestAddress
+#​
 #format: redis://username:password@my.host:6389
-#redis.uri=redis://cache.topcoder.com:6379
-​
-​
-#redis.maxTotalConnections=50
-#redis.maxIdleConnections=30
-#redis.minIdleConnections=1
+redis.uri=redis://env.topcoder.com:6379
+#​
+#​
+redis.maxTotalConnections=50
+redis.maxIdleConnections=30
+redis.minIdleConnections=1

From 708aadf9cf6945ff4acfeb0e087148a3f4b705cb Mon Sep 17 00:00:00 2001
From: deedee <dsyefria.gmail.com>
Date: Thu, 13 Apr 2017 12:13:33 +0000
Subject: [PATCH 2/2] update circle.yml

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index cf0f59c209b..4baf3f224fc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,7 @@ checkout:
   pre:
     - git clone https://github.com/topcoder-platform/tc-website-glue glue
     - git clone https://github.com/topcoder-platform/tc-website-shared shared
-    - git clone https://github.com/topcoder-platform/tc-website-external-artifacts
+    - git clone https://github.com/topcoder-platform/tc-website-external-artifacts external-artifacts
 
 
 test: