Skip to content

D
daaexample
Commit c914257d authored by Administrator's avatar Administrator
Browse files
Options

Updates project for the new course 

Angular has been updated to the version 11.

In addition, some minor changes have been done to update the project
and adapt it to some depencencies updates.
parent 7eb5e25d
Hide whitespace changes
Inline Side-by-side
Showing with 8956 additions and 9364 deletions
.gitignore
View file @ c914257d
...@@ -15,3 +15,6 @@ WebContent ...@@ -15,3 +15,6 @@ WebContent
# Testing # Testing
/servers /servers
C:\\nppdf32Log\\debuglog.txt C:\\nppdf32Log\\debuglog.txt
# Angular
src/main/angular
README.md
View file @ c914257d
...@@ -5,6 +5,16 @@ Aplicación y arquitectura de ejemplo para la asignatura Desarrollo Ágil de ...@@ -5,6 +5,16 @@ Aplicación y arquitectura de ejemplo para la asignatura Desarrollo Ágil de
Aplicaciones del Grado en Ingeniería Informática de la Escuela Superior de Aplicaciones del Grado en Ingeniería Informática de la Escuela Superior de
Ingeniería Informática de la Universidad de Vigo. Ingeniería Informática de la Universidad de Vigo.
## Dependencias
Este proyecto está diseñado para ser desarrollado en un entorno con:
* Maven 3
* Java 8
* MySQL 5.7.6+ o 8+
Además, se recomienda emplear la última versión de Eclipse IDE for Enterprise
Java Developers.
## Ejecución con Maven ## Ejecución con Maven
La configuración de Maven ha sido preparada para permitir varios tipos de La configuración de Maven ha sido preparada para permitir varios tipos de
ejecución. ejecución.
......
db/mysql-with-inserts.sql
View file @ c914257d
DROP DATABASE IF EXISTS `daaexample`;
CREATE DATABASE `daaexample`; CREATE DATABASE `daaexample`;
CREATE TABLE `daaexample`.`people` ( CREATE TABLE `daaexample`.`people` (
...@@ -14,7 +15,7 @@ CREATE TABLE `daaexample`.`users` ( ...@@ -14,7 +15,7 @@ CREATE TABLE `daaexample`.`users` (
PRIMARY KEY (`login`) PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE USER 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa'; CREATE USER IF NOT EXISTS 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
GRANT ALL ON `daaexample`.* TO 'daa'@'localhost'; GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Antón','Pérez'); INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Antón','Pérez');
......
db/mysql.sql
View file @ c914257d
DROP DATABASE IF EXISTS `daaexample`;
CREATE DATABASE `daaexample`; CREATE DATABASE `daaexample`;
CREATE TABLE `daaexample`.`people` ( CREATE TABLE `daaexample`.`people` (
...@@ -14,5 +15,5 @@ CREATE TABLE `daaexample`.`users` ( ...@@ -14,5 +15,5 @@ CREATE TABLE `daaexample`.`users` (
PRIMARY KEY (`login`) PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE USER 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa'; CREATE USER IF NOT EXISTS 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
GRANT ALL ON `daaexample`.* TO 'daa'@'localhost'; GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
pom.xml
View file @ c914257d
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<slf4j-jdk14.version>1.7.21</slf4j-jdk14.version> <slf4j-jdk14.version>1.7.21</slf4j-jdk14.version>
<!-- Tests dependencies --> <!-- Tests dependencies -->
<junit.version>4.12</junit.version> <junit.version>4.13.2</junit.version>
<java-hamcrest.version>2.0.0.0</java-hamcrest.version> <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<easymock.version>3.5.1</easymock.version> <easymock.version>3.5.1</easymock.version>
<selenium-java.version>3.141.59</selenium-java.version> <selenium-java.version>3.141.59</selenium-java.version>
...@@ -45,13 +45,14 @@ ...@@ -45,13 +45,14 @@
<spring-test-dbunit.version>1.3.0</spring-test-dbunit.version> <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version>
<hsqldb.version>2.3.3</hsqldb.version> <hsqldb.version>2.3.3</hsqldb.version>
<mysql.version>5.1.45</mysql.version> <mysql.version>5.1.45</mysql.version>
<geckodriver.version>v0.26.0</geckodriver.version> <geckodriver.version>v0.29.0</geckodriver.version>
<equalsverifier.version>2.4.2</equalsverifier.version> <equalsverifier.version>2.4.2</equalsverifier.version>
<!-- Plugins --> <!-- Plugins -->
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
<maven-jxr-plugin>3.0.0</maven-jxr-plugin>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>2.20.1</maven-surefire-report-plugin.version> <maven-surefire-report-plugin.version>2.20.1</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.2.0</maven-war-plugin.version> <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
...@@ -187,6 +188,16 @@ ...@@ -187,6 +188,16 @@
</dependency> </dependency>
</dependencies> </dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${maven-jxr-plugin.version}</version>
</plugin>
</plugins>
</reporting>
<build> <build>
<finalName>DAAExample</finalName> <finalName>DAAExample</finalName>
...@@ -247,7 +258,7 @@ ...@@ -247,7 +258,7 @@
<id>exec-npm-ng-build</id> <id>exec-npm-ng-build</id>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<skip>${skip-npm-build}</skip> <skip>${skip-npm-build}</skip>
<workingDirectory>${project.basedir}/src/main/angular</workingDirectory> <workingDirectory>${project.basedir}/src/main/angular</workingDirectory>
<executable>npm</executable> <executable>npm</executable>
<arguments> <arguments>
...@@ -361,10 +372,11 @@ ...@@ -361,10 +372,11 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
...@@ -667,7 +679,7 @@ ...@@ -667,7 +679,7 @@
<cargo.datasource.datasource.h2> <cargo.datasource.datasource.h2>
cargo.datasource.jndi=jdbc/daaexample| cargo.datasource.jndi=jdbc/daaexample|
cargo.datasource.driver=com.mysql.jdbc.Driver| cargo.datasource.driver=com.mysql.jdbc.Driver|
cargo.datasource.url=jdbc:mysql://localhost/daaexample| cargo.datasource.url=jdbc:mysql://localhost/daaexample?useSSL=false|
cargo.datasource.username=daa| cargo.datasource.username=daa|
cargo.datasource.password=daa| cargo.datasource.password=daa|
cargo.datasource.maxActive=8| cargo.datasource.maxActive=8|
...@@ -782,7 +794,7 @@ ...@@ -782,7 +794,7 @@
<cargo.datasource.datasource.h2> <cargo.datasource.datasource.h2>
cargo.datasource.jndi=jdbc/daaexample| cargo.datasource.jndi=jdbc/daaexample|
cargo.datasource.driver=com.mysql.jdbc.Driver| cargo.datasource.driver=com.mysql.jdbc.Driver|
cargo.datasource.url=jdbc:mysql://localhost/daaexample| cargo.datasource.url=jdbc:mysql://localhost/daaexample?useSSL=false|
cargo.datasource.username=daa| cargo.datasource.username=daa|
cargo.datasource.password=daa| cargo.datasource.password=daa|
cargo.datasource.maxActive=8| cargo.datasource.maxActive=8|
......
src/main/angular/angular.json
View file @ c914257d
...@@ -10,13 +10,14 @@ ...@@ -10,13 +10,14 @@
"prefix": "app", "prefix": "app",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
"styleext": "scss" "style": "scss"
} }
}, },
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"aot": true,
"outputPath": "dist/angular", "outputPath": "dist/angular",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
...@@ -43,7 +44,6 @@ ...@@ -43,7 +44,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"aot": true, "aot": true,
"extractLicenses": true, "extractLicenses": true,
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
"type": "initial", "type": "initial",
"maximumWarning": "2mb", "maximumWarning": "2mb",
"maximumError": "5mb" "maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
} }
] ]
} }
......
src/main/angular/browserslist deleted 100644 → 0
View file @ 7eb5e25d
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11
\ No newline at end of file
src/main/angular/package-lock.json
View file @ c914257d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/angular/package.json
View file @ c914257d
{ {
"name": "daa-example", "name": "daa-example",
"version": "0.2.0-alpha.13", "version": "0.2.0-alpha.14",
"scripts": { "scripts": {
"ng": "./node_modules/.bin/ng", "ng": "./node_modules/.bin/ng",
"start": "./node_modules/.bin/ng serve", "start": "./node_modules/.bin/ng serve",
...@@ -11,43 +11,43 @@ ...@@ -11,43 +11,43 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~8.2.14", "@angular/animations": "~11.2.1",
"@angular/cdk": "^8.2.3", "@angular/cdk": "^11.2.1",
"@angular/common": "~8.2.14", "@angular/common": "~11.2.1",
"@angular/compiler": "~8.2.14", "@angular/compiler": "~11.2.1",
"@angular/core": "~8.2.14", "@angular/core": "~11.2.1",
"@angular/forms": "~8.2.14", "@angular/forms": "~11.2.1",
"@angular/platform-browser": "~8.2.14", "@angular/platform-browser": "~11.2.1",
"@angular/platform-browser-dynamic": "~8.2.14", "@angular/platform-browser-dynamic": "~11.2.1",
"@angular/router": "~8.2.14", "@angular/router": "~11.2.1",
"angular2-notifications": "^3.0.0", "angular2-notifications": "^9.0.0",
"bootstrap": "^4.4.1", "bootstrap": "^4.4.1",
"jquery": "^3.4.1",
"popper.js": "^1.16.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"rxjs": "~6.5.4", "jquery": "^3.5.1",
"tslib": "^1.9.0", "popper.js": "^1.16.1",
"zone.js": "~0.9.1" "rxjs": "~6.6.3",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.803.25", "@angular-devkit/build-angular": "~0.1102.1",
"@angular/cli": "~8.3.25", "@angular/cli": "~11.2.1",
"@angular/compiler-cli": "~8.2.14", "@angular/compiler-cli": "~11.2.1",
"@angular/language-service": "~8.2.14", "@angular/language-service": "~11.2.1",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4", "@types/node": "^12.11.1",
"codelyzer": "^5.0.1", "codelyzer": "^6.0.0",
"jasmine-core": "~2.99.1", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~5.0.0",
"karma": "~3.1.1", "karma": "~6.1.1",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.0.1", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~1.1.2", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~5.4.0", "protractor": "~7.0.0",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"tslint": "~5.11.0", "tslint": "~6.1.0",
"typescript": "~3.5.3" "typescript": "~4.0.7"
} }
} }
src/main/angular/src/app/app-routing.module.ts
View file @ c914257d
...@@ -50,7 +50,7 @@ const routes: Routes = [ ...@@ -50,7 +50,7 @@ const routes: Routes = [
]; ];
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
exports: [RouterModule] exports: [RouterModule]
}) })
export class AppRoutingModule { } export class AppRoutingModule { }
src/main/angular/src/app/app.component.spec.ts
View file @ c914257d
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { TestBed, async } from '@angular/core/testing'; import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
RouterTestingModule RouterTestingModule
......
src/main/angular/src/app/components/login-panel/login-panel.component.spec.ts
View file @ c914257d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { LoginPanelComponent } from './login-panel.component'; import { LoginPanelComponent } from './login-panel.component';
...@@ -25,7 +25,7 @@ describe('LoginPanelComponent', () => { ...@@ -25,7 +25,7 @@ describe('LoginPanelComponent', () => {
let component: LoginPanelComponent; let component: LoginPanelComponent;
let fixture: ComponentFixture<LoginPanelComponent>; let fixture: ComponentFixture<LoginPanelComponent>;
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ LoginPanelComponent ] declarations: [ LoginPanelComponent ]
}) })
......
src/main/angular/src/app/components/main-panel/main-panel.component.spec.ts
View file @ c914257d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { MainPanelComponent } from './main-panel.component'; import { MainPanelComponent } from './main-panel.component';
...@@ -25,7 +25,7 @@ describe('MainPanelComponent', () => { ...@@ -25,7 +25,7 @@ describe('MainPanelComponent', () => {
let component: MainPanelComponent; let component: MainPanelComponent;
let fixture: ComponentFixture<MainPanelComponent>; let fixture: ComponentFixture<MainPanelComponent>;
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ MainPanelComponent ] declarations: [ MainPanelComponent ]
}) })
......
src/main/angular/src/app/modules/people/components/people-form/people-form.component.spec.ts
View file @ c914257d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PeopleFormComponent } from './people-form.component'; import { PeopleFormComponent } from './people-form.component';
...@@ -25,7 +25,7 @@ describe('PeopleFormComponent', () => { ...@@ -25,7 +25,7 @@ describe('PeopleFormComponent', () => {
let component: PeopleFormComponent; let component: PeopleFormComponent;
let fixture: ComponentFixture<PeopleFormComponent>; let fixture: ComponentFixture<PeopleFormComponent>;
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ PeopleFormComponent ] declarations: [ PeopleFormComponent ]
}) })
......
src/main/angular/src/app/modules/people/components/people-list/people-list.component.spec.ts
View file @ c914257d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PeopleListComponent } from './people-list.component'; import { PeopleListComponent } from './people-list.component';
...@@ -25,7 +25,7 @@ describe('PeopleListComponent', () => { ...@@ -25,7 +25,7 @@ describe('PeopleListComponent', () => {
let component: PeopleListComponent; let component: PeopleListComponent;
let fixture: ComponentFixture<PeopleListComponent>; let fixture: ComponentFixture<PeopleListComponent>;
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ PeopleListComponent ] declarations: [ PeopleListComponent ]
}) })
......
src/main/angular/src/app/modules/people/components/people-main/people-main.component.spec.ts
View file @ c914257d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PeopleMainComponent } from './people-main.component'; import { PeopleMainComponent } from './people-main.component';
...@@ -25,7 +25,7 @@ describe('PeopleMainComponent', () => { ...@@ -25,7 +25,7 @@ describe('PeopleMainComponent', () => {
let component: PeopleMainComponent; let component: PeopleMainComponent;
let fixture: ComponentFixture<PeopleMainComponent>; let fixture: ComponentFixture<PeopleMainComponent>;
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ PeopleMainComponent ] declarations: [ PeopleMainComponent ]
}) })
......
src/main/angular/src/app/services/authentication.service.ts
View file @ c914257d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import {BehaviorSubject, Observable, of} from 'rxjs'; import {BehaviorSubject, Observable, of} from 'rxjs';
import {UserModel} from '../models'; import {UserModel} from '../models';
import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http'; import {HttpClient, HttpHeaders} from '@angular/common/http';
import {environment} from '../../environments/environment'; import {environment} from '../../environments/environment';
import {catchError, tap} from 'rxjs/operators'; import {catchError, tap} from 'rxjs/operators';
......
src/main/angular/src/tsconfig.app.json
View file @ c914257d
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"types": [] "types": []
}, },
"exclude": [ "files": [
"test.ts", "main.ts",
"**/*.spec.ts" "polyfills.ts"
],
"include": [
"src/**/*.d.ts"
] ]
} }
src/main/angular/tsconfig.json
View file @ c914257d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"module": "esnext", "module": "es2020",
"moduleResolution": "node", "moduleResolution": "node",
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
......
src/main/angular/tslint.json
View file @ c914257d
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
"no-trailing-whitespace": true, "no-trailing-whitespace": true,
"no-unnecessary-initializer": true, "no-unnecessary-initializer": true,
"no-unused-expression": true, "no-unused-expression": true,
"no-use-before-declare": true,
"no-var-keyword": true, "no-var-keyword": true,
"object-literal-sort-keys": false, "object-literal-sort-keys": false,
"one-line": [ "one-line": [
......
src/test/java/es/uvigo/esei/daa/dao/PeopleDAOTest.java
View file @ c914257d
...@@ -12,7 +12,7 @@ import static es.uvigo.esei.daa.dataset.PeopleDataset.peopleWithout; ...@@ -12,7 +12,7 @@ import static es.uvigo.esei.daa.dataset.PeopleDataset.peopleWithout;
import static es.uvigo.esei.daa.matchers.IsEqualToPerson.containsPeopleInAnyOrder; import static es.uvigo.esei.daa.matchers.IsEqualToPerson.containsPeopleInAnyOrder;
import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson; import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import javax.sql.DataSource; import javax.sql.DataSource;
......
src/test/java/es/uvigo/esei/daa/dao/PeopleDAOUnitTest.java
View file @ c914257d
...@@ -14,7 +14,7 @@ import static org.easymock.EasyMock.expect; ...@@ -14,7 +14,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.reset; import static org.easymock.EasyMock.reset;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import java.sql.SQLException; import java.sql.SQLException;
......
src/test/java/es/uvigo/esei/daa/entities/PersonUnitTest.java
View file @ c914257d
...@@ -2,7 +2,7 @@ package es.uvigo.esei.daa.entities; ...@@ -2,7 +2,7 @@ package es.uvigo.esei.daa.entities;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Test; import org.junit.Test;
......
src/test/java/es/uvigo/esei/daa/rest/PeopleResourceTest.java
View file @ c914257d
...@@ -18,7 +18,7 @@ import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson; ...@@ -18,7 +18,7 @@ import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson;
import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.client.Entity.entity;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
......
src/test/java/es/uvigo/esei/daa/rest/PeopleResourceUnitTest.java
View file @ c914257d
...@@ -22,7 +22,7 @@ import static org.easymock.EasyMock.replay; ...@@ -22,7 +22,7 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import java.util.List; import java.util.List;
......
src/test/java/es/uvigo/esei/daa/rest/UsersResourceTest.java
View file @ c914257d
...@@ -8,7 +8,7 @@ import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasOkStatus; ...@@ -8,7 +8,7 @@ import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasOkStatus;
import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasUnauthorized; import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasUnauthorized;
import static es.uvigo.esei.daa.matchers.IsEqualToUser.equalsToUser; import static es.uvigo.esei.daa.matchers.IsEqualToUser.equalsToUser;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException; import java.io.IOException;
......
src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java
View file @ c914257d
...@@ -10,7 +10,7 @@ import static es.uvigo.esei.daa.matchers.IsEqualToPerson.containsPeopleInAnyOrde ...@@ -10,7 +10,7 @@ import static es.uvigo.esei.daa.matchers.IsEqualToPerson.containsPeopleInAnyOrde
import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson; import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
tomcat/server.mysql.xml
View file @ c914257d
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<Realm className="org.apache.catalina.realm.JDBCRealm" <Realm className="org.apache.catalina.realm.JDBCRealm"
driverName="com.mysql.jdbc.Driver" driverName="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://localhost/daaexample" connectionURL="jdbc:mysql://localhost/daaexample?useSSL=false"
connectionName="daa" connectionName="daa"
connectionPassword="daa" connectionPassword="daa"
userTable="users" userNameCol="login" userCredCol="password" userTable="users" userNameCol="login" userCredCol="password"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment