From e03e3c7cdae2e51fe8437d0a2fb184c59bda04cb Mon Sep 17 00:00:00 2001 From: ajefts Date: Tue, 5 Jan 2021 14:41:12 -0500 Subject: [PATCH 01/11] REmove spec review phases for Design challenges --- conf/phase_templates/TCSTemplate_Studio.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/conf/phase_templates/TCSTemplate_Studio.xml b/conf/phase_templates/TCSTemplate_Studio.xml index c249bc867..bb5320763 100644 --- a/conf/phase_templates/TCSTemplate_Studio.xml +++ b/conf/phase_templates/TCSTemplate_Studio.xml @@ -8,8 +8,6 @@ - - @@ -17,14 +15,7 @@ - - - - - - - From 949772b97ad53df5192a2431765da4a4eb48aa8e Mon Sep 17 00:00:00 2001 From: ajefts Date: Mon, 9 Aug 2021 16:31:45 -0400 Subject: [PATCH 02/11] remove challenge types that can be created via work manager --- src/web/scripts/launch/entity.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/web/scripts/launch/entity.js b/src/web/scripts/launch/entity.js index aae91c77f..ee1c2efee 100644 --- a/src/web/scripts/launch/entity.js +++ b/src/web/scripts/launch/entity.js @@ -214,16 +214,16 @@ var ESTIMATE_EFFORT_ONSITE = "Estimate Efforts Days Onsite"; var projectCategoryArray = [ {id:32, name:'Application Front-End Design', label:'Application Front-End Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, - {id:STUDIO_CATEGORY_ID_DESIGN_F2F, name:'Design First2Finish', label:'Design First2Finish', typeId:3, typeName:'Studio', hasMulti:false, hideInDropdown: false}, - {id:22, name:'Idea Generation', label:'Idea Generation', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, + {id:STUDIO_CATEGORY_ID_DESIGN_F2F, name:'Design First2Finish', label:'Design First2Finish', typeId:3, typeName:'Studio', hasMulti:false, hideInDropdown: true}, + {id:22, name:'Idea Generation', label:'Idea Generation', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: true}, {id:21, name:'Print/Presentation', label:'Print/Presentation', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, {id:17, name:'Web Design', label:'Web Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, {id:30, name:'Widget or Mobile Screen Design', label:'Widget or Mobile Screen Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, {id:18, name:'Wireframes', label:'Wireframes', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false}, - {id:SOFTWARE_CATEGORY_ID_BUG_HUNT, name:'Bug Hunt', label:'Bug Hunt', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false}, - {id:SOFTWARE_CATEGORY_ID_CODE, name:'Code', label:'Code', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false}, - {id:SOFTWARE_CATEGORY_ID_F2F, name:'First2Finish', label:'First2Finish', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false}, - {id:13, name:'TESTSUITES', label:'Test Suites', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: false}, + {id:SOFTWARE_CATEGORY_ID_BUG_HUNT, name:'Bug Hunt', label:'Bug Hunt', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: true}, + {id:SOFTWARE_CATEGORY_ID_CODE, name:'Code', label:'Code', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: true}, + {id:SOFTWARE_CATEGORY_ID_F2F, name:'First2Finish', label:'First2Finish', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: true}, + {id:13, name:'TESTSUITES', label:'Test Suites', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, {id:SOFTWARE_CATEGORY_ID_CONCEPT, name:'CONCEPTUALIZATION', label:'Software Conceptualization', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, {id:SOFTWARE_CATEGORY_ID_SPEC, name:'SPECIFICATION', label:'Software Specification', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, {id:7, name:'ARCHITECTURE', label:'Architecture', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true}, From 5331dbe3e54318191911e2dd0b4ee6710a78cd05 Mon Sep 17 00:00:00 2001 From: ajefts Date: Wed, 11 Aug 2021 10:55:54 -0400 Subject: [PATCH 03/11] hiding challenge types from create screen --- src/web/scripts/launchcontest.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/scripts/launchcontest.js b/src/web/scripts/launchcontest.js index e28894093..00f21a13d 100644 --- a/src/web/scripts/launchcontest.js +++ b/src/web/scripts/launchcontest.js @@ -467,7 +467,8 @@ $(document).ready(function() { // populate the select option for software group $.each(projectCategoryArray, function(i, projectCategory) { if (projectCategory.hideInDropdown) { - return; + //Commented out on Aug 11, 2021 to help hide challenge types from the create dropdown in entity.js + //return; } // not show copilot contest type if (projectCategory.id != 29 && projectCategory.id != ALGORITHM_CATEGORY_ID_MARATHON && projectCategory.typeId != 3) { From 2c9351cc553c98b8eb3661de10a05b0e0f372a05 Mon Sep 17 00:00:00 2001 From: standlove Date: Mon, 28 Nov 2022 12:06:08 +0800 Subject: [PATCH 04/11] fix crash --- .../services/view/ajax/CustomFormatAJAXResult.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java index 2cf7da282..13c195198 100644 --- a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java +++ b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.SocketException; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.util.zip.GZIPOutputStream; @@ -81,6 +82,13 @@ *

* *

+ * Version 1.2 + *

    + *
  • Fixed crash - java.net.SocketException: Broken pipe
    • + *
+ *

+ * + *

* Thread safety: Technically this class is NOT thread safe since it has mutable states, but the intended * usage of the mutators is for IoC injection and thus we expect for these values not to be changed after * initialization. Thus this class can be considered as thread-safe conditional in an IoC injection usage of @@ -88,7 +96,7 @@ *

* * @author AleaActaEst, TCSDEVELOPER, duxiaoyang - * @version 1.1 + * @version 1.2 */ @SuppressWarnings("serial") public class CustomFormatAJAXResult implements Result { @@ -300,11 +308,13 @@ private static void writeDataAndClose(InputStream in, OutputStream out) throws I } // flush output stream out.flush(); + } catch (SocketException e) { + // The client side has aborted or closed connection } finally { // close the input stream closeStream(in); // close the output stream - out.close(); + closeStream(out); } } From f39faa6fbde4a6e0c6158114282179af0ca70d20 Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Mon, 28 Nov 2022 10:59:59 +0530 Subject: [PATCH 05/11] Update config.yml Build fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d337fabb..ff784c639 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ install_dependency: &install_dependency command: | sed -i '/jessie-updates/d' /etc/apt/sources.list apt update - apt install -y openssl ant git zip jq + apt install -y --force-yes openssl ant git zip jq mkdir ~/awscli cd ~/awscli curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" From c0375b71db78725256dc32cb3977e914f73c1be3 Mon Sep 17 00:00:00 2001 From: standlove Date: Mon, 28 Nov 2022 13:39:15 +0800 Subject: [PATCH 06/11] update ci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d337fabb..ff784c639 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ install_dependency: &install_dependency command: | sed -i '/jessie-updates/d' /etc/apt/sources.list apt update - apt install -y openssl ant git zip jq + apt install -y --force-yes openssl ant git zip jq mkdir ~/awscli cd ~/awscli curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" From b662642dda25efffbe16f0f4a9f11fccdfbbed76 Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Mon, 28 Nov 2022 11:37:29 +0530 Subject: [PATCH 07/11] Update config.yml Build fix --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff784c639..94ee0ce3f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,8 @@ install_dependency: &install_dependency apt install -y --force-yes openssl ant git zip jq mkdir ~/awscli cd ~/awscli - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" + #curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" + curl https://s3.amazonaws.com/aws-cli/awscli-bundle-1.16.188.zip -o awscli-bundle.zip unzip awscli-bundle.zip ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws cd /usr/share/ant/lib From 491e6ae7a1a1d5ac9642c5e1be24abefed14c880 Mon Sep 17 00:00:00 2001 From: standlove Date: Fri, 9 Dec 2022 15:34:58 +0800 Subject: [PATCH 08/11] ignore io exception --- .../direct/services/view/ajax/CustomFormatAJAXResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java index 13c195198..e9d2e03a0 100644 --- a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java +++ b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java @@ -308,7 +308,7 @@ private static void writeDataAndClose(InputStream in, OutputStream out) throws I } // flush output stream out.flush(); - } catch (SocketException e) { + } catch (IOException e) { // The client side has aborted or closed connection } finally { // close the input stream From b794b597862563676301b31042bf9ee041ccab35 Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Fri, 9 Dec 2022 19:15:53 +0530 Subject: [PATCH 09/11] Update config.yml Build fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94ee0ce3f..895955f0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ install_dependency: &install_dependency install_deploysuite: &install_deploysuite name: Installation of install_deploysuite. command: | - git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript + git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript cp ./../buildscript/master_deploy.sh . cp ./../buildscript/buildenv.sh . cp ./../buildscript/awsconfiguration.sh . From b7fae543e6d9f07e83e935876cba5dc99db35598 Mon Sep 17 00:00:00 2001 From: standlove Date: Wed, 21 Dec 2022 09:11:51 +0800 Subject: [PATCH 10/11] log client connection aborted error log --- .../direct/services/view/ajax/CustomFormatAJAXResult.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java index e9d2e03a0..ca823f2c5 100644 --- a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java +++ b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java @@ -25,6 +25,7 @@ import com.topcoder.direct.services.view.action.contest.launch.AggregateDataModel; import com.topcoder.direct.services.view.ajax.processors.DefaultAJAXResultPreProcessor; import com.topcoder.direct.services.view.ajax.serializers.JSONDataSerializer; +import org.apache.log4j.Logger; /** *

@@ -185,6 +186,8 @@ public class CustomFormatAJAXResult implements Result { */ private boolean enabledGzip = false; + private Logger logger = Logger.getLogger(CustomFormatAJAXResult.class); + /** *

* Default constructor. @@ -310,6 +313,7 @@ private static void writeDataAndClose(InputStream in, OutputStream out) throws I out.flush(); } catch (IOException e) { // The client side has aborted or closed connection + logger.error("The client side has aborted or closed connection", e); } finally { // close the input stream closeStream(in); From 7b1883560bbd7d13a846c16e610c05f91f978343 Mon Sep 17 00:00:00 2001 From: standlove Date: Wed, 21 Dec 2022 09:18:03 +0800 Subject: [PATCH 11/11] fix --- .../direct/services/view/ajax/CustomFormatAJAXResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java index ca823f2c5..35fbadda6 100644 --- a/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java +++ b/src/java/main/com/topcoder/direct/services/view/ajax/CustomFormatAJAXResult.java @@ -301,7 +301,7 @@ public void execute(ActionInvocation invocation) throws AJAXDataPreProcessingExc * @throws IOException * if any io error happens */ - private static void writeDataAndClose(InputStream in, OutputStream out) throws IOException { + private void writeDataAndClose(InputStream in, OutputStream out) throws IOException { try { // Write input stream to output stream byte[] buf = new byte[BUFFER_SIZE];