Merge pull request #82 from UESTC-ACM/master

Release: v2.1.0

Author: ruinshe

.gitignore

@@ -7,3 +7,6 @@ nohup.out
 trunk/build/
 /.idea
 *.iml
+/out
+*.ipr
+*.iws

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "trunk/src/main/webapp/plugins/MathJax"]
 	path = trunk/src/main/webapp/plugins/MathJax
 	url = https://github.com/mathjax/MathJax.git
-[submodule "trunk/src/main/webapp/plugins/cdoj"]
-	path = trunk/src/main/webapp/plugins/cdoj
-	url = https://github.com/UESTC-ACM/CDOJ-UI.git

.travis.yml

@@ -0,0 +1,10 @@
+language: java
+jdk:
+  - openjdk7
+
+install:
+  - cd trunk
+
+script:
+  - gradle -PdbUser=travis -PdbPassword="" build
+

README.md

@@ -1,7 +1,6 @@
 # UESTC ACM/ICPC Online Judge
 
-## Notice
-- Please use [`maven 3`](http://maven.apache.org/) to test the web application, and the `JAVA_HOME` must be set in maven's `settings.xml` configuration file(A sample file is in `doc` folder). Please [click here](http://maven.apache.org/plugins/maven-compiler-plugin/examples/compile-using-different-jdk.html) for more details.
+[![Build Status](https://travis-ci.org/UESTC-ACM/CDOJ.png?branch=master)](https://travis-ci.org/UESTC-ACM/CDOJ)
 
-- MySQL version should be greater than 5.1 and the db configuration file is located in `trunk/src/main/resources/resources.properties`.
+project home page: [http://uestc-acm.github.io/CDOJ](http://uestc-acm.github.io/CDOJ)
 

doc/cdoj.mwb

@@ -19,4 +19,5 @@
 /gradle
 /gradlew
 /gradlew.bat
+/gradle-app.setting
 

doc/cdojtest.mwb

@@ -1,6 +1,9 @@
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'war'
 apply plugin: 'jetty'
+apply plugin: 'checkstyle'
+apply plugin: 'jacoco'
+apply plugin: 'idea'
 
 group = 'cn.edu.uestc.acmicpc'
 version = '2.0'
@@ -10,62 +13,170 @@ description = """UESTC Online Judge"""
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
+[jettyRunWar, jettyRun]*.contextPath = '/'
+project.stopPort = 8005
+project.stopKey = 'stop'
+
+task checkControllerDoNotContainDaos(type: Exec) {
+  commandLine "python", "src/test/python/check_controller_not_contain_daos.py"
+}
+
+task checkDtosDoNotContainEntities(type: Exec) {
+  commandLine "python", "src/test/python/check_dtos_not_contain_entities.py"
+}
+
+task checkTestingCodeAllDoNotUseJunit(type: Exec) {
+  commandLine "python", "src/test/python/check_testing_code_all_not_use_junit.py"
+}
+
+task createSchema(type: Exec) {
+  if (dbPassword == "") {
+    commandLine "mysql", "-u$dbUser"
+  } else {
+    commandLine "mysql", "-u$dbUser", "-p$dbPassword"
+  }
+  standardInput = new FileInputStream(new File("src/test/sql/uestcojtest.sql"))
+}
+
+task generateData(type: Exec) {
+  if (dbPassword == "") {
+    commandLine "mysql", "-u$dbUser"
+  } else {
+    commandLine "mysql", "-u$dbUser", "-p$dbPassword"
+  }
+  standardInput = new FileInputStream(new File("src/test/sql/uestcojtest-data0.sql"))
+}
+
+task generateMainPropertyFile(type: Exec) {
+  commandLine "bash", "scripts/configure_project.sh",
+      "src/main/resources/resources.properties.template",
+      "src/main/resources/resources.properties",
+      "$dbUser", "$dbPassword"
+}
+
+task generateTestPropertyFile(type: Exec) {
+  commandLine "bash", "scripts/configure_project.sh",
+      "src/test/resources/resources.properties.template",
+      "src/test/resources/resources.properties",
+      "$dbUser", "$dbPassword"
+}
+
+task cleanResources << {
+  delete "src/main/resources/resources.properties"
+  delete "src/test/resources/resources.properties"
+}
+
+compileJava.dependsOn(checkControllerDoNotContainDaos)
+compileJava.dependsOn(checkDtosDoNotContainEntities)
+compileJava.dependsOn(checkTestingCodeAllDoNotUseJunit)
+compileJava.dependsOn(createSchema)
+compileJava.dependsOn(generateData)
+generateData.dependsOn(createSchema)
+compileJava.dependsOn(generateMainPropertyFile)
+compileJava.dependsOn(generateTestPropertyFile)
+clean.dependsOn(cleanResources)
+
+configurations {
+  provided
+}
+
+sourceSets {
+  main.compileClasspath += configurations.provided
+  test.compileClasspath += configurations.provided
+  test.runtimeClasspath += configurations.provided
+}
+
 repositories {
   mavenCentral();
 }
 
 dependencies {
-  compile group: 'org.ow2.asm', name: 'asm', version:'4.1'
-  compile group: 'org.ow2.asm', name: 'asm-tree', version:'4.1'
-  compile group: 'org.ow2.asm', name: 'asm-analysis', version:'4.1'
-  compile group: 'org.ow2.asm', name: 'asm-util', version:'4.1'
-  compile group: 'org.springframework', name: 'spring-core', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-expression', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-beans', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-aop', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-context', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-context-support', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-tx', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-jdbc', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-orm', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-oxm', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-web', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-webmvc', version:'4.0.0.RELEASE'
-  compile group: 'org.springframework', name: 'spring-webmvc-portlet', version:'4.0.0.RELEASE'
-  compile group: 'cglib', name: 'cglib', version:'2.2.2'
-  compile group: 'aopalliance', name: 'aopalliance', version:'1.0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-server', version:'9.1.0.M0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'9.1.0.M0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-webapp', version:'9.1.0.M0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-servlets', version:'9.1.0.M0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-jsp', version:'9.1.0.M0'
-  compile group: 'org.eclipse.jetty', name: 'jetty-util', version:'9.1.0.M0'
-  compile group: 'javax.servlet', name: 'jstl', version:'1.2'
-  compile group: 'opensymphony', name: 'sitemesh', version:'2.4.2'
-  compile group: 'org.hibernate', name: 'hibernate-validator', version:'4.2.0.Final'
-  compile group: 'org.hibernate', name: 'hibernate-core', version:'4.3.0.Final'
-  compile group: 'mysql', name: 'mysql-connector-java', version:'5.1.22'
-  compile group: 'com.jolbox', name: 'bonecp', version:'0.8.0-rc1'
-  compile group: 'org.aspectj', name: 'aspectjweaver', version:'1.7.1'
-  compile group: 'org.aspectj', name: 'aspectjrt', version:'1.7.1'
-  compile group: 'com.alibaba', name: 'fastjson', version:'1.1.38'
-  compile group: 'log4j', name: 'log4j', version:'1.2.17'
-  compile group: 'org.slf4j', name: 'slf4j-log4j12', version:'1.7.5'
-  compile group: 'javax.servlet', name: 'jsp-api', version:'2.0'
-  compile group: 'net.sourceforge.jexcelapi', name: 'jxl', version:'2.6.12'
-  compile group: 'commons-io', name: 'commons-io', version:'1.3.2'
-  compile group: 'commons-fileupload', name: 'commons-fileupload', version:'1.3'
-  compile group: 'commons-lang', name: 'commons-lang', version:'2.0'
-  compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.1'
-  compile group: 'javax.servlet', name: 'servlet-api', version:'3.0-alpha-1'
-  compile group: 'javax.mail', name: 'mail', version:'1.5.0-b01'
-  compile group: 'com.sun.mail', name: 'smtp', version:'1.5.0'
-  testCompile group: 'org.springframework', name: 'spring-test', version:'4.0.0.RELEASE'
-  testCompile group: 'org.hamcrest', name: 'hamcrest-all', version:'1.3'
-  testCompile group: 'com.jayway.jsonpath', name: 'json-path', version:'0.8.1'
+  final asmGroup = 'org.ow2.asm'
+  final asmVersion = '4.1'
+  compile "$asmGroup:asm:$asmVersion"
+  compile "$asmGroup:asm-analysis:$asmVersion"
+  compile "$asmGroup:asm-tree:$asmVersion"
+  compile "$asmGroup:asm-util:$asmVersion"
+
+  final springGroup = 'org.springframework'
+  final springVersion = '4.0.0.RELEASE'
+  compile "$springGroup:spring-core:$springVersion"
+  compile "$springGroup:spring-expression:$springVersion"
+  compile "$springGroup:spring-beans:$springVersion"
+  compile "$springGroup:spring-aop:$springVersion"
+  compile "$springGroup:spring-context:$springVersion"
+  compile "$springGroup:spring-context-support:$springVersion"
+  compile "$springGroup:spring-tx:$springVersion"
+  compile "$springGroup:spring-jdbc:$springVersion"
+  compile "$springGroup:spring-orm:$springVersion"
+  compile "$springGroup:spring-oxm:$springVersion"
+  compile "$springGroup:spring-web:$springVersion"
+  compile "$springGroup:spring-webmvc:$springVersion"
+  compile "$springGroup:spring-webmvc-portlet:$springVersion"
+
+  compile "cglib:cglib:2.2.2"
+  compile "aopalliance:aopalliance:1.0"
+  compile "javax.servlet:jstl:1.2"
+  compile "com.jolbox:bonecp:0.8.0-rc1"
+  compile "com.alibaba:fastjson:1.1.38"
+
+  final jettyGroup = 'org.eclipse.jetty'
+  final jettyVersion = '9.1.0.M0'
+  compile "$jettyGroup:jetty-server:$jettyVersion"
+  compile "$jettyGroup:jetty-servlet:$jettyVersion"
+  compile "$jettyGroup:jetty-webapp:$jettyVersion"
+  compile "$jettyGroup:jetty-servlets:$jettyVersion"
+  compile "$jettyGroup:jetty-jsp:$jettyVersion"
+  compile "$jettyGroup:jetty-util:$jettyVersion"
+
+  final hibernateGroup = 'org.hibernate'
+  final hibernateVersion = '4.2.0.Final'
+  compile "$hibernateGroup:hibernate-core:$hibernateVersion"
+  compile "$hibernateGroup:hibernate-validator:$hibernateVersion"
+  compile "mysql:mysql-connector-java:5.1.22"
+
+  final aspectjGroup = 'org.aspectj'
+  final aspectjVersion = '1.7.1'
+  compile "$aspectjGroup:aspectjweaver:$aspectjVersion"
+  compile "$aspectjGroup:aspectjrt:$aspectjVersion"
+
+  compile "log4j:log4j:1.2.17"
+  compile "org.slf4j:slf4j-log4j12:1.7.5"
+
+  compile "net.sourceforge.jexcelapi:jxl:2.6.12"
+  compile "commons-io:commons-io:1.3.2"
+  compile "commons-fileupload:commons-fileupload:1.3"
+  compile "commons-lang:commons-lang:2.0"
+  compile "org.apache.commons:commons-lang3:3.1"
+  compile "javax.mail:mail:1.5.0-b01"
+  compile "com.sun.mail:smtp:1.5.0"
+
+  testCompile "$springGroup:spring-test:$springVersion"
+  testCompile "org.hamcrest:hamcrest-all:1.3"
+  testCompile "com.jayway.jsonpath:json-path:0.8.1"
   testCompile(group: 'junit', name: 'junit', version:'4.11') {
     exclude(module: 'hamcrest-core')
   }
-  testCompile group: 'org.testng', name: 'testng', version:'6.1.1'
-  testCompile group: 'org.mockito', name: 'mockito-all', version:'1.9.5'
+  testCompile "org.testng:testng:6.1.1"
+  testCompile "org.mockito:mockito-all:1.9.5"
+
+  provided "javax.servlet:jsp-api:2.0"
+  provided "org.glassfish:javax.servlet:3.0"
+  provided "javax.servlet:servlet-api:3.0-alpha-1"
+}
+
+test {
+  doFirst {
+    jettyRun.daemon = true
+    jettyRun.execute()
+  }
+  doLast {
+    jettyStop.execute()
+  }
+  useTestNG()
 }
+
+jacoco {
+ toolVersion = "0.6.5.201403032054"
+}
+

trunk/.gitignore

@@ -14,9 +14,10 @@
     <module name="AvoidStarImport">
     </module>
     <module name="ImportOrder">
-      <property name="groups" value="/^javax?\./,org,cn.edu,*"/>
+      <property name="groups" value="cn.edu.uestc.acmicpc,org,*,/^javax?\./,"/>
       <property name="ordered" value="true"/>
       <property name="option" value="top"/>
+      <property name="separated" value="true"/>
     </module>
     <module name="RedundantImport"/>
     <module name="UnusedImports">

trunk/build.gradle

@@ -0,0 +1,2 @@
+dbUser = root
+dbPassword = root