dev-maven to master-maven

.circleci/config.yml

@@ -31,7 +31,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-      git clone --branch v1.4.8 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 .
@@ -190,7 +190,8 @@ workflows:
           filters: 
             branches:
               only:
-                - dev-maven
+                - reskin-or
+                - ci-fix-test
 
       - deployProd:
           context : org-global

Dockerfile

@@ -36,5 +36,6 @@ RUN rm /root/tcs_informix-ds.xml
 ## add admin account
 RUN /root/wildfly-26.0.1.Final/bin/add-user.sh -u 'admin' -p 'password1!'
 RUN sed -i 's/<cached-connection-manager\/>/<cached-connection-manager debug="true" error="false"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
+RUN sed -i 's/<http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"\/>/<http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true" max-parameters="5000"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
 
 CMD ["/root/wildfly-26.0.1.Final/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0","-DFOREGROUND"]

ECSDockerfile

@@ -35,5 +35,6 @@ RUN rm /root/tcs_informix-ds.xml
 ## add admin account
 RUN /root/wildfly-26.0.1.Final/bin/add-user.sh -u 'admin' -p 'password1!'
 RUN sed -i 's/<cached-connection-manager\/>/<cached-connection-manager debug="true" error="false"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
+RUN sed -i 's/<http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"\/>/<http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true" max-parameters="5000"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
 
 CMD ["/root/wildfly-26.0.1.Final/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0","-DFOREGROUND"]

src/main/java/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java

@@ -499,7 +499,7 @@ protected String handleDownloadSubmission(HttpServletRequest request, HttpServle
             }
 
             // Allow only submitter to download the submission if it is MM type of challenge
-            if (project.getProjectCategory().getId() == 37) {
+            if (project.getProjectCategory().getId() == 37 || project.getProjectCategory().getProjectType().getId() == 3) {
                 if (!Boolean.parseBoolean((String) project.getProperty("Viewable Submissions Flag"))) {
                     long submitter =  upload.getOwner();
                     long loggedInUserId = AuthorizationHelper.getLoggedInUserId(request);

src/main/java/com/cronos/onlinereview/actions/projectlinks/EditProjectLinksAction.java

@@ -5,9 +5,11 @@
 
 import com.cronos.onlinereview.Constants;
 import com.cronos.onlinereview.actions.DynamicModelDrivenAction;
+import com.cronos.onlinereview.util.AuthorizationHelper;
 import com.cronos.onlinereview.model.DynamicModel;
 import com.cronos.onlinereview.util.ActionsHelper;
 import com.cronos.onlinereview.util.Comparators;
+import com.cronos.onlinereview.util.ConfigHelper;
 import com.cronos.onlinereview.util.CorrectnessCheckResult;
 import com.cronos.onlinereview.util.LoggingHelper;
 import com.topcoder.onlinereview.component.exception.BaseException;
@@ -69,6 +71,25 @@ public String execute() throws BaseException {
         }
 
         Project project = verification.getProject();
+        request.setAttribute("projectStatus", project.getProjectStatus().getName());
+
+        final String projectTypeName = project.getProjectCategory().getProjectType().getName();
+
+        boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
+
+        long projectId = project.getId();
+        long forumId = -1;
+        String tempStr;
+
+        tempStr = (String) project.getProperty("Developer Forum ID");
+        if (tempStr != null && tempStr.trim().length() != 0) {
+            forumId = Long.parseLong(tempStr, 10);
+        }
+
+        request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
+
+        request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
+                (projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
 
         // obtains the project link manager
         ProjectLinkManager linkManager = ActionsHelper.createProjectLinkManager();
@@ -92,6 +113,8 @@ public String execute() throws BaseException {
 
         // set up projects except for deleted ones
         request.setAttribute("allProjects", allProjects);
+        request.setAttribute("isAllowedToContactPM",
+        AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
 
         // Populate the form with project and project link properties
         populateProjectLinkForm(getModel(), verification.getProject());

src/main/java/com/cronos/onlinereview/actions/projectmanagementconsole/ViewManagementConsoleAction.java

@@ -9,6 +9,7 @@
 import com.cronos.onlinereview.util.AuthorizationHelper;
 import com.cronos.onlinereview.util.CorrectnessCheckResult;
 import com.cronos.onlinereview.util.LoggingHelper;
+import com.cronos.onlinereview.util.ConfigHelper;
 import com.topcoder.onlinereview.component.project.management.Project;
 import com.topcoder.onlinereview.component.exception.BaseException;
 
@@ -64,6 +65,28 @@ public String execute() throws BaseException {
             Project project = verification.getProject();
             initProjectManagementConsole(request, project);
 
+            request.setAttribute("projectStatus", project.getProjectStatus().getName());
+
+            final String projectTypeName = project.getProjectCategory().getProjectType().getName();
+
+            boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
+
+            long projectId = project.getId();
+            long forumId = -1;
+            String tempStr;
+
+            tempStr = (String) project.getProperty("Developer Forum ID");
+            if (tempStr != null && tempStr.trim().length() != 0) {
+                forumId = Long.parseLong(tempStr, 10);
+            }
+
+            request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
+
+            request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
+                (projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
+            request.setAttribute("isAllowedToContactPM",
+                AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
+
             return Constants.SUCCESS_FORWARD_NAME;
         }
     }

src/main/java/com/cronos/onlinereview/actions/projectpayments/EditProjectPaymentsAction.java

@@ -8,8 +8,10 @@
 import com.cronos.onlinereview.Constants;
 import com.cronos.onlinereview.util.ActionsHelper;
 import com.cronos.onlinereview.util.AuthorizationHelper;
+import com.cronos.onlinereview.util.ConfigHelper;
 import com.cronos.onlinereview.util.CorrectnessCheckResult;
 import com.cronos.onlinereview.util.LoggingHelper;
+import com.topcoder.onlinereview.component.project.management.Project;
 import com.topcoder.onlinereview.component.project.payment.ProjectPayment;
 import com.topcoder.onlinereview.component.project.payment.ProjectPaymentManager;
 import com.topcoder.onlinereview.component.project.payment.ProjectPaymentFilterBuilder;
@@ -64,7 +66,30 @@ public String execute() throws BaseException {
         // At this point, redirect-after-login attribute should be removed (if it exists)
         AuthorizationHelper.removeLoginRedirect(request);
 
-        long projectId = verification.getProject().getId();
+        Project project = verification.getProject();
+
+        request.setAttribute("projectStatus", project.getProjectStatus().getName());
+
+        final String projectTypeName = project.getProjectCategory().getProjectType().getName();
+
+        boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
+
+        long projectId = project.getId();
+        long forumId = -1;
+        String tempStr;
+
+        tempStr = (String) project.getProperty("Developer Forum ID");
+        if (tempStr != null && tempStr.trim().length() != 0) {
+            forumId = Long.parseLong(tempStr, 10);
+        }
+
+        request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
+
+        request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
+                (projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
+        request.setAttribute("isAllowedToContactPM",
+                AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
+
         ProjectPaymentManager projectPaymentManager = ActionsHelper.createProjectPaymentManager();
         List<ProjectPayment> payments = projectPaymentManager.search(
                 ProjectPaymentFilterBuilder.createProjectIdFilter(projectId));

src/main/java/com/cronos/onlinereview/actions/projectpayments/ViewProjectPaymentsAction.java

@@ -13,6 +13,7 @@
 import com.cronos.onlinereview.util.ConfigHelper;
 import com.cronos.onlinereview.util.CorrectnessCheckResult;
 import com.cronos.onlinereview.util.LoggingHelper;
+import com.topcoder.onlinereview.component.project.management.Project;
 import com.topcoder.onlinereview.component.project.payment.ProjectPayment;
 import com.topcoder.onlinereview.component.project.payment.ProjectPaymentManager;
 import com.topcoder.onlinereview.component.project.payment.ProjectPaymentFilterBuilder;
@@ -65,7 +66,27 @@ public String execute() throws BaseException {
         // At this point, redirect-after-login attribute should be removed (if it exists)
         AuthorizationHelper.removeLoginRedirect(request);
 
-        long projectId = verification.getProject().getId();
+        Project project = verification.getProject();
+
+        request.setAttribute("projectStatus", project.getProjectStatus().getName());
+
+        final String projectTypeName = project.getProjectCategory().getProjectType().getName();
+
+        boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
+
+        long projectId = project.getId();
+        long forumId = -1;
+        String tempStr;
+
+        tempStr = (String) project.getProperty("Developer Forum ID");
+        if (tempStr != null && tempStr.trim().length() != 0) {
+            forumId = Long.parseLong(tempStr, 10);
+        }
+
+        request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
+
+        request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
+                (projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
         ProjectPaymentManager projectPaymentManager = ActionsHelper.createProjectPaymentManager();
         List<ProjectPayment> payments = projectPaymentManager.search(
                 ProjectPaymentFilterBuilder.createProjectIdFilter(projectId));
@@ -74,6 +95,8 @@ public String execute() throws BaseException {
         Resource[] resources = ActionsHelper.getAllResourcesForProject(verification.getProject());
         populateResourcesMap(request, resources);
         request.setAttribute("payments", payments);
+        request.setAttribute("isAllowedToContactPM",
+                AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
         request.setAttribute("isAllowedToEditPayments",
                 AuthorizationHelper.hasUserPermission(request, Constants.EDIT_PAYMENTS_PERM_NAME));
         request.setAttribute("pactsPaymentDetailBaseURL", ConfigHelper.getPactsPaymentDetailBaseURL());

src/main/java/com/cronos/onlinereview/mockups/MockHandleTag.java

@@ -185,8 +185,9 @@ public int doEndTag() throws JspException {
             textColor = "coderTextOrange";
         }
 
+
         // Start preparing resulting output
-        StringBuilder results = new StringBuilder("<a href=\"http://www.topcoder.com/tc?module=MemberProfile&cr=");
+        StringBuilder results = new StringBuilder("<a href=\"http://<%=ApplicationServer.SERVER_NAME%>/tc?module=MemberProfile&cr=");
         // appending coder's id to the generated link
         results.append(coderId);
         // tab will be specified only if tab local variable is not empty

src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java

@@ -219,6 +219,9 @@ public static void gatherUserRoles(HttpServletRequest request) throws BaseExcept
             ExternalUser extUser = usrMgr.retrieveUser(getLoggedInUserId(request));
             // Place handle of the user into session as attribute
             request.getSession().setAttribute("userHandle", extUser.getHandle());
+            request.getSession().setAttribute("userFirstName", extUser.getFirstName());
+            request.getSession().setAttribute("userLastName", extUser.getLastName());
+            request.getSession().setAttribute("userEmail", extUser.getEmail());
         }
 
         // Perform search for resources
@@ -478,7 +481,7 @@ private static AuthorizationService retrieveAuthorizationService(HttpServletRequ
      * Sets the sso cookie service to be used for authenticating users based on
      * cookie.
      * </p>
-     * 
+     *
      * @param ssoCookieService the ssoCookieService to set
      */
     public void setSsoCookieService(SSOCookieService ssoCookieService) {
@@ -489,7 +492,7 @@ public void setSsoCookieService(SSOCookieService ssoCookieService) {
      * <p>
      * Validate jwt token
      * </p>
-     * 
+     *
      * @param token the jwt token
      * @throws JWTException if any error occurs
      * @return the DecodedJWT result

src/main/java/com/cronos/onlinereview/util/ConfigHelper.java

@@ -593,6 +593,11 @@ public class ConfigHelper {
      */
     private static final String CHALLENGE_BY_LEGACY_ID_URL_V5 = "challenge_by_legacy_id_url_v5";
 
+    /**
+     * <p>A <code>String</code> providing support requests v5 url property.</p>
+     */
+    private static final String SUPPORT_REQUEST_URL_V5 = "support_request_url_v5";
+
     /**
      * This member variable holds the submitter role id.
      */
@@ -1069,6 +1074,11 @@ public class ConfigHelper {
      */
     private static String challengeByLegacyIdUrlV5;
 
+    /**
+     * Support Request URL
+     */
+    private static String supportRequestUrlV5;
+
     static {
         // Obtaining the instance of Configuration Manager
         ConfigManager cfgMgr = new ConfigManager();
@@ -1696,6 +1706,8 @@ public class ConfigHelper {
             newAuthUrl = newAuth.getValue("new_auth_url");
 
             challengeByLegacyIdUrlV5 = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, CHALLENGE_BY_LEGACY_ID_URL_V5);
+
+            supportRequestUrlV5 = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, SUPPORT_REQUEST_URL_V5);
         } catch (Exception une) {
             System.out.println(une.getMessage());
             une.printStackTrace();
@@ -2586,4 +2598,12 @@ public static String getNewAuthUrl() {
     public static String getChallengeByLegacyIdUrlV5() {
         return challengeByLegacyIdUrlV5;
     }
+
+    /**
+     * Get support request url
+     * @return url
+     */
+    public static String getSupportRequestUrlV5() {
+        return supportRequestUrlV5;
+    }
 }