Merge branch 'technology-2015-01-08'

Author: ykohata

build-dependencies.xml

@@ -446,7 +446,7 @@
     <property name="dom4j-1.6.1.jar" value="${poi_libdir}/ooxml-lib/dom4j-1.6.1.jar"/>
     <property name="xmlbeans-2.3.0.jar" value="${poi_libdir}/ooxml-lib/xmlbeans-2.3.0.jar"/>
 
-    <property name="java-jwt-0.2.jar" value="${ext_libdir}/jwt/java-jwt-0.2.jar"/>
+    <property name="java-jwt-1.0.0.jar" value="${ext_libdir}/jwt/java-jwt-1.0.0.jar"/>
 
     <!-- Http Client libs -->
     <property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
@@ -650,7 +650,7 @@
         <pathelement location="${scribe.jar}"/>
         <pathelement location="${jsr311.jar}"/>
         <pathelement location="${cxf.jar}"/>
-        <pathelement location="${java-jwt-0.2.jar}"/>
+        <pathelement location="${java-jwt-1.0.0.jar}"/>
     </path>
 
 </project>

build.xml

@@ -316,7 +316,7 @@
         <copy file="${jackson-databind-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
 
     	<copy file="${yuicompressor.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${java-jwt-0.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${java-jwt-1.0.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
 
         <!-- EJB components -->
         <copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>

conf/Direct.properties

@@ -13,6 +13,7 @@ CONTEST_SERVICE_FACADE_PROVIDER_URL=@CONTEST_SERVICE_PROVIDER_URL@
 DOMAIN_AUTH0 = @DOMAIN_AUTH0@
 CLIENT_ID_AUTH0 = @CLIENT_ID_AUTH0@
 CLIENT_SECRET_AUTH0 = @CLIENT_SECRET_AUTH0@
+JWT_EXPIRATION_SECONDS = @JWT_EXPIRATION_SECONDS@
 LDAP_AUTH0_CONNECTION_NAME = @LDAP_AUTH0_CONNECTION_NAME@
 REDIRECT_URL_AUTH0 = /reg2/callback.action
 REG_SERVER_NAME= @REG_SERVER_NAME@

conf/token.properties

@@ -227,3 +227,78 @@ j#######################################################
 @projectCreationEmailCCAddresses@=testuser3@topcoder.com;testuser4@topcoder.com
 @projectCreationEmailTemplatePath@=email_templates/direct_project_creation_email_template.txt
 @projectCreationEmailFromAddress@=service@topcoder.com
+
+#######################################
+# Payment Dashboard                   #
+#######################################
+@paypal.baseUrl@=https://api-3t.sandbox.paypal.com/nvp
+@paypal.username@=
+@paypal.password@=
+@paypal.signature@=
+@payoneer.baseApiUrl@=
+@payoneer.username@=
+@payoneer.password@=
+@payoneer.partnerId@=
+@paymemtStatsService.resultLimit@=10
+@paymentsService.paymentMethodID@=2
+#@payoneerService@=com.topcoder.direct.services.payments.impl.PayoneerServiceImpl
+@payoneerService@=com.topcoder.direct.services.payments.impl.MockPayoneerServiceImpl
+@westernUnionBalanceFileName@=/mnt/shared/western.txt
+@paymentsByStatusByDays@=30,60,120
+
+#######################################
+# Wireframe Submissions Configuration #
+#######################################
+@wireframeDirectory@=/home/direct/wireframeDirectory
+@wireframeIndexPage@=submission/index.html
+@trustedIPs@=192.168.150.250;202.120.2.101
+@watermarkImageMapping@=/viewWireframePage/;/css/direct/WatermarkTcRepeat.css
+
+#########################
+# Assets configuration #
+#########################
+@assetUploadBasePath@=/tmp/assetupload
+@assetUploadTempFileRoot@=/tmp/assetuploadtemp
+
+##################
+# Project Tasks  #
+##################
+@taskEmailSender@=donotreply@topcoder.com
+@taskCreationEmailSubjectTemplateText@=(%PROJECT_NAME%) Task created and assigned to you\\: %TASK_NAME%
+@taskCreationEmailBodyTemplatePath@=email_templates/create_task_email_template.txt
+@taskStatusChangeEmailSubjectTemplateText@=(%PROJECT_NAME%) Task status changed to %UPDATED_TASK_STATUS%\\: %TASK_NAME%
+@taskStatusChangeEmailBodyTemplatePath@=email_templates/update_task_status_email_template.txt
+
+#OAuth settings.
+@oauth.authorizationURL@=https://api.login.yahoo.com/oauth/v2/request_auth?oauth_token=%s
+@oauth.callBackActionUrl@=https://cockpit.cloud.topcoder.com/direct/marathonmatch/callBack.action
+@oauth.consumerKey@=--
+@oauth.consumerSecret@=
+@oauth.providerClass@=org.scribe.builder.api.YahooApi
+
+##################################################
+# Marathon Match Analytics Service Configuration #
+##################################################
+@api_server_domain@=
+@apiKey@=
+@clientId@=test
+@clientSecret@=test
+
+#######################################
+# Contest Creation SNS Configuration #
+#######################################
+@amazonSNSAccessKey@=
+@amazonSNSSecretKey@=
+@contestCreationArn@=
+@contestCreationSubject@=cmc challenge contest creation
+@contestUpdateSubject@=cmc challenge contest update
+@contestCreationMessageTemplatePath@=contest_creation_sns_message.txt
+@contestUpdateMessageTemplatePath@=contest_update_sns_message.txt
+
+
+@DOMAIN_AUTH0@=
+@CLIENT_ID_AUTH0@=
+@CLIENT_SECRET_AUTH0@=
+@JWT_EXPIRATION_SECONDS@=36000000
+@REG_SERVER_NAME@=tc.cloud.topcoder.com
+@LDAP_AUTH0_CONNECTION_NAME@=vm-ldap-connection

conf/web/WEB-INF/applicationContext.xml

@@ -583,6 +583,11 @@
         <property name="milestoneService" ref="milestoneService"/>
     </bean>
 
+    <bean id="saveChallengeConfirmation"
+          class="com.topcoder.direct.services.view.action.setting.ChallengeConfirmationPreferenceAction"
+          scope="prototype" parent="baseDirectStrutsAction">
+    </bean>
+
     <bean id="contestSubmissionsAction"
           class="com.topcoder.direct.services.view.action.contest.ContestSubmissionsAction"
           scope="prototype" parent="baseDirectStrutsAction">

conf/web/WEB-INF/struts.xml

@@ -1666,6 +1666,12 @@
             <result name="error" type="json"/>
         </action>
 
+        <action name="saveChallengeConfirmation" method="updateChallengeConfirmationPreference" class="saveChallengeConfirmation">
+            <interceptor-ref name="securedDefaultStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
     </package>
 
     <package name="my" namespace="/my" extends="base">

lib/third_party/jwt/java-jwt-1.0.0.jar

@@ -10,6 +10,7 @@
 import com.topcoder.direct.services.project.milestone.model.SortOrder;
 import com.topcoder.direct.services.view.action.analytics.longcontest.MarathonMatchHelper;
 import com.topcoder.direct.services.view.action.analytics.longcontest.services.MarathonMatchAnalyticsService;
+import com.topcoder.direct.services.view.action.setting.ChallengeConfirmationPreferenceAction;
 import com.topcoder.direct.services.view.dto.cloudvm.VMInstanceData;
 import com.topcoder.direct.services.view.dto.cloudvm.VMInstanceStatus;
 import com.topcoder.direct.services.view.dto.contest.ContestCopilotDTO;
@@ -30,6 +31,9 @@
 import com.topcoder.service.project.CompetionType;
 import com.topcoder.service.project.ProjectData;
 import com.topcoder.service.project.SoftwareCompetition;
+import com.topcoder.shared.util.DBMS;
+import com.topcoder.web.common.RowNotFoundException;
+import com.topcoder.web.ejb.user.UserPreference;
 import org.apache.struts2.ServletActionContext;
 
 import org.apache.commons.lang.math.NumberUtils;
@@ -242,8 +246,16 @@
  * load these data via ajax instead after the page finishes loading.
  * </p>
  *
- * @author fabrizyo, FireIce, isv, morehappiness, GreatKevin, minhu, Veve, Ghost_141, GreatKevin, Veve
- * @version 3.0
+ * <p>
+ * Version 3.1 (TopCoder Direct - Draft Challenge Creation/Saving Prompt)
+ * <ul>
+ *     <li>Adds the {@link #showSaveChallengeConfirmation} and its getter</li>
+ *     <li>Updates {@link #executeAction()} to populate the {@link #showSaveChallengeConfirmation}</li>
+ * </ul>
+ * </p>
+ *
+ * @author fabrizyo, FireIce, isv, morehappiness, GreatKevin, minhu, Veve, Ghost_141, GreatKevin, Veve, GreatKevin
+ * @version 3.1
  */
 public class GetContestAction extends ContestAction {
     /**
@@ -359,6 +371,13 @@ public class GetContestAction extends ContestAction {
      */
     private int timelineInterval;
 
+    /**
+     * The preference value of whether to show the save challenge confirmation.
+     *
+     * @since 3.1
+     */
+    private boolean showSaveChallengeConfirmation;
+
     /**
      * <p>
      * Creates a <code>GetContestAction</code> instance.
@@ -524,6 +543,17 @@ protected void executeAction() throws Exception {
             billingAccountsForProject.add(billingAccount);
         }
 
+        UserPreference userPreference = this.getUserPreferenceHome().create();
+
+        try {
+            String value = userPreference.getValue(DirectUtils.getTCSubjectFromSession().getUserId(),
+                    ChallengeConfirmationPreferenceAction.CHALLENGE_CONFIRMATION_PREFERENCE_ID,
+                    DBMS.COMMON_OLTP_DATASOURCE_NAME);
+            this.showSaveChallengeConfirmation = Boolean.valueOf(value);
+        } catch (RowNotFoundException rfe) {
+            this.showSaveChallengeConfirmation = true;
+        }
+
         // Set current project context based on selected contest
         getSessionData().setCurrentProjectContext(contestStats.getContest().getProject());
         getSessionData().setCurrentSelectDirectProjectID(contestStats.getContest().getProject().getId());
@@ -968,4 +998,14 @@ public static enum TYPE {
         COPILOT_CONTEST, CONTEST, CONTEST_JSON
     }
 
+    /**
+     * Gets whether to show the save challenge confirmation.
+     *
+     * @return true if show, false otherwise.
+     * @since 3.1
+     */
+    public boolean isShowSaveChallengeConfirmation() {
+        return showSaveChallengeConfirmation;
+    }
+
 }

src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java

@@ -6,13 +6,17 @@
 import com.topcoder.direct.services.project.milestone.model.Milestone;
 import com.topcoder.direct.services.project.milestone.model.MilestoneStatus;
 import com.topcoder.direct.services.project.milestone.model.SortOrder;
+import com.topcoder.direct.services.view.action.setting.ChallengeConfirmationPreferenceAction;
 import com.topcoder.direct.services.view.dto.CommonDTO;
 import com.topcoder.direct.services.view.dto.IdNamePair;
 import com.topcoder.direct.services.view.dto.contest.ContestCopilotDTO;
 import com.topcoder.direct.services.view.util.DataProvider;
 import com.topcoder.direct.services.view.util.DirectUtils;
 import com.topcoder.direct.services.view.util.SessionData;
 import com.topcoder.security.TCSubject;
+import com.topcoder.shared.util.DBMS;
+import com.topcoder.web.common.RowNotFoundException;
+import com.topcoder.web.ejb.user.UserPreference;
 import org.apache.struts2.ServletActionContext;
 
 import javax.servlet.http.HttpServletRequest;
@@ -67,8 +71,16 @@
  * load these data via ajax instead after the page finishes loading.
  * </p>
  *
- * @author BeBetter, duxiaoyang, GreatKevin, Veve, Veve
- * @version 1.5
+ * <p>
+ * Version 1.6 (TopCoder Direct - Draft Challenge Creation/Saving Prompt)
+ * <ul>
+ *     <li>Adds the {@link #showSaveChallengeConfirmation} and its getter</li>
+ *     <li>Updates {@link #executeAction()} to populate the {@link #showSaveChallengeConfirmation}</li>
+ * </ul>
+ * </p>
+ *
+ * @author BeBetter, duxiaoyang, GreatKevin, Veve, Veve, GreatKevin
+ * @version 1.6
  */
 public class LaunchContestAction extends ContestAction {
     private CommonDTO viewData =  new CommonDTO();
@@ -94,6 +106,13 @@ public class LaunchContestAction extends ContestAction {
      */
     private IdNamePair cmcBillingAccount;
 
+    /**
+     * The preference value of whether to show the save challenge confirmation.
+     *
+     * @since 1.6
+     */
+    private boolean showSaveChallengeConfirmation;
+
     /**
      * <p>
      * Executes the action. Does nothing for now.
@@ -116,6 +135,18 @@ protected void executeAction() throws Exception {
         if(getCmcAccountId() != null && getCmcAccountId().trim().length() > 0) {
             setCmcBillingAccount(DataProvider.getBillingAccountFromCMCAccountID(getCmcAccountId()));
         }
+
+        UserPreference userPreference = this.getUserPreferenceHome().create();
+
+        try {
+            String value = userPreference.getValue(DirectUtils.getTCSubjectFromSession().getUserId(),
+                    ChallengeConfirmationPreferenceAction.CHALLENGE_CONFIRMATION_PREFERENCE_ID,
+                    DBMS.COMMON_OLTP_DATASOURCE_NAME);
+            this.showSaveChallengeConfirmation = Boolean.valueOf(value);
+        } catch (RowNotFoundException rfe) {
+            this.showSaveChallengeConfirmation = true;
+        }
+
     }
 
     public CommonDTO getViewData() {
@@ -253,4 +284,14 @@ public IdNamePair getCmcBillingAccount() {
     public void setCmcBillingAccount(IdNamePair cmcBillingAccount) {
         this.cmcBillingAccount = cmcBillingAccount;
     }
+
+    /**
+     * Gets whether to show the save challenge confirmation.
+     *
+     * @return true if show, false otherwise.
+     * @since 1.6
+     */
+    public boolean isShowSaveChallengeConfirmation() {
+        return showSaveChallengeConfirmation;
+    }
 }