Merge pull request #5 in BA/base-third from master to feature/10.0

* commit '8c06d68025b2f459b01bfe027c1669940c3c4a3e':
  build
  build
  xx
  tst
  1
  xx
  build
  build
  resource移动位置
  resource文件
  spring

META-INF/MANIFEST.MF

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

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 buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('/'))
-def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+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}"
 	}
 }
 
-
+jar.dependsOn copyFiles
-task deleteSrc(dependsOn:'build') {
-	ant {
-		delete(dir:"${srcDir}/fine-druid")
-		delete(dir:"${srcDir}/fine-poi")
-		delete(dir:"${srcDir}/fine-quartz")	
-	}
-
-
-}

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;
                     }
                 }

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();
                 }
             }

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;
                         }
                     }

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>