Completed the exercise :)

.classpath

@@ -1,13 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/apache-tomcat-7.0.109">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -15,3 +15,4 @@
 hs_err_pid*
 replay_pid*
 /build/
+/target/

.project

@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

.settings/org.eclipse.jdt.core.prefs

@@ -10,6 +10,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.text.custom_code_templates=

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

.settings/org.eclipse.wst.common.component

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="java7-struts1-jquery-bootstrap3-web-project">
+
+    <wb-module deploy-name="java7-struts1-jquery-bootstrap3-web-project-0.0.1-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+
         <property name="java-output-path" value="/java7-struts1-jquery-bootstrap3-web-project/build/classes"/>
-        <property name="context-root" value="MyApp"/>
+        <property name="context-root" value="java7-struts1-jquery-bootstrap3-web-project"/>
+
     </wb-module>
+
 </project-modules>

.settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.wst.validation.prefs

@@ -1,2 +1,2 @@
+disabled=06target
 eclipse.preferences.version=1
-encoding/<project>=UTF-8

pom.xml

@@ -0,0 +1,66 @@
+<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>
+  <groupId>java7-struts1-jquery-bootstrap3-web-project</groupId>
+  <artifactId>java7-struts1-jquery-bootstrap3-web-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts-core</artifactId>
+      <version>1.3.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.tinylog</groupId>
+      <artifactId>tinylog-api</artifactId>
+      <version>2.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.10.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>2.2.224</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

src/main/java/MessageResources.properties

@@ -8,7 +8,18 @@ error.password.wrong=Wrong password
 user.not-found.error=User not found
 user.username-taken.error=Username's already taken
 user.delete.at-least-one.error=Must keep at least one user
+user.email.error=Email's not valid
 
 user.create.success=User "{0}" was created successfully
 user.update.success=User "{0}" was update successfully
 user.delete.success=User "{0}" was deleted successfully
+
+
+company.not-found.error=Company not found
+company.name-taken.error=Name's already taken
+company.delete.at-least-one.error=Must keep at least one company
+
+
+company.create.success=Company "{0}" was created successfully
+company.update.success=Company "{0}" was update successfully
+company.delete.success=Company "{0}" was deleted successfully

src/main/java/com/my_app/App.java

@@ -15,12 +15,15 @@
 import com.my_app.db.DataSourceFactory;
 import com.my_app.exception.AppGenericException;
 import com.my_app.model.City;
+import com.my_app.model.Company;
 import com.my_app.model.Country;
 import com.my_app.model.User;
 import com.my_app.repo.CityRepository;
+import com.my_app.repo.CompanyRepository;
 import com.my_app.repo.CountryRepository;
 import com.my_app.repo.UserRepository;
 import com.my_app.repo.impl.CityRepositoryImpl;
+import com.my_app.repo.impl.CompanyRepositoryImpl;
 import com.my_app.repo.impl.CountryRepositoryImpl;
 import com.my_app.repo.impl.UserRepositoryImpl;
 
@@ -81,6 +84,7 @@ private void initDb() {
 		try (final Connection conn = this.dataSource.getConnection()) {
 			initDbCountriesAndCities(conn);
 			initDbUsers(conn);
+			createDbCompanies(conn);
 		} catch (SQLException e) {
 			throw new AppGenericException("Error trying to insert initial db data", e);
 		}
@@ -115,7 +119,7 @@ private void initDbCountriesAndCities(Connection conn) throws SQLException {
 	private void initDbUsers(Connection conn) throws SQLException {
 		try (final Statement stmt = conn.createStatement()) {
 			stmt.executeUpdate(
-					"CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))");
+					"CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, EMAIL VARCHAR(255) NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))");
 		}
 
 		final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn));
@@ -130,5 +134,23 @@ private void initDbUsers(Connection conn) throws SQLException {
 
 		Logger.debug("All users created: {}", userRepository.findAll());
 	}
+
+	private void createDbCompanies(Connection conn) throws SQLException {
+		try (final Statement stmt = conn.createStatement()) {
+			stmt.executeUpdate(
+					"CREATE TABLE \"COMPANY\" (ID IDENTITY NOT NULL PRIMARY KEY, NAME VARCHAR(255) UNIQUE NOT NULL, ADDRESS VARCHAR(255) NOT NULL, VAT BIGINT NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))");
+		}
+
+		final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn));
+		final CompanyRepository companyRepository = new CompanyRepositoryImpl(conn, cityRepository);
+
+		for (int i = 1; i < 5; i++) {
+			companyRepository.save(
+					new Company("company_name" + i, "address_company" + i, 1 + this.random.nextLong(49) + 1, cityRepository.findById((long) this.random.nextInt(49) + 1)));
+		}
+
+		Logger.debug("All comapny created: {}", companyRepository.findAll());
+
+	}
 
 }

src/main/java/com/my_app/model/Company.java

@@ -0,0 +1,81 @@
+package com.my_app.model;
+
+public class Company {
+
+	private Long id;
+	private String name;
+	private String address;
+	private Long vat;
+	private City city;
+
+	public Company() {
+		super();
+	}
+
+	public Company(String name, String address, Long vat, City city) {
+		super();
+		this.name = name;
+		this.address = address;
+		this.vat = vat;
+		this.city = city;
+	}
+	public Company(Long id, String name, String address, Long vat, City city) {
+		super();
+		this.id = id;
+		this.name = name;
+		this.address = address;
+		this.vat = vat;
+		this.city = city;
+	}
+
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getVat() {
+		return vat;
+	}
+
+	public void setVat(Long vat) {
+		this.vat = vat;
+	}
+
+	public City getCity() {
+		return city;
+	}
+
+	public void setCity(City city) {
+		this.city = city;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public String setAddress(String address) {
+		return address;
+	}
+
+	public boolean isNew() {
+		return this.id == null;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Company [id=%s, name=%s,address=%s, vat=%s, city=%s ]", id, name, address, vat, city);
+	}
+
+}

src/main/java/com/my_app/model/User.java

@@ -4,6 +4,7 @@ public class User {
 	private Long id;
 	private String username;
 	private String password;
+	private String email;
 	private City city;
 
 	public User() {
@@ -16,12 +17,13 @@ public User(String username, String password, City city) {
 		this.city = city;
 	}
 
-	public User(Long id, String username, String password, City city) {
+	public User(Long id, String username, String password, City city, String email) {
 		super();
 		this.id = id;
 		this.username = username;
 		this.password = password;
 		this.city = city;
+		this.email = email;
 	}
 
 	public Long getId() {
@@ -59,10 +61,19 @@ public void setCity(City city) {
 	public boolean isNew() {
 		return this.id == null;
 	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
 	@Override
 	public String toString() {
-		return String.format("User [id=%s, username=%s, password=%s, city=%s]", id, username, password, city);
+		return String.format("User [id=%s, username=%s, password=%s, city=%s, email=%s]", id, username, password, city, email);
 	}
 
+
 }