fix build + fix travis

.gitignore

@@ -1,3 +1,7 @@
+.project
+.classpath
+.gitignore
+
 /bin/
 /target/
 /build/

.travis.yml

@@ -1 +1,26 @@
-language: java
+sudo: required
+
+language: ruby
+
+services:
+  - docker
+
+before_install:
+  - echo "Testing Docker Hub credentials"
+  - docker login  -u=$DOCKER_LOGIN -p=$DOCKER_PWD
+  - echo "Docker Hub credentials are working"
+  - docker build -t nherbaut/variamos .
+
+script:
+  - docker ps -a
+
+after_success:
+  - echo "Test Success - Branch($TRAVIS_BRANCH) Pull Request($TRAVIS_PULL_REQUEST) Tag($TRAVIS_TAG)"
+  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then echo -e "Push Container to Docker Hub"; fi
+  - docker login  -u=$DOCKER_LOGIN -p=$DOCKER_PWD
+  - export REPO=nherbaut/variamos
+  - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
+  - docker build -f Dockerfile -t $REPO:$COMMIT .
+  - docker tag $REPO:$COMMIT $REPO:$TAG
+  - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER
+  - docker push $REPO

Dockerfile

@@ -0,0 +1,10 @@
+FROM openjdk:11
+RUN apt-get update
+RUN apt-get install gradle software-properties-common --yes
+RUN apt-add-repository ppa:swi-prolog/stable
+RUN apt-get install swi-prolog --yes
+RUN  mkdir -p /opt/local/VARIAMOS
+COPY ./docker-assets/libjpl.so /usr/lib/x86_64-linux-gnu/jni/libjpl.so 
+COPY . /opt/local/VARIAMOS/
+WORKDIR /opt/local/VARIAMOS
+RUN gradle build

README.md

@@ -1,2 +1,11 @@
-VARIAMOS
-========
+# VARIAMOS #
+
+
+## Native Dependencies ##
+
+SWI-PROLOG >= 7.7.10
+
+## Configuration ##
+
+specify the libjpl.so or libjpl.dll folder in the gradle.properties
+

build.gradle

@@ -5,17 +5,32 @@ group = 'com.variamos'
 version = '1.1.0.1'
 compileJava.options.encoding = 'UTF-8'
 
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            //options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+        }
+    }
+}
+
+
+
 subprojects {
   /* the Java plugin adds several tasks like clean, assemble, 
   build, etc, which make it easy to work with the build process when we follow conventions such as src/main/java and src/main/test as main folders*/
   apply plugin: "java"
   apply plugin: 'eclipse'
 
   repositories {
-       jcenter()
-  }
+       mavenCentral()  }
 
   dependencies {
-    testCompile "junit:junit:4+"
+  compile group: 'jpl', name: 'jpl', version: '7.4.0'
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+
    }
 }
+
+
+
+

build.gradle.orig

@@ -0,0 +1,41 @@
+/* Configurations here represents common characteristics shared for each of the sub projects*/
+apply plugin: "java"
+apply plugin: 'eclipse'
+group = 'com.variamos'
+version = '1.1.0.1'
+compileJava.options.encoding = 'UTF-8'
+
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            //options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+        }
+    }
+}
+
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> de0ebfe4... fix build on the master branch
+subprojects {
+  /* the Java plugin adds several tasks like clean, assemble, 
+  build, etc, which make it easy to work with the build process when we follow conventions such as src/main/java and src/main/test as main folders*/
+  apply plugin: "java"
+  apply plugin: 'eclipse'
+
+  repositories {
+       mavenCentral()  }
+
+  dependencies {
+  compile group: 'jpl', name: 'jpl', version: '7.4.0'
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+
+   }
+}
+
+
+ext {
+    JplLibraryPath = "/usr/lib/x86_64-linux-gnu/jni/"
+}
+

com.variamos.common/src/main/java/com/variamos/common/core/utilities/FileUtils.java

@@ -89,7 +89,7 @@ public static void writeFile(String path, String content) {
 	public static String writeFile(File file, String content)
 			throws TechnicalException {
 
-		// Se guarda la representaci�n en el archivo temporal de prolog
+		// Se guarda la representaci�n en el archivo temporal de prolog
 		FileUtils.writeFile(file.getAbsolutePath(), content);
 		return file.getAbsolutePath();
 

com.variamos.common/src/main/java/com/variamos/common/core/utilities/SetUtil.java

@@ -210,7 +210,7 @@ public static <E> boolean verifyCollectionSetContainsSet(List<E> inputSet,
 	 * @return true:Set is superset of some set of collection of sets.
 	 *         Otherwise False Ejm inputSet es {a,b,c} y not collectionOfSets
 	 *         tiene un elemento con el valor de {a,c}. En este caso el inputSet
-	 *         es superset pq tiene los mismos elementos( o m�s ) que el set de
+	 *         es superset pq tiene los mismos elementos( o más ) que el set de
 	 *         collectionOfSets
 	 */
 	public static <E> boolean verifySetIsSuperSetOfCollectionSets(
@@ -303,7 +303,7 @@ public static <E> List<List<E>> maintainNoSupersets(
 		List<E> inputSet = null;
 		Set<List<E>> setsToRemove = new HashSet<List<E>>();
 
-		// Se ordenan los conjuntos por tama�o de menor mayor
+		// Se ordenan los conjuntos por tamaño de menor mayor
 		Collections
 				.sort(inputCollectionOfSets, new CollectionsSizeComparator());
 
@@ -326,7 +326,7 @@ public static <E> List<List<E>> maintainNoSupersets(
 				}
 
 			}// Cierra while que recorre lista desde la segunda posicion
-		}// Cierra while que recorre la lista desde la primera posici�n
+		}// Cierra while que recorre la lista desde la primera posición
 
 		// Se eliminan los elementos
 		if (!setsToRemove.isEmpty()) {
@@ -372,7 +372,7 @@ public static <E> List<List<E>> maintainNoSubsets(
 				}
 
 			}// Cierra while que recorre lista de MCS desde la segunda posicion
-		}// Cierra while que recorre la lista de MCS desde la primera posici�n
+		}// Cierra while que recorre la lista de MCS desde la primera posición
 
 		// Se eliminan los elementos
 		// Se eliminan los elementos

com.variamos.dynsup/src/com/variamos/dynsup/instance/InstCell.java

@@ -8,7 +8,7 @@
  * A class to support clones of instance elements with shared values. Part of
  * PhD work at University of Paris 1
  * 
- * @author Juan C. Mu�oz Fern�ndez <[email protected]>
+ * @author Juan C. Mu�oz Fern�ndez <[email protected]>
  * 
  * @version 1.1
  * @since 2015-01-29 *

com.variamos.dynsup/src/com/variamos/dynsup/model/OpersSubOperation.java

@@ -11,7 +11,7 @@
  * operationalization with GUI edition. Part of PhD work at University of Paris
  * 1
  * 
- * @author Juan C. Mu�oz Fern�ndez <[email protected]>
+ * @author Juan C. Mu�oz Fern�ndez <[email protected]>
  * 
  * @version 1.1
  * @since 2014-02-05

com.variamos.dynsup/src/com/variamos/dynsup/translation/SolverOpersTask.java

@@ -848,7 +848,7 @@ public int medicExecution(InstElement operation, InstElement subOper, String ver
 						//inconsistentPath.add(split[0]);
 
 
-						// añadir la variable a la lista y después una por una las retsricciones
+						// añadir la variable a la lista y después una por una las retsricciones
 						// unarias asociadas.
 						for (NodeConstraintHLCL cons : ((NodeVariableHLCL) vertex).getUnary()) {
 							String [] object = getIdFromTable(cons.getConstraint(), table).split("_"); //this lines allow to obtain the id of the object

com.variamos.gui/src/com/variamos/gui/maineditor/ParadigmChooserPane.java

@@ -222,6 +222,6 @@ public static ParadigmTypeEnum showInputDialog(Frame f,String openModelOption) {
 
 	public static void main(String[] args) {
 		ParadigmTypeEnum optionChoosed = ParadigmChooserPane.showInputDialog();
-		System.out.println("La opción elegida es: "+optionChoosed);
+		System.out.println("La opción elegida es: "+optionChoosed);
 	}
 }

com.variamos.gui/src/com/variamos/gui/perspeditor/panels/AboutDialog.java

@@ -116,7 +116,7 @@ public AboutDialog(VariamosGraphEditor editor, ElemAttribute... arguments)
 				"http://www.flaticon.com/free-icon/settings_23408#term=configuration&page=1&position=3"));
 		panel.add(new JLabel(
 				"Organization of notification for elements and some icons:"));
-		panel.add(new JLabel("Jose Andr�s Moncada"));
+		panel.add(new JLabel("Jose Andr�s Moncada"));
 
 		SpringUtilities.makeCompactGrid(panel, 14, 1, 4, 4, 4, 4);
 

com.variamos.gui/src/com/variamos/gui/perspeditor/widgets/RefasWidgetFactory.java

@@ -22,7 +22,7 @@
  * A class to dynamically load appropriate widget. Based on WidgetFactory from
  * ProductLine. Part of PhD work at University of Paris 1
  * 
- * @author Juan C. Mu�oz Fern�ndez <[email protected]>
+ * @author Juan C. Muñoz Fernández <[email protected]>
  * 
  * @version 1.1
  * @since 2014-11-10

com.variamos.io/src/main/java/com/variamos/io/core/importExport/ExportDefectAnalyzer.java

@@ -29,7 +29,7 @@ public static void exportarListaModelosResumidaxTamCorrecc(
 		List<List<String>> resultadosAnalisis = new ArrayList<List<String>>();
 		HSSFWorkbook resultadosLibro = new HSSFWorkbook();
 		int cont = 1;
-		// Informaci�n para guardar
+		// Informacion para guardar
 		String titulos[] = { "Modelo", "#carac", "#depen", "#NonTraversal",
 				"%NonTraversal", "#traver", "%traver", "tipDef", "def",
 				"#caus", "#corr", "tiemp" };
@@ -55,7 +55,7 @@ private static void validatePath(String outputDirectoryPath)
 			throws FunctionalException {
 		File file = new File(outputDirectoryPath);
 		if (!file.exists()) {
-			// Si no existe el directorio se lanza una excepci�n
+			// Si no existe el directorio se lanza una excepcion
 			throw new FunctionalException("El directorio de salida "
 					+ outputDirectoryPath + " no existe");
 		}

com.variamos.io/src/main/java/com/variamos/io/core/importExport/ExportUtil.java

@@ -68,8 +68,8 @@ public static void addInfoToSheet(List<String> heads1List,
 
 		int contadorCelda = 0;
 		int filaInicialHoja = 0;
-		// Informaci�n con los tiempos
-		// Fila con las estad�sticas
+		// Informaci�n con los tiempos
+		// Fila con las estad�sticas
 		HSSFRow estadisticasTitle = sheet.createRow(filaInicialHoja);
 		HSSFCell celda0 = estadisticasTitle.createCell(0);
 		celda0.setCellValue("Statistics");

com.variamos.reasoning/.classpath

@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="lib" path="lib/java-json.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>