Merge pull request #337 from appirio-tech/dev

Remove Jira Features

Author: ajefts

build-dependencies.xml

@@ -63,8 +63,6 @@
 
     <property name="game_plan_service.jar" value="${direct_service_libdir}/game_plan_service.jar"/>
 
-    <property name="user_service_facade.jar" value="${direct_service_libdir}/user_service_facade.jar"/>
-
     <property name="project_service_facade.jar" value="${direct_service_libdir}/project_service_facade.jar"/>
 
     <property name="permission_service_facade.jar" value="${direct_service_libdir}/permission_service_facade.jar"/>
@@ -206,11 +204,6 @@
     <property name="jboss_login_module.path" value="jboss_login_module/${jboss_login_module.version}"/>
     <property name="jboss_login_module.jar" value="${tcs_libdir}/${jboss_login_module.path}/${jboss_login_module.jar.name}"/>
 
-    <property name="jira_user_soap_client.version" value="1.0.2"/>
-    <property name="jira_user_soap_client.jar.name" value="jira_user_soap_client.jar"/>
-    <property name="jira_user_soap_client.path" value="jira_user_soap_client/${jira_user_soap_client.version}"/>
-    <property name="jira_user_soap_client.jar" value="${tcs_libdir}/${jira_user_soap_client.path}/${jira_user_soap_client.jar.name}"/>
-
     <property name="ldap_sdk_interface.version" value="1.0.2"/>
     <property name="ldap_sdk_interface.jar.name" value="ldap_sdk_interface.jar"/>
     <property name="ldap_sdk_interface.path" value="ldap_sdk_interface/${ldap_sdk_interface.version}"/>
@@ -372,12 +365,9 @@
     <property name="commons-pool2.jar" value="${ext_libdir}/commons-pool/commons-pool2-2.4.2.jar"/>
     <property name="jedis.jar" value="${ext_libdir}/jedis/jedis-2.8.1.jar"/>
 
-    <property name="confluence-service-axis-client.jar" value="${ext_libdir}/confluence/2.7.3/confluence-service-axis-client.jar"/>
     <property name="httpProxyPackage.jar" value="${ext_libdir}/httpProxyPackage/httpProxyPackage.jar"/>
     <property name="ifxjdbcx.jar" value="${ext_libdir}/informix/ifxjdbcx.jar"/>
     <property name="ifxjdbc.jar" value="${ext_libdir}/informix/ifxjdbc.jar"/>
-    <property name="jira-service-axis-client.jar" value="${ext_libdir}/jira/3.13.4/jira-service-axis-client.jar"/>
-    <property name="jira-soapclient-all.jar" value="${ext_libdir}/jira/jira-soapclient-all.jar"/>
     <property name="mysql-connector-java-5.1.6-bin.jar" value="${ext_libdir}/mysql/mysql-connector-java-5.1.6-bin.jar"/>
     <property name="payflow.jar" value="${ext_libdir}/payflow/4.3/payflow.jar"/>
     <property name="paypal_base.jar" value="${ext_libdir}/paypal/paypal_base.jar"/>
@@ -606,7 +596,6 @@
         <pathelement location="${review_management.jar}"/>
         <pathelement location="${email_engine.jar}"/>
         <pathelement location="${team_management.jar}"/>
-        <pathelement location="${user_service_facade.jar}"/>
         <pathelement location="${user_service.jar}"/>
         <pathelement location="${workdays.jar}"/>
         <pathelement location="${file_upload.jar}"/>
@@ -641,7 +630,6 @@
         <path refid="poi.libs"/>
         <path refid="httpclient.lib"/>
         <path refid="pdf.lib"/>
-        <pathelement location="${jira-soapclient-all.jar}"/>
         <pathelement location="${servlet-api.jar}"/>
         <pathelement location="${jaxb.jar}"/>
         <pathelement location="${encoder.jar}"/>

build.xml

@@ -179,7 +179,6 @@
         <copy file="${guid_generator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${id_generator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jboss_login_module.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jira_user_soap_client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${logging_wrapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${multiple_locale_resource_bundle.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${object_factory.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -232,12 +231,9 @@
         <copy file="${commons-pool.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-pool2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jedis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${confluence-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${httpProxyPackage.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ifxjdbcx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ifxjdbc.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jira-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jira-soapclient-all.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${mysql-connector-java-5.1.6-bin.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${payflow.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${paypal_base.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -336,7 +332,6 @@
         <copy file="${specification_review_comment_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${contest_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${permission_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
-        <copy file="${user_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${project_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${admin_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${pipeline_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -521,7 +516,6 @@
                 <include name="app.properties" />
                 <include name="contestFees.xml" />
                 <include name="copilotFees.xml" />
-                <include name="IssueTrackingConfig.xml" />
                 <include name="CloudVMAccessErrorConfig.xml" />
                 <include name="contestTypes.xml" />
                 <include name="CockpitUserPersistence.xml" />

circle.yml

@@ -9,7 +9,7 @@ dependencies:
 
 test:
   override:
-    - docker run -v $PWD:/root/direct appiriodevops/direct-app:build2 /root/scripts/build.sh
+    - docker run -v $PWD:/root/direct appiriodevops/direct-app:build3 /root/scripts/build.sh
 
 #deployment:
 #  development:

components.xml

@@ -28,7 +28,6 @@
     <project name="project_payment_management"/>
     <project name="admin_service_facade" buildType="services"/>
     <project name="game_plan_service" buildType="services"/>
-    <project name="user_service_facade" buildType="services" tokenize="true"/>
     <project name="project_service_facade" buildType="services"/>
     <project name="permission_service_facade" buildType="services"/>
     <project name="specification_review_service" buildType="services"/>

conf/ApplicationServer.properties

@@ -8,7 +8,6 @@ ENVIRONMENT=@ApplicationServer.ENVIRONMENT@
 SERVER_NAME=@ApplicationServer.SERVER_NAME@
 NEW_SERVER_NAME=@ApplicationServer.NEW_SERVER_NAME@
 NEW_COMMUNITY_SERVER_NAME=@ApplicationServer.NEW_COMMUNITY_SERVER_NAME@
-JIRA_SERVER_NAME=@ApplicationServer.JIRA_SERVER_NAME@
 STUDIO_SERVER_NAME=@ApplicationServer.STUDIO_SERVER_NAME@
 OPENAIM_SERVER_NAME=@ApplicationServer.OPENAIM_SERVER_NAME@
 TRUVEO_SERVER_NAME=@ApplicationServer.TRUVEO_SERVER_NAME@

conf/IssueTrackingConfig.xml

@@ -52,9 +52,6 @@ com.topcoder.project.phases.template.DefaultPhaseTemplate.workdays.config = obje
 # since Cockpit Release Assembly for Receipts
 com.topcoder.clientcockpit.objectfactory = objectFactory_config.xml
 
-# since: Jira & Confluence User Sync Service
-com.topcoder.service.facade.user.UserServiceFacadeBean = objectFactory_config.xml
-
 # since (Cockpit Pipeline Release Assembly 2 - Capacity
 com.topcoder.service.pipeline.ejb.ContestPipelineServiceBean =  ContestCapacity.xml
 

conf/components/com/topcoder/util/config/ConfigManager.properties

@@ -64,10 +64,6 @@
         <ejb>ejb/cloud_vm_service.jar</ejb>
     </module>
 
-    <module>
-        <ejb>ejb/user_service_facade.jar</ejb>
-    </module>
-
     <module>
         <ejb>ejb/project_service_facade.jar</ejb>
     </module>

conf/ear/META-INF/application.xml

@@ -251,26 +251,6 @@
                 </Property>
             </Property>
         </Property>
-
-        <!--
-                    Configuration for JiraUserService implementation
-                    @since: Jira & Confluence User Sync Service
-                    -->
-        <Property name="jiraUserServiceKey">
-            <Property name="type">
-                <Value>com.topcoder.jira.client.impl.JiraUserServiceImpl</Value>
-            </Property>
-        </Property>
-
-        <!--
-                    Configuration for ConfluenceUserService implementation
-                    @since: Jira & Confluence User Sync Service
-                    -->
-        <Property name="confluenceUserServiceKey">
-            <Property name="type">
-                <Value>com.topcoder.confluence.client.impl.ConfluenceUserServiceImpl</Value>
-            </Property>
-        </Property>
     </Config>
 
     <!--
@@ -1951,53 +1931,6 @@
         </Property>
     </Config>
 
-    <!--
-            Configuration for UserSyncServiceBean
-            @since: Jira & Confluence User Sync Service
-            -->
-    <Config name="com.topcoder.service.facade.user.UserServiceFacadeBean">
-        <Property name="objectFactoryNamespace">
-            <Value>com.topcoder.util.objectfactory</Value>
-        </Property>
-        <Property name="jiraUserServiceKey">
-            <Value>jiraUserServiceKey</Value>
-        </Property>
-        <Property name="confluenceUserServiceKey">
-            <Value>confluenceUserServiceKey</Value>
-        </Property>
-        <Property name="jiraServiceEndPoint">
-            <Value>@jiraServiceEndPoint@</Value>
-        </Property>
-        <Property name="jiraServiceAdminUserName">
-            <Value>@jiraServiceAdminUserName@</Value>
-        </Property>
-        <Property name="jiraServiceAdminUserPassword">
-            <Value>@jiraServiceAdminUserPassword@</Value>
-        </Property>
-        <Property name="confluenceServiceEndPoint">
-             <Value>@confluenceServiceEndPoint@</Value>
-        </Property>
-        <Property name="confluenceServiceAdminUserName">
-            <Value>@confluenceServiceAdminUserName@</Value>
-        </Property>
-        <Property name="confluenceServiceAdminUserPassword">
-            <Value>@confluenceServiceAdminUserPassword@</Value>
-        </Property>
-        <Property name="normalUserConfluenceGroups">
-            <Value>confluence-users</Value>
-        </Property>
-        <Property name="adminUserConfluenceGroups">
-            <Value>topcoder-staff,confluence-users</Value>
-        </Property>
-	<!-- These two auth properties are only needed in dev environment -->
-	<Property name="authUserName">
-            <Value>alexdelarge</Value>
-        </Property>
-        <Property name="authPassword">
-            <Value>cl0ckw0rk</Value>
-        </Property>
-    </Config>
-
 	<!-- The object factory configuration for message generator -->
 	<!-- Cockpit Release Assembly for Receipts -->
     <Config name="com.topcoder.clientcockpit.objectfactory">