Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.8
JumpMind · Oct 12, 2017 · 14ecb26 · 14ecb26
2 parents 7b8dd10 + 3d37923
commit 14ecb26
Show file tree

Hide file tree

Showing 130 changed files with 510 additions and 10,336 deletions.
diff --git a/symmetric-assemble/asciidoc.gradle b/symmetric-assemble/asciidoc.gradle
@@ -133,6 +133,7 @@ task publishDoc {
 
         ant.scp(
             todir: "$publishUser:$publishPassword@$publishServer:~/www/doc/$majorMinorVersion",
+            port: "$publishPort",
             trust: 'true',
             verbose: 'true') {
             fileset(dir: "$buildDir/doc") { include(name: '**/**')

diff --git a/symmetric-assemble/gradle.properties b/symmetric-assemble/gradle.properties
@@ -7,6 +7,7 @@ deployUploadUrl=?
 docFormat=html5
 publishUser=?
 publishPassword=?
+publishPort=?
 publishServer=symmetricds.org
 sourceforgeUser=?
 sourceforgePassword=?
diff --git a/symmetric-assemble/src/asciidoc/advanced-topics.ad b/symmetric-assemble/src/asciidoc/advanced-topics.ad
@@ -296,6 +296,18 @@ keytool -keystore cacerts -import -alias sym -file sym.cer
 * Copy the cacerts file that is generated by this process to
 the `security` directory of each client's SymmetricDS installation.
 
+==== Importing Signed Certificates from PKCS 12 files
+
+You would use the following command to import a p12 certificate into the SymmetricDS keystore:
+
+[source, cli]
+----
+keytool -delete -alias sym -noprompt -keystore keystore -storetype jceks -storepass changeit
+
+keytool -importkeystore -deststorepass changeit -destkeypass changeit -destkeystore keystore -storetype jceks -srckeystore {yourcert.p12} -srcstoretype PKCS12 -srcstorepass {pkcs12 password} -srcalias {pkcs12 alias} -destalias sym
+----
+
+
 ==== Changing Keystore Password
 
 The keystore and each key entry is protected with a password that defaults to "changeit".  To change the password, use the following steps:

diff --git a/symmetric-assemble/src/asciidoc/appendix/db2.ad b/symmetric-assemble/src/asciidoc/appendix/db2.ad
@@ -47,7 +47,13 @@ CREATE SYSTEM TEMPORARY TABLESPACE tmp_tbsp
 |DecFloat|No
 |Binary, VarBinary|No
 |===    
-
+
+By default DB2 will not capture the transaction id associated with the captured data.   This can be turned on with the following parameter.
+
+----
+db2.capture.transaction.id=false
+----
+
 === DB2 for IBM i
 The DB2 for IBM i dialect can connect to a database on IBM iSeries (AS/400) machines.  It was tested with the
 http://jt400.sourceforge.net/[jt400 JDBC driver], which is already included in the SymmetricDS download.

diff --git a/symmetric-assemble/src/assembly/assembly-android.xml b/symmetric-assemble/src/assembly/assembly-android.xml
diff --git a/symmetric-assemble/src/assembly/assembly-client.xml b/symmetric-assemble/src/assembly/assembly-client.xml
diff --git a/symmetric-assemble/src/assembly/assembly-docbook.xml b/symmetric-assemble/src/assembly/assembly-docbook.xml
diff --git a/symmetric-assemble/src/assembly/assembly-server.xml b/symmetric-assemble/src/assembly/assembly-server.xml