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

Commit 07a79c3

Browse files
skyhitskyhit
authored
Merge branch 'dev' into points-prize-type
2 parents 1990c54 + 61d0d3f commit 07a79c3

File tree

112 files changed

+80
-10202
lines changed

Some content is hidden

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

112 files changed

+80
-10202
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ stacktrace.log
5252
*.diff
5353
.idea
5454

55+
/removeVmFeatures.patch

‎build-dependencies.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171

7272
<property name="contest_service_facade.jar" value="${direct_service_libdir}/contest_service_facade.jar"/>
7373

74-
<property name="cloud_vm_service.jar" value="${direct_service_libdir}/cloud_vm_service.jar"/>
75-
7674
<property name="specification_review_comment_service.jar" value="${direct_service_libdir}/specification_review_comment_service.jar"/>
7775

7876
<property name="topcoder_cockpit_project_metadata_services.jar" value="${tcs_libdir}/topcoder_cockpit_project_metadata_services.jar"/>
@@ -575,7 +573,6 @@
575573
<pathelement location="${typesafe_enum.jar}"/>
576574
<pathelement location="${contest_service_facade.jar}"/>
577575
<pathelement location="${permission_service_facade.jar}"/>
578-
<pathelement location="${cloud_vm_service.jar}"/>
579576
<pathelement location="${authentication_manager.jar}"/>
580577
<pathelement location="${project_service_facade.jar}"/>
581578
<pathelement location="${pipeline_service_facade.jar}"/>

‎build.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@
324324
<copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
325325
<copy file="${catalog_services.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
326326
<copy file="${client_project_entities_dao.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
327-
<copy file="${cloud_vm_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
328327
<copy file="${user_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
329328
<copy file="${project_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
330329
<copy file="${game_plan_service.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -519,7 +518,6 @@
519518
<include name="app.properties" />
520519
<include name="contestFees.xml" />
521520
<include name="copilotFees.xml" />
522-
<include name="CloudVMAccessErrorConfig.xml" />
523521
<include name="contestTypes.xml" />
524522
<include name="CockpitUserPersistence.xml" />
525523
<include name="fileTypes.xml" />
@@ -539,7 +537,6 @@
539537
<include name="ContestServiceFacade.xml" />
540538
<include name="ProjectServiceFacade.xml" />
541539
<include name="ProjectPaymentCalculator.xml" />
542-
<include name="CloudVMService.xml"/>
543540
<include name="PermissionServiceFacade.xml" />
544541
<include name="SpecReviewCommentService.xml" />
545542
<include name="SpecReviewService.xml" />
@@ -554,7 +551,6 @@
554551
<include name="project_fee_hibernate.cfg.xml" />
555552
<include name="ReviewApplicationManagement.xml" />
556553
<include name="SearchBundleManager.xml" />
557-
<include name="cloud_vm_service_access_error_message.txt"/>
558554
<include name="ProjectPaymentManagement.xml"/>
559555
</fileset>
560556
<fileset dir="${tokenized_conf}/components">

‎components.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<project name="permission_service_facade" buildType="services"/>
3333
<project name="specification_review_service" buildType="services"/>
3434
<project name="contest_service_facade" buildType="services" tokenize="true"/>
35-
<project name="cloud_vm_service" buildType="services"/>
3635
<project name="specification_review_comment_service" buildType="services"/>
3736
<project name="topcoder_cockpit_project_metadata_services"/>
3837
<project name="topcoder_cockpit_asset_services"/>

‎conf/CloudVMAccessErrorConfig.xml‎

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

‎conf/CloudVMService.xml‎

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ com.topcoder.service.review.specification.ejb.SpecificationReviewServiceBean=Spe
6363

6464
com.topcoder.service.facade.project.ejb.ProjectServiceFacadeBean=ProjectServiceFacade.xml
6565

66-
com.topcoder.direct.cloudvm.service.bean.CloudVMServiceBean=CloudVMService.xml
67-
6866
com.topcoder.util.file=emailTemplateConfig.xml
6967

7068
ReviewApplicationManagement.SearchBuilderManager=SearchBundleManager.xml

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
<ejb>ejb/contest_service_facade.jar</ejb>
6161
</module>
6262

63-
<module>
64-
<ejb>ejb/cloud_vm_service.jar</ejb>
65-
</module>
66-
6763
<module>
6864
<ejb>ejb/project_service_facade.jar</ejb>
6965
</module>

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,6 @@
8888
<property name="proxyInterface" value="com.topcoder.service.facade.admin.AdminServiceFacade"/>
8989
</bean>
9090

91-
<bean id="cloudVMService" class="org.springframework.jndi.JndiObjectFactoryBean">
92-
<property name="jndiName" value="CloudVMServiceBean/remote"/>
93-
<property name="cache" value="true"/>
94-
<property name="lookupOnStartup" value="false"/>
95-
<property name="jndiEnvironment">
96-
<props>
97-
<prop key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory
98-
</prop>
99-
<prop key="java.naming.provider.url">${service.provder.url}</prop>
100-
<prop key="java.naming.factory.url.pkgs">org.jboss.naming:org.jnp.interfaces
101-
</prop>
102-
</props>
103-
</property>
104-
<property name="proxyInterface" value="com.topcoder.direct.cloudvm.service.CloudVMService"/>
105-
</bean>
106-
10791
<bean id="userService" class="org.springframework.jndi.JndiObjectFactoryBean">
10892
<property name="jndiName" value="UserServiceBean/remote"/>
10993
<property name="cache" value="true"/>
@@ -273,17 +257,6 @@
273257
<property name="memberProfileUrlBase" value="@member.profile.url.base@"/>
274258
</bean>
275259

276-
<bean id="projectVMManagementAction"
277-
class="com.topcoder.direct.services.view.action.project.ProjectVMManagementAction" scope="prototype">
278-
<property name="cloudVMService" ref="cloudVMService"/>
279-
<property name="permissionServiceFacade" ref="permissionServiceFacade"/>
280-
</bean>
281-
282-
<bean id="getProjectVMInstancesAction"
283-
class="com.topcoder.direct.services.view.action.project.GetProjectVMInstancesAction" scope="prototype">
284-
<property name="cloudVMService" ref="cloudVMService"/>
285-
</bean>
286-
287260
<bean id="projectCopilotFeedbackAction" class="com.topcoder.direct.services.view.action.project.ProjectCopilotFeedbackAction"
288261
scope="prototype" parent="baseDirectStrutsAction">
289262
<property name="copilotProjectDAO" ref="copilotProjectDAO"/>
@@ -498,11 +471,6 @@
498471
parent="contestDetailAction" scope="prototype">
499472
</bean>
500473

501-
<bean id="abstractVMAction" class="com.topcoder.direct.services.view.action.cloudvm.AbstractVMAction"
502-
parent="baseDirectStrutsAction" scope="prototype" abstract="true">
503-
<property name="cloudVMService" ref="cloudVMService"/>
504-
</bean>
505-
506474
<bean id="editCockpitProjectAction" class="com.topcoder.direct.services.view.action.project.edit.EditCockpitProjectAction"
507475
parent="baseDirectStrutsAction" scope="prototype">
508476
<property name="groupService" ref="groupService"/>
@@ -528,36 +496,6 @@
528496
<property name="contestFeePercentageService" ref="contestFeePercentageService"/>
529497
</bean>
530498

531-
<bean id="launchVMInstanceAction" class="com.topcoder.direct.services.view.action.cloudvm.LaunchVMInstanceAction"
532-
parent="abstractVMAction" scope="prototype">
533-
<property name="contestServiceFacade" ref="contestServiceFacade"/>
534-
<property name="userService" ref="userService"/>
535-
<property name="softwareContestTypeId" value="1"/>
536-
<property name="studioContestTypeId" value="2"/>
537-
<property name="bugRaceContestTypeId" value="3"/>
538-
<property name="userSecurityKeyCheckUrl"
539-
value="http://66.37.210.86/tc?module=BasicRSS&amp;c=rss_get_key&amp;dsid=30&amp;hn={handle}"/>
540-
</bean>
541-
542-
<bean id="terminateVMInstanceAction"
543-
class="com.topcoder.direct.services.view.action.cloudvm.TerminateVMInstanceAction"
544-
parent="abstractVMAction" scope="prototype">
545-
</bean>
546-
547-
<bean id="showVMInstancesAction" class="com.topcoder.direct.services.view.action.cloudvm.ShowVMInstancesAction"
548-
parent="abstractVMAction" scope="prototype">
549-
</bean>
550-
551-
<bean id="dashboardVMAction" class="com.topcoder.direct.services.view.action.cloudvm.DashboardVMAction"
552-
scope="prototype">
553-
<property name="cloudVMService" ref="cloudVMService"/>
554-
</bean>
555-
556-
<bean id="contestVMInstancesAction" class="com.topcoder.direct.services.view.action.contest.ContestVMInstancesAction"
557-
scope="prototype" parent="baseDirectStrutsAction">
558-
<property name="cloudVMService" ref="cloudVMService"/>
559-
</bean>
560-
561499
<bean id="clientInvoiceManageAction"
562500
class="com.topcoder.direct.services.view.action.accounting.ClientInvoiceManageAction"
563501
scope="prototype" parent="baseDirectStrutsAction">

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

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -671,28 +671,12 @@
671671
<param name="bufferSize">1024</param>
672672
</result>
673673
</action>
674-
675-
<action name="contestVMInstances" class="contestVMInstancesAction">
676-
<interceptor-ref name="securedContestStack"/>
677-
<result name="success">/WEB-INF/contest-vm-instances.jsp</result>
678-
</action>
679674

680675
<action name="projectOverview" class="projectOverviewAction">
681676
<interceptor-ref name="securedProjectPreProcessorStack"/>
682677
<result name="success">/WEB-INF/project-overview.jsp</result>
683678
</action>
684679

685-
<action name="projectVMManagement" class="projectVMManagementAction">
686-
<interceptor-ref name="securedProjectPreProcessorStack"/>
687-
<result name="success">/WEB-INF/project-vm-management.jsp</result>
688-
</action>
689-
690-
<action name="getProjectVMInstances" class="getProjectVMInstancesAction">
691-
<interceptor-ref name="authnInterceptor"/>
692-
<result name="success" type="json"/>
693-
<result name="error" type="json"/>
694-
</action>
695-
696680
<action name="getProjectStatsAjax" method="getProjectStatsAjax" class="projectOverviewAction">
697681
<interceptor-ref name="securedProjectStack"/>
698682
<result name="success" type="json" />
@@ -1084,30 +1068,6 @@
10841068
</result>
10851069
</action>
10861070

1087-
<action name="dashboardVMAction" class="dashboardVMAction">
1088-
<interceptor-ref name="authnInterceptor"/>
1089-
<result name="success">/WEB-INF/vmmanager/dashboard-vm-management.jsp</result>
1090-
</action>
1091-
<action name="launchVMInstance" class="launchVMInstanceAction">
1092-
<!--<interceptor-ref name="token"/>-->
1093-
<interceptor-ref name="authnInterceptor"/>
1094-
<result name="success" type="json"/>
1095-
<result name="error" type="json"/>
1096-
<result name="invalid.token" type="json"/>
1097-
</action>
1098-
<action name="terminateVMInstance" class="terminateVMInstanceAction">
1099-
<!--<interceptor-ref name="token"/>-->
1100-
<interceptor-ref name="authnInterceptor"/>
1101-
<result name="success" type="json"/>
1102-
<result name="error" type="json"/>
1103-
<result name="invalid.token" type="json"/>
1104-
</action>
1105-
<action name="showVMInstances" class="showVMInstancesAction">
1106-
<interceptor-ref name="authnInterceptor"/>
1107-
<result name="success" type="json"/>
1108-
<result name="error" type="json"/>
1109-
</action>
1110-
11111071
<action name="dashboardReports" class="dashboardReportsAction">
11121072
<interceptor-ref name="baseStack"/>
11131073
<interceptor-ref name="defaultStack"/>
@@ -1683,11 +1643,6 @@
16831643
<result name="error" type="json"/>
16841644
</action>
16851645

1686-
<action name="getContestVMNumber" method="getContestVMNumber" class="contestDetailJSONAction">
1687-
<result name="success" type="json"/>
1688-
<result name="error" type="json"/>
1689-
</action>
1690-
16911646
<action name="detailJson" class="contestDetailJSONAction">
16921647
<result name="success" type="json"/>
16931648
<result name="error" type="json"/>

0 commit comments

Comments
 (0)