#47 Surrounding token with %%

gradle.properties

@@ -16,5 +16,6 @@ publishUrl=file:../gh-pages-marklogic-java/releases
 # 2.0a15 AbstractResourceCommand now sorts files
 # 2.0b1 Repackaged, added GroupManager
 # 2.0b2 Using ml-javaclient-util 2.2
-version=2.0b2
+# 2.0b3 Cert template IDs are stored in the custom tokens map
+version=2.0b3
 

src/main/java/com/rjrudin/marklogic/appdeployer/command/AbstractResourceCommand.java

@@ -104,7 +104,7 @@ protected void storeTokenForResourceId(SaveReceipt receipt, CommandContext conte
             resourceName = tokens[tokens.length - 3];
         }
 
-        String key = resourceName + "-id-" + receipt.getResourceId();
+        String key = "%%" + resourceName + "-id-" + receipt.getResourceId() + "%%";
         if (logger.isInfoEnabled()) {
             logger.info(format("Storing token with key '%s' and value '%s'", key, idValue));
         }

src/test/java/com/rjrudin/marklogic/appdeployer/command/security/ManageCertificateTemplatesTest.java

@@ -33,7 +33,7 @@ protected String[] getResourceNames() {
     @Override
     protected void afterResourcesCreated() {
         Map<String, String> customTokens = appConfig.getCustomTokens();
-        String key = "certificate-templates-id-sample-app-template";
+        String key = "%%certificate-templates-id-sample-app-template%%";
         assertNotNull(
                 "The cert template ID should have been stored in the tokens map so that it can be referenced in an HTTP server file",
                 customTokens.get(key));
@@ -45,7 +45,7 @@ protected void afterResourcesCreated() {
     @Override
     protected void afterResourcesCreatedAgain() {
         Map<String, String> customTokens = appConfig.getCustomTokens();
-        String key = "certificate-templates-id-sample-app-template";
+        String key = "%%certificate-templates-id-sample-app-template%%";
         assertNotNull("Verifying that the cert template ID is stored on an update as well", customTokens.get(key));
     }