Merge pull request #4 from topcoder-platform/dev

Struts upgrade and circle config

.deploy/circleci/build.properties

@@ -0,0 +1,34 @@
+# TopCoder Software Component Development Environment
+
+# Properties to automatically start/stop Jboss. Supposed to be used mostly for Continuos Integration server
+jdk_home=/opt/jdk1.7.0_79
+db_scripts_path=<<path_to_database_scripts>>
+bind_addr=127.0.0.1
+jnp_port=1099
+jboss_heap_size=512m
+
+# The location of the deployment directory for JBoss server.
+JBOSS_HOME=/root/jboss-4.0.2
+
+# remote deploy information
+#scp_path=scp
+# scp_path=pscp
+# scp_username=tcs
+# scp_password=<<password>
+# scp_keyfile=<<full path fo scp key: d:\\path\\to\\key.file>>
+# scp_remoteserver=174.129.113.55
+# scp_remotejboss=/home/tcs/jboss-4.0.2
+
+## uncomment the line bellow to allow update through ant
+# build.svn.update=yes
+
+# Do not stop on errors duing DB build.
+stoponerror=false
+
+
+##################################################################################
+# The online_review_home is the directory where the development distribution for #
+# Online Review application is checked to                                        #
+##################################################################################
+online_review_home=/root/online_review
+# SVN credentials

.deploy/circleci/build.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+set -e
+
+mv .deploy/circleci/build.properties .
+mv .deploy/circleci/token.properties .
+#add svn user name and password to build.properies
+echo "build.svn.username=$SVN_USERNAME" >> build.properties
+echo "build.svn.password=$SVN_PASSWORD" >> build.properties
+ant checkout-components 
+ant first_deploy deploy
+

.deploy/circleci/token.properties

@@ -0,0 +1,143 @@
+# TopCoder Software Component Development Environment
+
+## Used by CatalogBean.properties and Project_Phase_Template_Config.xml
+@JBOSS_HOME@=/root/jboss-4.0.2
+@jdk_home@=/opt/jdk1.7.0_79
+
+## Used by tcs_informix-ds.xml
+@database.server@=db
+@database.port@=2021
+@database.username@=informix
+@database.password@=1nf0rm1x
+@database.INFORMIXSERVER@=informixoltp_tcp
+@database.locale@=en_us.utf8
+
+# @context.security.url@ - URL for JNDI lookup 
+@context.security.url@=localhost:11199
+
+## Used by cache.properties
+@cache.host_url@=env.topcoder.com:2199
+
+## Used by EmailEngine.xml
+@emailengine_smtp_host@=127.0.0.1
+@emailengine_smtp_port@=25
+@emailengine_smtp_user@=
+@emailengine_smtp_password@=
+@notificationEmailFromAddress@=[email protected]
+
+## Used by ApplicationServer.properties
+@SERVER_NAME@=tcs.cloud.topcoder.com
+@STUDIO_SERVER_NAME@=studio.cloud.topcoder.com
+@OPENAIM_SERVER_NAME@=tc.cloud.topcoder.com/openaim
+@TRUVEO_SERVER_NAME@=tc.cloud.topcoder.com/truveo
+@AOLICQ_SERVER_NAME@=63.118.154.179
+@WINFORMULA_SERVER_NAME@=tc.cloud.topcoder.com/winformula
+@CSF_SERVER_NAME@=csf.dev.topcoder.com
+@CORP_SERVER_NAME@=tc.cloud.topcoder.com/corp
+@SOFTWARE_SERVER_NAME@=tcs.cloud.topcoder.com
+@FORUMS_SERVER_NAME@=forums.dev.topcoder.com
+@HOST_URL@=localhost:11199
+@FORUMS_HOST_URL@=jnp://localhost:1199
+@CONTEST_HOST_URL@=63.118.154.180:10099
+@SECURITY_PROVIDER_URL@=localhost:1199
+@TCS_APP_SERVER_URL@=localhost:11199
+@FILE_CONVERSION_PROVIDER_URL@=172.16.210.53:1099
+@JMS_HOST_URL@=jnp://localhost:1699
+@DISTRIBUTED_UI_SERVER_NAME@ = localhost:8080
+@OR_WEBSERVICES_SERVER_NAME@ = 63.118.154.186:8080
+@WIKI_SERVER_NAME@ = tc.cloud.topcoder.com/wiki
+@USER_SERVICES_HOST_URL@=jnp://localhost:1199
+@PACTS_HOST_URL@=localhost:1199
+@STUDIO_SERVICES_PROVIDER_URL@=jnp://localhost:1399
+@STUDIO_SERVICES_USERNAME@=user
+@STUDIO_SERVICES_PASSWORD@=password
+@STUDIO_SERVICES_PROTOCOL@=cockpitDomain
+
+# do not change this
+@COCKPIT_PROVIDER_URL@=jnp://184.73.115.186:1399
+
+@SSO_COOKIE_KEY@=tcsso_vm
+@SSO_HASH_SECRET@=GKDKJF80dbdc541fe829898aa01d9e30118bab5d6b9fe94fd052a40069385f5628
+@SSO_DOMAIN@=topcoder.com
+@CLIENT_ID_AUTH0@ = CMaBuwSnY0Vu68PLrWatvvu3iIiGPh7t
+@REDIRECT_URL_AUTH0@ = /reg2/callback.action
+@REG_SERVER_NAME@ = tc.cloud.topcoder.com
+@DOMAIN_AUTH0@ = topcoder.auth0.com
+
+## Used by OnlineReview.xml
+
+# The authenticator used in the login process - this object must be defined in the OnlineReview.xml file too
+@login.authenticator@=MockXMLAuthenticator
+
+# VM configuration for directories configuration
+@localFileUploadDir@=/root/downloads
+@catalogOutputDir@=/mnt/shared/temp_files
+@distributionToolOutputDir@=/mnt/shared/temp_files/tmp_dist
+@distributionScriptsBase@=/root/online_review/conf/distribution_scripts/unix
+@exttemplatesdir@=/root/online_review/conf/templates
+@adminUsers@=132456
+@thurgood.api.key@=
+@thurgood.username@=
+@thurgood.password@=
+@topcoder_api_base_url@=http://api.topcoder.com/v2
+@amazon_sns_arn@=
+@amazonSNSAccessKey@=
+@amazonSNSSecretKey@=
+@contactPMEmailFromAddress@ = [email protected]
+
+@pactJNDIAddress@=jnp://localhost:1199
+
+#### mockxmlauthenticator.xmlfile - when defined it is excluded from the build, comment it out to include in build for development
+#### Anyway - if it is included in the production build, it will do no harm
+# exclude.mockxmlauthenticator.xmlfile=yes, exclude me!
+
+#####################################
+# Parameters specific to Auto Pilot #
+#####################################
+# typical VM configuration
+# A path to file to signal to Auto Pilot to stop the job
+@auto_pilot_guard_file@=stopAutoPilot.txt
+# A path to file to signal to Auto Pilot that there is another tool instance already running
+@auto_pilot_running_file@=autoPilotIsRunning.txt
+# A path to log file for Auto Pilot
+@auto_pilot_log_file@=auto_pilot.log
+# An interval (in seconds) between Auto Pilot job executions
+@auto_pilot_poll_interval@=20
+
+####################################################
+# Parameters specific to Late Deliverables Tracker #
+####################################################
+# A path to file to signal to Late Deliverables Tracker to stop the job
+@late_deliverables_tracker_guard_file@=stopLateDeliverablesTracker.txt
+# A path to file to signal to Late Deliverables Tracker that there is another tool instance already running
+@late_deliverables_tracker_running_file@=lateDeliverablesTrackerIsRunning.txt
+# An interval (in seconds) between Late Deliverables Tracker job executions
+@late_deliverables_tracking_interval@=300
+# An interval (in seconds) between sending PM emails about unresolved late deliverables
+@late_deliverables_pm_notification_interval@=43200
+# A path to log file for Late Deliverables Tracker
+@late_deliverables_tracker_log_file@=late_deliverables.log
+
+####################################################
+# Parameters specific to Review Assignment Tool    #
+####################################################
+# A path to file to signal to Review Assignment tool to stop the job
+@review_assignment_guard_file@=stopReviewAssignment.txt
+# A path to file to signal to Review Assignment Tool that there is another tool instance already running
+@review_assignment_running_file@=reviewAssignmentIsRunning.txt
+# A path to log file for Review Assignment tool
+@review_assignment_log_file@=review_assignment.log
+# An interval (in seconds) between Review Assignment job executions
+@review_assignment_interval@=60
+# An ID for user account to represent the Review Assignment tool
+@review_assignment_operator@=132456
+
+#####################
+# SVN configuration #
+#####################
+@svn.root@=https://coder.topcoder.com/tcs
+@svn.username@=OnlineReview
+@svn.password@=password
+@svn.mkdir.commit.message@=Online Review auto-commit
+@svn.temp.files.basedir@=/root/temp_files/temp_svn
+@svn.authz.file.url@=https://coder.topcoder.com/tcs/configuration/trunk/svn-permissions.txt

build-dependencies.xml

@@ -68,14 +68,14 @@
     <property name="jackson-databind.jar" value="${ext_libdir}/jackson/jackson-databind-2.1.5.jar"/>
     <property name="jackson-annotations.jar" value="${ext_libdir}/jackson/jackson-annotations-2.1.5.jar"/>
 
-    <property name="struts2-core.jar" value="${ext_libdir}/struts/struts2-core-2.3.15.3.jar"/>
-    <property name="struts2-json-plugin.jar" value="${ext_libdir}/struts/struts2-json-plugin-2.3.15.3.jar"/>
-    <property name="struts2-spring-plugin.jar" value="${ext_libdir}/struts/struts2-spring-plugin-2.3.15.3.jar"/>
-    <property name="xwork-core.jar" value="${ext_libdir}/struts/xwork-core-2.3.15.3.jar"/>
+    <property name="struts2-core.jar" value="${ext_libdir}/struts/struts2-core-2.3.32.jar"/>
+    <property name="struts2-json-plugin.jar" value="${ext_libdir}/struts/struts2-json-plugin-2.3.32.jar"/>
+    <property name="struts2-spring-plugin.jar" value="${ext_libdir}/struts/struts2-spring-plugin-2.3.32.jar"/>
+    <property name="xwork-core.jar" value="${ext_libdir}/struts/xwork-core-2.3.32.jar"/>
     <!-- xwork 1 is used by jive-->
     <property name="xwork.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
 
-    <property name="ognl.jar" value="${ext_libdir}/ognl-3.0.6.jar"/>
+    <property name="ognl.jar" value="${ext_libdir}/struts/ognl-3.0.19.jar"/>
     <property name="antlr.jar" value="${ext_libdir}/antlr-2.7.2.jar"/>
 
     <property name="junit.jar" value="${ext_libdir}/testing/junit-3.8.1.jar"/>

circle.yml

@@ -0,0 +1,11 @@
+machine:
+  services:
+    - docker
+
+dependencies:
+  pre:
+    - pip install awsebcli
+
+test:
+  override:
+    - docker run -e SVN_USERNAME=$SVN_USERNAME -e SVN_PASSWORD=$SVN_PASSWORD -v $PWD:/root/online_review -t appiriodevops/online-review:circleci-build sh -c ".deploy/circleci/build.sh"