Skip to content

Commit 4a4a03d

Browse files
Merge pull request #340 from Spring-Framework-Java-Apps/master
deploy to heroku
2 parents 2c013f4 + 60e7685 commit 4a4a03d

File tree

179 files changed

+2831
-2882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+2831
-2882
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ root = true
55
[*]
66
charset = utf-8
77
end_of_line = lf
8-
indent_size = 4
8+
indent_size = 2
99
indent_style = space
1010
insert_final_newline = true
1111
trim_trailing_whitespace = true
@@ -27,4 +27,4 @@ end_of_line = lf
2727
indent_size = 3
2828
indent_style = space
2929
insert_final_newline = false
30-
trim_trailing_whitespace = true
30+
trim_trailing_whitespace = true

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ setenv.cmd
3333
/src/main/java/org/woehlke/simpleworklist/project/x.txt
3434
/src/main/java/org/woehlke/simpleworklist/task/x.txt
3535
/src/main/java/org/woehlke/simpleworklist/context/x.txt
36-
/src/main/java/org/woehlke/simpleworklist/application/error/x.txt
36+
/src/main/java/org/woehlke/java/simpleworklist/application/error/x.txt
3737
/src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt
3838

3939
/simpleworklist.diff

.idea/jarRepositories.xml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etc/db/setup-postgresql-account-and-db.sql

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ CREATE TABLESPACE tablespace_simpleworklist
2020
OWNER tw
2121
LOCATION '/opt/postgresql/tablespace_simpleworklist';
2222

23+
CREATE TABLESPACE tablespace_simpleworklist
24+
OWNER tw
25+
LOCATION 'C:\tablespace_pg\simpleworklist';
26+
2327
ALTER TABLESPACE tablespace_simpleworklist
2428
OWNER TO simpleworklist;
2529

@@ -34,38 +38,3 @@ CREATE DATABASE simpleworklistref
3438
ENCODING = 'UTF8'
3539
TABLESPACE = tablespace_simpleworklist
3640
CONNECTION LIMIT = -1;
37-
38-
39-
40-
41-
42-
43-
CREATE ROLE petclinic_jakartaee LOGIN
44-
PASSWORD 'petclinic_jakartaeepwd'
45-
SUPERUSER INHERIT CREATEDB CREATEROLE REPLICATION;
46-
GRANT pg_monitor TO petclinic_jakartaee;
47-
GRANT pg_read_all_settings TO petclinic_jakartaee;
48-
GRANT pg_read_all_stats TO petclinic_jakartaee;
49-
GRANT pg_signal_backend TO petclinic_jakartaee;
50-
GRANT pg_stat_scan_tables TO petclinic_jakartaee;
51-
52-
53-
-- Database: petclinic_jakartaee
54-
55-
-- DROP DATABASE petclinic_jakartaee;
56-
-- CONNECTION LIMIT = -1;
57-
58-
CREATE TABLESPACE tablespace_petclinic_jakartae
59-
OWNER tw
60-
LOCATION '/opt/postgresql/tablespace_petclinic_jakartae';
61-
62-
ALTER TABLESPACE tablespace_petclinic_jakartae
63-
OWNER TO simpleworklist;
64-
65-
CREATE DATABASE petclinic_jakartaee
66-
WITH OWNER = petclinic_jakartaee
67-
ENCODING = 'UTF8'
68-
TABLESPACE = tablespace_petclinic_jakartae
69-
CONNECTION LIMIT = -1;
70-
71-

0 commit comments

Comments
 (0)