From 96a8c1fdfbd9ce6478710aab5cd4e1c72428be63 Mon Sep 17 00:00:00 2001
From: szymonsztuka <szymon.sztuka@yahoo.com>
Date: Mon, 13 Aug 2018 16:55:57 +0100
Subject: [PATCH] Re-enable database migration tool to migrated databse
(mapped) schemas from Cordapps in 'cordapps' directory - regression
introduced by CORDA-1799.
---
.../src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt b/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt
index 0be8eb8c9d..c282dc289b 100644
--- a/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt
+++ b/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt
@@ -133,7 +133,7 @@ private fun runCommand(options: OptionSet, parser: OptionParser) {
errorAndExit("Not a valid node folder. Could not find the config file: '$config'.")
}
val nodeConfig = ConfigHelper.loadConfig(baseDirectory, config).parseAsNodeConfiguration()
- val cordappLoader = JarScanningCordappLoader.fromDirectories(setOf(baseDirectory))
+ val cordappLoader = JarScanningCordappLoader.fromDirectories(setOf(baseDirectory, baseDirectory / "cordapps"))
val schemaService = NodeSchemaService(extraSchemas = cordappLoader.cordappSchemas, includeNotarySchemas = nodeConfig.notary != null)