From 39961e51d8344df2967c2fe0e3334431d8bf57d0 Mon Sep 17 00:00:00 2001 From: elong Date: Tue, 19 Apr 2016 16:25:17 -0400 Subject: [PATCH] 0002564: cleanup. --- symmetric-assemble/src/asciidoc/advanced-topics.ad | 8 ++++++++ .../main/java/org/jumpmind/symmetric/io/DbCompare.java | 6 ------ .../java/org/jumpmind/symmetric/io/DbCompareTables.java | 5 +---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/symmetric-assemble/src/asciidoc/advanced-topics.ad b/symmetric-assemble/src/asciidoc/advanced-topics.ad index c55d1f7010..38417f9b7f 100644 --- a/symmetric-assemble/src/asciidoc/advanced-topics.ad +++ b/symmetric-assemble/src/asciidoc/advanced-topics.ad @@ -306,6 +306,14 @@ keytool -keystore keystore -storetype jceks -alias sym -keypasswd keytool -keystore keystore -storetype jceks -alias sym.secret -keypasswd ---- +* (Optional) Obfuscate the password to prevent casual observation from the configuration files. An obfuscated password starts with "obf:" +while a cleartext password does not. + +[source, cli] +---- +syadmin obfuscate-text changeit +---- + * Edit `bin/setenv` (or `bin\setenv.bat` on Windows) and `conf/sym_service.conf` files to find a similar line as below to change the password. [source, cli] diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java index 88e8eba912..4652caed29 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java @@ -20,17 +20,13 @@ */ package org.jumpmind.symmetric.io; -import java.io.FileOutputStream; -import java.io.OutputStream; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; -import org.apache.xalan.templates.FuncKey; import org.jumpmind.db.model.Column; import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.DatabaseInfo; @@ -40,11 +36,9 @@ import org.jumpmind.db.sql.ISqlReadCursor; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; -import org.jumpmind.db.util.BinaryEncoding; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.common.TableConstants; import org.jumpmind.symmetric.io.DbCompareReport.TableReport; -import org.jumpmind.symmetric.io.data.transform.TransformColumn; import org.jumpmind.symmetric.model.Trigger; import org.jumpmind.symmetric.service.impl.TransformService.TransformTableNodeGroupLink; import org.slf4j.Logger; diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareTables.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareTables.java index 6b29e89025..4326a0c8a6 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareTables.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompareTables.java @@ -33,6 +33,7 @@ import org.jumpmind.symmetric.service.impl.TransformService.TransformTableNodeGroupLink; public class DbCompareTables { + private Table sourceTable; private Table targetTable; private TransformTableNodeGroupLink transform; @@ -66,7 +67,6 @@ public void applyColumnMappings() { } protected void applyColumnMappingsFromTransform() { - for (Column sourceColumn : sourceTable.getColumns()) { List sourceTransformColumns = transform.getTransformColumnFor(sourceColumn.getName()); if (!sourceTransformColumns.isEmpty()) { @@ -84,9 +84,6 @@ protected void applyColumnMappingsFromTransform() { } } } - - // when column policy is specified, make sure - } protected void applyColumnMappingsDefault() {