Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Remove jira #331

Merged
skyhit merged 5 commits into from
Oct 26, 2017
Merged

Remove jira #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e49feb5
removeJira
Oct 20, 2017
260771e
removeJira
Oct 20, 2017
d9db73d
removeJira
Oct 22, 2017
2fb8ddc
removeJira
Oct 22, 2017
a9b6fb1
removeJira
Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Copy link
Collaborator

@skyhit skyhit Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tuxing1986 it is removed, because of we built from source code?

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's removed and the user_service_facade under the service directory is also removed.


<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"/>
Expand Down Expand Up @@ -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}"/>
Expand Down Expand Up @@ -376,8 +369,6 @@
<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"/>
Expand Down Expand Up @@ -606,7 +597,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}"/>
Expand Down Expand Up @@ -641,7 +631,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}"/>
Expand Down
4 changes: 0 additions & 4 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -236,8 +235,6 @@
<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"/>
Expand Down Expand Up @@ -336,7 +333,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"/>
Expand Down
1 change: 0 additions & 1 deletion components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 0 additions & 1 deletion conf/ApplicationServer.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down
79 changes: 0 additions & 79 deletions conf/IssueTrackingConfig.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions conf/components/com/topcoder/util/config/ConfigManager.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions conf/ear/META-INF/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
57 changes: 0 additions & 57 deletions conf/objectFactory_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,6 @@
</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
Expand Down Expand Up @@ -1951,53 +1941,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">
Expand Down
9 changes: 0 additions & 9 deletions conf/token.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,10 @@ j#######################################################
############################
# objectFactory_config.xml #
############################
@jiraServiceEndPoint@=http://bad/bugs/rpc/soap/jirasoapservice-v2
@jiraServiceAdminUserName@=jadmin
@jiraServiceAdminUserPassword@=admin123
@confluenceServiceEndPoint@=http://www.dev.topcoder.com/wiki/rpc/soap-axis/confluenceservice-v1
@confluenceServiceAdminUserName@=scamp
@confluenceServiceAdminUserPassword@=password

############################
# IssueTrackingConfig.xml #
############################
@jiraIssueURLPrefix@=http://tc.cloud.topcoder.com/bugs/browse/
@jiraProfilePrefix@=http://tc.cloud.topcoder.com/bugs/secure/ViewProfile.jspa?name=
@jiraBugRaceProject@=TEST

################################
# ApplicationServer.properties #
Expand Down
57 changes: 1 addition & 56 deletions conf/web/WEB-INF/applicationContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,6 @@
<property name="proxyInterface" value="com.topcoder.service.user.UserService"/>
</bean>

<bean id="userServiceFacade" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="UserServiceFacadeBean/remote"/>
<property name="cache" value="true"/>
<property name="lookupOnStartup" value="false"/>
<property name="jndiEnvironment">
<props>
<prop key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory
</prop>
<prop key="java.naming.provider.url">${service.provder.url}</prop>
<prop key="java.naming.factory.url.pkgs">org.jboss.naming:org.jnp.interfaces
</prop>
</props>
</property>
<property name="proxyInterface" value="com.topcoder.service.facade.user.UserServiceFacade"/>
</bean>

<bean id="gamePlanService" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="GamePlanServiceBean/remote"/>
<property name="cache" value="true"/>
Expand Down Expand Up @@ -259,7 +243,6 @@
<property name="adminServiceFacade" ref="adminServiceFacade"/>
<property name="referenceDataBean" ref="referenceDataBean"/>
<property name="userService" ref="userService"/>
<property name="userServiceFacade" ref="userServiceFacade"/>
<property name="projectServices" ref="projectServices"/>
<property name="specificationReviewService" ref="specificationReviewService"/>
<property name="userPreferenceHome" ref="userPreferenceHome"/>
Expand Down Expand Up @@ -794,19 +777,6 @@
<property name="viewData.showJustForm" value="true"/>
</bean>

<bean id="dashboardJiraIssuesReportAction"
Copy link
Collaborator

@skyhit skyhit Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tuxing1986 these reports are related to JIRA calls, not direct database query?

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dashboardJiraIssuesReportAction will execute "dashboard_jira_issues_report" query in the database.

Copy link
Collaborator

@skyhit skyhit Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tuxing1986 can you restore the related logic, db query related logic is fine, we just need to remove the JIRA API calls, as we are going to shutdown the JIRA service.

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dashboardJiraIssuesReportAction will also use ServerConfiguration.JIRA_SERVER_NAME indirectly.
Hence, it will invoke the jira calls.

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dashboardJiraIssuesReportAction is for src\web\WEB-INF\report\dashboard-jira-issues-report.jsp
That jsp page will call '${ticketId}' to get the ticket.

Hence all the action, jsp file and the related js file should all be removed.

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call https:/ServerConfiguration.JIRA_SERVER_NAM/browse/ticketId

Copy link
Collaborator

@skyhit skyhit Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tuxing1986 this seems just linked to the external service, let me double check with PM, and response to you

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, all the issues and bug races related to the jira urls, hence they should be removed.

Copy link
Contributor Author

@tuxing1986 tuxing1986 Oct 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can not access my gmail now, please post any issue here, thanks.

class="com.topcoder.direct.services.view.action.report.DashboardJiraIssuesReportAction"
scope="prototype" parent="baseDirectStrutsAction">
<property name="viewData.showJustForm" value="false"/>
</bean>


<bean id="dashboardShowJiraIssuesReportAction"
class="com.topcoder.direct.services.view.action.report.DashboardJiraIssuesReportAction"
scope="prototype" parent="baseDirectStrutsAction">
<property name="viewData.showJustForm" value="true"/>
</bean>

<bean id="dashboardParticipationReportAction"
class="com.topcoder.direct.services.view.action.report.DashboardParticipationMetricsReportAction"
scope="prototype" parent="baseDirectStrutsAction">
Expand Down Expand Up @@ -874,9 +844,6 @@
<bean id="createNewProjectAction"
class="com.topcoder.direct.services.view.action.CreateNewProjectAction"
scope="prototype" parent="baseDirectStrutsAction">
<property name="pptJIRAProject" value="@pptJIRAProject@"/>
<property name="pptJIRAIssueTypeId" value="3"/>
<property name="pptJIRAIssueReporter" value="anonymus"/>
<property name="copilotURLPrefix" value="http://community.topcoder.com/tc?module=ProjectDetail&amp;pj="/>
<property name="groupService" ref="groupService"/>
<property name="projectContestFeeService" ref="contestFeeService"/>
Expand Down Expand Up @@ -1103,11 +1070,6 @@
class="com.topcoder.direct.services.view.action.project.UpdateProjectForumWatchAction"
scope="prototype" parent="baseDirectStrutsAction">
</bean>

<bean id="syncUserAction"
class="com.topcoder.direct.services.view.action.dashboard.SyncUserAction"
scope="prototype" parent="baseDirectStrutsAction">
</bean>

<!-- configuration for the direct project metadata services and key service -->

Expand Down Expand Up @@ -1309,24 +1271,7 @@
scope="prototype" parent="baseDirectStrutsAction">
<property name="copilotProfileDAO" ref="copilotProfileDAO"/>
</bean>

<bean id="baseJIRAAttachmentAction" class="com.topcoder.direct.services.view.action.contest.JIRAAttachmentBaseAction"
abstract="true" parent="baseDirectStrutsAction">
<property name="fileLocation" value="@file_storage_location@"/>
</bean>
<bean id="createJIRABugIssueAction" class="com.topcoder.direct.services.view.action.contest.CreateJIRAIssueAction"
scope="prototype" parent="baseJIRAAttachmentAction">
<property name="jiraProject" value="@jiraBugRaceProject@"/>
<property name="issueTypeId" value="1"/>
</bean>
<bean id="createProjectJIRABugIssueAction" class="com.topcoder.direct.services.view.action.project.CreateProjectJIRAIssueAction"
scope="prototype" parent="baseJIRAAttachmentAction">
<property name="jiraProject" value="@jiraBugRaceProject@"/>
<property name="issueTypeId" value="1"/>
</bean>
<bean id="updateJIRAIssueAction" class="com.topcoder.direct.services.view.action.contest.UpdateJIRAIssueAction"
scope="prototype" parent="baseJIRAAttachmentAction">
</bean>

<bean id="submitApprovalAction"
class="com.topcoder.direct.services.view.action.contest.SubmitApprovalAction"
scope="prototype" parent="baseDirectStrutsAction">
Expand Down
Loading