Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
fbec6db
Add description
JavaWebinar Nov 5, 2016
81a0a1a
Add HW0 comments
JavaWebinar Nov 10, 2016
4f29fe7
Update README.md
JavaOPs Nov 30, 2016
fab7022
Update README.md
JavaOPs Dec 1, 2016
ce1caba
Update README.md
JavaOPs Dec 1, 2016
c01186b
Prepare to HW0
meirakhmetov Dec 4, 2016
25dc217
1_1_HW0
meirakhmetov Dec 21, 2016
f7860da
1_2_HW0_cycle
meirakhmetov Dec 21, 2016
f48e28a
1_3_switch_to_war
meirakhmetov Dec 21, 2016
1d4c218
1_4_add_servlet_api
meirakhmetov Dec 21, 2016
502dd4a
1_4_add_servlet_api2
meirakhmetov Dec 21, 2016
0f5921b
1_5_forward_to_redirect
meirakhmetov Dec 22, 2016
f0250cb
1_6_logging
meirakhmetov Dec 22, 2016
6b461d9
1_6_remote_jmx
meirakhmetov Dec 22, 2016
24b92d1
HW1
meirakhmetov Dec 23, 2016
274b8ef
HW1_CRUD
meirakhmetov Jan 16, 2017
d18ae8d
2_3_app_layers
meirakhmetov Jan 16, 2017
b7c1ab2
2_4_add_spring_context
meirakhmetov Jan 17, 2017
fc99f7b
2_5_add_dependency_injection
meirakhmetov Jan 17, 2017
9f611f4
2_5_add_dependency_injection
meirakhmetov Jan 17, 2017
14ffad3
2_6_add_annotation_processing
meirakhmetov Jan 17, 2017
2aa144c
3_0_fix_validate
meirakhmetov Jan 17, 2017
951c7d1
3_01_HW2_repository
meirakhmetov Jan 17, 2017
564049b
3_01_HW2_repository
meirakhmetov Jan 17, 2017
379c502
3_02_HW2_meal_layers
meirakhmetov Jan 17, 2017
07a9a74
3_03_HW2_optional_MealServlet
meirakhmetov Jan 17, 2017
6ed96bf
3_4_HW2_optional_filter
meirakhmetov Jan 17, 2017
bb68b77
3_5_HW2_optional_select_user
meirakhmetov Jan 17, 2017
1106ce7
3_06_bean_life_cycle
meirakhmetov Jan 17, 2017
0eed750
3_07_add_junit
meirakhmetov Jan 17, 2017
e1f7370
3_08_add_spring_test
meirakhmetov Jan 17, 2017
f2e869e
3_09_add_postgresql
meirakhmetov Jan 17, 2017
cd1216f
3_10_populate_and_init_db
meirakhmetov Jan 18, 2017
f7a4702
3_11_impl_JdbcUserRepository
meirakhmetov Jan 18, 2017
970bbd3
3_12_test_UserService
meirakhmetov Jan 18, 2017
3330e80
3_13_test_logging
meirakhmetov Jan 18, 2017
710f0b2
3_14_fix_servlet
meirakhmetov Jan 18, 2017
0b9d329
4_0_fix
meirakhmetov Jan 19, 2017
f0c9bcb
4_1_HW3
meirakhmetov Jan 19, 2017
071a6d5
4_2_HW3_optional
meirakhmetov Jan 19, 2017
da0852d
4_3_improve_code
meirakhmetov Jan 19, 2017
74a7205
4_4_init_and_populate_db
meirakhmetov Jan 19, 2017
577298e
4_5_create_mock_test_ctx
meirakhmetov Jan 19, 2017
21a38c3
Update README.md
meirakhmetov Nov 25, 2024
59b9c05
Update Main.java
meirakhmetov Nov 25, 2024
ade580e
added var test to Main.java
meirakhmetov Nov 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
3_09_add_postgresql
  • Loading branch information
meirakhmetov committed Jan 17, 2017
commit f2e869e3732db9494cd74cc19863da83b50c1c0c
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<logback.version>1.1.7</logback.version>
<slf4j.version>1.7.21</slf4j.version>

<!--DB-->
<postgresql.version>9.4.1212</postgresql.version>
<!-- Tests -->
<junit.version>4.12</junit.version>
</properties>
Expand Down Expand Up @@ -86,6 +88,13 @@
</exclusions>
</dependency>

<!--DataBase-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>

<!--Web-->
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/db/postgres.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#database.url=jdbc:postgresql://ec2-54-217-202-110.eu-west-1.compute.amazonaws.com:5432/dehm6lvm8bink0?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory
#database.username=wegxlfzjjgxaxy
#database.password=SSQyKKE_e93kiUCR-ehzMcKCxZ

database.url=jdbc:postgresql://localhost:5432/topjava
database.username=user
database.password=password