dev checkin. fix pom.xml

JumpMind · Mar 6, 2012 · 4c33291 · 4c33291
1 parent da6c7db
commit 4c33291
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 49 deletions.
diff --git a/symmetric/symmetric-client/pom.xml b/symmetric/symmetric-client/pom.xml
@@ -28,7 +28,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<outputDirectory>${basedir}\target</outputDirectory>
+					<outputDirectory>${basedir}/target</outputDirectory>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/symmetric/symmetric-core/pom.xml b/symmetric/symmetric-core/pom.xml
@@ -28,7 +28,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<outputDirectory>${basedir}\target</outputDirectory>
+					<outputDirectory>${basedir}/target</outputDirectory>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml b/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml
@@ -447,7 +447,7 @@
     </table>
 
     <table name="conflict_event" description="Identifies rows that were in conflict and how the conflicts were resolved.">
-        <column name="batch_id" type="INTEGER" size="50" required="true" primaryKey="true" description="The id of the outgoing_batch that is being loaded." />
+        <column name="batch_id" type="INTEGER" required="true" primaryKey="true" description="The id of the outgoing_batch that is being loaded." />
         <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true" description="The node_id of the source of the batch being loaded." />
         <column name="failed_row_number" type="BIGINT" required="true" primaryKey="true" description="This is the row number in the batch for the data that was being processed when the batch failed." />
         <column name="conflict_id" type="VARCHAR" size="50" required="true" primaryKey="true"  description="Unique identifier of a specific conflict resolver." />        

diff --git a/symmetric/symmetric-db/pom.xml b/symmetric/symmetric-db/pom.xml
@@ -46,7 +46,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<outputDirectory>${basedir}\target</outputDirectory>
+					<outputDirectory>${basedir}/target</outputDirectory>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/symmetric/symmetric-io/pom.xml b/symmetric/symmetric-io/pom.xml
@@ -32,7 +32,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<outputDirectory>${basedir}\target</outputDirectory>
+					<outputDirectory>${basedir}/target</outputDirectory>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java
@@ -8,61 +8,68 @@
 import org.slf4j.LoggerFactory;
 
 public class DefaultDatabaseWriterConflictResolver implements IDatabaseWriterConflictResolver {
-    
+
     protected Logger log = LoggerFactory.getLogger(getClass());
 
     protected boolean autoRegister;
+
+    public void reportConflict(DatabaseWriter writer, DatabaseWriterSettings writerSettings,
+            CsvData data, ConflictEvent conflictEvent) {
+
+    }
 
-    public void needsResolved(DatabaseWriter writer, DatabaseWriterSettings writerSettings, CsvData data) {
+    public void needsResolved(DatabaseWriter writer, DatabaseWriterSettings writerSettings,
+            CsvData data) {
         DataEventType originalEventType = data.getDataEventType();
-        ConflictSettings conflictSetting = writerSettings.getConflictSettings(writer.getTargetTable(), writer.getBatch());                    
+        ConflictSettings conflictSetting = writerSettings.getConflictSettings(
+                writer.getTargetTable(), writer.getBatch());
         switch (originalEventType) {
-        case INSERT:
-            switch (conflictSetting.getResolveInsertType()) {
-            case MANUAL:
-                throw new ConflictException(data, writer.getTargetTable(), false);
-            case BLINK_FALLBACK:
-                performFallbackToUpdate(writer, data);
-                break;
-            case NEWER_WINS:
-                // TODO
-                throw new NotImplementedException();
-            case IGNORE:
-            default:
+            case INSERT:
+                switch (conflictSetting.getResolveInsertType()) {
+                    case MANUAL:
+                        throw new ConflictException(data, writer.getTargetTable(), false);
+                    case BLINK_FALLBACK:
+                        performFallbackToUpdate(writer, data);
+                        break;
+                    case NEWER_WINS:
+                        // TODO
+                        throw new NotImplementedException();
+                    case IGNORE:
+                    default:
+                        break;
+                }
                 break;
-            }
-            break;
 
-        case UPDATE:
-            switch (conflictSetting.getResolveUpdateType()) {
-            case MANUAL:
-                throw new ConflictException(data, writer.getTargetTable(), false);
-            case BLINK_FALLBACK:
-                performFallbackToInsert(writer, data);
+            case UPDATE:
+                switch (conflictSetting.getResolveUpdateType()) {
+                    case MANUAL:
+                        throw new ConflictException(data, writer.getTargetTable(), false);
+                    case BLINK_FALLBACK:
+                        performFallbackToInsert(writer, data);
+                        break;
+                    case NEWER_WINS:
+                        // TODO
+                        throw new NotImplementedException();
+                    case IGNORE:
+                    default:
+                        break;
+                }
                 break;
-            case NEWER_WINS:
-                // TODO
-                throw new NotImplementedException();
-            case IGNORE:
-            default:
+
+            case DELETE:
+                switch (conflictSetting.getResolveDeleteType()) {
+                    case MANUAL:
+                        throw new ConflictException(data, writer.getTargetTable(), false);
+                    default:
+                    case IGNORE:
+                        writer.getStatistics().get(writer.getBatch())
+                                .increment(DataWriterStatisticConstants.MISSINGDELETECOUNT);
+                        break;
+                }
                 break;
-            }
-            break;
 
-        case DELETE:
-            switch (conflictSetting.getResolveDeleteType()) {
-            case MANUAL:
-                throw new ConflictException(data, writer.getTargetTable(), false);
             default:
-            case IGNORE:
-                writer.getStatistics().get(writer.getBatch())
-                        .increment(DataWriterStatisticConstants.MISSINGDELETECOUNT);
                 break;
-            }
-            break;
-
-        default:
-            break;
         }
     }
 
@@ -87,5 +94,5 @@ protected void performFallbackToInsert(DatabaseWriter writer, CsvData csvData) {
     public void setAutoRegister(boolean autoRegister) {
         this.autoRegister = autoRegister;
     }
-    
+
 }
diff --git a/.../src/main/java/org/jumpmind/symmetric/io/data/writer/IDatabaseWriterConflictResolver.java b/.../src/main/java/org/jumpmind/symmetric/io/data/writer/IDatabaseWriterConflictResolver.java
@@ -6,5 +6,7 @@
 public interface IDatabaseWriterConflictResolver extends IExtensionPoint {
 
     public void needsResolved(DatabaseWriter writer, DatabaseWriterSettings writerSettings, CsvData data);
+
+    public void reportConflict(DatabaseWriter writer, DatabaseWriterSettings writerSettings, CsvData data, ConflictEvent conflictEvent);
 
 }
diff --git a/symmetric/symmetric-jdbc/pom.xml b/symmetric/symmetric-jdbc/pom.xml
@@ -29,7 +29,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<outputDirectory>${basedir}\target</outputDirectory>
+					<outputDirectory>${basedir}/target</outputDirectory>
 				</configuration>
 			</plugin>
 		</plugins>