Merge pull request #4 from laurentC35/eno-v2

Eno v2
laurentC35 · Feb 26, 2020 · 21e474b · 21e474b
2 parents 367e72d + fec98db
commit 21e474b
Show file tree

Hide file tree

Showing 241 changed files with 129,570 additions and 19,788 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,11 +37,16 @@ src/main/resources/xslt/inputs/*/templates.xsl
 src/main/resources/xslt/inputs/*/functions.xsl
 src/main/resources/xslt/transformations/*/*.xsl
 src/main/resources/xml/null.xml
-
+
+# Ignore temp and debug files
+*-temp.*
+*-debug.*
+
 # Don't ignore not generated files looking like generated ones
 !src/main/resources/xslt/inputs/fods/source.xsl
 !src/main/resources/xslt/inputs/xml/source.xsl
 !src/main/resources/xslt/transformations/*/*-fixed.xsl
 
 #Oxygen project
-enojs.xpr
+Eno.xpr
+questionnaires/test/
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 jdk:
-- openjdk8
+  - openjdk8
 
 install:
-- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-- mvn test -B
+  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+  - mvn test -B
diff --git a/Eno.xpr b/Eno.xpr
diff --git a/docs/ddi-qg-guide.html b/docs/ddi-qg-guide.html
@@ -447,7 +447,7 @@ <h4 id="single-choice-question-ddi-modelling">DDI Modelling</h4>
       </r:CodeListReference>        
       <r:ResponseCardinality maximumResponses="1"></r:ResponseCardinality>
    </d:CodeDomain>
-</d:QuestionItem
+</d:QuestionItem>
 </textarea>
 
     <p><em>Case 2: Drop-down box</em></p>

diff --git a/pom.xml b/pom.xml
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.eno</groupId>
 	<artifactId>eno-core</artifactId>
-	<version>1.1.0</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>Eno – Questionnaire generator</name>
@@ -50,6 +51,14 @@
 		<commons-io.version>2.5</commons-io.version>
 		<saxon.version>9.7.0-8</saxon.version>
 		<fop.version>2.2</fop.version>
+		<xalan.version>2.7.1</xalan.version>
+		<slf4j.version>1.7.25</slf4j.version>
+
+		<apache-commons.version>3.5</apache-commons.version>
+		<junit.version>4.12</junit.version>
+		<xmlunit.version>2.3.0</xmlunit.version>
+		<log4j-slf4j.version>2.11.0</log4j-slf4j.version>
+
 		<source.plugin.version>3.0.1</source.plugin.version>
 		<javadoc.plugin.version>3.0.0</javadoc.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,7 +76,7 @@
 		<dependency>
 			<groupId>xalan</groupId>
 			<artifactId>xalan</artifactId>
-			<version>2.7.1</version>
+			<version>${xalan.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
@@ -87,41 +96,55 @@
 			<version>${fop.version}</version>
 		</dependency>
 
-		<!-- LOG4j and SL4J depandancies -->
+		<!-- LOG4j and SL4J dependancies -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<!-- Jaxb -->
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.moxy</artifactId>
+			<version>2.6.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>eclipselink</artifactId>
+			<version>2.6.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
 		</dependency>
 
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
+			<version>${apache-commons.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.xmlunit</groupId>
 			<artifactId>xmlunit-matchers</artifactId>
-			<version>2.3.0</version>
+			<version>${xmlunit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.11.0</version>
+			<version>${log4j-slf4j.version}</version>
 			<scope>test</scope>
 		</dependency>
-
-
-
 	</dependencies>
 
 	<build>
@@ -135,6 +158,91 @@
 					<target>${compiler.target}</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<version>2.5.0</version>
+				<executions>
+					<execution>
+						<id>xjc-schema</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+						<configuration>
+							<packageName>fr.insee.eno.parameters</packageName>
+							<encoding>UTF-8</encoding>							
+							<xjbSources>
+								<xjbSource>src/main/resources/params/schemas/jaxb/bindings.xjb</xjbSource>
+							</xjbSources>
+							<sources>
+								<source>src/main/resources/params/schemas/ENOParameters.xsd</source>
+							</sources>
+							<clearOutputDir>false</clearOutputDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.0</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<inputEncoding>UTF-8</inputEncoding>
+					<outputEncoding>UTF-8</outputEncoding>
+					<argLine>-Dfile.encoding=UTF-8
+						-Djavax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/generated-sources/jaxb/fr/insee/eno/parameters</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources/params/schemas/jaxb</directory>
+									<includes>
+										<include>bindings.xml</include>
+										<include>jaxb.properties</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>${project.build.directory}/generated-sources/jaxb</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
@@ -234,6 +342,9 @@
 		<developer>
 			<name>Benoit Werquin</name>
 		</developer>
+		<developer>
+			<name>Laurent Caouissin</name>
+		</developer>
 	</developers>
 
 	<contributors>