merge output .places and .trans files contents with .nupn file; only …

….nupn file is output.

.travis.yml

@@ -7,15 +7,31 @@ branches:
 
 # jdk
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 
 before_script:
-  - wget http://pnml.lip6.fr/camipnml/download/fr.lip6.pnml.cami2pnml-2.1.13.jar
-  - mvn install:install-file -Dfile=fr.lip6.pnml.cami2pnml-2.1.13.jar -DgroupId=fr.lip6.pnml -DartifactId=fr.lip6.pnml.cami2pnml -Dversion=2.1.13 -Dpackaging=jar
+  - wget http://pnml.lip6.fr/camipnml/download/fr.lip6.pnml.cami2pnml-2.2.0.jar
+  - mvn install:install-file -Dfile=fr.lip6.pnml.cami2pnml-2.2.0.jar -DgroupId=fr.lip6.pnml -DartifactId=fr.lip6.pnml.cami2pnml -Dversion=2.2.0 -Dpackaging=jar
 
 # script to launch
 script: "./build.sh"
 
+# deploiement
+before_deploy:
+  - export BODY="$(cat ./fr.lip6.move.pnml2nupn/src/main/resources/changelog.md)"
+
+deploy:
+  provider: releases
+  api_key: "$GITHUB_OAUTH_TOKEN"
+  file_glob: true
+  file: ./fr.lip6.move.pnml2nupn/target/pnml2nupn-*.jar
+  skip_cleanup: true
+  on:
+    tags: true
+    all_branches: true
+  name: "$TRAVIS_TAG"
+  body: "$BODY"
+
 # cache
 cache:
   directories:

fr.lip6.move.pnml2nupn/META-INF/MANIFEST.MF

@@ -3,13 +3,13 @@ Main-Class: fr.lip6.move.pnml2nupn.MainPNML2NUPN
 Bundle-ManifestVersion: 2
 Bundle-Name: PNML to Nested Units Petri Nets Translation Tool
 Bundle-SymbolicName: fr.lip6.pnml.pnml2nupn;singleton:=true
-Bundle-Version: 2.3.0
-Require-Bundle: fr.lip6.pnml.cami2pnml;bundle-version="2.1.13"
+Bundle-Version: 3.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: fr.lip6.move.pnml2nupn;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
  fr.lip6.move.pnml2nupn.exceptions,
  fr.lip6.move.pnml2nupn.export;uses:="org.slf4j",
  fr.lip6.move.pnml2nupn.export.impl;uses:="fr.lip6.move.pnml2nupn.export,org.slf4j",
  fr.lip6.move.pnml2nupn.utils
-Bundle-Vendor: Sorbonne Université, CNRS, LIP6, and Univ. Paris Nanterre
+Bundle-Vendor: Sorbonne Université, LIP6, CNRS, and Univ. Paris Nanterre
 Bundle-ClassPath: .
+Automatic-Module-Name: fr.lip6.pnml.pnml2nupn

fr.lip6.move.pnml2nupn/PNML-NUPN-Package.launch

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="clean package"/>
-    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-    <booleanAttribute key="M2_OFFLINE" value="false"/>
-    <stringAttribute key="M2_PROFILES" value="copy-to-releases"/>
-    <listAttribute key="M2_PROPERTIES">
-        <listEntry value="maven.javadoc.skip=true"/>
-    </listAttribute>
-    <stringAttribute key="M2_RUNTIME" value="apache-maven-3.5.2"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-    <intAttribute key="M2_THREADS" value="1"/>
-    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-    <stringAttribute key="M2_USER_SETTINGS" value=""/>
-    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/fr.lip6.move.pnml2nupn}"/>
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean package"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="copy-to-releases"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="maven.javadoc.skip=true"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="apache-maven-3.6.1"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/fr.lip6.move.pnml2nupn}"/>
 </launchConfiguration>

fr.lip6.move.pnml2nupn/PNML-NUPN-Site.launch

@@ -8,7 +8,7 @@
 <listAttribute key="M2_PROPERTIES">
 <listEntry value="maven.javadoc.skip=true"/>
 </listAttribute>
-<stringAttribute key="M2_RUNTIME" value="apache-maven-3.5.2"/>
+<stringAttribute key="M2_RUNTIME" value="apache-maven-3.6.1"/>
 <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
 <intAttribute key="M2_THREADS" value="1"/>
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>

fr.lip6.move.pnml2nupn/build.properties

@@ -1,5 +1,4 @@
-source.. = src/,\
-           test/
+source.. = src/
 bin.includes = plugin.xml,\
                META-INF/,\
                .

fr.lip6.move.pnml2nupn/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>fr.lip6.pnml</groupId>
 	<artifactId>pnml2nupn</artifactId>
-	<version>2.3.0</version>
+	<version>3.0.0</version>
 
 	<packaging>jar</packaging>
 
@@ -81,18 +81,18 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
+				<version>3.0.0</version>
 				<reportSets>
 					<reportSet>
 						<reports>
 							<report>summary</report>
 							<report>dependency-info</report>
 							<report>dependencies</report>
 							<report>dependency-convergence</report>
-							<report>project-team</report>
-							<report>mailing-list</report>
-							<report>issue-tracking</report>
-							<report>license</report>
+							<report>team</report>
+							<report>mailing-lists</report>
+							<report>issue-management</report>
+							<report>licenses</report>
 							<report>scm</report>
 						</reports>
 					</reportSet>
@@ -102,10 +102,25 @@
 	</reporting>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>javax.activation</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.4.0-b180830.0359</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.4.0-b180830.0438</version>
+		</dependency>
 		<dependency>
 			<groupId>fr.lip6.pnml</groupId>
 			<artifactId>fr.lip6.pnml.cami2pnml</artifactId>
-			<version>2.1.13</version>
+			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ximpleware</groupId>
@@ -117,7 +132,7 @@
 			<groupId>it.unimi.dsi</groupId>
 			<artifactId>fastutil</artifactId>
 			<!-- Previous working in pnml2nupn 1.5.3: 6.5.16 -->
-			<version>8.1.1</version>
+			<version>8.3.0</version>
 		</dependency>
 	</dependencies>
 
@@ -170,21 +185,20 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.8.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<release>11</release>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.7.1</version>
+				<version>3.8.2</version>
 				<dependencies>
 					<dependency>
 						<groupId>io.github.devacfr.maven.skins</groupId>
 						<artifactId>reflow-velocity-tools</artifactId>
-						<version>2.0.0-beta2</version>
+						<version>2.0.2</version>
 					</dependency>
 					<!-- <dependency> <groupId>lt.velykis.maven.skins</groupId> <artifactId>reflow-velocity-tools</artifactId> 
 						<version>1.1.1</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> 
@@ -194,7 +208,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
+				<version>3.1.2</version>
 				<configuration>
 					<archive>
 						<manifestFile>${manifestdir}/MANIFEST.MF</manifestFile>
@@ -204,7 +218,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -235,7 +249,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
+				<version>3.0.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -252,12 +266,13 @@
 								<artifactItem>
 									<groupId>io.github.devacfr.maven.skins</groupId>
 									<artifactId>reflow-default-webdeps</artifactId>
-									<version>2.0.0-beta2</version>
+									<version>2.0.2</version>
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<includes> **/css/bootstrap.min.css, **/css/fontawesome/**/*,
 										**/css/themes/flatly/*.css,
-										**/js/*.js, **/js/languages/*, **/js/styles/github.min.css
+										**/js/*.js, **/js/languages/*,
+										**/js/styles/github.min.css
 									</includes>
 								</artifactItem>
 							</artifactItems>
@@ -318,7 +333,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.0.1</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>

fr.lip6.move.pnml2nupn/src/fr/lip6/move/pnml2nupn/export/impl/NUPNConstants.java

@@ -27,6 +27,10 @@ public final class NUPNConstants {
 	public static final String COMMA = ",";
 	public static final String COMMAWS = COMMA + WS;
 	public static final String STRUCTURE = "structure";
+	public static final String P_PREFX = "p";
+	public static final String T_PREFX = "t";
+	public static final String LABELS_1_0_0 = "labels 1 0 0"; // When there is no transition
+	public static final String LABELS_1_1_0 = "labels 1 1 0"; // When there is at least one transition
 
 	private NUPNConstants() {super();}
 

fr.lip6.move.pnml2nupn/src/fr/lip6/move/pnml2nupn/export/impl/NUPNWriter.java

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2014-2019 Université Paris Ouest and Sorbonne Université,
+ *  Copyright 2014-2019 Université Paris Nanterre and Sorbonne Université,
  * 							CNRS, LIP6
  *
  *  All rights reserved.   This program and the accompanying materials
@@ -30,9 +30,7 @@
 import fr.lip6.move.pnml2nupn.utils.PNML2NUPNUtils;
 
 /**
- * Thread task to write contents read from a queue int a channel.
- * @author lom
- *
+ * Thread task to write contents read from a queue into a channel.
  */
 public final class NUPNWriter implements Runnable {