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

Commit 3361f6d

Browse files
committed
fix all issues
1 parent ab495f5 commit 3361f6d

File tree

10 files changed

+53
-773
lines changed

10 files changed

+53
-773
lines changed

Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@ ENV JBOSS_HOME /data/jboss-4.2.3.GA
1212

1313
ADD ./start-jboss.sh /data/jboss-4.2.3.GA/bin/
1414
ADD ./TC.prod.ldap.keystore /data/jboss-4.2.3.GA/bin/
15-
ADD ./jboss_files/jboss-service.xml /data/jboss-4.2.3.GA/server/default/conf/
16-
ADD ./jboss_files/myserver.keystore /data/jboss-4.2.3.GA/server/default/conf/
1715
ADD ./jboss_files/server.xml /data/jboss-4.2.3.GA/server/default/deploy/jboss-web.deployer/
18-
ADD ./jboss_files/run.conf /data/jboss-4.2.3.GA/bin/
19-
ADD ./jboss_files/start.sh /data/jboss-4.2.3.GA/bin/
2016

21-
ADD ./ear-web/target/direct.ear /data/jboss-4.2.3.GA/server/default/deploy/direct.ear
17+
ADD ./ear-web/target/direct /data/jboss-4.2.3.GA/server/default/deploy/direct.ear/
2218
ADD ./ear-web/target/conf/ /data/jboss-4.2.3.GA/server/default/conf/
2319
ADD ./ear-web/target/direct-ds.xml /data/jboss-4.2.3.GA/server/default/deploy/
2420
ADD ./jboss_files/lib /data/jboss-4.2.3.GA/server/default/lib
@@ -30,7 +26,14 @@ ADD ./lib/third_party/informix/ifxjdbcx.jar /data/jboss-4.2.3.GA/server/default/
3026
ADD ./lib/third_party/jboss-cache/jboss-cache-jdk50.jar /data/jboss-4.2.3.GA/server/default/lib/
3127
ADD ./lib/third_party/jboss-cache/jgroups.jar /data/jboss-4.2.3.GA/server/default/lib/
3228

29+
ADD ./jboss_files/deploy/static.ear /data/jboss-4.2.3.GA/server/default/deploy/static.ear/
30+
ADD ./ear-web/target/static.war /data/jboss-4.2.3.GA/server/default/deploy/static.ear/static.war
31+
32+
ADD ./lib/tcs/security.ear /data/
33+
RUN ["unzip", "/data/security.ear", "-d", "/data/jboss-4.2.3.GA/server/default/deploy/security.ear"]
34+
3335
RUN mkdir /data/temp_files
3436
RUN rm /data/jboss-4.2.3.zip
37+
RUN rm /data/security.ear
3538

3639
CMD ["/data/jboss-4.2.3.GA/bin/start-jboss.sh"]

app/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,12 +1251,6 @@
12511251
<version>1.0-SNAPSHOT</version>
12521252
<scope>provided</scope>
12531253
</dependency>
1254-
<dependency>
1255-
<groupId>com.topcoder</groupId>
1256-
<artifactId>direct-conf</artifactId>
1257-
<version>1.0-SNAPSHOT</version>
1258-
<!-- <scope>provided</scope>-->
1259-
</dependency>
12601254
</dependencies>
12611255
<build>
12621256
<plugins>

conf/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<include>phase_templates/**/*.xml</include>
3838
<include>xml_phase_template.xsd</include>
3939
<include>AwsCredentials.properties</include>
40-
<!-- <include>AwsS3Credentials.properties</include>-->
41-
<!-- <include>contest_creation_sns_message.txt</include>-->
42-
<!-- <include>contest_update_sns_message.txt</include>-->
40+
<include>AwsS3Credentials.properties</include>
41+
<include>contest_creation_sns_message.txt</include>
42+
<include>contest_update_sns_message.txt</include>
4343
</includes>
4444
<filtering>true</filtering>
4545
</resource>

ear-web/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,43 @@
10221022
</resources>
10231023
</configuration>
10241024
</execution>
1025+
<execution>
1026+
<id>copy-resource-fifth</id>
1027+
<phase>generate-sources</phase>
1028+
<goals>
1029+
<goal>copy-resources</goal>
1030+
</goals>
1031+
<configuration>
1032+
<outputDirectory>${basedir}/target/static.war</outputDirectory>
1033+
<filters>
1034+
<filter>../token.properties</filter>
1035+
</filters>
1036+
<resources>
1037+
<resource>
1038+
<directory>../app/src/web</directory>
1039+
<includes>
1040+
<include>css/direct/**/*.css</include>
1041+
<include>scripts/*.*</include>
1042+
<include>scripts/launch/**/*.*</include>
1043+
<include>scripts/copilot/**/*.*</include>
1044+
<include>scripts/tinyMCE/templates/*.html</include>
1045+
<include>scripts/ckeditor/**/*.*</include>
1046+
<include>images/*.*</include>
1047+
<include>images/copilotPosting/*.*</include>
1048+
<include>images/edit/*.*</include>
1049+
<include>images/filter-panel/*.*</include>
1050+
<include>images/gantt/*.*</include>
1051+
<include>images/gantt/menu/*.*</include>
1052+
<include>images/public-roadmap/*.*</include>
1053+
</includes>
1054+
<excludes>
1055+
<exclude>scripts/tiny_mce/**/*.*</exclude>
1056+
</excludes>
1057+
<filtering>true</filtering>
1058+
</resource>
1059+
</resources>
1060+
</configuration>
1061+
</execution>
10251062
</executions>
10261063
</plugin>
10271064
<plugin>

0 commit comments

Comments
 (0)