#378 Tokens are now replaced in schemas

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java

@@ -111,6 +111,12 @@ protected SchemasLoader buildSchemasLoader(CommandContext context, DatabaseClien
 		if (filter != null) {
 			schemasLoader.addFileFilter(filter);
 		}
+
+		// TODO Should rename this method to something more generic than "modules"; not sure what that should be yet
+		if (appConfig.isReplaceTokensInModules()) {
+			schemasLoader.setTokenReplacer(appConfig.buildTokenReplacer());
+		}
+
 		return schemasLoader;
 	}
 

src/test/java/com/marklogic/appdeployer/command/schemas/LoadSchemasTest.java

@@ -5,7 +5,10 @@
 import com.marklogic.appdeployer.command.databases.DeployOtherDatabasesCommand;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.document.GenericDocumentManager;
+import com.marklogic.client.io.BytesHandle;
+import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.DocumentMetadataHandle;
+import com.marklogic.client.io.StringHandle;
 import org.junit.After;
 import org.junit.Test;
 
@@ -49,6 +52,8 @@ public void databaseSpecificPaths() {
 	@Test
 	public void testSchemaLoading() {
 		initializeAppDeployer(new DeployOtherDatabasesCommand(1), newCommand());
+
+		appConfig.getCustomTokens().put("%%replaceMe%%", "world");
 		appDeployer.deploy(appConfig);
 
 		DatabaseClient client = appConfig.newSchemasDatabaseClient();
@@ -60,6 +65,10 @@ public void testSchemaLoading() {
 		assertNotNull("XSD document loaded", docMgr.exists("/x.xsd").getUri());
 		assertNull(docMgr.exists("/.do-not-load"));
 		assertNull(docMgr.exists(".do-not-load"));
+
+		String content = new String(docMgr.read("/x.xsd", new BytesHandle()).get());
+		assertTrue("Tokens should be replaced when schemas are loaded; actual content: " + content,
+			content.contains("<hello>world</hello>"));
 	}
 
 	@Test

src/test/resources/sample-app/src/main/ml-schemas/x.xsd

@@ -1,2 +1,3 @@
 <xsm>
+	<hello>%%replaceMe%%</hello>
 </xsm>