diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a3a31d1..37b81f4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -10,9 +10,5 @@ ** Year 2024 -D02 This is the second version of the Acme framework. - ------------------------------------------------------------------- - -D01 This is the first version of the Acme framework. +D03 This is the third version of the Acme SF. diff --git a/README.txt b/README.txt index e3c65dd..a6694d4 100644 --- a/README.txt +++ b/README.txt @@ -1,2 +1,2 @@ -# Acme-SF-D02 -Second deliverable of DP2 \ No newline at end of file +# Acme-SF-D03 +Third deliverable of DP2 \ No newline at end of file diff --git a/SCRIPT.txt b/SCRIPT.txt index b397a01..0668694 100644 --- a/SCRIPT.txt +++ b/SCRIPT.txt @@ -1,20 +1,20 @@ -drop database if exists `Acme-SF-D02`; -create database `Acme-SF-D02` +drop database if exists `Acme-SF-D03`; +create database `Acme-SF-D03` character set = 'utf8mb4' collate = 'utf8mb4_unicode_ci'; grant select, insert, update, delete, create, drop, references, index, alter, create temporary tables, lock tables, create view, create routine, alter routine, execute, trigger, show view - on `Acme-SF-D02`.* to 'acme-user'@'%'; + on `Acme-SF-D03`.* to 'acme-user'@'%'; -drop database if exists `Acme-SF-D02-Test`; -create database `Acme-SF-D02-Test` +drop database if exists `Acme-SF-D03-Test`; +create database `Acme-SF-D03-Test` character set = 'utf8mb4' collate = 'utf8mb4_unicode_ci'; grant select, insert, update, delete, create, drop, references, index, alter, create temporary tables, lock tables, create view, create routine, alter routine, execute, trigger, show view - on `Acme-SF-D02-Test`.* to 'acme-user'@'%'; \ No newline at end of file + on `Acme-SF-D03-Test`.* to 'acme-user'@'%'; \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8e455fa..797c1c4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,10 +22,10 @@ 4.0.0 Acme SF - Acme - Software Factory - D02 of the group C1.033 + Acme - Software Factory - D03 of the group C1.033 Acme-SF - D02 + D03 war diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ee713bc..9f8725c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,7 +12,7 @@ acme.application.display-name = Acme SF acme.application.name = acme-sf -acme.application.version = D02 +acme.application.version = D03 acme.runtime.base-moment = 2022/07/30 00:00 acme.runtime.servicing-time = 0 diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index 860d81d..dcaaf28 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,9 +1,9 @@ - ,---. ,---. ,------. ,------. ,--. ,---. - / O \ ,---.,--,--,--.,---. ,-----.' .-'| .---',-----.| .-. \ / \'.-. \ -| .-. | .--'| | .-. :'-----'`. `-.| `--, '-----'| | \ :| () |.-' .' -| | | \ `--.| | | \ --. .-' | |` | '--' / \ // '-. -`--' `--'`---'`--`--`--'`----' `-----'`--' `-------' `--' '-----' + ,---. ,---. ,------. ,------. ,--. ,----. + / O \ ,---.,--,--,--.,---. ,-----.' .-'| .---',-----.| .-. \ / \'.-. | +| .-. | .--'| | .-. :'-----'`. `-.| `--, '-----'| | \ :| () | .' < +| | | \ `--.| | | \ --. .-' | |` | '--' / \ //'-' | +`--' `--'`---'`--`--`--'`----' `-----'`--' `-------' `--' `----' Application: ${acme.application.versioned-name} diff --git a/src/main/webapp/WEB-INF/views/fragments/company-en.i18n b/src/main/webapp/WEB-INF/views/fragments/company-en.i18n index e7f2f3c..373c9bc 100644 --- a/src/main/webapp/WEB-INF/views/fragments/company-en.i18n +++ b/src/main/webapp/WEB-INF/views/fragments/company-en.i18n @@ -13,8 +13,8 @@ master.company.text = \ Acme SF, Inc. is a fictitious company that provides a starter \ project for the students of the Design and Testing subject of the \ Software Engineering Curriculum of the University of Seville. -master.company.name = Acme, Inc. -master.company.address = 01 Acme Drive, Wondercity, Wonderland +master.company.name = Acme SF, Inc. +master.company.address = 01 Acme SF Drive, Wondercity, Wonderland master.company.phone = +1 000 111 222 -master.company.email = contact@acme.com +master.company.email = contact@acme-sf.com diff --git a/src/main/webapp/WEB-INF/views/fragments/company-es.i18n b/src/main/webapp/WEB-INF/views/fragments/company-es.i18n index 5a5f815..072986a 100644 --- a/src/main/webapp/WEB-INF/views/fragments/company-es.i18n +++ b/src/main/webapp/WEB-INF/views/fragments/company-es.i18n @@ -13,7 +13,7 @@ master.company.text = \ Acme SF, Inc. es una empresa ficticia que ofrece un proyecto starter para los \ estudiantes de la asignatura Diseño y Pruebas de la titulación de \ Ingeniería del Software en la Universidad de Seville. -master.company.name = Acme, Inc. -master.company.address = 01 Acme Drive, Wondercity, Wonderland +master.company.name = Acme SF, Inc. +master.company.address = 01 Acme SF Drive, Wondercity, Wonderland master.company.phone = +1 000 111 222 -master.company.email = contact@acme.com +master.company.email = contact@acme-sf.com diff --git a/src/main/webapp/WEB-INF/views/fragments/footer-en.i18n b/src/main/webapp/WEB-INF/views/fragments/footer-en.i18n index 0f43d1b..ae5408a 100644 --- a/src/main/webapp/WEB-INF/views/fragments/footer-en.i18n +++ b/src/main/webapp/WEB-INF/views/fragments/footer-en.i18n @@ -12,9 +12,9 @@ master.footer.title.about = About us master.footer.label.company = Company master.footer.label.license = License master.footer.title.social = Social -master.footer.url.linkedin = http://www.linkedin.com/acme-sf-d01 +master.footer.url.linkedin = http://www.linkedin.com/acme-sf master.footer.label.linked-in = Linked-In -master.footer.url.twitter = http://www.twitter.com/acme-sf-d01 +master.footer.url.twitter = http://www.twitter.com/acme-sf master.footer.label.twitter = Twitter master.footer.title.languages = Languages master.footer.label.english = English diff --git a/src/main/webapp/WEB-INF/views/fragments/footer-es.i18n b/src/main/webapp/WEB-INF/views/fragments/footer-es.i18n index 161bfba..d89fbe8 100644 --- a/src/main/webapp/WEB-INF/views/fragments/footer-es.i18n +++ b/src/main/webapp/WEB-INF/views/fragments/footer-es.i18n @@ -12,9 +12,9 @@ master.footer.title.about = Nosotros master.footer.label.company = La empresa master.footer.label.license = Licencia master.footer.title.social = Social -master.footer.url.linkedin = http://www.linkedin.com/acme-sf-d01 +master.footer.url.linkedin = http://www.linkedin.com/acme-sf master.footer.label.linked-in = Linked-In -master.footer.url.twitter = http://www.twitter.com/acme-sf-d01 +master.footer.url.twitter = http://www.twitter.com/acme-sf master.footer.label.twitter = Twitter master.footer.title.languages = Lenguajes master.footer.label.english = Inglés