Merge branch 'develop' into 'master'

Develop

See merge request !40

hl7templates/hl7templates-packager-jar/src/test/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/scripts/EHDSITransformers.java → hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/scripts/EHDSITransformers.java

-package net.ihe.gazelle.lib.hl7templatespackager.peripherals.scripts;
+package net.ihe.gazelle.lib.hl7templatespackager.adapters.scripts;
 
 import net.ihe.gazelle.tempgen.ehdsi.scripts.EHDSIFriendlyTransformer;
 
-import org.junit.Ignore;
-import org.junit.Test;
-
 import javax.xml.bind.JAXBException;
 import java.io.IOException;
 
 
-/**
- * All methods in this class are ignored, as they are executed as scripts and not tests
- */
+
 public class EHDSITransformers {
 
-    @Test
-    @Ignore
+    public static void main(String[] args) throws JAXBException, IOException {
+        //Set required system properties for log4j to avoid errors (not used)
+        System.setProperty("workspaceRoot","/tmp");
+        System.setProperty("generationDate","tmp");
+        EHDSITransformers e = new EHDSITransformers();
+        e.transformBBRToFriendly();
+    }
+
     public void transformBBRToFriendly() throws IOException, JAXBException {
         String bbrPath = System.getProperty("bbrPath");
         String bbrOutput = System.getProperty("bbrOutput");

hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh

@@ -36,7 +36,7 @@ function friendly_trannsform {
   packagerPath=`realpath ..`
   packagerFolder=${packagerPath##*/}
   if [ $packagerFolder == "hl7templates-packager-jar" ]; then
-    $mavenPath -f "$packagerPath/pom.xml" -Dtest=EHDSITransformers#transformBBRToFriendly test -DbbrPath="$bbrPath" -DbbrOutput="$bbrFriendlyOutput"
+    $mavenPath -f "$packagerPath/pom.xml" compile exec:java -Dexec.mainClass="net.ihe.gazelle.lib.hl7templatespackager.adapters.scripts.EHDSITransformers" -DbbrPath="$bbrPath" -DbbrOutput="$bbrFriendlyOutput"
     if [ $? == 0 ]; then
       bbrPath=$bbrFriendlyOutput
       echo -e "${GREEN}BBR Transformed to friendly at: ${bbrFriendlyOutput}${NC}"