diff --git a/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java b/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java index 2719b723b7..6c3157eee7 100644 --- a/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java +++ b/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java @@ -53,7 +53,7 @@ protected static ISymmetricEngine prepareRoot(String sql) { public static IDatabasePlatform dropDatabaseTables(String databaseType, ISymmetricEngine engine) { - engine.uninstall(); + engine.uninstall(); ISymmetricDialect dialect = engine.getSymmetricDialect(); diff --git a/symmetric-client/src/test/resources/log4j.xml b/symmetric-client/src/test/resources/log4j.xml index 1e9b971da2..2eb689d987 100644 --- a/symmetric-client/src/test/resources/log4j.xml +++ b/symmetric-client/src/test/resources/log4j.xml @@ -23,7 +23,6 @@ - --> @@ -32,6 +31,8 @@ + + --> diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java index 81a5faf1dd..1c9ab0c7ea 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java @@ -114,7 +114,7 @@ abstract public class AbstractSymmetricEngine implements ISymmetricEngine { protected ISecurityService securityService; - protected IParameterService parameterService; + protected ParameterService parameterService; protected ISymmetricDialect symmetricDialect; @@ -506,6 +506,9 @@ public synchronized boolean start(boolean startJobs) { public synchronized void uninstall() { + + log.warn("Attempting an uninstall of all SymmetricDS database objects from the database"); + stop(); try { @@ -532,6 +535,10 @@ public synchronized void uninstall() { symmetricDialect.dropTablesAndDatabaseObjects(); + parameterService.setDatabaseHasBeenInitialized(false); + + log.warn("Finished uninstalling SymmetricDS database objects from the database"); + } public synchronized void stop() {