Change the file_trigger column recursive to recurse because recursive…

… is a keyword in firebird.

symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTrigger.java

@@ -39,7 +39,7 @@ public class FileTrigger implements Serializable {
 
     private String triggerId;
     private String baseDir;
-    private boolean recursive;
+    private boolean recurse;
     private String includesFiles;
     private String excludesFiles;
     private boolean syncOnCreate = true;
@@ -54,9 +54,9 @@ public class FileTrigger implements Serializable {
     public FileTrigger() {
     }
 
-    public FileTrigger(String baseDir, boolean recursive, String includes, String excludes) {
+    public FileTrigger(String baseDir, boolean recurse, String includes, String excludes) {
         this.baseDir = baseDir;
-        this.recursive = recursive;
+        this.recurse = recurse;
         this.includesFiles = includes;
         this.excludesFiles = excludes;
         this.triggerId = "?";
@@ -79,12 +79,12 @@ public void setBaseDir(String baseDir) {
         this.baseDir = baseDir;
     }
 
-    public boolean isRecursive() {
-        return recursive;
+    public boolean isRecurse() {
+        return recurse;
     }
 
-    public void setRecursive(boolean recursive) {
-        this.recursive = recursive;
+    public void setRecurse(boolean recursive) {
+        this.recurse = recursive;
     }
 
     public String getIncludesFiles() {
@@ -161,7 +161,7 @@ public IOFileFilter createIOFileFilter() {
             fileFilters.add(new NotFileFilter(new WildcardFileFilter(excludes)));
             filter = new AndFileFilter(fileFilters);
         }
-        if (!recursive) {
+        if (!recurse) {
             List<IOFileFilter> fileFilters = new ArrayList<IOFileFilter>();
             fileFilters.add(filter);
             fileFilters.add(new NotFileFilter(FileFilterUtils.directoryFileFilter()));

symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java

@@ -172,7 +172,7 @@ public void saveFileTrigger(FileTrigger fileTrigger) {
         fileTrigger.setLastUpdateTime(new Date());
         if (0 == sqlTemplate.update(
                 getSql("updateFileTriggerSql"),
-                new Object[] { fileTrigger.getBaseDir(), fileTrigger.isRecursive() ? 1 : 0,
+                new Object[] { fileTrigger.getBaseDir(), fileTrigger.isRecurse() ? 1 : 0,
                         fileTrigger.getIncludesFiles(), fileTrigger.getExcludesFiles(),
                         fileTrigger.isSyncOnCreate() ? 1 : 0,
                         fileTrigger.isSyncOnModified() ? 1 : 0,
@@ -184,7 +184,7 @@ public void saveFileTrigger(FileTrigger fileTrigger) {
                         Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR })) {
             fileTrigger.setCreateTime(fileTrigger.getLastUpdateTime());
             sqlTemplate.update(getSql("insertFileTriggerSql"),
-                    new Object[] { fileTrigger.getBaseDir(), fileTrigger.isRecursive() ? 1 : 0,
+                    new Object[] { fileTrigger.getBaseDir(), fileTrigger.isRecurse() ? 1 : 0,
                             fileTrigger.getIncludesFiles(), fileTrigger.getExcludesFiles(),
                             fileTrigger.isSyncOnCreate() ? 1 : 0,
                             fileTrigger.isSyncOnModified() ? 1 : 0,
@@ -683,7 +683,7 @@ public FileTrigger mapRow(Row rs) {
             fileTrigger.setIncludesFiles(rs.getString("includes_files"));
             fileTrigger.setLastUpdateBy(rs.getString("last_update_by"));
             fileTrigger.setLastUpdateTime(rs.getDateTime("last_update_time"));
-            fileTrigger.setRecursive(rs.getBoolean("recursive"));
+            fileTrigger.setRecurse(rs.getBoolean("recurse"));
             fileTrigger.setSyncOnCreate(rs.getBoolean("sync_on_create"));
             fileTrigger.setSyncOnDelete(rs.getBoolean("sync_on_delete"));
             fileTrigger.setAfterCopyScript(rs.getString("after_copy_script"));

symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncServiceSqlMap.java

@@ -12,7 +12,7 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map<String, String> rep
         // @formatter:off
 
         putSql("selectFileTriggersSql", 
-                " select trigger_id, base_dir, recursive,                                     " +
+                " select trigger_id, base_dir, recurse,                                     " +
                 "        includes_files, excludes_files,                                      " +
         		"        sync_on_create, sync_on_modified, sync_on_delete,                    " +
                 "        before_copy_script,                                                  " +
@@ -25,13 +25,13 @@ public FileSyncServiceSqlMap(IDatabasePlatform platform, Map<String, String> rep
 
 
         putSql("updateFileTriggerSql",                 
-                " update $(file_trigger) set base_dir=?, recursive=?, includes_files=?,         " +
+                " update $(file_trigger) set base_dir=?, recurse=?, includes_files=?,         " +
         		"  excludes_files=?, sync_on_create=?, sync_on_modified=?, sync_on_delete=?,    " +
                 "  before_copy_script=?, after_copy_script=?,                                   " +
         		"  last_update_by=?, last_update_time=? where trigger_id=?                      ");
 
         putSql("insertFileTriggerSql",                 
-                " insert into $(file_trigger) (base_dir, recursive, includes_files,             " +
+                " insert into $(file_trigger) (base_dir, recurse, includes_files,             " +
                 "  excludes_files, sync_on_create, sync_on_modified, sync_on_delete,            " +
                 "  before_copy_script, after_copy_script,                                       " +
                 "  last_update_by, last_update_time, trigger_id, create_time)                   " +

symmetric-core/src/main/resources/symmetric-schema.xml

@@ -649,7 +649,7 @@
     <table name="file_trigger" description="This table defines files or sets of files for which changes will be captured for file synchronization">
         <column name="trigger_id" type="VARCHAR" size="50" required="true" primaryKey="true"  description="Unique identifier for a trigger." />
         <column name="base_dir" type="VARCHAR" size="255" required="true" description="The base directory on the client that will be synchronized." />
-        <column name="recursive" type="BOOLEANINT" size="1" required="true" default="1"  description="Whether to synchronize child directories." />
+        <column name="recurse" type="BOOLEANINT" size="1" required="true" default="1"  description="Whether to synchronize child directories." />
         <column name="includes_files" type="VARCHAR" size="255"  description="Wildcard-enabled, comma-separated list of file to include in synchronization." />
         <column name="excludes_files" type="VARCHAR" size="255"  description="Wildcard-enabled, comma-separated list of file to exclude from synchronization." />
         <column name="sync_on_create" type="BOOLEANINT" size="1" required="true" default="1"  description="Whether to capture and send files when they are created." />