Merge remote-tracking branch 'origin/dev-1.66'

Conflicts: src/main/resources/xsl/GenericTransformer/RVK-transformer.xsl src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl src/main/resources/xsl/YamlCompiler/EP-2-XML-4-JSON-mapping.xsl src/main/resources/xsl/YamlCompiler/EP-JSON.xsl src/main/resources/xsl/YamlCompiler/EP-YAML.xsl src/main/resources/xsl/YamlCompiler/Imvert2OpenAPI-KING-endproduct-xml.xsl
Imvertor · May 4, 2022 · 12c3da6 · 12c3da6
2 parents db2e33d + 23468a3
commit 12c3da6
Show file tree

Hide file tree

Showing 372 changed files with 3,398 additions and 43,954 deletions.
diff --git a/pom.xml b/pom.xml
@@ -241,14 +241,7 @@
       <version>2.9.9</version>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.10.0.pr1</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
+     <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>

diff --git a/src/main/java/nl/imvertor/ChainRegression.java b/src/main/java/nl/imvertor/ChainRegression.java
@@ -64,11 +64,13 @@ public static void main(String[] args) {
 
 		    configurator.save();
 
-		    configurator.getRunner().info(logger,"Processing " + configurator.getXParm("cli/tstfolder"));
+		    String owners = configurator.getXParm("cli/regowner");
+		    configurator.getRunner().info(logger,"Testing for owners: " +  (owners == null ? "(all available)" : owners));
+		    configurator.getRunner().setDebug();
 
 		    boolean succeeds = true;
-		    		    
-			// compile regression test xml
+
+		   // compile regression test xml
 		    succeeds = succeeds && (new RegressionExtractor()).run();
 
 			// analyze this run. 

diff --git a/src/main/java/nl/imvertor/ChainTranslateAndReport.java b/src/main/java/nl/imvertor/ChainTranslateAndReport.java
@@ -37,6 +37,7 @@
 import nl.imvertor.ModelHistoryAnalyzer.ModelHistoryAnalyzer;
 import nl.imvertor.OfficeCompiler.OfficeCompiler;
 import nl.imvertor.ReadmeCompiler.ReadmeCompiler;
+import nl.imvertor.RegressionExtractor.RegressionExtractor;
 import nl.imvertor.ReleaseComparer.ReleaseComparer;
 import nl.imvertor.ReleaseCompiler.ReleaseCompiler;
 import nl.imvertor.Reporter.Reporter;
@@ -228,7 +229,12 @@ public static void main(String[] args) {
 
 				    if (configurator.isTrue("cli","createyaml",false)) 
 			    		succeeds = succeeds && (new YamlCompiler()).run();
-
+
+				    // finally, a regression test if requested
+				    if (configurator.isTrue("cli","regression",false)) {
+				    	configurator.setXParm("cli/identifier","DEVELOPMENT");
+				    	succeeds = succeeds && (new RegressionExtractor()).run();
+				    }
 			    }
 			} catch (Exception e) {
 				configurator.getRunner().error(logger,"Step-level system error - Please notify your system administrator: " + e.getMessage(),e);

diff --git a/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java b/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java
@@ -25,6 +25,7 @@
 import nl.imvertor.common.Step;
 import nl.imvertor.common.Transformer;
 import nl.imvertor.common.file.AnyFolder;
+import nl.imvertor.common.file.ShaclFile;
 import nl.imvertor.common.file.XmlFile;
 
 /**
@@ -57,6 +58,13 @@ public boolean run() throws Exception{
 
 		succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath", "properties/WORK_CONFIG_FILE", "properties/IMVERTOR_CONFIG_XSLPATH") : false ;
 
+		// Save cfg file to etc folder
+		AnyFolder etcFolder = new AnyFolder(configurator.getXParm("system/work-etc-folder-path"));
+		XmlFile cfgFile = new XmlFile(configurator.getXParm("properties/WORK_CONFIG_FILE"));
+		XmlFile appCfgFile = new XmlFile(etcFolder,"config.xml");
+		cfgFile.copyFile(appCfgFile);
+
+		// create the EA profile/toolbox when requested
 		Boolean p = configurator.isTrue(configurator.getXParm("cli/createeaprofile",false));
 		Boolean q = configurator.isTrue(configurator.getXParm("cli/createeatoolbox",false));
 

diff --git a/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java
@@ -128,10 +128,13 @@ public void generateOfficeReport() throws Exception {
 						succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_METAMODEL_" + mm + "_MODELDOC_RESPEC_XSLPATH") : false;
 						if (succeeds) processDoc(fn,"respec.full.html","appinfo/full-respec-documentation-filename","properties/WORK_RESPEC_FILE","none");
 					}
-					// process catalog only
+					// process catalog only, save as HTML
 					transformer.setXslParm("catalog-only", "true");
 					succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_METAMODEL_" + mm + "_MODELDOC_RESPEC_XSLPATH") : false;
 					if (succeeds) processDoc(fn,"respec.html","appinfo/respec-documentation-filename","properties/WORK_RESPEC_FILE",configurator.getXParm("cli/passoffice",false));
+					// process catalog only, save as XHTML
+					succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_MODELDOC_RESPEC_XSLPATH") : false;
+					if (succeeds) processDoc(fn,"respec.catalog.xhtml","appinfo/respec-documentation-filename","properties/WORK_RESPEC_FILE","none");
 				}
 			} else {
 				runner.error(logger,"No (valid) office variant specified: " + vr.toString());