Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0

# Conflicts:
#	fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java

.gitignore

@@ -1,2 +1,3 @@
 *.iml
 .idea/
+.gradle/

build.third_step0.gradle

@@ -41,7 +41,7 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s
 def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
 
 def srcDir="."
-def maven_version="${version}-FEATURE-SNAPSHOT"
+def maven_version="${version}-RELEASE-SNAPSHOT"
 def jar_version = version
 
 configurations {
@@ -50,7 +50,7 @@ configurations {
 }
 
 dependencies {
-    thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+    thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	sigar "com.fr.third:sigar:1.6.0"
     testCompile 'junit:junit:4.12'
 }

build.third_step1.gradle

@@ -59,7 +59,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

build.third_step2.gradle

@@ -48,7 +48,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

build.third_step3.gradle

@@ -46,7 +46,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

build.third_step4.gradle

@@ -45,7 +45,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

build.third_step5.gradle

@@ -44,7 +44,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'ojdbc7-12.1.0.jar')
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

build.third_step6.gradle

@@ -46,7 +46,6 @@ sourceSets{
 				"${srcDir}/fine-lz4/src",
 				"${srcDir}/fine-log4j/src",
 				"${srcDir}/fine-jgit/src"
-
 				]
 		}
 	}
@@ -76,7 +75,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }

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

@@ -1199,19 +1199,15 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                 }
             }
 
-            if (job == null) {
             try {
+                if (job == null) {
                     job = retrieveJob(conn, newTrigger.getJobKey());
-                } catch (JobPersistenceException e) {
-                    getLog().error(e.getMessage());
-                }
                 }
                 if (job == null) {
                     throw new JobPersistenceException("The job ("
                             + newTrigger.getJobKey()
                             + ") referenced by the trigger does not exist.");
                 }
-
                 if (job.isConcurrentExectionDisallowed() && !recovering) {
                     state = checkBlockedState(conn, job.getKey(), state);
                 }
@@ -1221,6 +1217,9 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                 } else {
                     getDelegate().insertTrigger(conn, newTrigger, state, job);
                 }
+            } catch (JobPersistenceException e) {
+                getLog().error(e.getMessage());
+            }
         } catch (Exception e) {
             throw new JobPersistenceException("Couldn't store trigger '" + newTrigger.getKey() + "' for '"
                     + newTrigger.getJobKey() + "' job:" + e.getMessage(), e);
@@ -2987,6 +2986,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
             } catch (SQLException sqle) {
                 getLog().error("Unable to set trigger state to ERROR.", sqle);
             }
+            return null;
         }
 
         if (trigger.getCalendarName() != null) {