0005283: Added tables from console-schema.xml to pro user guide

JumpMind · Apr 29, 2022 · b624b0e · b624b0e
1 parent 4ba6452
commit b624b0e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/symmetric-assemble/asciidoc.gradle b/symmetric-assemble/asciidoc.gradle
@@ -113,6 +113,15 @@ task generateAppendixes {
 					'asciidoc'        		
         		]
         	}
+
+	        javaexec {
+	            main = 'org.jumpmind.db.io.DatabaseXmlAsciiDocBuilder'
+	            classpath = configurations.generateAppendixesDependencies
+	            args = [
+	                symAssembleDir + '/../symmetric-core/src/main/resources/symmetric-schema.xml,' + symAssembleDir + '/../../symmetric-pro/symmetric-pro/src/main/resources/console-schema.xml',
+	                symAssembleDir + '/src/asciidoc/generated/schema.ad'
+	            ]
+	        }
         } else {
         	javaexec {
             	main = 'org.jumpmind.properties.DefaultParameterParser'
@@ -129,22 +138,23 @@ task generateAppendixes {
             	main = 'org.jumpmind.properties.DefaultParameterParser'
             	classpath = configurations.generateAppendixesDependencies
             	args = [
-             	   symAssembleDir + '/../symmetric-core/src/main/resources/symmetric-default.properties',
-             	   symAssembleDir + '/src/asciidoc/generated/runtime-parameters.ad',
-             	   'true',
-            	   'asciidoc'
+             	    symAssembleDir + '/../symmetric-core/src/main/resources/symmetric-default.properties',
+             	    symAssembleDir + '/src/asciidoc/generated/runtime-parameters.ad',
+             	    'true',
+            	    'asciidoc'
            	 	]
-       		 }
+       		}
+
+	        javaexec {
+	            main = 'org.jumpmind.db.io.DatabaseXmlAsciiDocBuilder'
+	            classpath = configurations.generateAppendixesDependencies
+	            args = [
+	                symAssembleDir + '/../symmetric-core/src/main/resources/symmetric-schema.xml',
+	                symAssembleDir + '/src/asciidoc/generated/schema.ad'
+	            ]
+	        }
         }
 
-        javaexec {
-            main = 'org.jumpmind.db.io.DatabaseXmlAsciiDocBuilder'
-            classpath = configurations.generateAppendixesDependencies
-            args = [
-                symAssembleDir + '/../symmetric-core/src/main/resources/symmetric-schema.xml',
-                symAssembleDir + '/src/asciidoc/generated/schema.ad'
-            ]
-        }
     }
 }
 

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlAsciiDocBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlAsciiDocBuilder.java
@@ -25,6 +25,9 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.jumpmind.db.model.Column;
 import org.jumpmind.db.model.Database;
@@ -38,10 +41,15 @@ public static void main(String[] args) throws Exception {
             System.err.println("Usage: <input_xml_file> <output_asciidoc_file>");
             System.exit(-1);
         }
-        Database db = DatabaseXmlUtil.read(new File(args[0]));
+        String[] paths = args[0].split(",");
+        List<Table> allTables = new ArrayList<Table>();
+        for (String path : paths) {
+            Database db = DatabaseXmlUtil.read(new File(path));
+            allTables.addAll(Arrays.asList(db.getTables()));
+        }
+        allTables.sort(null);
         PrintWriter out = new PrintWriter(new FileWriter(args[1]));
-        Table[] tables = db.getTables();
-        for (Table table : tables) {
+        for (Table table : allTables) {
             out.println("=== " + table.getName().toUpperCase());
             out.println();
             if (isNotBlank(table.getDescription())) {