Commit 1d1a9774 authored by David Gnabasik's avatar David Gnabasik
Browse files

Changes for clauses 9.3, 9.5, 9.6, 9.7, 9.8.

parent 9c0bdfcd

pom.xml

+37 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<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">

	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">

	<modelVersion>4.0.0</modelVersion>

	<groupId>fr.mines-stetienne.ci.saref</groupId>

	<artifactId>saref-pipeline</artifactId>
@@ -25,9 +24,9 @@ 
			</properties>

		</developer>

		<developer>

			<name>Omar Qawasmeh</name>

			<email>omar.alqawasmeh@emse.fr</email>

			<url>https://perso.univ-st-etienne.fr/alo09685/</url>

			<name>David Gnabasik</name>

			<email>David.Gnabasik@emse.fr</email>

			<url>https://www.linkedin.com/in/david-gnabasik-0056a0ba/</url>

			<organization>Ecole des mines de Saint-Etienne</organization>

			<organizationUrl>http://www.mines-stetienne.fr/</organizationUrl>

			<timezone>+1</timezone>
@@ -46,14 +45,21 @@ 
		</license>

	</licenses>



	<repositories>

		<repository>

			<id>gitlab-maven</id>

			<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>

		</repository>

	</repositories>

	

	<distributionManagement>

		<snapshotRepository>

			<id>ossrh</id>

			<url>https://oss.sonatype.org/content/repositories/snapshots</url>

			<id>gitlab-maven</id>

			<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>

		</snapshotRepository>

		<repository>

			<id>ossrh</id>

			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>

			<id>gitlab-maven</id>

			<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>

		</repository>

	</distributionManagement>
@@ -205,6 +211,23 @@ 
			<artifactId>jena-text</artifactId>

			<version>3.13.0</version>

		</dependency>

		<dependency>

			<groupId>jakarta.xml.bind</groupId>

			<artifactId>jakarta.xml.bind-api</artifactId>

			<version>2.3.2</version>

		</dependency>



		<!-- NEW JAXB API and Implementation -->

		<dependency>

			<groupId>com.sun.xml.ws</groupId>

			<artifactId>jaxws-rt</artifactId>

			<version>2.3.2</version>

		</dependency>

		<dependency>

			<groupId>javax.jws</groupId>

			<artifactId>javax.jws-api</artifactId>

			<version>1.1</version>

		</dependency>

	</dependencies>



	<build>
@@ -222,10 +245,8 @@ 
						</goals>

						<configuration>

							<transformers>

								<transformer

									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

								<transformer

									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

									<mainClass>fr.mines_stetienne.ci.saref.Main

									</mainClass>

								</transformer>

src/main/java/fr/mines_stetienne/ci/saref/CLIExecution.java

+10 −3
Original line number Diff line number Diff line
@@ -63,10 +63,15 @@ public class CLIExecution implements SAREFCredentialsProvider { 
	private static final String ARG_IGNORE_TERMS_LONG = "no-terms";

	private static final String ARG_IGNORE_TERMS_MAN = "Do not generate the static portal for terms";



	private static final String ARG_IGNORE_DOCUMENTATION = "d";

	private static final String ARG_IGNORE_DOCUMENTATION_LONG = "no-documentation";

	private static final String ARG_IGNORE_DOCUMENTATION_MAN = "Do not check documentation";



	private static final Options OPTIONS = new Options()

			.addOption(ARG_IGNORE_EXAMPLES, ARG_IGNORE_EXAMPLES_LONG, false, ARG_IGNORE_EXAMPLES_MAN)

			.addOption(ARG_IGNORE_TERMS, ARG_IGNORE_TERMS_LONG, false, ARG_IGNORE_TERMS_MAN)

			.addOption(ARG_IGNORE_SITE, ARG_IGNORE_SITE_LONG, false, ARG_IGNORE_SITE_MAN);

			.addOption(ARG_IGNORE_SITE, ARG_IGNORE_SITE_LONG, false, ARG_IGNORE_SITE_MAN)

			.addOption(ARG_IGNORE_DOCUMENTATION, ARG_IGNORE_DOCUMENTATION_LONG, false, ARG_IGNORE_DOCUMENTATION_MAN);



	private static final Console console = System.console();
@@ -79,6 +84,7 @@ public class CLIExecution implements SAREFCredentialsProvider { 
		final boolean ignoreExamples;

		final boolean ignoreTerms;

		final boolean ignoreSite;

		final boolean ignoreDocumentation;

		final File directory;



		try {
@@ -129,8 +135,9 @@ public class CLIExecution implements SAREFCredentialsProvider { 
			ignoreExamples = cl.hasOption(ARG_IGNORE_EXAMPLES);

			ignoreTerms = cl.hasOption(ARG_IGNORE_TERMS);

			ignoreSite = cl.hasOption(ARG_IGNORE_SITE);

			ignoreDocumentation = cl.hasOption(ARG_IGNORE_DOCUMENTATION);

			

			return new SAREFPipeline(this, directory, mode, ignoreExamples, ignoreTerms, ignoreSite);

			return new SAREFPipeline(this, directory, mode, ignoreExamples, ignoreTerms, ignoreSite, ignoreDocumentation);

		} catch (IOException | ParseException ex) {

			LOG.debug("Exception while parsing arguments", ex);

			throw new RuntimeException();

src/main/java/fr/mines_stetienne/ci/saref/Main.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class Main { 
		try {

			CAN_BROWSE = Desktop.isDesktopSupported()

			&& Desktop.getDesktop().isSupported(Desktop.Action.BROWSE);

		} catch (Exception ex) {}

		} catch (Error | Exception ex) {}

	}



	private static final String CI_SERVER_HOST = System.getenv("CI_SERVER_HOST");

src/main/java/fr/mines_stetienne/ci/saref/SAREF.java

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ public class SAREF { 
	public final static String LICENSE = "https://forge.etsi.org/etsi-software-license";

	public final static String PUBLISHER = "https://www.etsi.org/";



	public static final String SAREF_PORTAL_STATIC_GIT = "https://gitlab.emse.fr/saref/saref-portal-static.git";

//	public static final String SAREF_PORTAL_STATIC_GIT = "https://forge.etsi.org/rep/SAREF/saref-portal-static.git"; // uncomment when the project is public

	public static final String SAREF_PORTAL_STATIC_GIT = "https://labs.etsi.org/rep/saref/saref-portal.git";

	public static final String LOGGER_BASE = "SAREF Pipeline: ";

	

	public static final String NAME_SITE = "site";

src/main/java/fr/mines_stetienne/ci/saref/SAREFPipeline.java

+4 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class SAREFPipeline { 
	public final boolean ignoreExamples;

	public final boolean ignoreTerms;

	public final boolean ignoreSite;

	public final boolean ignoreDocumentation;

	

	private Logger logger;

	private DatasetManager datasetManager;
@@ -92,7 +93,7 @@ public class SAREFPipeline { 
		return ontologyManager;

	}



	public SAREFPipeline(SAREFCredentialsProvider credentialsProvider, File directory, Mode mode, boolean ignoreExamples, boolean ignoreTerms, boolean ignoreSite) {

	public SAREFPipeline(SAREFCredentialsProvider credentialsProvider, File directory, Mode mode, boolean ignoreExamples, boolean ignoreTerms, boolean ignoreSite, boolean ignoreDocumentation) {

		this.credentialsProvider = credentialsProvider;

		this.directory = directory;

		targetDir = new File(directory, NAME_TARGET);
@@ -100,6 +101,7 @@ public class SAREFPipeline { 
		this.ignoreExamples = ignoreExamples;

		this.ignoreTerms = ignoreTerms;

		this.ignoreSite = ignoreSite;

		this.ignoreDocumentation = ignoreDocumentation;

	}



	public TestSuites run() {