Browse Source

Merge pull request #4 in BA/base-third from master to feature/9.0

* commit '8c06d68025b2f459b01bfe027c1669940c3c4a3e':
  build
  build
  xx
  tst
  1
  xx
  build
  build
  resource移动位置
  resource文件
  spring
feature/9.0
superman 7 years ago
parent
commit
37153f0c64
  1. 2
      META-INF/MANIFEST.MF
  2. 31
      build.third.gradle
  3. BIN
      fine-druid/lib/javax.servlet-api-3.0.1.jar
  4. BIN
      fine-druid/lib/javax.servlet-api-3.1.0.jar
  5. 2
      fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzSchedulerThread.java
  6. 2
      fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/UpdateLockRowSemaphore.java
  7. 6
      fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SimpleThreadPool.java
  8. 12
      fine-spring/fine-spring.iml
  9. BIN
      fine-spring/lib/aopalliance-1.0.jar
  10. BIN
      fine-spring/lib/asm-4.0.jar
  11. BIN
      fine-spring/lib/asm-analysis-4.0.jar
  12. BIN
      fine-spring/lib/asm-commons-4.0.jar
  13. BIN
      fine-spring/lib/asm-tree-4.0.jar
  14. BIN
      fine-spring/lib/asm-util-4.0.jar
  15. BIN
      fine-spring/lib/aspectjweaver-1.8.4.jar
  16. BIN
      fine-spring/lib/bcmail-jdk14-1.38.jar
  17. BIN
      fine-spring/lib/bcmail-jdk14-138.jar
  18. BIN
      fine-spring/lib/bcprov-jdk14-1.38.jar
  19. BIN
      fine-spring/lib/bctsp-jdk14-1.38.jar
  20. BIN
      fine-spring/lib/bsh-2.0b4.jar
  21. BIN
      fine-spring/lib/bytelist-1.0.11.jar
  22. BIN
      fine-spring/lib/commons-beanutils-1.8.3.jar
  23. BIN
      fine-spring/lib/commons-codec-1.6.jar
  24. BIN
      fine-spring/lib/commons-collections-3.2.1.jar
  25. BIN
      fine-spring/lib/commons-fileupload-1.3.1.jar
  26. BIN
      fine-spring/lib/commons-io-2.2.jar
  27. BIN
      fine-spring/lib/commons-lang-2.4.jar
  28. BIN
      fine-spring/lib/commons-logging-1.1.3.jar
  29. BIN
      fine-spring/lib/commons-pool-1.6.jar
  30. BIN
      fine-spring/lib/ejb-api-3.0.jar
  31. BIN
      fine-spring/lib/freemarker-2.3.20.jar
  32. BIN
      fine-spring/lib/groovy-all-1.8.9.jar
  33. BIN
      fine-spring/lib/hessian-4.0.7.jar
  34. BIN
      fine-spring/lib/hibernate-validator-4.3.2.Final.jar
  35. BIN
      fine-spring/lib/httpasyncclient-4.0.2.jar
  36. BIN
      fine-spring/lib/httpclient-4.3.6.jar
  37. BIN
      fine-spring/lib/httpcore-4.3.3.jar
  38. BIN
      fine-spring/lib/httpcore-nio-4.3.2.jar
  39. BIN
      fine-spring/lib/invokebinder-1.2.jar
  40. BIN
      fine-spring/lib/itext-2.1.7.jar
  41. BIN
      fine-spring/lib/jackson-annotations-2.3.0.jar
  42. BIN
      fine-spring/lib/jackson-core-2.3.4.jar
  43. BIN
      fine-spring/lib/jackson-core-asl-1.9.13.jar
  44. BIN
      fine-spring/lib/jackson-databind-2.3.4.jar
  45. BIN
      fine-spring/lib/jackson-mapper-asl-1.9.13.jar
  46. BIN
      fine-spring/lib/jamon-2.4.jar
  47. BIN
      fine-spring/lib/jasperreports-5.5.1.jar
  48. BIN
      fine-spring/lib/javassist-3.7.ga.jar
  49. BIN
      fine-spring/lib/javax.el-api-2.2.5.jar
  50. BIN
      fine-spring/lib/javax.enterprise.concurrent-api-1.0.jar
  51. BIN
      fine-spring/lib/javax.faces-api-2.2.jar
  52. BIN
      fine-spring/lib/javax.inject-1.jar
  53. BIN
      fine-spring/lib/javax.servlet-api-3.0.1.jar
  54. BIN
      fine-spring/lib/javax.servlet.jsp-api-2.2.1.jar
  55. BIN
      fine-spring/lib/javax.servlet.jsp.jstl-api-1.2.1.jar
  56. BIN
      fine-spring/lib/jboss-logging-3.1.0.CR2.jar
  57. BIN
      fine-spring/lib/jcodings-1.0.10.jar
  58. BIN
      fine-spring/lib/jdom-1.0.jar
  59. BIN
      fine-spring/lib/jetty-server-9.1.5.v20140505.jar
  60. BIN
      fine-spring/lib/jetty-servlet-9.1.5.v20140505.jar
  61. BIN
      fine-spring/lib/jffi-1.2.7-native.jar
  62. BIN
      fine-spring/lib/jffi-1.2.7.jar
  63. BIN
      fine-spring/lib/jnr-constants-0.8.5.jar
  64. BIN
      fine-spring/lib/jnr-enxio-0.4.jar
  65. BIN
      fine-spring/lib/jnr-ffi-2.0.0.jar
  66. BIN
      fine-spring/lib/jnr-netdb-1.1.2.jar
  67. BIN
      fine-spring/lib/jnr-posix-3.0.8.jar
  68. BIN
      fine-spring/lib/jnr-unixsocket-0.3.jar
  69. BIN
      fine-spring/lib/jnr-x86asm-1.0.2.jar
  70. BIN
      fine-spring/lib/joda-time-2.5.jar
  71. BIN
      fine-spring/lib/joni-2.1.3.jar
  72. BIN
      fine-spring/lib/jopt-simple-4.6.jar
  73. BIN
      fine-spring/lib/jruby-core-1.7.17.jar
  74. BIN
      fine-spring/lib/jruby-stdlib-1.7.17.jar
  75. BIN
      fine-spring/lib/jxl-2.6.12.jar
  76. BIN
      fine-spring/lib/jzlib-1.1.3.jar
  77. BIN
      fine-spring/lib/log4j-1.2.17.jar
  78. BIN
      fine-spring/lib/mvel2-2.0.11.jar
  79. BIN
      fine-spring/lib/nailgun-server-0.9.1.jar
  80. BIN
      fine-spring/lib/ognl-2.7.3.jar
  81. BIN
      fine-spring/lib/options-1.2.jar
  82. BIN
      fine-spring/lib/poi-3.10.1.jar
  83. BIN
      fine-spring/lib/portlet-api-2.0.jar
  84. BIN
      fine-spring/lib/rome-1.0.jar
  85. BIN
      fine-spring/lib/snakeyaml-1.13.jar
  86. BIN
      fine-spring/lib/spring-cglib-repack-3.1.jar
  87. BIN
      fine-spring/lib/spring-objenesis-repack-2.1.jar
  88. BIN
      fine-spring/lib/tiles-api-2.2.2.jar
  89. BIN
      fine-spring/lib/tiles-compat-2.2.2.jar
  90. BIN
      fine-spring/lib/tiles-core-2.2.2.jar
  91. BIN
      fine-spring/lib/tiles-el-2.2.2.jar
  92. BIN
      fine-spring/lib/tiles-extras-2.2.2.jar
  93. BIN
      fine-spring/lib/tiles-freemarker-2.2.2.jar
  94. BIN
      fine-spring/lib/tiles-jsp-2.2.2.jar
  95. BIN
      fine-spring/lib/tiles-mvel-2.2.2.jar
  96. BIN
      fine-spring/lib/tiles-ognl-2.2.2.jar
  97. BIN
      fine-spring/lib/tiles-servlet-2.2.2.jar
  98. BIN
      fine-spring/lib/tiles-servlet-wildcard-2.2.2.jar
  99. BIN
      fine-spring/lib/tiles-template-2.2.2.jar
  100. BIN
      fine-spring/lib/tiles-velocity-2.2.2.jar
  101. Some files were not shown because too many files have changed in this diff Show More

2
META-INF/MANIFEST.MF

@ -0,0 +1,2 @@
Manifest-Version: 1.0

31
build.third.gradle

@ -21,7 +21,8 @@ sourceSets{
java{
srcDirs=["${srcDir}/fine-druid/src",
"${srcDir}/fine-poi/src",
"${srcDir}/fine-quartz/src"]
"${srcDir}/fine-quartz/src",
"${srcDir}/fine-spring/src"]
}
}
@ -32,8 +33,8 @@ repositories{
//
FileTree files =fileTree(dir:'./',include:'build.*.gradle')
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('/'))
def branchName=buildDir.substring(buildDir.lastIndexOf ('/')+1)
//
dependencies{
@ -41,6 +42,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"../../finereport-lib-base/${branchName}",include:'**/*.jar')
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
@ -65,10 +67,16 @@ task unJar{
fileset(dir:"${srcDir}/fine-poi/lib"){
include(name:'**/*.jar')
}
fileset(dir:"${srcDir}/fine-spring/lib"){
include(name:'aopalliance-1.0.jar')
include(name:'aspectjweaver-1.8.4.jar')
}
}
}
}
//
def dataContent ={def dir ->
copySpec{
@ -78,23 +86,18 @@ def dataContent ={def dir ->
}
}
task copyFiles(type:Copy,dependsOn:'unJar'){
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-druid/src")
with dataContent.call("${srcDir}/fine-poi/src")
with dataContent.call("${srcDir}/fine-quartz/src")
with dataContent.call("${srcDir}/fine-spring/src")
into "${classesDir}"
}
}
task deleteSrc(dependsOn:'build') {
ant {
delete(dir:"${srcDir}/fine-druid")
delete(dir:"${srcDir}/fine-poi")
delete(dir:"${srcDir}/fine-quartz")
}
}
jar.dependsOn copyFiles

BIN
fine-druid/lib/javax.servlet-api-3.0.1.jar

Binary file not shown.

BIN
fine-druid/lib/javax.servlet-api-3.1.0.jar

Binary file not shown.

2
fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzSchedulerThread.java

@ -181,7 +181,7 @@ public class QuartzSchedulerThread extends Thread {
try {
join();
break;
} catch (InterruptedException _) {
} catch (InterruptedException e) {
interrupted = true;
}
}

2
fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/UpdateLockRowSemaphore.java

@ -95,7 +95,7 @@ public class UpdateLockRowSemaphore extends DBSemaphore {
}
try {
Thread.sleep(1000L);
} catch (InterruptedException _) {
} catch (InterruptedException e1) {
Thread.currentThread().interrupt();
}
}

6
fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SimpleThreadPool.java

@ -353,7 +353,7 @@ public class SimpleThreadPool implements ThreadPool {
while(handoffPending) {
try {
nextRunnableLock.wait(100);
} catch(InterruptedException _) {
} catch(InterruptedException e) {
interrupted = true;
}
}
@ -369,7 +369,7 @@ public class SimpleThreadPool implements ThreadPool {
// note: with waiting infinite time the
// application may appear to 'hang'.
nextRunnableLock.wait(2000);
} catch (InterruptedException _) {
} catch (InterruptedException e) {
interrupted = true;
}
}
@ -380,7 +380,7 @@ public class SimpleThreadPool implements ThreadPool {
try {
wt.join();
workerThreads.remove();
} catch (InterruptedException _) {
} catch (InterruptedException e) {
interrupted = true;
}
}

12
fine-spring/fine-spring.iml

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib-spring" level="project" />
</component>
</module>

BIN
fine-spring/lib/aopalliance-1.0.jar

Binary file not shown.

BIN
fine-spring/lib/asm-4.0.jar

Binary file not shown.

BIN
fine-spring/lib/asm-analysis-4.0.jar

Binary file not shown.

BIN
fine-spring/lib/asm-commons-4.0.jar

Binary file not shown.

BIN
fine-spring/lib/asm-tree-4.0.jar

Binary file not shown.

BIN
fine-spring/lib/asm-util-4.0.jar

Binary file not shown.

BIN
fine-spring/lib/aspectjweaver-1.8.4.jar

Binary file not shown.

BIN
fine-spring/lib/bcmail-jdk14-1.38.jar

Binary file not shown.

BIN
fine-spring/lib/bcmail-jdk14-138.jar

Binary file not shown.

BIN
fine-spring/lib/bcprov-jdk14-1.38.jar

Binary file not shown.

BIN
fine-spring/lib/bctsp-jdk14-1.38.jar

Binary file not shown.

BIN
fine-spring/lib/bsh-2.0b4.jar

Binary file not shown.

BIN
fine-spring/lib/bytelist-1.0.11.jar

Binary file not shown.

BIN
fine-spring/lib/commons-beanutils-1.8.3.jar

Binary file not shown.

BIN
fine-spring/lib/commons-codec-1.6.jar

Binary file not shown.

BIN
fine-spring/lib/commons-collections-3.2.1.jar

Binary file not shown.

BIN
fine-spring/lib/commons-fileupload-1.3.1.jar

Binary file not shown.

BIN
fine-spring/lib/commons-io-2.2.jar

Binary file not shown.

BIN
fine-spring/lib/commons-lang-2.4.jar

Binary file not shown.

BIN
fine-spring/lib/commons-logging-1.1.3.jar

Binary file not shown.

BIN
fine-spring/lib/commons-pool-1.6.jar

Binary file not shown.

BIN
fine-spring/lib/ejb-api-3.0.jar

Binary file not shown.

BIN
fine-spring/lib/freemarker-2.3.20.jar

Binary file not shown.

BIN
fine-spring/lib/groovy-all-1.8.9.jar

Binary file not shown.

BIN
fine-spring/lib/hessian-4.0.7.jar

Binary file not shown.

BIN
fine-spring/lib/hibernate-validator-4.3.2.Final.jar

Binary file not shown.

BIN
fine-spring/lib/httpasyncclient-4.0.2.jar

Binary file not shown.

BIN
fine-spring/lib/httpclient-4.3.6.jar

Binary file not shown.

BIN
fine-spring/lib/httpcore-4.3.3.jar

Binary file not shown.

BIN
fine-spring/lib/httpcore-nio-4.3.2.jar

Binary file not shown.

BIN
fine-spring/lib/invokebinder-1.2.jar

Binary file not shown.

BIN
fine-spring/lib/itext-2.1.7.jar

Binary file not shown.

BIN
fine-spring/lib/jackson-annotations-2.3.0.jar

Binary file not shown.

BIN
fine-spring/lib/jackson-core-2.3.4.jar

Binary file not shown.

BIN
fine-spring/lib/jackson-core-asl-1.9.13.jar

Binary file not shown.

BIN
fine-spring/lib/jackson-databind-2.3.4.jar

Binary file not shown.

BIN
fine-spring/lib/jackson-mapper-asl-1.9.13.jar

Binary file not shown.

BIN
fine-spring/lib/jamon-2.4.jar

Binary file not shown.

BIN
fine-spring/lib/jasperreports-5.5.1.jar

Binary file not shown.

BIN
fine-spring/lib/javassist-3.7.ga.jar

Binary file not shown.

BIN
fine-spring/lib/javax.el-api-2.2.5.jar

Binary file not shown.

BIN
fine-spring/lib/javax.enterprise.concurrent-api-1.0.jar

Binary file not shown.

BIN
fine-spring/lib/javax.faces-api-2.2.jar

Binary file not shown.

BIN
fine-spring/lib/javax.inject-1.jar

Binary file not shown.

BIN
fine-spring/lib/javax.servlet-api-3.0.1.jar

Binary file not shown.

BIN
fine-spring/lib/javax.servlet.jsp-api-2.2.1.jar

Binary file not shown.

BIN
fine-spring/lib/javax.servlet.jsp.jstl-api-1.2.1.jar

Binary file not shown.

BIN
fine-spring/lib/jboss-logging-3.1.0.CR2.jar

Binary file not shown.

BIN
fine-spring/lib/jcodings-1.0.10.jar

Binary file not shown.

BIN
fine-spring/lib/jdom-1.0.jar

Binary file not shown.

BIN
fine-spring/lib/jetty-server-9.1.5.v20140505.jar

Binary file not shown.

BIN
fine-spring/lib/jetty-servlet-9.1.5.v20140505.jar

Binary file not shown.

BIN
fine-spring/lib/jffi-1.2.7-native.jar

Binary file not shown.

BIN
fine-spring/lib/jffi-1.2.7.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-constants-0.8.5.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-enxio-0.4.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-ffi-2.0.0.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-netdb-1.1.2.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-posix-3.0.8.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-unixsocket-0.3.jar

Binary file not shown.

BIN
fine-spring/lib/jnr-x86asm-1.0.2.jar

Binary file not shown.

BIN
fine-spring/lib/joda-time-2.5.jar

Binary file not shown.

BIN
fine-spring/lib/joni-2.1.3.jar

Binary file not shown.

BIN
fine-spring/lib/jopt-simple-4.6.jar

Binary file not shown.

BIN
fine-spring/lib/jruby-core-1.7.17.jar

Binary file not shown.

BIN
fine-spring/lib/jruby-stdlib-1.7.17.jar

Binary file not shown.

BIN
fine-spring/lib/jxl-2.6.12.jar

Binary file not shown.

BIN
fine-spring/lib/jzlib-1.1.3.jar

Binary file not shown.

BIN
fine-spring/lib/log4j-1.2.17.jar

Binary file not shown.

BIN
fine-spring/lib/mvel2-2.0.11.jar

Binary file not shown.

BIN
fine-spring/lib/nailgun-server-0.9.1.jar

Binary file not shown.

BIN
fine-spring/lib/ognl-2.7.3.jar

Binary file not shown.

BIN
fine-spring/lib/options-1.2.jar

Binary file not shown.

BIN
fine-spring/lib/poi-3.10.1.jar

Binary file not shown.

BIN
fine-spring/lib/portlet-api-2.0.jar

Binary file not shown.

BIN
fine-spring/lib/rome-1.0.jar

Binary file not shown.

BIN
fine-spring/lib/snakeyaml-1.13.jar

Binary file not shown.

BIN
fine-spring/lib/spring-cglib-repack-3.1.jar

Binary file not shown.

BIN
fine-spring/lib/spring-objenesis-repack-2.1.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-api-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-compat-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-core-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-el-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-extras-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-freemarker-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-jsp-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-mvel-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-ognl-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-servlet-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-servlet-wildcard-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-template-2.2.2.jar

Binary file not shown.

BIN
fine-spring/lib/tiles-velocity-2.2.2.jar

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save