fix some issues

Author: xxcxy

Dockerfile

@@ -12,6 +12,11 @@ ENV JBOSS_HOME /data/jboss-4.2.3.GA
 
 ADD ./start-jboss.sh /data/jboss-4.2.3.GA/bin/
 ADD ./TC.prod.ldap.keystore /data/jboss-4.2.3.GA/bin/
+ADD ./jboss_files/jboss-service.xml /data/jboss-4.2.3.GA/server/default/conf/
+ADD ./jboss_files/myserver.keystore /data/jboss-4.2.3.GA/server/default/conf/
+ADD ./jboss_files/server.xml /data/jboss-4.2.3.GA/server/default/deploy/jboss-web.deployer/
+ADD ./jboss_files/run.conf /data/jboss-4.2.3.GA/bin/
+ADD ./jboss_files/start.sh /data/jboss-4.2.3.GA/bin/
 
 ADD ./ear-web/target/direct.ear /data/jboss-4.2.3.GA/server/default/deploy/direct.ear
 ADD ./ear-web/target/conf/ /data/jboss-4.2.3.GA/server/default/conf/

app/pom.xml

@@ -1251,6 +1251,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.topcoder</groupId>
+            <artifactId>direct-conf</artifactId>
+            <version>1.0-SNAPSHOT</version>
+<!--            <scope>provided</scope>-->
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -1302,6 +1308,7 @@
                             <directory>src/web/WEB-INF</directory>
                             <includes>
                                 <include>tags/**/*.tag</include>
+                                <include>includes/jq_1_11_1.jsp</include>
                             </includes>
                             <filtering>true</filtering>
                             <targetPath>WEB-INF</targetPath>

conf/pom.xml

@@ -37,9 +37,9 @@
                                         <include>phase_templates/**/*.xml</include>
                                         <include>xml_phase_template.xsd</include>
                                         <include>AwsCredentials.properties</include>
-                                        <include>AwsS3Credentials.properties</include>
-                                        <include>contest_creation_sns_message.txt</include>
-                                        <include>contest_update_sns_message.txt</include>
+<!--                                        <include>AwsS3Credentials.properties</include>-->
+<!--                                        <include>contest_creation_sns_message.txt</include>-->
+<!--                                        <include>contest_update_sns_message.txt</include>-->
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>

ear-web/pom.xml

@@ -974,6 +974,8 @@
                                         <include>ReviewApplicationManagement.xml</include>
                                         <include>SearchBundleManager.xml</include>
                                         <include>ProjectPaymentManagement.xml</include>
+                                        <include>contest_creation_sns_message.txt</include>
+                                        <include>contest_update_sns_message.txt</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
@@ -1029,8 +1031,15 @@
                 <configuration>
                     <defaultLibBundleDir>lib/</defaultLibBundleDir>
                     <skinnyModules>true</skinnyModules>
-<!--                    <applicationXml>conf/ear/META-INF/application.xml</applicationXml>-->
+                    <applicationXml>conf/ear/META-INF/application.xml</applicationXml>
                     <modules>
+                        <jarModule>
+                            <groupId>com.topcoder</groupId>
+                            <artifactId>direct-conf</artifactId>
+                            <bundleFileName>conf</bundleFileName>
+                            <bundleDir>./</bundleDir>
+                            <unpack>true</unpack>
+                        </jarModule>
                         <ejbModule>
                             <groupId>com.topcoder</groupId>
                             <artifactId>catalog_services_id_generator</artifactId>
@@ -1151,17 +1160,12 @@
                             <bundleDir>ejb/</bundleDir>
                             <bundleFileName>ldap_sdk_interface.jar</bundleFileName>
                         </ejbModule>
-                        <jarModule>
-                            <groupId>com.topcoder</groupId>
-                            <artifactId>direct-conf</artifactId>
-                            <bundleFileName>conf.jar</bundleFileName>
-                            <bundleDir>./</bundleDir>
-<!--                            <unpack>true</unpack>-->
-                        </jarModule>
                         <webModule>
                             <groupId>com.topcoder</groupId>
                             <artifactId>direct-app</artifactId>
                             <bundleFileName>direct.war</bundleFileName>
+                            <contextRoot>/direct</contextRoot>
+                            <unpack>true</unpack>
                         </webModule>
                     </modules>
                 </configuration>