Merge pull request #99 from cloudspokes/technology-2014-12-11

Technology 2014 12 11

Author: mashannon168

build-dependencies.xml

@@ -362,6 +362,9 @@
     <property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
     <property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
     <property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
+    <property name="jackson-annotations-2.3.0.jar" value="${ext_libdir}/jackson/1.9.7/jackson-annotations-2.3.0.jar"/>
+    <property name="jackson-core-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-2.3.2.jar"/>
+    <property name="jackson-databind-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-databind-2.3.2.jar"/>
     <property name="axis.jar" value="${ext_libdir}/axis/1.3/axis.jar"/>
     <property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
     <property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
@@ -443,6 +446,8 @@
     <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"/>
+
     <!-- Http Client libs -->
     <property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
 
@@ -639,9 +644,13 @@
         <pathelement location="${yuicompressor.jar}"/>
         <pathelement location="${jackson-core.jar}"/>
         <pathelement location="${jackson-mapper.jar}"/>
+        <pathelement location="${jackson-annotations-2.3.0.jar}"/>
+        <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-0.2.jar}"/>
     </path>
 
 </project>

build.xml

@@ -311,7 +311,12 @@
         </copy>
     	<copy file="${jackson-core.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
     	<copy file="${jackson-mapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-annotations-2.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-core-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <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"/>
 
         <!-- EJB components -->
         <copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -577,10 +582,6 @@
                 <include name="jboss-cache/jboss-cache-jdk50.jar" />
                 <include name="jboss-cache/jgroups.jar" />
             </fileset>
-            <fileset dir="${tcs_libdir}">
-                <include name="shared.jar" />
-                <include name="tcwebcommon.jar" />
-            </fileset>
         </copy>
     </target>
 

conf/Direct.properties

@@ -12,6 +12,7 @@ CONTEST_SERVICE_FACADE_PROVIDER_URL=@CONTEST_SERVICE_PROVIDER_URL@
 #The Auth0 related setting for the social accounts sign-in purpose.
 DOMAIN_AUTH0 = @DOMAIN_AUTH0@
 CLIENT_ID_AUTH0 = @CLIENT_ID_AUTH0@
+CLIENT_SECRET_AUTH0 = @CLIENT_SECRET_AUTH0@
 LDAP_AUTH0_CONNECTION_NAME = @LDAP_AUTH0_CONNECTION_NAME@
 REDIRECT_URL_AUTH0 = /reg2/callback.action
 REG_SERVER_NAME= @REG_SERVER_NAME@

conf/web/WEB-INF/applicationContext.xml

@@ -251,7 +251,7 @@
 
     <!-- Actions -->
     <bean id="baseDirectStrutsAction"
-          class="com.topcoder.direct.services.view.action.contest.launch.BaseDirectStrutsAction"
+          class="com.topcoder.direct.services.view.action.BaseDirectStrutsAction"
           abstract="true">
         <property name="projectServiceFacade" ref="projectServiceFacade"/>
         <property name="contestServiceFacade" ref="contestServiceFacade"/>