From bd114967903b1b7c7231182048d515a30e808f7b Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 17:21:32 +0200
Subject: [PATCH 01/46] Maven template

---
 docs/maven/.travis.yml                        | 18 +++++++++
 docs/maven/README.md                          | 13 ++++++
 docs/maven/pom.xml                            | 12 +++---
 docs/maven/settings.xml                       | 40 +++++++++++++++++++
 .../src/main/resources/application.properties |  6 +++
 docs/maven/src/main/resources/log4j2.xml      | 17 +++++---
 6 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 docs/maven/.travis.yml
 create mode 100644 docs/maven/README.md
 create mode 100644 docs/maven/settings.xml
 create mode 100644 docs/maven/src/main/resources/application.properties

diff --git a/docs/maven/.travis.yml b/docs/maven/.travis.yml
new file mode 100644
index 0000000..5952784
--- /dev/null
+++ b/docs/maven/.travis.yml
@@ -0,0 +1,18 @@
+language: java
+jdk:
+- oraclejdk8
+branches:
+  only:
+  - master
+  - develop
+notifications:
+  email:
+    recipients:
+    - architect@gmail.com
+services:
+- mysql
+before_install:
+- mysql -e 'CREATE DATABASE IF NOT EXISTS bd;'
+script:
+#Test unitario y de integracion en develop
+- mvn verify --settings settings.xml
diff --git a/docs/maven/README.md b/docs/maven/README.md
new file mode 100644
index 0000000..f5d7a40
--- /dev/null
+++ b/docs/maven/README.md
@@ -0,0 +1,13 @@
+# Forja
+#### Asignatura: *Ingeniería Web: Visión General*
+#### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
+
+### Tecnologías necesarias
+* Java
+* Maven
+* Eclipse
+* GitHub
+
+### Descripción
+Este proyecto pretende ser un ejemplo de preparación de una forja para el desarrollo de software colaborativo
+
diff --git a/docs/maven/pom.xml b/docs/maven/pom.xml
index 0971053..4939e48 100644
--- a/docs/maven/pom.xml
+++ b/docs/maven/pom.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>maven</artifactId>
+	<artifactId>IWVG.Forge</artifactId>
 	<groupId>es.upm.miw</groupId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>${project.groupId}.${project.artifactId}</name>
@@ -159,9 +159,9 @@
 
 	<developers>
 		<developer>
-			<name>Nombre y Apellidos</name>
-			<id>***</id>
-			<email>***@alumnos.upm.es</email>
+			<name>Name</name>
+			<id>Id</id>
+			<email>mail@gmail.com</email>
 			<organization>MIW UPM</organization>
 			<roles>
 				<role>Architect</role>
diff --git a/docs/maven/settings.xml b/docs/maven/settings.xml
new file mode 100644
index 0000000..e2c0037
--- /dev/null
+++ b/docs/maven/settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $HOME/.m2/settings.xml We set 3 profiles: develop, preproduction and production 
+	To check active profiles, in a project folder we run mvn help:active-profiles 
+	Now in our pom.xml we can add profiles with their own properties like database 
+	settings -->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+	<profiles>
+		<profile>
+			<id>develop</id>
+			<activation>
+				<!-- develop is active by default, so doing 'mvn install' will apply this -->
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<environment.type>develop</environment.type>
+			</properties>
+		</profile>
+		<profile>
+			<id>preproduction</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<environment.type>preproduction</environment.type>
+			</properties>
+		</profile>
+		<profile>
+			<id>production</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<environment.type>production</environment.type>
+			</properties>
+		</profile>
+	</profiles>
+</settings>       
\ No newline at end of file
diff --git a/docs/maven/src/main/resources/application.properties b/docs/maven/src/main/resources/application.properties
new file mode 100644
index 0000000..b374035
--- /dev/null
+++ b/docs/maven/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+
+#DB properties:
+dataSource.driverClassName=${database.driver}
+dataSource.url=${database.url}
+dataSource.username=${database.user}
+dataSource.password=${database.password}
diff --git a/docs/maven/src/main/resources/log4j2.xml b/docs/maven/src/main/resources/log4j2.xml
index 7c21eef..d4cd87b 100644
--- a/docs/maven/src/main/resources/log4j2.xml
+++ b/docs/maven/src/main/resources/log4j2.xml
@@ -5,15 +5,22 @@
 			<PatternLayout
 				pattern="[%-5level] %d{dd/MMM HH:mm:ss} %-30.30c{2} --> %msg%n" />
 		</Console>
-		<File name="File" fileName="target/logs/logs.txt">
-			<PatternLayout
-				pattern="[%-5level] %d{dd-MMM HH:mm:ss} %-30.30c{2} --> %msg%n" />
-		</File>
+        <RollingFile name="RollingFile" fileName="target/logs/iwvg.log"
+            filePattern="target/logs/iwvg-%d{yyyy-MM-dd.HH}-%i.log">
+            <PatternLayout>
+                <pattern>[%-5level] %d{dd-MMM HH:mm:ss} %-30.30c{2} --> %msg%n
+                </pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="1 MB" />
+            </Policies>
+        </RollingFile>
 	</appenders>
 	<loggers>
 		<root level="${logs.level.root}">
 			<AppenderRef ref="Console" />
-			<appenderRef ref="File" />
+			<appenderRef ref="RollingFile" />
 		</root>
 	</loggers>
 </configuration> 
\ No newline at end of file

From 197b3491e0f6234b9bd0bb709c8ce7c022445586 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 17:48:46 +0200
Subject: [PATCH 02/46] Codebeat

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f5d7a40..edf3524 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
+[![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
+
 ### Tecnologías necesarias
 * Java
 * Maven

From d15299c21313540b31800cec8622d1e58ead36d6 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 17:51:59 +0200
Subject: [PATCH 03/46] Travis-ci

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index edf3524..db5250b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
+[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
+
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 
 ### Tecnologías necesarias

From 204d6090ddd51be38abe303f7ff910ab1596a219 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 17:53:45 +0200
Subject: [PATCH 04/46] Travis-CI

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index db5250b..77175e9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
-[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
+Travis-CI [![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From 0fe402fdff28ee0a24762ea563a7ae1aa6d72154 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 17:55:17 +0200
Subject: [PATCH 05/46] Travis-CI

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 77175e9..c7e44e0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
-Travis-CI [![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
+[![Travis-CI Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From c06a0757f54ed80b38f1e1705b11779a3d472502 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 18:02:54 +0200
Subject: [PATCH 06/46] Travis-CI

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7e44e0..db5250b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
-[![Travis-CI Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
+[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From d244c54b44ca99c381b89e9adfe6a41bea8b0efc Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 18:57:23 +0200
Subject: [PATCH 07/46] Sonar cloud

---
 scripts/4.sonar-cloud.bat | 20 ++++++++++++++++++++
 settings.xml              | 15 +++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 scripts/4.sonar-cloud.bat

diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
new file mode 100644
index 0000000..ca95a69
--- /dev/null
+++ b/scripts/4.sonar-cloud.bat
@@ -0,0 +1,20 @@
+@echo off
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
+set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
+echo -----------------------------------------
+echo . (C) MIW
+echo -----------------------------------------
+echo .
+echo Workspace --- %workspace%
+echo JAVA_HOME --- %JAVA_HOME%
+echo M2_HOME   --- %M2_HOME%
+echo .
+cd %workspace%
+echo ============ mvn clean test (profile: develop) =======================================================
+echo .
+call mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
+pause
+
diff --git a/settings.xml b/settings.xml
index e2c0037..ea2fe8f 100644
--- a/settings.xml
+++ b/settings.xml
@@ -36,5 +36,20 @@
 				<environment.type>production</environment.type>
 			</properties>
 		</profile>
+		<profile>
+            <id>sonar</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <!-- Optional URL to server. Default value is http://localhost:9000 -->
+                <sonar.host.url>
+                  http://myserver:9000
+                </sonar.host.url>
+            </properties>
+        </profile>
 	</profiles>
+	<pluginGroups>
+        <pluginGroup>org.sonarsource.scanner.maven</pluginGroup>
+    </pluginGroups>
 </settings>       
\ No newline at end of file

From 43d1d1a0e628c7692c3eab930d7c52207b329f1c Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 19:35:26 +0200
Subject: [PATCH 08/46] Code quality in Sonar

---
 scripts/4.sonar-cloud.bat                                   | 2 +-
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java        | 6 ++++--
 src/main/java/es/upm/miw/iwvg/forge/junit/User.java         | 3 +--
 .../miw/iwvg/forge/junit/exception/DecimalCollection.java   | 2 +-
 src/main/java/es/upm/miw/iwvg/forge/test/NaturalDao.java    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index ca95a69..3901824 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -13,7 +13,7 @@ echo JAVA_HOME --- %JAVA_HOME%
 echo M2_HOME   --- %M2_HOME%
 echo .
 cd %workspace%
-echo ============ mvn clean test (profile: develop) =======================================================
+echo ============ mvn sonar:sonar ... =======================================================
 echo .
 call mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 pause
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index f080973..e3bd589 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -2,7 +2,9 @@
 
 public class Point {
 
-    private int x, y;
+    private int x;
+
+    private int y;
 
     public Point(int x, int y) {
         this.x = x;
@@ -18,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt(this.x * this.x + this.y * this.y);
+        return Math.sqrt((double)this.x * this.x + this.y * this.y);
     }
 
     public double phase() {
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/User.java b/src/main/java/es/upm/miw/iwvg/forge/junit/User.java
index 0200c49..1fe0282 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/User.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/User.java
@@ -15,8 +15,7 @@ public User(int number, String name, String familyName) {
     }
 
     private String format(String string) {
-        string = string.trim();
-        return string.substring(0, 1).toUpperCase() + string.substring(1).toLowerCase();
+        return string.trim().substring(0, 1).toUpperCase() + string.substring(1).toLowerCase();
     }
 
     public String fullName() {
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollection.java b/src/main/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollection.java
index cbde1ef..62d3508 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollection.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollection.java
@@ -8,7 +8,7 @@ public class DecimalCollection {
     private List<Double> collection;
 
     public DecimalCollection() {
-        this.collection = new ArrayList<Double>();
+        this.collection = new ArrayList<>();
     }
 
     public void add(double value) {
diff --git a/src/main/java/es/upm/miw/iwvg/forge/test/NaturalDao.java b/src/main/java/es/upm/miw/iwvg/forge/test/NaturalDao.java
index 94bd658..13074b1 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/test/NaturalDao.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/test/NaturalDao.java
@@ -8,7 +8,7 @@ public void save(Natural natural) {
         this.natural = natural;
     }
 
-    public Natural findOne(Integer id) {
+    public Natural findOne() {
         // Se recupera de la BD
         return natural;
     }

From 9ac36e6a7dd2fe0a6cd65575190925af1c3a641a Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sun, 3 Sep 2017 20:06:11 +0200
Subject: [PATCH 09/46] conar coverage

---
 scripts/4.sonar-cloud.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index 3901824..ea119bd 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -15,6 +15,7 @@ echo .
 cd %workspace%
 echo ============ mvn sonar:sonar ... =======================================================
 echo .
+call mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
 call mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 pause
 

From f791d722da5e0388b6e25c4ed59666d296a17b71 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 00:23:29 +0200
Subject: [PATCH 10/46] clean

---
 scripts/Package.sh | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 scripts/Package.sh

diff --git a/scripts/Package.sh b/scripts/Package.sh
deleted file mode 100644
index 71f27db..0000000
--- a/scripts/Package.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#echo off
-export workspace=/home/gonzalo/Escritorio/master/workspace/gonzalo.gutierrez.ecp1.miw.upm.es
-#set PATH=%PATH%C:\Program Files\Java\jdk1.8.0_40\bin;C:\Archivos_de_programa_Portables\apache-maven-3.3.1\bin
-#set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_40
-echo -----------------------------------------
-echo ". (C) MIW"
-echo -----------------------------------------
-echo .
-echo Workspace --- $workspace
-echo .
-echo .
-
-cd $workspace
-# -ff, --fail-fast. Stop at first failure in reactorized builds. Línea de comentario
-echo "============ mvn -ff clean test (profile: develop) ========================================================================="
-echo .
-mvn -ff clean test 
-if [ $? -gt 0 ] ; then
-	echo .
-	echo .
-	echo .
-	echo "########  ERRORES..."
-else
-	echo .
-	echo ":: -Dmaven.test.skip=true. To skip running the tests for a particular project"
-	echo "============ call mvn -Dmaven.test.skip=true install -Denvironment.type=preproduction (profile: preproduction) ================"
-	echo .
-	mvn -Dmaven.test.skip=true install -Denvironment.type=preproduction
-	exit    
-fi

From 7b561c165e57c4269d43f83d0e03d34e8ad1cf69 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 00:43:21 +0200
Subject: [PATCH 11/46] clean sonar cloud

---
 settings.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/settings.xml b/settings.xml
index ea2fe8f..e2c0037 100644
--- a/settings.xml
+++ b/settings.xml
@@ -36,20 +36,5 @@
 				<environment.type>production</environment.type>
 			</properties>
 		</profile>
-		<profile>
-            <id>sonar</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <!-- Optional URL to server. Default value is http://localhost:9000 -->
-                <sonar.host.url>
-                  http://myserver:9000
-                </sonar.host.url>
-            </properties>
-        </profile>
 	</profiles>
-	<pluginGroups>
-        <pluginGroup>org.sonarsource.scanner.maven</pluginGroup>
-    </pluginGroups>
 </settings>       
\ No newline at end of file

From 646e6f72fb28a62113bb6ea3c67bf7f86101cbac Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 06:40:46 +0200
Subject: [PATCH 12/46] Travis & sonar

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2058695..19d90eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,4 +15,6 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 #Test unitario y de integracion en develop
+- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
+- mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 - mvn verify --settings settings.xml

From 8c71ece5d42bce9d00800de339e7e404f456c4a8 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 06:51:20 +0200
Subject: [PATCH 13/46] travis-ci & sonar

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 19d90eb..1767033 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,6 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 #Test unitario y de integracion en develop
-- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
+- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install --settings settings.xml
 - mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 - mvn verify --settings settings.xml

From 5ef98537bc23f427a1b34cbcb172b61f4322e2d1 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:01:11 +0200
Subject: [PATCH 14/46] travis-ci & sonar

---
 .travis.yml                                          | 3 ++-
 scripts/4.sonar-cloud.bat                            | 2 +-
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1767033..d94975f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ services:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
-#Test unitario y de integracion en develop
+
 - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install --settings settings.xml
 - mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
+#Test unitario y de integracion en develop
 - mvn verify --settings settings.xml
diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index ea119bd..10b5081 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -15,7 +15,7 @@ echo .
 cd %workspace%
 echo ============ mvn sonar:sonar ... =======================================================
 echo .
-call mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install
+call mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install --settings settings.xml
 call mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 pause
 
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index e3bd589..9b3f2bd 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x + this.y * this.y);
+        return Math.sqrt((double)this.x * this.x * this.y * this.y);
     }
 
     public double phase() {

From 763fa53e6d363fbb6463c5b3a5ce2301f227c97e Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:07:50 +0200
Subject: [PATCH 15/46] travis-ci & sonar

---
 .travis.yml                                          | 2 --
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d94975f..cfaf176 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,5 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 
-- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install --settings settings.xml
-- mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 #Test unitario y de integracion en develop
 - mvn verify --settings settings.xml
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index 9b3f2bd..e3bd589 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x * this.y * this.y);
+        return Math.sqrt((double)this.x * this.x + this.y * this.y);
     }
 
     public double phase() {

From 3363d5a33892101388099e07779d4928bf8573c3 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:14:54 +0200
Subject: [PATCH 16/46] scripts in travis

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cfaf176..00f6f3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,10 @@ services:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
-
+- mvn test --settings settings.xml
+- if errorLevel 1 goto error
 #Test unitario y de integracion en develop
 - mvn verify --settings settings.xml
+- exit
+- :error
+- echo .....=====......

From 60dc3daa3099b66b4f7db850ab7a823b976fea20 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:20:15 +0200
Subject: [PATCH 17/46] travis scripts

---
 .travis.yml                                          | 8 ++++----
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00f6f3c..f76076d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 - mvn test --settings settings.xml
-- if errorLevel 1 goto error
+- if [ $? -gt 0 ] ; then
+-  echo .
+-  echo "=====================>>>>>>>>>>>>>  ERRORES..."
+- else
 #Test unitario y de integracion en develop
 - mvn verify --settings settings.xml
-- exit
-- :error
-- echo .....=====......
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index e3bd589..9b3f2bd 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x + this.y * this.y);
+        return Math.sqrt((double)this.x * this.x * this.y * this.y);
     }
 
     public double phase() {

From 364791b51c3651f73a31f1ffcdd0c2b88749ed12 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:27:34 +0200
Subject: [PATCH 18/46] travis scripts

---
 .travis.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f76076d..fd90cce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,5 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 - mvn test --settings settings.xml
-- if [ $? -gt 0 ] ; then
--  echo .
--  echo "=====================>>>>>>>>>>>>>  ERRORES..."
-- else
-#Test unitario y de integracion en develop
-- mvn verify --settings settings.xml
+- if [ $? -gt 0 ] ; then echo "=====================>>>>>>>>>>>>>  ERRORES..."; else mvn verify --settings settings.xml; fi
+

From fdb56a886bc61862362660a530cf5988a380d6d6 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 07:41:48 +0200
Subject: [PATCH 19/46] tavis-ci scripts

---
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index 9b3f2bd..e3bd589 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x * this.y * this.y);
+        return Math.sqrt((double)this.x * this.x + this.y * this.y);
     }
 
     public double phase() {

From a937f8f276ee05cec4c6614e7aeeefd36c15ddae Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 08:10:15 +0200
Subject: [PATCH 20/46] readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index db5250b..8c07af2 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
+
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 
 ### Tecnologías necesarias

From 2c3c01ac950f99835bb15e183da55cf8305fdbf5 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 08:15:57 +0200
Subject: [PATCH 21/46] readme

---
 README.md                 | 2 ++
 scripts/4.sonar-cloud.bat | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8c07af2..8f386d0 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
+### Status code
+
 [![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 
 [![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index 10b5081..5bd5e28 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -13,9 +13,11 @@ echo JAVA_HOME --- %JAVA_HOME%
 echo M2_HOME   --- %M2_HOME%
 echo .
 cd %workspace%
+echo ============ mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml ... ==================
+echo . Se prepara cobertura
+call mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml
+
 echo ============ mvn sonar:sonar ... =======================================================
-echo .
-call mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install --settings settings.xml
+echo . Se analiza y sube a sonar cloud
 call mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
 pause
-

From 8662d9e8fe545196c3d29a9f6b929cefb529f91e Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 08:21:49 +0200
Subject: [PATCH 22/46] readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f386d0..fe5c6f3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 #### Asignatura: *Ingeniería Web: Visión General*
 #### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
 
-### Status code
+### Estado del código
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
 

From 99b516dd0f82f9ac047d35a9aa525ae23a72685f Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 4 Sep 2017 08:34:08 +0200
Subject: [PATCH 23/46] readme

---
 .travis.yml |  4 +---
 README.md   | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd90cce..6f30a0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,4 @@ services:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
-- mvn test --settings settings.xml
-- if [ $? -gt 0 ] ; then echo "=====================>>>>>>>>>>>>>  ERRORES..."; else mvn verify --settings settings.xml; fi
-
+- mvn verify --settings settings.xml
diff --git a/README.md b/README.md
index fe5c6f3..28a258a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Forja
-#### Asignatura: *Ingeniería Web: Visión General*
-#### [Máster en Ingeniería Web por la U.P.M.](http://miw.etsisi.upm.es)
+> Este proyecto pretende ser un ejemplo de preparación de una forja para el desarrollo de software colaborativo
+> ##### [Máster en Ingeniería Web por la Universidad Politécnica de Madrid (miw-upm)](http://miw.etsisi.upm.es)
+> ##### Asignatura: *Ingeniería Web: Visión General*
 
 ### Estado del código
 
@@ -15,7 +16,6 @@
 * Maven
 * Eclipse
 * GitHub
-
-### Descripción
-Este proyecto pretende ser un ejemplo de preparación de una forja para el desarrollo de software colaborativo
-
+* Travis-ci
+* Sonarcloud
+* Codebeat

From 9ba6ee8bdbb54d46fa1661206786f1853688751e Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Wed, 6 Sep 2017 12:13:24 +0200
Subject: [PATCH 24/46] update template maven

---
 docs/maven.zip       | Bin 3836 -> 5683 bytes
 docs/maven/README.md |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/maven.zip b/docs/maven.zip
index 076a1a1f6beb527ae6f2336558d245ce9fb88ea2..dcaae4f714e4f9c800e4872413420ee561f6f499 100644
GIT binary patch
literal 5683
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

literal 3836
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
LBpOqSG64J^ie3Q_

diff --git a/docs/maven/README.md b/docs/maven/README.md
index f5d7a40..3c1f14a 100644
--- a/docs/maven/README.md
+++ b/docs/maven/README.md
@@ -9,5 +9,8 @@
 * GitHub
 
 ### Descripción
-Este proyecto pretende ser un ejemplo de preparación de una forja para el desarrollo de software colaborativo
+Este proyecto pretende ser una plantilla maven para crear un proyecto
+1.- Descomprimir en la carpeta de trabajo
+1.- Editar el pom.xml y cambiarle el nombre del proyecto
+1.- Desde Eclipse, importar el proyecto como un proyecto de maven existente
 

From 917bcb9555b7a1cec75cfea32649adc6a40cc8b1 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Wed, 6 Sep 2017 12:37:54 +0200
Subject: [PATCH 25/46] refactoring scripts

---
 pom.xml                              | 3 +--
 scripts/0.version.bat                | 2 +-
 scripts/1.mvnAllUnitTest.bat         | 6 +++---
 scripts/2.mvnAllTest.bat             | 6 +++---
 scripts/3.mvnVeriryPreproduction.bat | 8 ++++----
 scripts/4.sonar-cloud.bat            | 2 +-
 scripts/{Test.sh => test.sh}         | 0
 7 files changed, 13 insertions(+), 14 deletions(-)
 rename scripts/{Test.sh => test.sh} (100%)

diff --git a/pom.xml b/pom.xml
index 528c740..3f03072 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,11 +30,10 @@
 		<log4j.version>2.3</log4j.version>
 		<!-- Data Base -->
 		<database.driver>com.mysql.jdbc.Driver</database.driver>
-		<database.url>jdbc:mysql://localhost:3306/eco</database.url>
+		<database.url>jdbc:mysql://localhost:3306/forge</database.url>
 	</properties>
 
 	<profiles>
-		<!-- Maven will apply this by default as we set in $HOME/.m2/settings.xml -->
 		<!-- Default: -Denvironment.type=develop -->
 		<profile>
 			<id>develop</id>
diff --git a/scripts/0.version.bat b/scripts/0.version.bat
index a2b0458..06506cf 100644
--- a/scripts/0.version.bat
+++ b/scripts/0.version.bat
@@ -8,7 +8,7 @@ set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 ::echo saca por pantalla un mensaje
 echo -----------------------------------------
-echo . (C) MIW
+echo . (C) MIW - UPM
 echo -----------------------------------------
 echo .
 echo Workspace --- %workspace%
diff --git a/scripts/1.mvnAllUnitTest.bat b/scripts/1.mvnAllUnitTest.bat
index 47b32aa..d760f3c 100644
--- a/scripts/1.mvnAllUnitTest.bat
+++ b/scripts/1.mvnAllUnitTest.bat
@@ -5,7 +5,7 @@ set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
 set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
-echo . (C) MIW
+echo . (C) MIW - UPM
 echo -----------------------------------------
 echo .
 echo Workspace --- %workspace%
@@ -13,8 +13,8 @@ echo JAVA_HOME --- %JAVA_HOME%
 echo M2_HOME   --- %M2_HOME%
 echo .
 cd %workspace%
-echo ============ mvn clean test (profile: develop) =======================================================
+echo ============ mvn clean test --settings settings.xml  (profile: develop) =====================================
 echo .
-call mvn clean test  --settings settings.xml
+call mvn clean test --settings settings.xml
 pause
 
diff --git a/scripts/2.mvnAllTest.bat b/scripts/2.mvnAllTest.bat
index 698fe71..c4d5a86 100644
--- a/scripts/2.mvnAllTest.bat
+++ b/scripts/2.mvnAllTest.bat
@@ -5,7 +5,7 @@ set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
 set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
-echo . (C) MIW
+echo . (C) MIW - UPM
 echo -----------------------------------------
 echo .
 echo Workspace --- %workspace%
@@ -14,8 +14,8 @@ echo M2_HOME   --- %M2_HOME%
 echo .
 cd %workspace%
 
-echo ============ mvn clean test (profile: develop) =======================================================
+echo ============ mvn clean verify (profile: develop) =======================================================
 echo .
-call mvn verify test  --settings settings.xml
+call mvn clean verify test --settings settings.xml
 pause
 
diff --git a/scripts/3.mvnVeriryPreproduction.bat b/scripts/3.mvnVeriryPreproduction.bat
index 3e60523..e134605 100644
--- a/scripts/3.mvnVeriryPreproduction.bat
+++ b/scripts/3.mvnVeriryPreproduction.bat
@@ -5,7 +5,7 @@ set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
 set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
-echo . (C) MIW
+echo . (C) MIW - UPM
 echo -----------------------------------------
 echo .
 echo Workspace --- %workspace%
@@ -14,7 +14,7 @@ echo M2_HOME   --- %M2_HOME%
 echo .
 cd %workspace%
 
-:: -ff, --fail-fast. Stop at first failure in reactorized builds. Línea de comentario
+:: -ff, --fail-fast. Stop at first failure in reactorized builds
 echo ============ mvn -ff clean test --settings settings.xml (profile: develop) ==================================
 echo .
 call mvn -ff clean test --settings settings.xml
@@ -22,7 +22,7 @@ if errorLevel 1 goto errorDevelop
 
 echo .
 :: -Dmaven.test.skip=true. To skip running the tests for a particular project
-echo ============ call mvn -Dmaven.test.skip=true veriry -Denvironment.type=preproduction --settings settings.xml (profile: preproduction) ======
+echo ============ call mvn -Dmaven.test.skip=true verify -Denvironment.type=preproduction --settings settings.xml  ======
 echo .
 call mvn -Dmaven.test.skip=true verify -Denvironment.type=preproduction --settings settings.xml
 pause
@@ -32,5 +32,5 @@ exit
 echo .
 echo .
 echo .
-echo ########  ERRORES...
+echo >>>>>>>>>>>>>>>>>>>  ERRORES!!!!!!!!!!!!!!
 pause
diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index 5bd5e28..8e310f8 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -5,7 +5,7 @@ set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
 set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
-echo . (C) MIW
+echo . (C) MIW -UPM
 echo -----------------------------------------
 echo .
 echo Workspace --- %workspace%
diff --git a/scripts/Test.sh b/scripts/test.sh
similarity index 100%
rename from scripts/Test.sh
rename to scripts/test.sh

From 338f9a1b139f6c476047b8a6eac657dd2e1a4af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ster=20en=20Ingenier=C3=ADa=20Web?=
 <miw@etsisi.upm.es>
Date: Sun, 10 Sep 2017 21:21:35 +0200
Subject: [PATCH 26/46] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28a258a..78e8e80 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 ### Estado del código
 
-[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG.Forge)
+[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
 [![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
 

From 1a154c005575ba7c648d832eac46fb9bcc247810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ster=20en=20Ingenier=C3=ADa=20Web?=
 <miw@etsisi.upm.es>
Date: Sun, 10 Sep 2017 21:25:32 +0200
Subject: [PATCH 27/46] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 78e8e80..279e2de 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 ### Estado del código
 
-[![Build Status](https://travis-ci.org/miw-upm/IWVG.Forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
+[![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
 [![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
 

From cc6a073eeea63c609664454b7c47eb33ec43a5d2 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Mon, 11 Sep 2017 21:25:14 +0200
Subject: [PATCH 28/46] update maven 3.5

---
 docs/maven.zip                       | Bin 5683 -> 5684 bytes
 docs/maven/pom.xml                   |   2 +-
 pom.xml                              |   2 +-
 scripts/0.version.bat                |   4 ++--
 scripts/1.mvnAllUnitTest.bat         |   4 ++--
 scripts/2.mvnAllTest.bat             |   6 +++---
 scripts/3.mvnVeriryPreproduction.bat |   4 ++--
 scripts/4.sonar-cloud.bat            |   4 ++--
 scripts/test.sh                      |   2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/maven.zip b/docs/maven.zip
index dcaae4f714e4f9c800e4872413420ee561f6f499..8ec595c68f8b06a9cdcdab7e7b235d03aabcbba4 100644
GIT binary patch
delta 1541
zcmV+g2KxE4EVL}JlmQ9ysw+#Agr<Ewlbrz@e~!~I5I%#%JD3$GMD1M`5UfJ@(eks1
zg_Zcdx{2F$apGV*Ed}vZ964~{fp`VRc48+fg(9fn(#?GSW<28=PbT~A^Oxk-yF#Ej
zQ<}^2=FT48-9fC(WX{X!&7Bv|?~ktU+)B@#O)4d4EHmfMo&kkY-`qJhraB;`pmSDY
ze_GM(lwql+<mBlwxq^4WP|H1dr+MHn77M)Ccg)MXyL;sI@#ANpTF?<MwV`FktR83_
zXa_%*88zVB1{<PvjCVTs;K=bX$U6`d?2{BSXX2#~KXt1K>0y>cmEjYbnWH>CdiC-F
zz7IxOLL%%~Qzh#Po|(pVRp5dz65_CCe|_Fq+_Srko;|s9^6cT$=Lwm2b^@Q@&?%gK
zI-@EfL2SG&X~EJ9ADUd?#`;Gbq3F}cgjjl`3F{SuHKy%8XOi=y5xRo})yS@JmeZVR
zq#2@F#&U)VmUCJfhAw=-7=OHk?#(bf3pu?q!;Qxu(P$K{J)(0OfVPBES3wDBe`UYg
zIy<hp$g!5S%GkYz0pYb|h+rLa)s|wFR0d!yYg5(c$M$~79@z9d>WzFHvimk?`5PQ7
z0FI;s#6vu`RT@sw7jh<xiVLO!dmmp-NPlgOC5)akZ4l)12y!`9G~-`C4ed`T7n)93
zuyGmh-N1W(i@3bH#fhrfnCf6|e^!^=1lkq62R0nGs`^+?qn<CSxch!W9JH!-NDW1I
zsb)bp2V@KY&J_oG3I~FVrG6{$EFWk1(4h$#&<47-5~-yhI8Epv0-BCEmD(Ka@9$nC
zER)tmWV^dc;+=|@Yy#QP!+b8d5QtWlSR!-EH5xA=B@<c;gW&iU4DOvlf4oE&9zH$3
zM{seO0AQ<AV`!kgTXyL64$$b3m2<9SS+LSzv#i+7oXwe#Rl^VNSOFxSrwt(?@a#e8
z6nyUbs|P}(ST=IgbB25Q-V!)-Dry$ZJFzuLIu@Ng*mI>fxr%_$g*Atjlm;x1>uEv;
zaLbOF(U4lZl8_#@LaeCPe+#MdG!P@!x;gBaq&d!*i(+0P_tFyLN9m{(1C_kaY^dv#
z(xYuFHN8!?kRV=8<c9evmM`GX#u+M>C-Au4JZ+Ms?Pq9<>0wGqwPAjwIc4g%QsgxL
zAWN+f`e@E7R_5@EZRo4-j7agv5~nX1&Dzlq!kyYzynC7SX0bE9f0@p$k7&h*Bi)%e
zv<*j}Ft#<}M1QvBUnUj%uN~B40>8Yd#9wq167Oc1Unky88ta^F*MI7nV{GVIE5{;D
z+>GkUVHC7t6U99kwW*@$ZOu?di!o<NNR8mGOQ56NixUn9ucVc`lX)9{G##!ZS1^1^
zwM@0jU}WPZ3A-mGf2_82xMqeaJCzz$Lp=q#y{KLLQEcyFC2FV$Cj`j~YYNCukd0C=
zH-qH(ud{ZV9eIsmvijNT55TKwYc(=iPWZG|p<_DKM`e?qzv<|DIIs+b4?VNO@^EO-
z!yO#xL)g+mwKMr|98|0Fy9dR~Ow_s0e-BA7UL+Tfp5qyOfA=M%0b5o8^iNL7ekZ<T
zS#1Hwi%{e=FJSJ!Uo1W{&=10E*q^AR!dr;)4^%81l}OZD6Ms`GZ+MkXfC|^eJx2>a
zJ~9$Q_(f2V06tl65Q-=My8t?fUMcV(xHS;kMreiRn}8{|){#LB1JV=t2}4nHHb;49
z(qaWvZ)$&TLr?9mz4qXfeQX$TmuSh~`#6q|UZEE!#|i18ZU2<b2U;tncT{%D4a=ZF
ztlV2WY~Agyx#uv*bR+7DewYdW9!S3fv+xED2?_G5D@&7vrhPn<1`sj^38S}lGb@um
z5Ih0#lY0<g0ZWtI5Mu#TlRyz$0eh325nutRll>880os%O5f_sS3kj1N6%><~5;_7E
z3zIMl8<Xx5P6A8|lQ0V#lUWmF0{jb;Fbf-#+7nm-#FH}=U;^<ClRgd>ldBX?0wWHS
rJ`Nv~8Wm0gUJjG64jYq&6;1+`4wJABB$FBy43h;GC<fII000009*ojV

delta 1540
zcmV+f2K)K6EVC@IlmQ9UiX%%I-yM!Slbrz@e{R$;5I%#%JD7?SV(pe91XTz>DnCUO
zD)D>uCf=<VCl0o=%Yt|+jvP4fK)eEDJF$~&7Z$+^F5ArKZ^kp8@nq8PU%n={-xmVS
znbKUAw|4gM?hayQCUag+Z|%H%@nCdg=XQGGd{QYnW0|>d{v0Tj`qs{=G1UPf1)Z}J
zf76O)rwmIqB`430$u+zShFb2yd(8uXu~^{6zGGh9-Q6Q^j-NaS)q;+AsSPbNX7xbh
zKs)$}%%}n1HrNoYW4zb72S<*FLEeFwV4tLrITNpZ_^De>NDs3lstljd%pB$E(d$<a
z@dGf*5)xs@nkrdW@XR!>s{$8%kr0P9f9vzc;-1}Q^!(}Fljo0~y-3KsvlICImQLa9
z(-~C>31Z`INeh-<`q<<GH`YJl2t}VhCB)JjO<1oOtTAo(IhR}<jnG{rs77{$vz+Ek
zBh3)aGL|z`u$<G<Fm&l7#`x0}bbp57S;*<N8E!oOghr!i?J=Fx0JJ5Px(Z52e=Gad
z*4c5*MUJ(sRmSc&3<$3!Lj>!XtF{!Yq%r_wS(~ahXWRQFdtlS=s5kO)$nM*m<!^DU
z063Bk5D)R#R%tjzU&xs(DlV7`?0vkSkp9{lOBlUi+91g15#(~JXvV*N9@?K!E;OC6
zVB;#@yNUPw7IArXixX9|G1bA`f2=OK3AAf?4{SJWRrQISMm<+lad#V?gI3iJsiEi|
z)hy`dfQ$jax#B=i;XrV))b9kI<>L$=Iy4~z+CaBfBDM4brwJWIK+_SYQk#SQ{oU(?
zWzw36Y<E{lyi@U#O&}Y3n9l_l0@11xOJq*DM&l)<WI}6U5FFov!M!txf0yXeqi4tW
z2`;V@0Bm(?3=On*%MQKX0U8~$a?X`33sxFzmKD2|vpEy8YWTq&D}coFv>_w}o;?Vi
zg3n!l^+0G8%SLW`&Tuc^TLNcJMa`mlC$<Jj$D)%5d#>~*R}m1pu;#Fm(tzc0Jx#~}
zZrL$28d7Ul64Jv~h!xd(e<4+#24cioH-{aQG{+fpQOrx^URpw&m5xd=P|54ehPpl}
zJ=(TX)7xYV3F75MZkV59`4awYoS|ZQ0*~9x(<VvUeulP~9;TF38|FuvQ>K0^MNZ=n
zveXKpkLIjmWe%^{hQ9jFh!lS;ar%PMtR4Lz+^K!VyO&9C7CYCQf9c%%h*o?!(w&P#
z+i>&=V_OqW^k-ZCWm2*K+CeQQ@XL!z{6#k*@ot9sb>iKmvCheM{imKe#)h7?axBus
z&8VInMnNk!QQU`7n<|Rl)eL2{7;}b%)Clgn1UkySIN@;cN?N%)nYZCb)8RUD1;eLQ
z%T%ijMmAoOuzNzne`-sIYi5|TQ>jrk)Kie#i`umx#r7UnqK1laLXfPmrhxne*(mjL
zGf0mAI%}udk=Ga|tDmj@0KA&ERwI+;gimV~I;KN?R5t1P+m5b>1ItkO&@(G64~GUl
z+`)l9ge@IZJCpy$LA5Hsdr-X0M4kKm_mK4RWperG1)jloe_uixuw?~6|KybHcj9}N
z)fRBP2t`iw0_Ohv#o{9a{UE%C{fSB{yoD&Ap<>~vM55N3_?uFB%d2z(RJbngIa)aT
z$Vdp`7ePS+_++_3D4zK50_Y%mrND#W)<9?*p%t2M0;b$rM+PwrNKfG>3`Nb^9Oa!!
zixp74sr|V#Lbbp4+JjH_v0=bnq9y;}<2XKgjb5G{C!~wE{Zlp{XswXmRoN*wEQ12E
za&PUhb+^0bp2Hy1ji@X7VJ7^0ApHTe@dgbElb{m>1sUHRjysbF5Hbewj30W)B$Gc7
zJOS{Nd=Ov(N|W6XV*yf=K@nR4dXt?IU;(F-{t;yX*^~Ye7n2MN36mQY6qA?|Isz06
zlQ9b$lkXBv0!s^%F$)`$S`%af`wNpX3mcQ$6IcPmlQa}y0`Lu!KMod?tQ1ZHA`X*3
q4j+>n6;1+O4wJDC8<U0=P6Ct;ld%pYlN%KblLi(j2GkA!0000vmfmRq

diff --git a/docs/maven/pom.xml b/docs/maven/pom.xml
index 4939e48..a032113 100644
--- a/docs/maven/pom.xml
+++ b/docs/maven/pom.xml
@@ -21,7 +21,7 @@
 		<project.resources.sourceEncoding>${encoding}</project.resources.sourceEncoding>
 		<jdk.version>1.8</jdk.version>
 		<!-- Maven -->
-		<maven.compiler.version>3.3</maven.compiler.version>
+		<maven.compiler.version>3.5</maven.compiler.version>
 		<!-- Maven. Test de Integración -->
 		<maven.failsafe.version>2.19.1</maven.failsafe.version>
 		<!-- Pruebas -->
diff --git a/pom.xml b/pom.xml
index 3f03072..890250d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 		<project.resources.sourceEncoding>${encoding}</project.resources.sourceEncoding>
 		<jdk.version>1.8</jdk.version>
 		<!-- Maven -->
-		<maven.compiler.version>3.3</maven.compiler.version>
+		<maven.compiler.version>3.5</maven.compiler.version>
 		<!-- Maven. Test de Integración -->
 		<maven.failsafe.version>2.19.1</maven.failsafe.version>
 		<!-- Pruebas -->
diff --git a/scripts/0.version.bat b/scripts/0.version.bat
index 06506cf..2655325 100644
--- a/scripts/0.version.bat
+++ b/scripts/0.version.bat
@@ -1,9 +1,9 @@
 @echo off
 ::set se definen variables
-set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG-forge
 ::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
-set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.5.0
 :: %var% se accede a una variable
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 ::echo saca por pantalla un mensaje
diff --git a/scripts/1.mvnAllUnitTest.bat b/scripts/1.mvnAllUnitTest.bat
index d760f3c..ba23639 100644
--- a/scripts/1.mvnAllUnitTest.bat
+++ b/scripts/1.mvnAllUnitTest.bat
@@ -1,8 +1,8 @@
 @echo off
-set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG-forge
 ::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
-set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.5.0
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
 echo . (C) MIW - UPM
diff --git a/scripts/2.mvnAllTest.bat b/scripts/2.mvnAllTest.bat
index c4d5a86..fe81748 100644
--- a/scripts/2.mvnAllTest.bat
+++ b/scripts/2.mvnAllTest.bat
@@ -1,8 +1,8 @@
 @echo off
-set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG-forge
 ::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
-set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.5.0
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
 echo . (C) MIW - UPM
@@ -16,6 +16,6 @@ cd %workspace%
 
 echo ============ mvn clean verify (profile: develop) =======================================================
 echo .
-call mvn clean verify test --settings settings.xml
+call mvn clean verify --settings settings.xml
 pause
 
diff --git a/scripts/3.mvnVeriryPreproduction.bat b/scripts/3.mvnVeriryPreproduction.bat
index e134605..95c3d7d 100644
--- a/scripts/3.mvnVeriryPreproduction.bat
+++ b/scripts/3.mvnVeriryPreproduction.bat
@@ -1,8 +1,8 @@
 @echo off
-set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG-forge
 ::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
-set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.5.0
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
 echo . (C) MIW - UPM
diff --git a/scripts/4.sonar-cloud.bat b/scripts/4.sonar-cloud.bat
index 8e310f8..92e681d 100644
--- a/scripts/4.sonar-cloud.bat
+++ b/scripts/4.sonar-cloud.bat
@@ -1,8 +1,8 @@
 @echo off
-set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG.Forge
+set workspace=C:\DatosJBB\WorkSpaces\Oxygen\IWVG-forge
 ::Las variables de entorno se pueden configurar directamente en Windows cuando se tienen los permisos necesarios
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_65
-set M2_HOME=C:\Archivos_de_programa\apache-maven-3.3.3
+set M2_HOME=C:\Archivos_de_programa\apache-maven-3.5.0
 set PATH=%PATH%;%JAVA_HOME%\bin;%M2_HOME%\bin
 echo -----------------------------------------
 echo . (C) MIW -UPM
diff --git a/scripts/test.sh b/scripts/test.sh
index 8a9cb34..dc0399d 100644
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,6 +1,6 @@
 #echo off
 export workspace=/home/gonzalo/Escritorio/master/workspace/gonzalo.gutierrez.ecp1.miw.upm.es
-#set PATH=%PATH%C:\Program Files (x86)\Java\jre1.8.0_51\bin;C:\Users\bm0827\Desktop\apache-maven-3.3.3\bin
+#set PATH=%PATH%C:\Program Files (x86)\Java\jre1.8.0_51\bin;C:\Users\bm0827\Desktop\apache-maven-3.5.0\bin
 #set JAVA_HOME=C:\Program Files (x86)\Java\jre1.8.0_51
 echo -----------------------------------------
 echo ".(C) MIW"

From cda8521485eb4674b0cc9f1fec7c5c0d3c6f8593 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:03:25 +0200
Subject: [PATCH 29/46] update travis-ci & sonarcloud

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6f30a0d..88499b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,3 +15,5 @@ before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
 - mvn verify --settings settings.xml
+- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml
+- mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml

From c0c86dd67ff1aa3c8c700056226a8ee45a96aa4c Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:20:16 +0200
Subject: [PATCH 30/46] sonar & enviroment

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 88499b3..5481faa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,6 @@ services:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
-- mvn verify --settings settings.xml
-- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml
-- mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=2c0fb8373ef9b9e73ffad70e23f1a77158fb0e37 --settings settings.xml
+- mvn clean verify --settings settings.xml
+- mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml
+- mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR --settings settings.xml

From 594dddf3b8dbce4fd356cac91750ee6f9f3175ff Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:32:58 +0200
Subject: [PATCH 31/46] update pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 890250d..125a503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	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>
-	<artifactId>IWVG.Forge</artifactId>
+	<artifactId>IWVG-forge</artifactId>
 	<groupId>es.upm.miw</groupId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>

From efca1fb5805a52f6c75a854b0b413265c2e85a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ster=20en=20Ingenier=C3=ADa=20Web?=
 <miw@etsisi.upm.es>
Date: Tue, 12 Sep 2017 23:33:57 +0200
Subject: [PATCH 32/46] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 279e2de..92eb0e1 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From e28a255c89795c32a71f98114983fadd31d82fc7 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:45:25 +0200
Subject: [PATCH 33/46] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 279e2de..92eb0e1 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG.Forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG.Forge)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From 1566232cb73e028bd943cc8212e4d64165f6ce05 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:48:30 +0200
Subject: [PATCH 34/46] update readme

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 92eb0e1..c7c078b 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,6 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
-
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 
 ### Tecnologías necesarias

From fe3bf9577de11a58dd07de46dbdf7620ae5a91b6 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:48:58 +0200
Subject: [PATCH 35/46] update readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c7c078b..92eb0e1 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
+
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 
 ### Tecnologías necesarias

From 59e4cb2bc698b9fa595a2dec9c7104501239b74c Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Tue, 12 Sep 2017 23:59:09 +0200
Subject: [PATCH 36/46] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92eb0e1..5885a73 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=miw-upm-iwvg-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From 855b70afbfb1076400cdd81c975958a86ebc24e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ster=20en=20Ingenier=C3=ADa=20Web?=
 <miw@etsisi.upm.es>
Date: Wed, 13 Sep 2017 00:10:28 +0200
Subject: [PATCH 37/46] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5885a73..92eb0e1 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 [![Build Status](https://travis-ci.org/miw-upm/IWVG-forge.svg?branch=develop)](https://travis-ci.org/miw-upm/IWVG-forge)
 
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=miw-upm-iwvg-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=es.upm.miw:IWVG-forge)](https://sonarcloud.io/dashboard/index/es.upm.miw:IWVG-forge)
 
 [![codebeat badge](https://codebeat.co/badges/72a87b0f-0ada-4895-9fcb-1d10a392bdaf)](https://codebeat.co/projects/github-com-miw-upm-iwvg-forge-develop)
 

From 98b9883a26e385fb3c7752a19109e5df11de642a Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Thu, 14 Sep 2017 10:20:56 +0200
Subject: [PATCH 38/46] update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5481faa..d223737 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,6 @@ services:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS forge;'
 script:
-- mvn clean verify --settings settings.xml
+- mvn verify --settings settings.xml
 - mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify --settings settings.xml
 - mvn sonar:sonar -Dsonar.organization=miw-upm-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR --settings settings.xml

From 093f905c6bd7dce3ebdbae8f721a707768873f1e Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Thu, 14 Sep 2017 10:24:53 +0200
Subject: [PATCH 39/46] error

---
 src/main/java/es/upm/miw/iwvg/forge/junit/Point.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index e3bd589..9b3f2bd 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x + this.y * this.y);
+        return Math.sqrt((double)this.x * this.x * this.y * this.y);
     }
 
     public double phase() {

From ce99139d07c366514a8f6cd9ad0a26f796b763dc Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 12:02:24 +0200
Subject: [PATCH 40/46] error

---
 .../upm/miw/iwvg/forge/junit/LoggerDemo.java  | 22 +++++++++++++++++++
 .../es/upm/miw/iwvg/forge/junit/Point.java    |  2 +-
 .../es/upm/miw/iwvg/forge/log/LoggerDemo.java | 11 ++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java

diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
new file mode 100644
index 0000000..3bca0b7
--- /dev/null
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
@@ -0,0 +1,22 @@
+package es.upm.miw.iwvg.forge.junit;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LoggerDemo {
+
+    public void logs() {
+        Logger logger = LogManager.getLogger(this.getClass().getName());
+        logger.fatal("Log de fatal");
+        logger.error("Log de error");
+        logger.warn("Log de warning");
+        logger.info("Log de info");
+        logger.debug("Log de debug");
+        logger.trace("Log de trace");
+    }
+
+    public static void main(String[] args) {
+        new LoggerDemo().logs();
+    }
+
+}
diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
index 9b3f2bd..e3bd589 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/Point.java
@@ -20,7 +20,7 @@ public Point() {
     }
 
     public double module() {
-        return Math.sqrt((double)this.x * this.x * this.y * this.y);
+        return Math.sqrt((double)this.x * this.x + this.y * this.y);
     }
 
     public double phase() {
diff --git a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
index 97285dd..3065fec 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
@@ -1,9 +1,12 @@
 package es.upm.miw.iwvg.forge.log;
 
+import java.util.List;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class LoggerDemo {
+    private List<Double> collection;
 
     public void logs() {
         Logger logger = LogManager.getLogger(this.getClass().getName());
@@ -13,6 +16,14 @@ public void logs() {
         logger.info("Log de info");
         logger.debug("Log de debug");
         logger.trace("Log de trace");
+        
+        double higher = Double.NEGATIVE_INFINITY;
+        for (double item : this.collection) {
+            if (item > higher) {
+                higher = item;
+            }
+        }
+
     }
 
     public static void main(String[] args) {

From 8cf30f633c51e704d9b6b554f9da22cb4ba545fd Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 12:07:47 +0200
Subject: [PATCH 41/46] error

---
 src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
index 3065fec..3affa8c 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
@@ -1,12 +1,13 @@
 package es.upm.miw.iwvg.forge.log;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class LoggerDemo {
-    private List<Double> collection;
+    private List<Double> collection = new ArrayList<>();
 
     public void logs() {
         Logger logger = LogManager.getLogger(this.getClass().getName());

From b421cf38442937da3bd776897daeb8baf0c6c0b3 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 12:10:57 +0200
Subject: [PATCH 42/46] error

---
 .../java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
index 3bca0b7..7d9e7fc 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
@@ -14,6 +14,15 @@ public void logs() {
         logger.debug("Log de debug");
         logger.trace("Log de trace");
     }
+    public void logs2() {
+        Logger logger = LogManager.getLogger(this.getClass().getName());
+        logger.fatal("Log de fatal");
+        logger.error("Log de error");
+        logger.warn("Log de warning");
+        logger.info("Log de info");
+        logger.debug("Log de debug");
+        logger.trace("Log de trace");
+    }
 
     public static void main(String[] args) {
         new LoggerDemo().logs();

From 19796e39abc1d5cd32624ee3e4882bc949e2cce5 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 17:37:45 +0200
Subject: [PATCH 43/46] refactoring

---
 .../upm/miw/iwvg/forge/junit/LoggerDemo.java  | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java

diff --git a/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
deleted file mode 100644
index 7d9e7fc..0000000
--- a/src/main/java/es/upm/miw/iwvg/forge/junit/LoggerDemo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package es.upm.miw.iwvg.forge.junit;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class LoggerDemo {
-
-    public void logs() {
-        Logger logger = LogManager.getLogger(this.getClass().getName());
-        logger.fatal("Log de fatal");
-        logger.error("Log de error");
-        logger.warn("Log de warning");
-        logger.info("Log de info");
-        logger.debug("Log de debug");
-        logger.trace("Log de trace");
-    }
-    public void logs2() {
-        Logger logger = LogManager.getLogger(this.getClass().getName());
-        logger.fatal("Log de fatal");
-        logger.error("Log de error");
-        logger.warn("Log de warning");
-        logger.info("Log de info");
-        logger.debug("Log de debug");
-        logger.trace("Log de trace");
-    }
-
-    public static void main(String[] args) {
-        new LoggerDemo().logs();
-    }
-
-}

From 354497f328237a19781963b1654740045edf55e0 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 17:41:58 +0200
Subject: [PATCH 44/46] refactoring

---
 .../miw/iwvg/forge/junit/exception/DecimalCollectionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollectionTest.java b/src/test/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollectionTest.java
index 5213e1e..4271cc3 100644
--- a/src/test/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollectionTest.java
+++ b/src/test/java/es/upm/miw/iwvg/forge/junit/exception/DecimalCollectionTest.java
@@ -37,7 +37,7 @@ public void testAdd() {
 
 	@Test
 	public void testSum() {
-		assertEquals(6, this.decimalCollection.sum(), 10e-5);
+		assertEquals(6.0, this.decimalCollection.sum(), 10e-5);
 	}
 
 	@Test
@@ -48,7 +48,7 @@ public void testSumArithmeticExceptionIfEmpty() {
 
 	@Test
 	public void testHigher() {
-		assertEquals(3, this.decimalCollection.higher(), 10e-5);
+		assertEquals(3.0, this.decimalCollection.higher(), 10e-5);
 	}
 
 	@Test

From 53bd01da3905156711f8fb6890e47f16db42a555 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 17:55:47 +0200
Subject: [PATCH 45/46] refactoring

---
 src/test/java/es/upm/miw/iwvg/forge/AllForgeTests.java    | 3 ++-
 src/test/java/es/upm/miw/iwvg/forge/junit/.gitignore      | 1 -
 src/test/java/es/upm/miw/iwvg/forge/test/NaturalTest.java | 3 +--
 src/test/java/es/upm/miw/iwvg/forge/test/ServiceIT.java   | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 src/test/java/es/upm/miw/iwvg/forge/junit/.gitignore

diff --git a/src/test/java/es/upm/miw/iwvg/forge/AllForgeTests.java b/src/test/java/es/upm/miw/iwvg/forge/AllForgeTests.java
index a2ea455..2f258ef 100644
--- a/src/test/java/es/upm/miw/iwvg/forge/AllForgeTests.java
+++ b/src/test/java/es/upm/miw/iwvg/forge/AllForgeTests.java
@@ -14,7 +14,8 @@
     AllForgeJunitTests.class,
     AllForgeLogTests.class,
     AllForgeTestTests.class,
-    AllForgeTestIntegrationTests.class})
+    AllForgeTestIntegrationTests.class
+})
 public class AllForgeTests {
 
 }
diff --git a/src/test/java/es/upm/miw/iwvg/forge/junit/.gitignore b/src/test/java/es/upm/miw/iwvg/forge/junit/.gitignore
deleted file mode 100644
index 8f630a7..0000000
--- a/src/test/java/es/upm/miw/iwvg/forge/junit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/solution/
diff --git a/src/test/java/es/upm/miw/iwvg/forge/test/NaturalTest.java b/src/test/java/es/upm/miw/iwvg/forge/test/NaturalTest.java
index 50f15bb..99e5420 100644
--- a/src/test/java/es/upm/miw/iwvg/forge/test/NaturalTest.java
+++ b/src/test/java/es/upm/miw/iwvg/forge/test/NaturalTest.java
@@ -1,7 +1,6 @@
 package es.upm.miw.iwvg.forge.test;
 
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/es/upm/miw/iwvg/forge/test/ServiceIT.java b/src/test/java/es/upm/miw/iwvg/forge/test/ServiceIT.java
index cd40a62..78e4dec 100644
--- a/src/test/java/es/upm/miw/iwvg/forge/test/ServiceIT.java
+++ b/src/test/java/es/upm/miw/iwvg/forge/test/ServiceIT.java
@@ -1,7 +1,6 @@
 package es.upm.miw.iwvg.forge.test;
 
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 
 import es.upm.miw.iwvg.forge.test.Service;

From d88ce9fea040b70ee7d719de690bfb27b2bed331 Mon Sep 17 00:00:00 2001
From: JBernal <j.bernal@upm.es>
Date: Sat, 16 Sep 2017 17:59:45 +0200
Subject: [PATCH 46/46] refactoring

---
 .../es/upm/miw/iwvg/forge/log/LoggerDemo.java    | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
index 3affa8c..7cbae08 100644
--- a/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
+++ b/src/main/java/es/upm/miw/iwvg/forge/log/LoggerDemo.java
@@ -1,13 +1,9 @@
 package es.upm.miw.iwvg.forge.log;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class LoggerDemo {
-    private List<Double> collection = new ArrayList<>();
 
     public void logs() {
         Logger logger = LogManager.getLogger(this.getClass().getName());
@@ -17,18 +13,6 @@ public void logs() {
         logger.info("Log de info");
         logger.debug("Log de debug");
         logger.trace("Log de trace");
-        
-        double higher = Double.NEGATIVE_INFINITY;
-        for (double item : this.collection) {
-            if (item > higher) {
-                higher = item;
-            }
-        }
-
-    }
-
-    public static void main(String[] args) {
-        new LoggerDemo().logs();
     }
 
 }