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

Commit 5355d7e

Browse files
tuxing1986skyhit
tuxing1986
authored and
skyhit
committed
Remove jira (#331)
Remove Jira related logic
1 parent 37e8286 commit 5355d7e

File tree

130 files changed

+60592
-11250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+60592
-11250
lines changed

‎build-dependencies.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363

6464
<property name="game_plan_service.jar" value="${direct_service_libdir}/game_plan_service.jar"/>
6565

66-
<property name="user_service_facade.jar" value="${direct_service_libdir}/user_service_facade.jar"/>
67-
6866
<property name="project_service_facade.jar" value="${direct_service_libdir}/project_service_facade.jar"/>
6967

7068
<property name="permission_service_facade.jar" value="${direct_service_libdir}/permission_service_facade.jar"/>
@@ -206,11 +204,6 @@
206204
<property name="jboss_login_module.path" value="jboss_login_module/${jboss_login_module.version}"/>
207205
<property name="jboss_login_module.jar" value="${tcs_libdir}/${jboss_login_module.path}/${jboss_login_module.jar.name}"/>
208206

209-
<property name="jira_user_soap_client.version" value="1.0.2"/>
210-
<property name="jira_user_soap_client.jar.name" value="jira_user_soap_client.jar"/>
211-
<property name="jira_user_soap_client.path" value="jira_user_soap_client/${jira_user_soap_client.version}"/>
212-
<property name="jira_user_soap_client.jar" value="${tcs_libdir}/${jira_user_soap_client.path}/${jira_user_soap_client.jar.name}"/>
213-
214207
<property name="ldap_sdk_interface.version" value="1.0.2"/>
215208
<property name="ldap_sdk_interface.jar.name" value="ldap_sdk_interface.jar"/>
216209
<property name="ldap_sdk_interface.path" value="ldap_sdk_interface/${ldap_sdk_interface.version}"/>
@@ -376,8 +369,6 @@
376369
<property name="httpProxyPackage.jar" value="${ext_libdir}/httpProxyPackage/httpProxyPackage.jar"/>
377370
<property name="ifxjdbcx.jar" value="${ext_libdir}/informix/ifxjdbcx.jar"/>
378371
<property name="ifxjdbc.jar" value="${ext_libdir}/informix/ifxjdbc.jar"/>
379-
<property name="jira-service-axis-client.jar" value="${ext_libdir}/jira/3.13.4/jira-service-axis-client.jar"/>
380-
<property name="jira-soapclient-all.jar" value="${ext_libdir}/jira/jira-soapclient-all.jar"/>
381372
<property name="mysql-connector-java-5.1.6-bin.jar" value="${ext_libdir}/mysql/mysql-connector-java-5.1.6-bin.jar"/>
382373
<property name="payflow.jar" value="${ext_libdir}/payflow/4.3/payflow.jar"/>
383374
<property name="paypal_base.jar" value="${ext_libdir}/paypal/paypal_base.jar"/>
@@ -606,7 +597,6 @@
606597
<pathelement location="${review_management.jar}"/>
607598
<pathelement location="${email_engine.jar}"/>
608599
<pathelement location="${team_management.jar}"/>
609-
<pathelement location="${user_service_facade.jar}"/>
610600
<pathelement location="${user_service.jar}"/>
611601
<pathelement location="${workdays.jar}"/>
612602
<pathelement location="${file_upload.jar}"/>
@@ -641,7 +631,6 @@
641631
<path refid="poi.libs"/>
642632
<path refid="httpclient.lib"/>
643633
<path refid="pdf.lib"/>
644-
<pathelement location="${jira-soapclient-all.jar}"/>
645634
<pathelement location="${servlet-api.jar}"/>
646635
<pathelement location="${jaxb.jar}"/>
647636
<pathelement location="${encoder.jar}"/>

‎build.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@
179179
<copy file="${guid_generator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
180180
<copy file="${id_generator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
181181
<copy file="${jboss_login_module.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
182-
<copy file="${jira_user_soap_client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
183182
<copy file="${logging_wrapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
184183
<copy file="${multiple_locale_resource_bundle.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
185184
<copy file="${object_factory.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -236,8 +235,6 @@
236235
<copy file="${httpProxyPackage.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
237236
<copy file="${ifxjdbcx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
238237
<copy file="${ifxjdbc.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
239-
<copy file="${jira-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
240-
<copy file="${jira-soapclient-all.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
241238
<copy file="${mysql-connector-java-5.1.6-bin.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
242239
<copy file="${payflow.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
243240
<copy file="${paypal_base.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -336,7 +333,6 @@
336333
<copy file="${specification_review_comment_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
337334
<copy file="${contest_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
338335
<copy file="${permission_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
339-
<copy file="${user_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
340336
<copy file="${project_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
341337
<copy file="${admin_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
342338
<copy file="${pipeline_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>

‎components.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<project name="project_payment_management"/>
2929
<project name="admin_service_facade" buildType="services"/>
3030
<project name="game_plan_service" buildType="services"/>
31-
<project name="user_service_facade" buildType="services" tokenize="true"/>
3231
<project name="project_service_facade" buildType="services"/>
3332
<project name="permission_service_facade" buildType="services"/>
3433
<project name="specification_review_service" buildType="services"/>

‎conf/ApplicationServer.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ENVIRONMENT=@ApplicationServer.ENVIRONMENT@
88
SERVER_NAME=@ApplicationServer.SERVER_NAME@
99
NEW_SERVER_NAME=@ApplicationServer.NEW_SERVER_NAME@
1010
NEW_COMMUNITY_SERVER_NAME=@ApplicationServer.NEW_COMMUNITY_SERVER_NAME@
11-
JIRA_SERVER_NAME=@ApplicationServer.JIRA_SERVER_NAME@
1211
STUDIO_SERVER_NAME=@ApplicationServer.STUDIO_SERVER_NAME@
1312
OPENAIM_SERVER_NAME=@ApplicationServer.OPENAIM_SERVER_NAME@
1413
TRUVEO_SERVER_NAME=@ApplicationServer.TRUVEO_SERVER_NAME@

‎conf/IssueTrackingConfig.xml‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ com.topcoder.project.phases.template.DefaultPhaseTemplate.workdays.config = obje
5252
# since Cockpit Release Assembly for Receipts
5353
com.topcoder.clientcockpit.objectfactory = objectFactory_config.xml
5454

55-
# since: Jira & Confluence User Sync Service
56-
com.topcoder.service.facade.user.UserServiceFacadeBean = objectFactory_config.xml
57-
5855
# since (Cockpit Pipeline Release Assembly 2 - Capacity
5956
com.topcoder.service.pipeline.ejb.ContestPipelineServiceBean = ContestCapacity.xml
6057

‎conf/ear/META-INF/application.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@
6464
<ejb>ejb/cloud_vm_service.jar</ejb>
6565
</module>
6666

67-
<module>
68-
<ejb>ejb/user_service_facade.jar</ejb>
69-
</module>
70-
7167
<module>
7268
<ejb>ejb/project_service_facade.jar</ejb>
7369
</module>

‎conf/objectFactory_config.xml‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,6 @@
252252
</Property>
253253
</Property>
254254

255-
<!--
256-
Configuration for JiraUserService implementation
257-
@since: Jira & Confluence User Sync Service
258-
-->
259-
<Property name="jiraUserServiceKey">
260-
<Property name="type">
261-
<Value>com.topcoder.jira.client.impl.JiraUserServiceImpl</Value>
262-
</Property>
263-
</Property>
264-
265255
<!--
266256
Configuration for ConfluenceUserService implementation
267257
@since: Jira & Confluence User Sync Service
@@ -1951,53 +1941,6 @@
19511941
</Property>
19521942
</Config>
19531943

1954-
<!--
1955-
Configuration for UserSyncServiceBean
1956-
@since: Jira & Confluence User Sync Service
1957-
-->
1958-
<Config name="com.topcoder.service.facade.user.UserServiceFacadeBean">
1959-
<Property name="objectFactoryNamespace">
1960-
<Value>com.topcoder.util.objectfactory</Value>
1961-
</Property>
1962-
<Property name="jiraUserServiceKey">
1963-
<Value>jiraUserServiceKey</Value>
1964-
</Property>
1965-
<Property name="confluenceUserServiceKey">
1966-
<Value>confluenceUserServiceKey</Value>
1967-
</Property>
1968-
<Property name="jiraServiceEndPoint">
1969-
<Value>@jiraServiceEndPoint@</Value>
1970-
</Property>
1971-
<Property name="jiraServiceAdminUserName">
1972-
<Value>@jiraServiceAdminUserName@</Value>
1973-
</Property>
1974-
<Property name="jiraServiceAdminUserPassword">
1975-
<Value>@jiraServiceAdminUserPassword@</Value>
1976-
</Property>
1977-
<Property name="confluenceServiceEndPoint">
1978-
<Value>@confluenceServiceEndPoint@</Value>
1979-
</Property>
1980-
<Property name="confluenceServiceAdminUserName">
1981-
<Value>@confluenceServiceAdminUserName@</Value>
1982-
</Property>
1983-
<Property name="confluenceServiceAdminUserPassword">
1984-
<Value>@confluenceServiceAdminUserPassword@</Value>
1985-
</Property>
1986-
<Property name="normalUserConfluenceGroups">
1987-
<Value>confluence-users</Value>
1988-
</Property>
1989-
<Property name="adminUserConfluenceGroups">
1990-
<Value>topcoder-staff,confluence-users</Value>
1991-
</Property>
1992-
<!-- These two auth properties are only needed in dev environment -->
1993-
<Property name="authUserName">
1994-
<Value>alexdelarge</Value>
1995-
</Property>
1996-
<Property name="authPassword">
1997-
<Value>cl0ckw0rk</Value>
1998-
</Property>
1999-
</Config>
2000-
20011944
<!-- The object factory configuration for message generator -->
20021945
<!-- Cockpit Release Assembly for Receipts -->
20031946
<Config name="com.topcoder.clientcockpit.objectfactory">

‎conf/token.properties‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,10 @@ j#######################################################
142142
############################
143143
# objectFactory_config.xml #
144144
############################
145-
@jiraServiceEndPoint@=http://bad/bugs/rpc/soap/jirasoapservice-v2
146-
@jiraServiceAdminUserName@=jadmin
147-
@jiraServiceAdminUserPassword@=admin123
148145
@confluenceServiceEndPoint@=http://www.dev.topcoder.com/wiki/rpc/soap-axis/confluenceservice-v1
149146
@confluenceServiceAdminUserName@=scamp
150147
@confluenceServiceAdminUserPassword@=password
151148

152-
############################
153-
# IssueTrackingConfig.xml #
154-
############################
155-
@jiraIssueURLPrefix@=http://tc.cloud.topcoder.com/bugs/browse/
156-
@jiraProfilePrefix@=http://tc.cloud.topcoder.com/bugs/secure/ViewProfile.jspa?name=
157-
@jiraBugRaceProject@=TEST
158149

159150
################################
160151
# ApplicationServer.properties #

‎conf/web/WEB-INF/applicationContext.xml‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,6 @@
120120
<property name="proxyInterface" value="com.topcoder.service.user.UserService"/>
121121
</bean>
122122

123-
<bean id="userServiceFacade" class="org.springframework.jndi.JndiObjectFactoryBean">
124-
<property name="jndiName" value="UserServiceFacadeBean/remote"/>
125-
<property name="cache" value="true"/>
126-
<property name="lookupOnStartup" value="false"/>
127-
<property name="jndiEnvironment">
128-
<props>
129-
<prop key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory
130-
</prop>
131-
<prop key="java.naming.provider.url">${service.provder.url}</prop>
132-
<prop key="java.naming.factory.url.pkgs">org.jboss.naming:org.jnp.interfaces
133-
</prop>
134-
</props>
135-
</property>
136-
<property name="proxyInterface" value="com.topcoder.service.facade.user.UserServiceFacade"/>
137-
</bean>
138-
139123
<bean id="gamePlanService" class="org.springframework.jndi.JndiObjectFactoryBean">
140124
<property name="jndiName" value="GamePlanServiceBean/remote"/>
141125
<property name="cache" value="true"/>
@@ -259,7 +243,6 @@
259243
<property name="adminServiceFacade" ref="adminServiceFacade"/>
260244
<property name="referenceDataBean" ref="referenceDataBean"/>
261245
<property name="userService" ref="userService"/>
262-
<property name="userServiceFacade" ref="userServiceFacade"/>
263246
<property name="projectServices" ref="projectServices"/>
264247
<property name="specificationReviewService" ref="specificationReviewService"/>
265248
<property name="userPreferenceHome" ref="userPreferenceHome"/>
@@ -794,19 +777,6 @@
794777
<property name="viewData.showJustForm" value="true"/>
795778
</bean>
796779

797-
<bean id="dashboardJiraIssuesReportAction"
798-
class="com.topcoder.direct.services.view.action.report.DashboardJiraIssuesReportAction"
799-
scope="prototype" parent="baseDirectStrutsAction">
800-
<property name="viewData.showJustForm" value="false"/>
801-
</bean>
802-
803-
804-
<bean id="dashboardShowJiraIssuesReportAction"
805-
class="com.topcoder.direct.services.view.action.report.DashboardJiraIssuesReportAction"
806-
scope="prototype" parent="baseDirectStrutsAction">
807-
<property name="viewData.showJustForm" value="true"/>
808-
</bean>
809-
810780
<bean id="dashboardParticipationReportAction"
811781
class="com.topcoder.direct.services.view.action.report.DashboardParticipationMetricsReportAction"
812782
scope="prototype" parent="baseDirectStrutsAction">
@@ -874,9 +844,6 @@
874844
<bean id="createNewProjectAction"
875845
class="com.topcoder.direct.services.view.action.CreateNewProjectAction"
876846
scope="prototype" parent="baseDirectStrutsAction">
877-
<property name="pptJIRAProject" value="@pptJIRAProject@"/>
878-
<property name="pptJIRAIssueTypeId" value="3"/>
879-
<property name="pptJIRAIssueReporter" value="anonymus"/>
880847
<property name="copilotURLPrefix" value="http://community.topcoder.com/tc?module=ProjectDetail&amp;pj="/>
881848
<property name="groupService" ref="groupService"/>
882849
<property name="projectContestFeeService" ref="contestFeeService"/>
@@ -1103,11 +1070,6 @@
11031070
class="com.topcoder.direct.services.view.action.project.UpdateProjectForumWatchAction"
11041071
scope="prototype" parent="baseDirectStrutsAction">
11051072
</bean>
1106-
1107-
<bean id="syncUserAction"
1108-
class="com.topcoder.direct.services.view.action.dashboard.SyncUserAction"
1109-
scope="prototype" parent="baseDirectStrutsAction">
1110-
</bean>
11111073

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

@@ -1309,24 +1271,7 @@
13091271
scope="prototype" parent="baseDirectStrutsAction">
13101272
<property name="copilotProfileDAO" ref="copilotProfileDAO"/>
13111273
</bean>
1312-
1313-
<bean id="baseJIRAAttachmentAction" class="com.topcoder.direct.services.view.action.contest.JIRAAttachmentBaseAction"
1314-
abstract="true" parent="baseDirectStrutsAction">
1315-
<property name="fileLocation" value="@file_storage_location@"/>
1316-
</bean>
1317-
<bean id="createJIRABugIssueAction" class="com.topcoder.direct.services.view.action.contest.CreateJIRAIssueAction"
1318-
scope="prototype" parent="baseJIRAAttachmentAction">
1319-
<property name="jiraProject" value="@jiraBugRaceProject@"/>
1320-
<property name="issueTypeId" value="1"/>
1321-
</bean>
1322-
<bean id="createProjectJIRABugIssueAction" class="com.topcoder.direct.services.view.action.project.CreateProjectJIRAIssueAction"
1323-
scope="prototype" parent="baseJIRAAttachmentAction">
1324-
<property name="jiraProject" value="@jiraBugRaceProject@"/>
1325-
<property name="issueTypeId" value="1"/>
1326-
</bean>
1327-
<bean id="updateJIRAIssueAction" class="com.topcoder.direct.services.view.action.contest.UpdateJIRAIssueAction"
1328-
scope="prototype" parent="baseJIRAAttachmentAction">
1329-
</bean>
1274+
13301275
<bean id="submitApprovalAction"
13311276
class="com.topcoder.direct.services.view.action.contest.SubmitApprovalAction"
13321277
scope="prototype" parent="baseDirectStrutsAction">

0 commit comments

Comments
 (0)