Merge pull request #115 from appirio-tech/dev

merge from dev - release from 2015/12

Author: jamesdotcom

.gitignore

@@ -7,3 +7,6 @@ target/
 token.properties
 topcoder_global.properties
 stacktrace.log
+/bin/
+.DS_Store
+*/.DS_Store

README.md

@@ -1,14 +1,49 @@
 direct-app
 ==========
 
+## building
+To build, download the docker build container that has all of the build dependencies. You can then run the container to build your local source code.
+
+1. Clone the github source directory
+2. Rename `token.properties.docker` to `token.properties` in the source directory
+3. Rename `topcoder_global.properties.docker` to `topcoder_global.properties`
+4. Unzip [jboss-4.2.3.zip](http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.2.3.GA/jboss-4.2.3.GA.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fjboss%2Ffiles%2FJBoss%2FJBoss-4.2.3.GA%2F) in your root source directory. The build will place jboss deployment files here. It also needs some of its libraries for the build itself.
+5. Run the docker container to execute a build. The format of the command is `docker run --rm=true -v <source dir>:/data -t appiriodevops/tc-direct-app-build <ant target(s)>`.
+
+   For example, `docker run --rm=true -v /Users/james/dev/topcoder/direct-app:/data -t appiriodevops/tc-direct-app-build clean package-direct deploy-prod`
+
+> NOTE: the source directory should be writeable to Docker so use a directory under `/Users/<username>`
+
+## running locally
+In this configuration, we'll run the direct app in a docker container locally but it unfortunately requires many dependencies so we'll need to run several containers and connect to the dev database. To run, follow these steps.
+
+> NOTE: it is assumed you are running with the latest Docker toolbox and Docker compose (1.5+)
+
+1. Add this entry to your local /etc/hosts file: `<docker ip> docker.topcoder-dev.com`. This is needed for auth integration that requires the same top level domain. You can get the docker ip with the command `docker-machine ip default`
+2. Set the following environment variables:
+* TC_DEV_NAT_DIR : Local directory containing the pem file for accessing the dev NAT instance (used to create a tunnel to the dev informix instances)
+* TC_DIRECT_SRC_HOME : Local directory for the root direct-app directory
+* ASP_API_URL : Base URL for the ASP API (e.g., https://api.topcoder-dev.com)
+3. Run `docker-compose up` from the `docker` subdirectory containing the `docker-compose.yml` file
+
+
+   This will start the app with an endpoint available on port 443. You can now go to https://docker.topcoder-dev.com/direct/enterpriseDashboard/activeContests.action
+
+> NOTE: the SSL certificate is self-signed as will generate a warning/error when you access the site for the first time. Just accept it and continue.
+
+---
+
+
+## **old** instructions
+
 Setup on VM:
 * Once you get your VM, login into the VM with your private key and account 'direct'
 * Back up token.properties and topcoder_global.properties in /home/direct/direct somewhere
 * Delete the whole directory /home/direct/direct
 * Git Clone the direct-app repo into folder /home/direct/direct.
 * Copy the back up *.properties files back to /home/direct/direct
 * Among the *.properties, update topcoder_global.properties, add line 'direct_service_libdir=${libdir}/tcs/ejb' after tcs_libdir property
-* Make sure JDK7 is used: run 
+* Make sure JDK7 is used: run
 * + export JAVA_HOME=/opt/jdk1.7.0_17
 * + export PATH=/opt/jdk1.7.0_17/bin:$PATH
 

build-dependencies.xml

@@ -401,11 +401,13 @@
     <property name="jai_codec-1.1.3.jar" value="${ext_libdir}/jai/jai_codec-1.1.3.jar"/>
     <property name="jai_core-1.1.3.jar" value="${ext_libdir}/jai/jai_core-1.1.3.jar"/>
 
+<!--
     <property name="cxf.jar" value="${ext_libdir}/cxf/cxf-2.6.4.jar"/>
     <property name="aopalliance-1.0.jar" value="${ext_libdir}/cxf/aopalliance-1.0.jar"/>
     <property name="geronimo-jaxws_2.2_spec-1.1.jar" value="${ext_libdir}/cxf/geronimo-jaxws_2.2_spec-1.1.jar"/>
     <property name="geronimo-annotation_1.0_spec-1.1.1.jar" value="${ext_libdir}/cxf/geronimo-annotation_1.0_spec-1.1.1.jar"/>
     <property name="neethi-3.0.1.jar" value="${ext_libdir}/cxf/neethi-3.0.1.jar"/>
+-->
 
     <!-- Struts 2 libs -->
     <property name="struts2_libdir" value="${ext_libdir}/struts"/>
@@ -472,6 +474,8 @@
     <!-- slf4j -->
     <property name="slf4j.jar" value="${ext_libdir}/mime-util/slf4j-api-1.5.11.jar"/>
 
+    <property name="asp-client.jar" value="${ext_libdir}/aspclient/asp-client.jar"/>
+
 
     <!-- EJB/Persistence libraries -->
     <path id="ejb.libs">
@@ -622,6 +626,10 @@
         <pathelement location="${scorecard_management.jar}"/>
     </path>
 
+    <path id="aspclient.libs">
+        <fileset dir="${ext_libdir}/aspclient" includes="*.jar"/>
+    </path>
+
     <path id="component.3rdParty-dependencies">
         <path refid="struts.libs"/>
         <path refid="spring.libs"/>
@@ -648,9 +656,12 @@
         <pathelement location="${jackson-core-2.3.2.jar}"/>
         <pathelement location="${jackson-databind-2.3.2.jar}"/>
         <pathelement location="${scribe.jar}"/>
+<!--
         <pathelement location="${jsr311.jar}"/>
         <pathelement location="${cxf.jar}"/>
+-->
         <pathelement location="${java-jwt-1.0.0.jar}"/>
+        <pathelement location="${asp-client.jar}"/>
     </path>
 
 </project>

build.xml

@@ -6,6 +6,8 @@
     <!-- Override these in ../topcoder_global.properties -->
     <property name="javadoc.locale" value="en_US"/>
     <property name="javac.encoding" value="UTF-8"/>
+    <property name="javac.source.ver" value="1.6"/>
+    <property name="javac.target.ver" value="1.6"/>
     <property name="debug" value="off"/>
     <property name="verbose" value="no"/>
     <available file="topcoder_global.properties" property="properties.exists"/>
@@ -119,15 +121,17 @@
     <target name="compile" description="compile the source code">
         <mkdir dir="${build_classdir}"/>
         <javac srcdir="${javamain}" destdir="${build_classdir}" includes="${packagedir}/**" debug="true"
-               verbose="${verbose}" includeAntRuntime="no" encoding="${javac.encoding}">
+               verbose="${verbose}" includeAntRuntime="no" encoding="${javac.encoding}"
+               source="${javac.source.ver}" target="${javac.target.ver}">
             <classpath refid="buildlibs"/>
         </javac>
     </target>
 
     <target name="marathonmatch_compile" description="compile the marathon match source code">
         <mkdir dir="${build_classdir}"/>
         <javac srcdir="${javamain}" destdir="${build_classdir}" includes="com/topcoder/marathonmatch/**" debug="true"
-            verbose="${verbose}" includeantruntime="no" encoding="${javac.encoding}">
+            verbose="${verbose}" includeantruntime="no" encoding="${javac.encoding}"
+            source="${javac.source.ver}" target="${javac.target.ver}">
             <classpath refid="buildlibs" />
         </javac>
     </target>
@@ -287,12 +291,20 @@
         <copy file="${log4j.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${slf4j.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${scribe.jar}" todir="${ear_shared_libdir}" overwrite="true" />
+<!--
         <copy file="${jsr311.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${cxf.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+-->
+        <copy file="${asp-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy todir="${ear_shared_libdir}" overwrite="true">
+            <fileset dir="${ext_libdir}/aspclient" includes="*.jar"/>
+        </copy>
+<!--
         <copy file="${aopalliance-1.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${geronimo-jaxws_2.2_spec-1.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${geronimo-annotation_1.0_spec-1.1.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${neethi-3.0.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+-->
         <copy todir="${ear_shared_libdir}" overwrite="true">
             <fileset dir="${httpclient_libdir}">
                 <include name="commons-codec-1.6.jar"/>

components/copilot_pool_and_profiles_services/conf/META-INF/mapping.hbm.xml

@@ -64,7 +64,12 @@
 
     <class name="CopilotProject" table="copilot_project">
         <id name="id" column="copilot_project_id" type="long">
+            <!-- use a sequence b/c rows are inserted by other processes too
             <generator class="increment"/>
+            -->
+            <generator class="sequence">
+                <param name="sequence">copilot_project_sequence</param>
+            </generator>
         </id>
         <property name="createDate" column="create_date" type="timestamp" update="false"/>
         <property name="createUser" column="create_user" type="string" update="false"/>

components/project_management/src/java/main/com/topcoder/management/project/persistence/AbstractInformixProjectPersistence.java

@@ -459,7 +459,7 @@ public abstract class AbstractInformixProjectPersistence implements ProjectPersi
      * 
      * @since 1.1.2
      */
-    public static final long PUBLIC_SUBMITTER_TERMS_ID = 21173;
+    public static final long PUBLIC_SUBMITTER_TERMS_ID = 21193; // 21173
 
 	/**
      * <p>

conf/ear/META-INF/application.xml

@@ -96,11 +96,11 @@
         <java>conf</java>
     </module>
 
-    <module>
-        <web>
-            <web-uri>scorecard.war</web-uri>
-            <context-root>/direct/scorecard</context-root>
-        </web>
+     <module>
+         <web>
+            <web-uri>scorecard.war</web-uri>		
+            <context-root>/direct/scorecard</context-root>		
+        </web>		
     </module>
     <module>
         <web>

conf/web/WEB-INF/applicationContext.xml

@@ -294,6 +294,13 @@
         <property name="permissionServiceFacade" ref="permissionServiceFacade"/>
     </bean>
 
+    <bean id="projectWorkManagementAction"
+          class="com.topcoder.direct.services.view.action.project.ProjectWorkManagementAction" scope="prototype" parent="baseDirectStrutsAction">
+        <property name="studioSubmissionBase" value="@studio.submission.base@"/>
+        <property name="softwareSubmissionBase" value="@file_storage_location@"/>
+        <property name="mimeTypeRetriever" ref="mimeTypeRetriever"/>
+    </bean>
+
     <bean id="getProjectVMInstancesAction"
           class="com.topcoder.direct.services.view.action.project.GetProjectVMInstancesAction" scope="prototype">
         <property name="cloudVMService" ref="cloudVMService"/>
@@ -492,14 +499,18 @@
           parent="contestAction" scope="prototype">
           <property name="type" value="CONTEST" />
           <property name="timelineInterval" value="1"/>
+<!--
           <property name="marathonMatchAnalyticsService" ref="marathonMatchAnalyticsService"/>
+-->
     </bean>
 
     <bean id="contestDetailJSONAction" class="com.topcoder.direct.services.view.action.contest.launch.GetContestAction"
           parent="contestAction" scope="prototype">
           <property name="type" value="CONTEST_JSON" />
           <property name="timelineInterval" value="1"/>
+<!--
           <property name="marathonMatchAnalyticsService" ref="marathonMatchAnalyticsService"/>
+-->
     </bean>
 
     <!-- we need this type to avoid to store session value  -->
@@ -1528,7 +1539,9 @@
     <bean id="marathonMatchViewAction"
           class="com.topcoder.direct.services.view.action.analytics.longcontest.MarathonMatchViewAction"
           scope="prototype">
+<!--
         <property name="marathonMatchAnalyticsService" ref="marathonMatchAnalyticsService"/>
+-->
         <property name="contestServiceFacade" ref="contestServiceFacade"/>
         <property name="timelineInterval" value="1"/>
         <property name="submissionHistoryInterval" value="20"/>
@@ -1537,13 +1550,16 @@
     <bean id="marathonMatchResultsViewAction"
           class="com.topcoder.direct.services.view.action.analytics.longcontest.MarathonMatchResultsViewAction"
           scope="prototype">
+<!--
         <property name="marathonMatchAnalyticsService" ref="marathonMatchAnalyticsService"/>
+-->
         <property name="contestServiceFacade" ref="contestServiceFacade"/>
         <property name="timelineInterval" value="1"/>
     </bean>
 
     <bean id="marathonMatchRoundIdAction" class="com.topcoder.direct.services.view.action.analytics.longcontest.MarathonMatchRoundIdAction" scope="prototype"/>
 
+    <!--
     <bean id="marathonMatchAnalyticsService"
           class="com.topcoder.direct.services.view.action.analytics.longcontest.services.impl.MarathonMatchAnalyticsServiceImpl"
           init-method="checkInit">
@@ -1559,6 +1575,7 @@
         <property name="clientSecret" value="@clientSecret@"/>
         <property name="apiKey" value="@apiKey@"/>
     </bean>
+    -->
 
     <bean id="needFinalFixAction"
           class="com.topcoder.direct.services.view.action.contest.studio.NeedFinalFixAction"

conf/web/WEB-INF/struts.xml

@@ -778,6 +778,41 @@
             <result name="success">/WEB-INF/project-vm-management.jsp</result>
         </action>
 
+        <action name="projectWorkManager" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success">/WEB-INF/project-work-management.jsp</result>
+        </action>
+
+        <action name="getProjectWorkSteps" method="getDirectProjectWorkSteps" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
+        <action name="getWorkStepChallenges" method="getChallengesForWorkStepAndProject" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
+        <action name="getContestPhasesForWorkStep" method="getContestPhasesForWorkStep" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
+        <action name="getSubmissionDataForPhase" method="getSubmissionDataForPhase" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
+        <action name="pushSubmissions" method="pushSubmissions" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
         <action name="getProjectVMInstances" class="getProjectVMInstancesAction">
             <interceptor-ref name="authnInterceptor"/>
             <result name="success" type="json"/>

conf/web/WEB-INF/tld/tcdirect-functions.tld

@@ -165,6 +165,18 @@
         <function-class>com.topcoder.direct.services.view.util.JSPHelper</function-class>
         <function-signature>boolean hasWriteProjectPermission(long)</function-signature>
     </function>
+
+    <function>
+        <name>hasPermissionToAccessWorkManager</name>
+        <function-class>com.topcoder.direct.services.view.util.JSPHelper</function-class>
+        <function-signature>boolean hasPermissionToAccessWorkManager(long)</function-signature>
+    </function>
+
+    <function>
+        <name>getDemandWorkId</name>
+        <function-class>com.topcoder.direct.services.view.util.JSPHelper</function-class>
+        <function-signature>java.lang.String getDirectProjectDemandWorkId(long)</function-signature>
+    </function>
 
     <function>
         <name>maxLong</name>