move code over to the symmetric-client project

JumpMind · Jan 11, 2012 · 2e8ec92 · 2e8ec92
1 parent c1bfc81
commit 2e8ec92
Show file tree

Hide file tree

Showing 43 changed files with 31 additions and 7 deletions.
diff --git a/...mind/symmetric/ClientSymmetricEngine.java → ...mind/symmetric/ClientSymmetricEngine.java b/...mind/symmetric/ClientSymmetricEngine.java → ...mind/symmetric/ClientSymmetricEngine.java
@@ -20,6 +20,8 @@
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.common.SecurityConstants;
 import org.jumpmind.symmetric.config.PropertiesFactoryBean;
+import org.jumpmind.symmetric.db.ISymmetricDialect;
+import org.jumpmind.symmetric.db.JdbcSymmetricDialectFactory;
 import org.jumpmind.symmetric.ext.ExtensionPointManager;
 import org.jumpmind.symmetric.ext.IExtensionPointManager;
 import org.jumpmind.symmetric.job.IJobManager;
@@ -92,6 +94,12 @@ public static BasicDataSource createBasicDataSource(Log log, TypedProperties pro
         return dataSource;
 
     }
+
+    @Override
+    protected ISymmetricDialect createSymmetricDialect() {
+        return new JdbcSymmetricDialectFactory(parameterService, platform, log)
+        .create();
+    }
 
     @Override
     protected IDatabasePlatform createDatabasePlatform(TypedProperties properties) {

diff --git a/.../db/AbstractEmbeddedSymmetricDialect.java → .../db/AbstractEmbeddedSymmetricDialect.java b/.../db/AbstractEmbeddedSymmetricDialect.java → .../db/AbstractEmbeddedSymmetricDialect.java
diff --git a/...symmetric/db/AbstractEmbeddedTrigger.java → ...symmetric/db/AbstractEmbeddedTrigger.java b/...symmetric/db/AbstractEmbeddedTrigger.java → ...symmetric/db/AbstractEmbeddedTrigger.java
diff --git a/...ind/symmetric/db/EmbeddedDbFunctions.java → ...ind/symmetric/db/EmbeddedDbFunctions.java b/...ind/symmetric/db/EmbeddedDbFunctions.java → ...ind/symmetric/db/EmbeddedDbFunctions.java
diff --git a/...etric/db/JdbcSymmetricDialectFactory.java → ...etric/db/JdbcSymmetricDialectFactory.java b/...etric/db/JdbcSymmetricDialectFactory.java → ...etric/db/JdbcSymmetricDialectFactory.java
diff --git a/...symmetric/db/db2/Db2SymmetricDialect.java → ...symmetric/db/db2/Db2SymmetricDialect.java b/...symmetric/db/db2/Db2SymmetricDialect.java → ...symmetric/db/db2/Db2SymmetricDialect.java
diff --git a/...mind/symmetric/db/db2/Db2TriggerText.java → ...mind/symmetric/db/db2/Db2TriggerText.java b/...mind/symmetric/db/db2/Db2TriggerText.java → ...mind/symmetric/db/db2/Db2TriggerText.java
diff --git a/...mmetric/db/db2/Db2v9SymmetricDialect.java → ...mmetric/db/db2/Db2v9SymmetricDialect.java b/...mmetric/db/db2/Db2v9SymmetricDialect.java → ...mmetric/db/db2/Db2v9SymmetricDialect.java
diff --git a/...nd/symmetric/db/derby/DerbyFunctions.java → ...nd/symmetric/db/derby/DerbyFunctions.java b/...nd/symmetric/db/derby/DerbyFunctions.java → ...nd/symmetric/db/derby/DerbyFunctions.java
diff --git a/...etric/db/derby/DerbySymmetricDialect.java → ...etric/db/derby/DerbySymmetricDialect.java b/...etric/db/derby/DerbySymmetricDialect.java → ...etric/db/derby/DerbySymmetricDialect.java
diff --git a/.../symmetric/db/derby/DerbyTriggerText.java → .../symmetric/db/derby/DerbyTriggerText.java b/.../symmetric/db/derby/DerbyTriggerText.java → .../symmetric/db/derby/DerbyTriggerText.java
diff --git a/...db/firebird/FirebirdSymmetricDialect.java → ...db/firebird/FirebirdSymmetricDialect.java b/...db/firebird/FirebirdSymmetricDialect.java → ...db/firebird/FirebirdSymmetricDialect.java
diff --git a/...tric/db/firebird/FirebirdTriggerText.java → ...tric/db/firebird/FirebirdTriggerText.java b/...tric/db/firebird/FirebirdTriggerText.java → ...tric/db/firebird/FirebirdTriggerText.java
diff --git a/...jumpmind/symmetric/db/h2/H2Functions.java → ...jumpmind/symmetric/db/h2/H2Functions.java b/...jumpmind/symmetric/db/h2/H2Functions.java → ...jumpmind/symmetric/db/h2/H2Functions.java
diff --git a/...d/symmetric/db/h2/H2SymmetricDialect.java → ...d/symmetric/db/h2/H2SymmetricDialect.java b/...d/symmetric/db/h2/H2SymmetricDialect.java → ...d/symmetric/db/h2/H2SymmetricDialect.java
diff --git a/...g/jumpmind/symmetric/db/h2/H2Trigger.java → ...g/jumpmind/symmetric/db/h2/H2Trigger.java b/...g/jumpmind/symmetric/db/h2/H2Trigger.java → ...g/jumpmind/symmetric/db/h2/H2Trigger.java
diff --git a/...mpmind/symmetric/db/h2/H2TriggerText.java → ...mpmind/symmetric/db/h2/H2TriggerText.java b/...mpmind/symmetric/db/h2/H2TriggerText.java → ...mpmind/symmetric/db/h2/H2TriggerText.java
diff --git a/.../symmetric/db/hsqldb/HsqlDbFunctions.java → .../symmetric/db/hsqldb/HsqlDbFunctions.java b/.../symmetric/db/hsqldb/HsqlDbFunctions.java → .../symmetric/db/hsqldb/HsqlDbFunctions.java
diff --git a/...ric/db/hsqldb/HsqlDbSymmetricDialect.java → ...ric/db/hsqldb/HsqlDbSymmetricDialect.java b/...ric/db/hsqldb/HsqlDbSymmetricDialect.java → ...ric/db/hsqldb/HsqlDbSymmetricDialect.java
diff --git a/...nd/symmetric/db/hsqldb/HsqlDbTrigger.java → ...nd/symmetric/db/hsqldb/HsqlDbTrigger.java b/...nd/symmetric/db/hsqldb/HsqlDbTrigger.java → ...nd/symmetric/db/hsqldb/HsqlDbTrigger.java
diff --git a/...ymmetric/db/hsqldb/HsqlDbTriggerText.java → ...ymmetric/db/hsqldb/HsqlDbTriggerText.java b/...ymmetric/db/hsqldb/HsqlDbTriggerText.java → ...ymmetric/db/hsqldb/HsqlDbTriggerText.java
diff --git a/...c/db/hsqldb2/HsqlDb2SymmetricDialect.java → ...c/db/hsqldb2/HsqlDb2SymmetricDialect.java b/...c/db/hsqldb2/HsqlDb2SymmetricDialect.java → ...c/db/hsqldb2/HsqlDb2SymmetricDialect.java
diff --git a/...metric/db/hsqldb2/HsqlDb2TriggerText.java → ...metric/db/hsqldb2/HsqlDb2TriggerText.java b/...metric/db/hsqldb2/HsqlDb2TriggerText.java → ...metric/db/hsqldb2/HsqlDb2TriggerText.java
diff --git a/...db/informix/InformixSymmetricDialect.java → ...db/informix/InformixSymmetricDialect.java b/...db/informix/InformixSymmetricDialect.java → ...db/informix/InformixSymmetricDialect.java
diff --git a/...tric/db/informix/InformixTriggerText.java → ...tric/db/informix/InformixTriggerText.java b/...tric/db/informix/InformixTriggerText.java → ...tric/db/informix/InformixTriggerText.java
diff --git a/.../interbase/InterbaseSymmetricDialect.java → .../interbase/InterbaseSymmetricDialect.java b/.../interbase/InterbaseSymmetricDialect.java → .../interbase/InterbaseSymmetricDialect.java
diff --git a/...ic/db/interbase/InterbaseTriggerText.java → ...ic/db/interbase/InterbaseTriggerText.java b/...ic/db/interbase/InterbaseTriggerText.java → ...ic/db/interbase/InterbaseTriggerText.java
diff --git a/...etric/db/mssql/MsSqlSymmetricDialect.java → ...etric/db/mssql/MsSqlSymmetricDialect.java b/...etric/db/mssql/MsSqlSymmetricDialect.java → ...etric/db/mssql/MsSqlSymmetricDialect.java
diff --git a/.../symmetric/db/mssql/MsSqlTriggerText.java → .../symmetric/db/mssql/MsSqlTriggerText.java b/.../symmetric/db/mssql/MsSqlTriggerText.java → .../symmetric/db/mssql/MsSqlTriggerText.java
@@ -142,4 +142,9 @@ public MsSqlTriggerText() {
 "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                                " );
     }
 
+
+    @Override
+    protected boolean requiresEmptyLobTemplateForDeletes() {
+        return true;
+    }
 }
diff --git a/...etric/db/mysql/MySqlSymmetricDialect.java → ...etric/db/mysql/MySqlSymmetricDialect.java b/...etric/db/mysql/MySqlSymmetricDialect.java → ...etric/db/mysql/MySqlSymmetricDialect.java
diff --git a/.../symmetric/db/mysql/MySqlTriggerText.java → .../symmetric/db/mysql/MySqlTriggerText.java b/.../symmetric/db/mysql/MySqlTriggerText.java → .../symmetric/db/mysql/MySqlTriggerText.java
diff --git a/...ric/db/oracle/OracleSymmetricDialect.java → ...ric/db/oracle/OracleSymmetricDialect.java b/...ric/db/oracle/OracleSymmetricDialect.java → ...ric/db/oracle/OracleSymmetricDialect.java
diff --git a/...ymmetric/db/oracle/OracleTriggerText.java → ...ymmetric/db/oracle/OracleTriggerText.java b/...ymmetric/db/oracle/OracleTriggerText.java → ...ymmetric/db/oracle/OracleTriggerText.java
diff --git a/...postgresql/GreenplumSymmetricDialect.java → ...postgresql/GreenplumSymmetricDialect.java b/...postgresql/GreenplumSymmetricDialect.java → ...postgresql/GreenplumSymmetricDialect.java
diff --git a/...c/db/postgresql/GreenplumTriggerText.java → ...c/db/postgresql/GreenplumTriggerText.java b/...c/db/postgresql/GreenplumTriggerText.java → ...c/db/postgresql/GreenplumTriggerText.java
diff --git a/...ostgresql/PostgreSqlSymmetricDialect.java → ...ostgresql/PostgreSqlSymmetricDialect.java b/...ostgresql/PostgreSqlSymmetricDialect.java → ...ostgresql/PostgreSqlSymmetricDialect.java
diff --git a/.../db/postgresql/PostgreSqlTriggerText.java → .../db/postgresql/PostgreSqlTriggerText.java b/.../db/postgresql/PostgreSqlTriggerText.java → .../db/postgresql/PostgreSqlTriggerText.java
@@ -146,5 +146,10 @@ public PostgreSqlTriggerText() {
         sqlTemplates.put("initialLoadSqlTemplate" ,
 "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                                " );
     }
+
+    @Override
+    protected boolean requiresWrappedBlobTemplateForBlobType() {
+        return true;
+    }
 
 }
diff --git a/...ric/db/sybase/SybaseSymmetricDialect.java → ...ric/db/sybase/SybaseSymmetricDialect.java b/...ric/db/sybase/SybaseSymmetricDialect.java → ...ric/db/sybase/SybaseSymmetricDialect.java
diff --git a/...ymmetric/db/sybase/SybaseTriggerText.java → ...ymmetric/db/sybase/SybaseTriggerText.java b/...ymmetric/db/sybase/SybaseTriggerText.java → ...ymmetric/db/sybase/SybaseTriggerText.java
diff --git a/...ic/service/jmx/NodeManagementService.java → ...ic/service/jmx/NodeManagementService.java b/...ic/service/jmx/NodeManagementService.java → ...ic/service/jmx/NodeManagementService.java
diff --git a/...rvice/jmx/ParameterManagementService.java → ...rvice/jmx/ParameterManagementService.java b/...rvice/jmx/ParameterManagementService.java → ...rvice/jmx/ParameterManagementService.java
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -17,7 +17,6 @@
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.common.TableConstants;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
-import org.jumpmind.symmetric.db.JdbcSymmetricDialectFactory;
 import org.jumpmind.symmetric.ext.IExtensionPointManager;
 import org.jumpmind.symmetric.io.DefaultOfflineClientListener;
 import org.jumpmind.symmetric.io.IOfflineClientListener;
@@ -193,8 +192,7 @@ protected void init() {
                 .getLong(ParameterConstants.CACHE_TIMEOUT_TABLES_IN_MS));
 
         this.bandwidthService = new BandwidthService(parameterService, log);
-        this.symmetricDialect = new JdbcSymmetricDialectFactory(parameterService, platform, log)
-                .create();
+        this.symmetricDialect = createSymmetricDialect();
         this.nodeService = new NodeService(parameterService, symmetricDialect);
         this.configurationService = new ConfigurationService(parameterService, symmetricDialect,
                 nodeService);
@@ -258,6 +256,8 @@ protected static ISecurityService createSecurityService() {
         // TODO check system property. integrate eric's changes
         return new SecurityService();
     }
+
+    abstract protected ISymmetricDialect createSymmetricDialect();
 
     abstract protected IJobManager createJobManager();
 

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/TriggerText.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/TriggerText.java
@@ -32,8 +32,6 @@
 import org.jumpmind.db.model.Table;
 import org.jumpmind.symmetric.Version;
 import org.jumpmind.symmetric.common.Constants;
-import org.jumpmind.symmetric.db.mssql.MsSqlSymmetricDialect;
-import org.jumpmind.symmetric.db.postgresql.PostgreSqlSymmetricDialect;
 import org.jumpmind.symmetric.io.data.DataEventType;
 import org.jumpmind.symmetric.model.Channel;
 import org.jumpmind.symmetric.model.Node;
@@ -527,6 +525,14 @@ protected String getPrimaryKeyWhereString(String alias, Column[] columns) {
         b.append("'");
         return b.toString();
     }
+
+    protected boolean requiresWrappedBlobTemplateForBlobType() {
+        return false;
+    }
+
+    protected boolean requiresEmptyLobTemplateForDeletes() {
+        return false;
+    }
 
     protected ColumnString buildColumnString(String origTableAlias, String tableAlias,
             String columnPrefix, Column[] columns, ISymmetricDialect symmetricDialect, DataEventType dml,
@@ -577,7 +583,7 @@ protected ColumnString buildColumnString(String origTableAlias, String tableAlia
                     isLob = true;
                     break;
                 case Types.BLOB:
-                    if (symmetricDialect instanceof PostgreSqlSymmetricDialect) {
+                    if (requiresWrappedBlobTemplateForBlobType()) {
                         templateToUse = wrappedBlobColumnTemplate;
                         isLob = true;
                         break;
@@ -634,7 +640,7 @@ protected ColumnString buildColumnString(String origTableAlias, String tableAlia
                             + column.getType() + " with JDBC type of " + column.getJdbcTypeName());
                 }
 
-                if (dml == DataEventType.DELETE && isLob && symmetricDialect instanceof MsSqlSymmetricDialect) {
+                if (dml == DataEventType.DELETE && isLob && requiresEmptyLobTemplateForDeletes()) {
                     templateToUse = emptyColumnTemplate;
                 } else if (isLob && trigger.isUseStreamLobs()) {
                     templateToUse = emptyColumnTemplate;