Merge branch 'technology-2014-10-23'

Author: mashannon168

build-dependencies.xml

@@ -408,7 +408,7 @@
     <property name="commons-fileupload-1.3.jar" value="${struts2_libdir}/commons-fileupload-1.3.jar"/>
     <property name="commons-io-2.0.1.jar" value="${struts2_libdir}/commons-io-2.0.1.jar"/>
     <property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
-    <property name="commons-lang3-3.1.jar" value="${struts2_libdir}/commons-lang3-3.1.jar"/>
+    <property name="commons-lang3-3.3.2.jar" value="${struts2_libdir}/commons-lang3-3.3.2.jar"/>
     <property name="commons-logging-1.1.3.jar" value="${struts2_libdir}/commons-logging-1.1.3.jar"/>
     <property name="ezmorph-1.0.6.jar" value="${struts2_libdir}/ezmorph-1.0.6.jar"/>
     <property name="freemarker-2.3.19.jar" value="${struts2_libdir}/freemarker-2.3.19.jar"/>
@@ -478,7 +478,7 @@
         <pathelement location="${commons-fileupload-1.3.jar}"/>
         <pathelement location="${commons-io-2.0.1.jar}"/>
         <pathelement location="${commons-lang-2.4.jar}"/>
-        <pathelement location="${commons-lang3-3.1.jar}"/>
+        <pathelement location="${commons-lang3-3.3.2.jar}"/>
         <pathelement location="${commons-logging-1.1.3.jar}"/>
         <pathelement location="${ezmorph-1.0.6.jar}"/>
         <pathelement location="${freemarker-2.3.19.jar}"/>

build.xml

@@ -254,7 +254,7 @@
         <copy file="${commons-fileupload-1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-io-2.0.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${commons-lang3-3.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-lang3-3.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${freemarker-2.3.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

conf/web/WEB-INF/struts.xml

@@ -892,6 +892,13 @@
             <result name="error" type="json"/>
         </action>
 
+        <action name="saveAppirioManagers" class="saveCockpitProjectSettingAction"
+                method="saveAppirioManagers">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
         <action name="addNewCustomMetadataKey" class="saveCockpitProjectSettingAction"
                 method="addNewCustomMetadataKey">
             <interceptor-ref name="securedProjectPreProcessorStack"/>

lib/third_party/struts/commons-lang3-3.1.jar

@@ -839,9 +839,17 @@
  * </ul>
  * </p>
  *
+ * <p>
+ * Version 3.2 (TopCoder Direct - Add Appirio Manager)
+ * <ul>
+ *     <li>Updated {@link #createContestResources(com.topcoder.security.TCSubject, com.topcoder.service.project.SoftwareCompetition, long, boolean)}
+ *     to add Appirio Manager as manager resource if it's in the passed-in competition object</li>
+ * </ul>
+ * </p>
+ *
  * @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
- * @author isv, GreatKevin
- * @version 3.1
+ * @author isv, GreatKevin, Veve
+ * @version 3.2
  */
 @Stateless
 @TransactionManagement(TransactionManagementType.CONTAINER)
@@ -3802,18 +3810,31 @@ private com.topcoder.management.resource.Resource[] createContestResources(TCSub
          // check if contest contains copilot resource
         com.topcoder.management.resource.Resource[] contestResources = contest.getResources();
         com.topcoder.management.resource.Resource copilot = null;
+        com.topcoder.management.resource.Resource appirioManager = null;
 
         // flag indicates whether current user is set as the copilot
         boolean isCopilotCurrentUser = false;
+        boolean isAppirioManagerCurrentUser = false;
 
         if (contestResources.length > 1) {
-            // contains copilot resource
-            copilot = contestResources[1];
+            for (int i = 1; i < contestResources.length; ++i) {
 
-            if(copilot.getProperty(RESOURCE_INFO_EXTERNAL_REFERENCE_ID).equals(String.valueOf(tcSubject.getUserId()))) {
-                isCopilotCurrentUser = true;
-            }
+                if (contestResources[i].getResourceRole().getId() == ResourceRole.RESOURCE_ROLE_COPILOT_ID) {
+                    // contains copilot resource
+                    copilot = contestResources[1];
 
+                    if (copilot.getProperty(RESOURCE_INFO_EXTERNAL_REFERENCE_ID).equals(
+                            String.valueOf(tcSubject.getUserId()))) {
+                        isCopilotCurrentUser = true;
+                    }
+                } else if (contestResources[i].getResourceRole().getId() == ResourceRole.RESOURCE_ROLE_MANAGER_ID) {
+                    appirioManager = contestResources[i];
+                    if (appirioManager.getProperty(RESOURCE_INFO_EXTERNAL_REFERENCE_ID).equals(
+                            String.valueOf(tcSubject.getUserId()))) {
+                        isAppirioManagerCurrentUser = true;
+                    }
+                }
+            }
         }
 
         // create an array to store the resources, if copilot exists and copilot is not current user, we create
@@ -3850,8 +3871,9 @@ private com.topcoder.management.resource.Resource[] createContestResources(TCSub
         boolean tcstaff = isRole(tcSubject, TC_STAFF_ROLE);
         boolean isObserverCopilot = false;
 
-        // tc staff add as manager, other as observer
-        if (tcstaff) {
+        if (appirioManager != null) {
+        	resources[0] = appirioManager;
+        } else if (tcstaff) {
             resources[0].setResourceRole(managerRole);
         } else if (contest.getProjectHeader().getSecurityGroupId() > 0) {
             resources[0].setResourceRole(managerRole);
@@ -3865,7 +3887,7 @@ private com.topcoder.management.resource.Resource[] createContestResources(TCSub
             }
         }
 
-        if (!isObserverCopilot) {
+        if (!isObserverCopilot && appirioManager == null) {
             // we don't override the copilot properties if the observer is the copilot
             resources[0].setProperty(RESOURCE_INFO_EXTERNAL_REFERENCE_ID, String.valueOf(tcSubject.getUserId()));
             resources[0].setProperty(RESOURCE_INFO_HANDLE, getUserName(tcSubject));
@@ -3937,6 +3959,11 @@ private com.topcoder.management.resource.Resource[] createContestResources(TCSub
             existingResourceIds.add(Long.valueOf(r.getProperty(RESOURCE_INFO_EXTERNAL_REFERENCE_ID)));
         }
 
+        if (appirioManager != null) {
+            allResources.add(appirioManager);
+            existingResourceIds.add(appirioManager.getUserId());
+        }
+
         for (Permission p : permissions) {
             if (!existingResourceIds.contains(p.getUserId())) {
                 com.topcoder.management.resource.Resource r = new com.topcoder.management.resource.Resource();