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

Commit af375a5

Browse files
ajeftsajefts
authored
Merge pull request #337 from appirio-tech/dev
Remove Jira Features
2 parents 512a26b + 314a347 commit af375a5

File tree

121 files changed

+837
-11387
lines changed

Some content is hidden

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

121 files changed

+837
-11387
lines changed

‎build-dependencies.xml

-12
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}"/>
@@ -372,12 +365,9 @@
372365
<property name="commons-pool2.jar" value="${ext_libdir}/commons-pool/commons-pool2-2.4.2.jar"/>
373366
<property name="jedis.jar" value="${ext_libdir}/jedis/jedis-2.8.1.jar"/>
374367

375-
<property name="confluence-service-axis-client.jar" value="${ext_libdir}/confluence/2.7.3/confluence-service-axis-client.jar"/>
376368
<property name="httpProxyPackage.jar" value="${ext_libdir}/httpProxyPackage/httpProxyPackage.jar"/>
377369
<property name="ifxjdbcx.jar" value="${ext_libdir}/informix/ifxjdbcx.jar"/>
378370
<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"/>
381371
<property name="mysql-connector-java-5.1.6-bin.jar" value="${ext_libdir}/mysql/mysql-connector-java-5.1.6-bin.jar"/>
382372
<property name="payflow.jar" value="${ext_libdir}/payflow/4.3/payflow.jar"/>
383373
<property name="paypal_base.jar" value="${ext_libdir}/paypal/paypal_base.jar"/>
@@ -606,7 +596,6 @@
606596
<pathelement location="${review_management.jar}"/>
607597
<pathelement location="${email_engine.jar}"/>
608598
<pathelement location="${team_management.jar}"/>
609-
<pathelement location="${user_service_facade.jar}"/>
610599
<pathelement location="${user_service.jar}"/>
611600
<pathelement location="${workdays.jar}"/>
612601
<pathelement location="${file_upload.jar}"/>
@@ -641,7 +630,6 @@
641630
<path refid="poi.libs"/>
642631
<path refid="httpclient.lib"/>
643632
<path refid="pdf.lib"/>
644-
<pathelement location="${jira-soapclient-all.jar}"/>
645633
<pathelement location="${servlet-api.jar}"/>
646634
<pathelement location="${jaxb.jar}"/>
647635
<pathelement location="${encoder.jar}"/>

‎build.xml

-6
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"/>
@@ -232,12 +231,9 @@
232231
<copy file="${commons-pool.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
233232
<copy file="${commons-pool2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
234233
<copy file="${jedis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
235-
<copy file="${confluence-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
236234
<copy file="${httpProxyPackage.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
237235
<copy file="${ifxjdbcx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
238236
<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"/>
241237
<copy file="${mysql-connector-java-5.1.6-bin.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
242238
<copy file="${payflow.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
243239
<copy file="${paypal_base.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -336,7 +332,6 @@
336332
<copy file="${specification_review_comment_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
337333
<copy file="${contest_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
338334
<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"/>
340335
<copy file="${project_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
341336
<copy file="${admin_service_facade.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
342337
<copy file="${pipeline_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -521,7 +516,6 @@
521516
<include name="app.properties" />
522517
<include name="contestFees.xml" />
523518
<include name="copilotFees.xml" />
524-
<include name="IssueTrackingConfig.xml" />
525519
<include name="CloudVMAccessErrorConfig.xml" />
526520
<include name="contestTypes.xml" />
527521
<include name="CockpitUserPersistence.xml" />

‎circle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99

1010
test:
1111
override:
12-
- docker run -v $PWD:/root/direct appiriodevops/direct-app:build2 /root/scripts/build.sh
12+
- docker run -v $PWD:/root/direct appiriodevops/direct-app:build3 /root/scripts/build.sh
1313

1414
#deployment:
1515
# development:

‎components.xml

-1
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

-1
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

-79
This file was deleted.

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

-3
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

-4
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

-67
Original file line numberDiff line numberDiff line change
@@ -251,26 +251,6 @@
251251
</Property>
252252
</Property>
253253
</Property>
254-
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-
265-
<!--
266-
Configuration for ConfluenceUserService implementation
267-
@since: Jira & Confluence User Sync Service
268-
-->
269-
<Property name="confluenceUserServiceKey">
270-
<Property name="type">
271-
<Value>com.topcoder.confluence.client.impl.ConfluenceUserServiceImpl</Value>
272-
</Property>
273-
</Property>
274254
</Config>
275255

276256
<!--
@@ -1951,53 +1931,6 @@
19511931
</Property>
19521932
</Config>
19531933

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-
20011934
<!-- The object factory configuration for message generator -->
20021935
<!-- Cockpit Release Assembly for Receipts -->
20031936
<Config name="com.topcoder.clientcockpit.objectfactory">

0 commit comments

Comments
 (0)