Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 585b9f57 authored by Achraf Achkari's avatar Achraf Achkari
Browse files

Fix Pipeline Jacoco

parent 52705958
No related branches found
No related tags found
2 merge requests!2Release GOC,!1Release GOC
Hide whitespace changes
Inline Side-by-side
Showing
with 57 additions and 29 deletions
archetype/generated-validator/pom.xml
+ 8
− 0
View file @ 585b9f57
......@@ -2,6 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gazelle-objects-checker</artifactId>
<groupId>net.ihe.gazelle</groupId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.goc</groupId>
......
hl7templates/gocmodel-jar/src/main/resources/log4j.properties
+ 2
− 2
View file @ 585b9f57
......@@ -2,13 +2,13 @@ log4j.rootLogger=DEBUG, SYN_FILE, GLB_FILE
log4j.appender.SYN_FILE=org.apache.log4j.FileAppender
log4j.appender.SYN_FILE.Threshold=INFO
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC.log
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/detailed_report.log
log4j.appender.SYN_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.SYN_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
log4j.appender.GLB_FILE=org.apache.log4j.FileAppender
log4j.appender.GLB_FILE.Threshold=WARN
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC_Report.txt
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/generation_report.log
log4j.appender.GLB_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.GLB_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
hl7templates/hl7templates-generator-jar/src/main/resources/log4j.properties
+ 2
− 2
View file @ 585b9f57
......@@ -2,13 +2,13 @@ log4j.rootLogger=DEBUG, SYN_FILE, GLB_FILE
log4j.appender.SYN_FILE=org.apache.log4j.FileAppender
log4j.appender.SYN_FILE.Threshold=INFO
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC.log
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/detailed_report.log
log4j.appender.SYN_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.SYN_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
log4j.appender.GLB_FILE=org.apache.log4j.FileAppender
log4j.appender.GLB_FILE.Threshold=WARN
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC_Report.txt
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/generation_report.log
log4j.appender.GLB_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.GLB_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
hl7templates/hl7templates-model-jar/src/main/resources/log4j.properties
+ 2
− 2
View file @ 585b9f57
......@@ -2,13 +2,13 @@ log4j.rootLogger=DEBUG, SYN_FILE, GLB_FILE
log4j.appender.SYN_FILE=org.apache.log4j.FileAppender
log4j.appender.SYN_FILE.Threshold=INFO
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC.log
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/detailed_report.log
log4j.appender.SYN_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.SYN_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
log4j.appender.GLB_FILE=org.apache.log4j.FileAppender
log4j.appender.GLB_FILE.Threshold=WARN
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC_Report.txt
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/generation_report.log
log4j.appender.GLB_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.GLB_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
hl7templates/hl7templates-packager-jar/pom.xml
+ 21
− 0
View file @ 585b9f57
......@@ -63,6 +63,27 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/extra-resources</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/assemble-scripts/</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCLoggerImpl.java
+ 2
− 2
View file @ 585b9f57
......@@ -59,11 +59,11 @@ public class GOCLoggerImpl implements GOCLogger {
public GOCLoggerImpl(String workspaceRoot, String generationDate){
this.workspaceRoot = workspaceRoot;
this.generationDate = generationDate;
this.GOCDetailedLogPath = workspaceRoot +"logs/log-"+generationDate+"/GOC.log" ;
this.GOCDetailedLogPath = workspaceRoot +"logs/log-"+generationDate+"/detailed_report.log" ;
this.GOCCmdLogPath = workspaceRoot+"logs/log-"+generationDate+"/cmdOutput.log";
try {
FileOutputStream fileOutputStream = new FileOutputStream(workspaceRoot +"logs/log-"+generationDate+"/GOC_Report.txt",true);
FileOutputStream fileOutputStream = new FileOutputStream(workspaceRoot +"logs/log-"+generationDate+"/generation_report.log",true);
this.logStream = new PrintStream(fileOutputStream);
} catch (FileNotFoundException e) {
log.error("Failed to create a stream with synthetic log file, you can check all logs in: {}",GOCDetailedLogPath);
......
hl7templates/hl7templates-packager-jar/src/main/resources/assemble-scripts/eHDSIGeneration.sh
+ 18
− 19
View file @ 585b9f57
......@@ -10,18 +10,18 @@ NC='\033[0m'
jarPath=`ls -l | grep -oh -e "[^ ]*-jar-with-dependencies\.jar"`
if [ -z $jarPath ]; then
echo -e "${RED}Could not detect the JAR of GOC, please provide the path manually"
echo -e "${ORANGE}Could not detect the JAR of GOC, please provide the path manually${NC}"
read -r jarPath
else
absJarPath=`realpath $jarPath`
echo -e "${NC}A GOC JAR has been detected at: (${jarPath}) want you to use it?"
echo -e "${GREEN}A GOC JAR has been detected at: (${jarPath}) want you to use it?${NC}"
printf "hit enter for yes, enter an other path to change it: "
read -r newJarPath
if [ ! -z $newJarPath ]; then
isAbsPath=`echo "${newJarPath}" | grep ^/.* | wc -l`
if [ $isAbsPath -eq 0 ]; then
echo -e "${RED}[ ${newJarPath} ] is not an absolute path"
exit 0
echo -e "${RED}[ ${newJarPath} ] is not an absolute path${NC}"
exit 1
fi
absJarPath=$newJarPath
fi
......@@ -30,31 +30,30 @@ fi
#Try to get maven path automatically
mavenPath=`mvn -v | sed -n 2p | grep -oh -e "/.*"`
if [ -z $mavenPath ];then
echo -e "${NC}Could not detect a maven installation, please enter the absolute to the binary file of maven: "
echo -e "${ORANGE}Could not detect a maven installation, please enter the absolute to the binary file of maven: ${NC}"
read -r mavenPath
testMaven=`${mavenPath} -v`
if [ -z $testMaven ];then
echo -e "${NC}Wrong maven executable..."
echo -e "${RED}Wrong maven executable...${NC}"
exit 1
fi
else
mavenPath="${mavenPath}/bin/mvn"
fi
echo -e "${NC}Using maven at: ${mavenPath}"
echo -e "${GREEN}Using maven at: ${mavenPath}${NC}"
printf "Please enter a path to your BBR (Absolute Path) : "
read -r bbrPath
echo -e $bbrPath
isAbsPath=`echo "${bbrPath}" | grep ^/.* | wc -l`
if [ $isAbsPath -eq 0 ]; then
echo -e "${RED}[ ${bbrPath} ] is not an absolute path"
exit 0
echo -e "${RED}[ ${bbrPath} ] is not an absolute path${NC}"
exit 1
fi
if [ ! -f $bbrPath ]; then
echo -e "${RED}[ ${bbrPath} ] is not a file or doesn't exist !"
exit 0
echo -e "${RED}[ ${bbrPath} ] is not a file or doesn't exist !${NC}"
exit 1
fi
printf "Please choose the kind of validator you want to generate: \n"
......@@ -65,27 +64,27 @@ printf "your choice: "
read -r choice
if [ $choice -gt 3 -o $choice -lt 1 ]; then
echo "Wrong choice, please repeat and choose between 1 and 3"
exit 0
echo "${RED}Wrong choice, please repeat and choose between 1 and 3${NC}"
exit 1
fi
case $choice in
1)
echo "generating pivot"
echo -e "${GREEN}generating pivot${NC}"
validator="pivot"
;;
2)
echo "generation scanned"
echo -e "${GREEN}generation scanned${NC}"
validator="scanned"
;;
3)
echo "generation friendly"
echo -e "${GREEN}generation friendly${NC}"
validator="friendly"
;;
esac
printf "Please enter when you want to generate the validator: "
printf "Please enter workspace path (where you want to generate the validator): "
read -r workspaceDir
if [ ! -d $workspaceDir ]; then
echo "${RED}The provided workspace is not a valid directory"
......@@ -105,7 +104,7 @@ if [ -z $folderName ]; then
folderName="output-${validator}-${_currDate}"
fi;
echo "your validator will be generated in: ${workspaceDir}/${folderName}"
echo -e "${GREEN}your validator will be generated in: ${workspaceDir}/${folderName}${NC}"
java -jar $jarPath -bbr $bbrPath -out "${workspaceDir}/${folderName}" -mvn $mavenPath -serviceName $validator -HL7TEMP_CDACONFFOLDERNAME cdaepsos
......
hl7templates/hl7templates-packager-jar/src/main/resources/log4j.properties
+ 2
− 2
View file @ 585b9f57
......@@ -2,13 +2,13 @@ log4j.rootLogger=DEBUG, SYN_FILE, GLB_FILE
log4j.appender.SYN_FILE=org.apache.log4j.FileAppender
log4j.appender.SYN_FILE.Threshold=INFO
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC.log
log4j.appender.SYN_FILE.File=${workspaceRoot}/logs/log-${generationDate}/detailed_report.log
log4j.appender.SYN_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.SYN_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
log4j.appender.GLB_FILE=org.apache.log4j.FileAppender
log4j.appender.GLB_FILE.Threshold=WARN
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/GOC_Report.txt
log4j.appender.GLB_FILE.File=${workspaceRoot}/logs/log-${generationDate}/generation_report.log
log4j.appender.GLB_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.GLB_FILE.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%-5p] (%c{5}:%L) %m%n
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment