Skip to content

Commit

Permalink
modificado versionado de D02 a D03
Browse files Browse the repository at this point in the history
  • Loading branch information
karyouben committed Mar 10, 2024
1 parent c8385eb commit a987da2
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 31 deletions.
6 changes: 1 addition & 5 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Acme-SF-D02
Second deliverable of DP2
# Acme-SF-D03
Third deliverable of DP2
12 changes: 6 additions & 6 deletions SCRIPT.txt
Original file line number Diff line number Diff line change
@@ -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'@'%';
on `Acme-SF-D03-Test`.* to 'acme-user'@'%';
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>

<name>Acme SF</name>
<description>Acme - Software Factory - D02 of the group C1.033</description>
<description>Acme - Software Factory - D03 of the group C1.033</description>

<artifactId>Acme-SF</artifactId>
<version>D02</version>
<version>D03</version>
<packaging>war</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/banner.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

,---. ,---. ,------. ,------. ,--. ,---.
/ O \ ,---.,--,--,--.,---. ,-----.' .-'| .---',-----.| .-. \ / \'.-. \
| .-. | .--'| | .-. :'-----'`. `-.| `--, '-----'| | \ :| () |.-' .'
| | | \ `--.| | | \ --. .-' | |` | '--' / \ // '-.
`--' `--'`---'`--`--`--'`----' `-----'`--' `-------' `--' '-----'
,---. ,---. ,------. ,------. ,--. ,----.
/ O \ ,---.,--,--,--.,---. ,-----.' .-'| .---',-----.| .-. \ / \'.-. |
| .-. | .--'| | .-. :'-----'`. `-.| `--, '-----'| | \ :| () | .' <
| | | \ `--.| | | \ --. .-' | |` | '--' / \ //'-' |
`--' `--'`---'`--`--`--'`----' `-----'`--' `-------' `--' `----'


Application: ${acme.application.versioned-name}
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/views/fragments/company-en.i18n
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [email protected]
master.company.email = contact@acme-sf.com

6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/views/fragments/company-es.i18n
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [email protected]
master.company.email = contact@acme-sf.com
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/fragments/footer-en.i18n
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/fragments/footer-es.i18n
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a987da2

Please sign in to comment.