Fix/small freemarker example and generator adjustments (#183)

Author: stefan-ka

.travis.yml

@@ -33,3 +33,8 @@ before_install:
 - openssl aes-256-cbc -K $encrypted_324cf7253e32_key -iv $encrypted_324cf7253e32_iv
   -in secret-key.gpg.enc -out secret-key.gpg -d
 
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.gradle
+

org.contextmapper.dsl.ui/samples/freemarker/markdown-templates/glossary/GlossaryTemplate.md.ftl

@@ -1,12 +1,21 @@
-Glossary for '${filename}'
-=========================
+---
+title: Glossary for '${fileName}'
+project: ${projectName}
+author: ${userName}
+date: ${timeStamp}, Context Mapper version ${contextMapperVersion}
+copyright: The authors, 2020. All rights reserved.
+---
 
-This glossary forms the [ubiquituous language](https://martinfowler.com/bliki/UbiquitousLanguage.html) for '${filename}'.
+Ubiquitous Language Glossary for '${fileName}'
+=============================================
 
-Analysis Model 
+This glossary forms the [ubiquituous language](https://martinfowler.com/bliki/UbiquitousLanguage.html) for '${fileName}'.
+
+Analysis Model
 --------------
 
-### Domain Overview
+<#if domains?has_content>
+## Domain Overview
 
 <#list domains as d>
 Domain `${d.name}` has the  following domain vision statement: 
@@ -24,7 +33,9 @@ ${d.name} contains the following subdomains:
 </#list>
 
 ### Entities
-<#list d.subdomains as sd><#list sd.entities as e><#if e?has_content>
+<#list d.subdomains as sd>
+<#list sd.entities as e>
+<#if e?has_content>
 #### ${e.name}
 Entity in subdomain ${sd.name} (in domain ${d.name}).
 <#if e.hint?has_content>
@@ -45,15 +56,17 @@ Hint: ${e.hint!"*no hint given*"}
  * ${uc.name}
 </#list> 
 </#if>
+</#if>
 
 Design Model
-============
+------------
 
-## Overview
+<#if filterBoundedContexts(boundedContexts)?has_content>
+## Bounded Context Overview
 
 The following [bounded context](https://martinfowler.com/bliki/BoundedContext.html)s are defined:
 
-<#list boundedContexts as bc>
+<#list filterBoundedContexts(boundedContexts) as bc>
 * *${bc.name}*: ${bc.domainVisionStatement!"[domain vision of the context not defined]"} 
 </#list>
 
@@ -150,12 +163,14 @@ It contains the following Bounded Contexts:
  * ${bc.name}
 </#list>
 </#if>
+</#if>
 
-
+<#if filterTeams(boundedContexts)?has_content>
 ## Teams 
 <#list filterTeams(boundedContexts) as team>
  * ${team.name}
 </#list>
+</#if>
 
 <#macro renderDomainObjectOperationsAndAttributes simpleDomainObject>
 <#if simpleDomainObject.operations?has_content>

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/handler/GenericTextFileGenerationHandler.java

@@ -26,6 +26,7 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
@@ -82,7 +83,9 @@ public void run() {
 	}
 
 	private void registerCustomGenerationVariables(ExecutionEvent event) {
-		generator.registerCustomModelProperty("projectname", getSelectedFile(event).getProject().getName());
+		String projectName = getSelectedFile(event).getProject().getName();
+		generator.registerCustomModelProperty("projectname", projectName); // for backwards compatibility
+		generator.registerCustomModelProperty("projectName", projectName);
 		Bundle contextMapperBundle = Platform.getBundle("org.contextmapper.dsl.ui");
 		if (contextMapperBundle != null)
 			generator.registerCustomModelProperty("contextMapperVersion", contextMapperBundle.getVersion().toString());
@@ -94,7 +97,8 @@ private GenerateGenericTextFileContext getLastStoredContext(ExecutionEvent event
 			Map<QualifiedName, String> properties = selectedCmlFile.getPersistentProperties();
 			if (!properties.containsKey(getQualifiedName4File(selectedCmlFile, LAST_SELECTED_TEMPLATE_PROPERTY)))
 				return context;
-			IFile templateFile = findFileInContainer(selectedCmlFile.getProject(), properties.get(getQualifiedName4File(selectedCmlFile, LAST_SELECTED_TEMPLATE_PROPERTY)));
+			IFile templateFile = findFileInContainer(selectedCmlFile.getWorkspace().getRoot(),
+					properties.get(getQualifiedName4File(selectedCmlFile, LAST_SELECTED_TEMPLATE_PROPERTY)));
 			context.setFreemarkerTemplateFile(templateFile);
 			if (properties.containsKey(getQualifiedName4File(selectedCmlFile, LAST_TARGET_FILE_NAME_PROPERTY)))
 				context.setTargetFileName(properties.get(getQualifiedName4File(selectedCmlFile, LAST_TARGET_FILE_NAME_PROPERTY)));
@@ -106,8 +110,9 @@ private GenerateGenericTextFileContext getLastStoredContext(ExecutionEvent event
 
 	private void persistContext(GenerateGenericTextFileContext context) {
 		try {
+			IFile templateFile = context.getFreemarkerTemplateFile();
 			selectedCmlFile.setPersistentProperty(getQualifiedName4File(selectedCmlFile, LAST_SELECTED_TEMPLATE_PROPERTY),
-					context.getFreemarkerTemplateFile().getProjectRelativePath().toString());
+					templateFile.getProject().getName() + IPath.SEPARATOR + templateFile.getProjectRelativePath().toString());
 			selectedCmlFile.setPersistentProperty(getQualifiedName4File(selectedCmlFile, LAST_TARGET_FILE_NAME_PROPERTY), context.getTargetFileName());
 		} catch (CoreException e) {
 			StatusManager.getManager().handle(new Status(IStatus.ERROR, DslActivator.PLUGIN_ID, "Could not persist template file location.", e));

org.contextmapper.dsl/src/org/contextmapper/dsl/generator/freemarker/FreemarkerTextGenerator.java

@@ -88,9 +88,15 @@ private Map<String, Object> prepareModelData(ContextMappingModel contextMappingM
 		dataMap.put("domains", contextMappingModel.getDomains());
 		dataMap.put("imports", contextMappingModel.getImports());
 		dataMap.put("useCases", contextMappingModel.getUseCases());
-		dataMap.put("timestamp", new SimpleDateFormat("dd.MM.YYYY HH:mm:ss z").format(new Date()));
-		dataMap.put("filename", contextMappingModel.eResource().getURI().lastSegment().toString());
-		dataMap.put("username", System.getProperty("user.name"));
+		String timeStamp = new SimpleDateFormat("dd.MM.YYYY HH:mm:ss z").format(new Date());
+		dataMap.put("timestamp", timeStamp); // for backwards compatibility
+		dataMap.put("timeStamp", timeStamp);
+		String fileName = contextMappingModel.eResource().getURI().lastSegment().toString();
+		dataMap.put("filename", fileName); // for backwards compatibility
+		dataMap.put("fileName", fileName);
+		String userName = System.getProperty("user.name");
+		dataMap.put("username", userName); // for backwards compatibility
+		dataMap.put("userName", userName);
 
 		dataMap.putAll(createTemplatingHelperMethods());
 		dataMap.putAll(createClassMap());