Merge pull request #222 from appirio-tech/dev

Promote to prod - task fixes

Author: ajefts

.gitignore

@@ -1,4 +1,41 @@
-lib/tcs
+lib/tcs/auto_screening_management.jar
+lib/tcs/client_invoice_entities_dao.jar
+lib/tcs/cockpit_facade_util.jar
+lib/tcs/configuration_manager.jar
+lib/tcs/copilot_pool_and_profiles_services.jar
+lib/tcs/deliverable_management.jar
+lib/tcs/ejb/admin_service_facade.jar
+lib/tcs/ejb/catalog_services.jar
+lib/tcs/ejb/client_project_entities_dao.jar
+lib/tcs/ejb/cloud_vm_service.jar
+lib/tcs/ejb/contest_eligibility_persistence.jar
+lib/tcs/ejb/contest_eligibility_validation.jar
+lib/tcs/ejb/contest_service_facade.jar
+lib/tcs/ejb/game_plan_service.jar
+lib/tcs/ejb/permission_service_facade.jar
+lib/tcs/ejb/pipeline_service.jar
+lib/tcs/ejb/pipeline_service_facade.jar
+lib/tcs/ejb/project_service.jar
+lib/tcs/ejb/project_service_facade.jar
+lib/tcs/ejb/project_services.jar
+lib/tcs/ejb/specification_review_comment_service.jar
+lib/tcs/ejb/specification_review_service.jar
+lib/tcs/ejb/user_service.jar
+lib/tcs/ejb/user_service_facade.jar
+lib/tcs/online_review_upload_services.jar
+lib/tcs/phase_management.jar
+lib/tcs/project_management.jar
+lib/tcs/project_phases.jar
+lib/tcs/resource_management.jar
+lib/tcs/review_application_management.jar
+lib/tcs/review_management.jar
+lib/tcs/scorecard_management.jar
+lib/tcs/team_management.jar
+lib/tcs/topcoder_cockpit_asset_services.jar
+lib/tcs/topcoder_cockpit_project_metadata_services.jar
+lib/tcs/topcoder_cockpit_project_milestone_services.jar
+lib/tcs/topcoder_cockpit_task_management_services.jar
+lib/tcs/workdays.jar
 build/
 direct.ear
 direct.jar

LOCAL_SETUP.md

@@ -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-dependencies.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

build.xml

@@ -21,7 +21,7 @@
     <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
 	<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
 	<xa-datasource-property name="DatabaseName">tcs_catalog</xa-datasource-property>
-	<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property> 
+	<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
     <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
     <!-- sql to call when connection is created -->
@@ -45,7 +45,7 @@
 
     <no-tx-datasource>
        <jndi-name>OLTP</jndi-name>
-        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=informixoltp_tcp</connection-url>
+        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=@database.INFORMIXSERVER@</connection-url>
         <driver-class>com.informix.jdbc.IfxDriver</driver-class>
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -79,7 +79,7 @@
 
     <no-tx-datasource>
         <jndi-name>TCS_CATALOG</jndi-name>
-        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=informixoltp_tcp
+        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=@database.INFORMIXSERVER@
         </connection-url>
         <driver-class>com.informix.jdbc.IfxDriver</driver-class>
          <driver-class>com.informix.jdbc.IfxDriver</driver-class>
@@ -107,7 +107,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">informixoltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
 		<new-connection-sql>set lock mode to wait 5</new-connection-sql>
         <check-valid-connection-sql>select '1' from dual</check-valid-connection-sql>
@@ -167,7 +167,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -196,7 +196,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -226,7 +226,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">common_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -258,7 +258,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">time_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
 		<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
 		<!-- sql to call when connection is created -->

conf/cache.properties

@@ -14,7 +14,7 @@ j#######################################################
 @database.port@=2021
 @database.username@=coder
 @database.password@=c0d3r4T
-@database.INFORMIXSERVER@=informixoltp_tcp
+    @database.INFORMIXSERVER@=informixoltp_tcp
 
 ###############################
 # bugs database configuration #
@@ -208,11 +208,6 @@ j#######################################################
 
 @ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
 
-###########################
-# Scorecard Configuration #
-###########################
-@scorecardUrl@=jdbc:informix-sqli://env.topcoder.com:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
-
 ##############################
 # CockpitUserPersistence.xml #
 ##############################