From 4dd351c88f5c775752b9f0987344d5c5d53bcdd8 Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Thu, 18 Jun 2020 12:15:38 +0530 Subject: [PATCH 01/10] database added --- src/main/java/com/websystique/springmvc/dao/ConnectionDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index 07dc3c3..da788db 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -15,7 +15,7 @@ public Connection RetriveConnection() { try { Class.forName("com.mysql.jdbc.Driver"); con=DriverManager.getConnection( - "jdbc:mysql://awsrds.cuaofirbrh2o.us-west-2.rds.amazonaws.com:3306/user","username","password"); + "jdbc:pysql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/user","postgres","javawebapp"); }catch(Exception e){ System.out.println(e);} return con; } From aba1ef22d04dd7efa09b7159dd867f6fd0f4b0df Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Thu, 18 Jun 2020 12:18:17 +0530 Subject: [PATCH 02/10] Update ConnectionDao.java --- src/main/java/com/websystique/springmvc/dao/ConnectionDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index da788db..7f06535 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -15,7 +15,7 @@ public Connection RetriveConnection() { try { Class.forName("com.mysql.jdbc.Driver"); con=DriverManager.getConnection( - "jdbc:pysql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/user","postgres","javawebapp"); + "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/postgres","postgres","javawebapp"); }catch(Exception e){ System.out.println(e);} return con; } From cd565a0ff0dee186d0fcca8cc337ce713b108604 Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Thu, 18 Jun 2020 19:58:39 +0530 Subject: [PATCH 03/10] Create Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d82a2be --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM tomcat:8.0 +RUN rm -rf /usr/local/tomcat/webapps/* +COPY target/Spring4MVCAngularJSExample.war /usr/local/tomcat/webapps/ROOT.war +CMD ["catalina.sh","run"] From 5ac093ef4638e8b2f9a177805c67d9dd6940d167 Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Thu, 18 Jun 2020 20:09:47 +0530 Subject: [PATCH 04/10] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d82a2be..65c7c23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM tomcat:8.0 RUN rm -rf /usr/local/tomcat/webapps/* COPY target/Spring4MVCAngularJSExample.war /usr/local/tomcat/webapps/ROOT.war +EXPOSE 8080 CMD ["catalina.sh","run"] From 1458637fb3bdebaa60684a0c05fe4e4c1813c79e Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Fri, 19 Jun 2020 01:36:01 +0530 Subject: [PATCH 05/10] Update user_service.js --- src/main/webapp/static/js/service/user_service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/static/js/service/user_service.js b/src/main/webapp/static/js/service/user_service.js index 47f716d..1d655d3 100644 --- a/src/main/webapp/static/js/service/user_service.js +++ b/src/main/webapp/static/js/service/user_service.js @@ -2,7 +2,7 @@ angular.module('myApp').factory('UserService', ['$http', '$q', function($http, $q){ - var REST_SERVICE_URI = 'http://localhost:8080/Spring4MVCAngularJSExample/user/'; + var REST_SERVICE_URI = 'http://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com/Spring4MVCAngularJSExample/user/'; var factory = { fetchAllUsers: fetchAllUsers, From edd990025723fc3ab6486d4c2f9fd1fed09ba83b Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Fri, 19 Jun 2020 02:03:03 +0530 Subject: [PATCH 06/10] Update user_controller.js --- src/main/webapp/static/js/controller/user_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/static/js/controller/user_controller.js b/src/main/webapp/static/js/controller/user_controller.js index 2047010..2453f8a 100644 --- a/src/main/webapp/static/js/controller/user_controller.js +++ b/src/main/webapp/static/js/controller/user_controller.js @@ -2,7 +2,7 @@ angular.module('myApp').controller('UserController', ['$scope', 'UserService', function($scope, UserService) { var self = this; - self.user={id:null,username:'',address:'',email:''}; + self.user={id:1,username:'',address:'',email:''}; self.users=[]; self.submit = submit; From df6e9b0118b8cbefea30b097b94a11f7a6feacea Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Fri, 19 Jun 2020 02:14:39 +0530 Subject: [PATCH 07/10] Update ConnectionDao.java --- src/main/java/com/websystique/springmvc/dao/ConnectionDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index 7f06535..c36e3e2 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -15,7 +15,7 @@ public Connection RetriveConnection() { try { Class.forName("com.mysql.jdbc.Driver"); con=DriverManager.getConnection( - "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/postgres","postgres","javawebapp"); + "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/test","postgres","javawebapp"); }catch(Exception e){ System.out.println(e);} return con; } From 4bf845a142b9f50d3b8e1c83b3513a1a6af2bb6f Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Fri, 19 Jun 2020 02:52:21 +0530 Subject: [PATCH 08/10] Update ConnectionDao.java --- src/main/java/com/websystique/springmvc/dao/ConnectionDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index c36e3e2..2a550ce 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -13,7 +13,7 @@ public class ConnectionDao { Connection con = null; public Connection RetriveConnection() { try { - Class.forName("com.mysql.jdbc.Driver"); + Class.forName("org.postgresql.Driver"); con=DriverManager.getConnection( "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/test","postgres","javawebapp"); }catch(Exception e){ System.out.println(e);} From 01ad817fa6da1330df8f790b0594040e30615e7a Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Fri, 19 Jun 2020 03:29:36 +0530 Subject: [PATCH 09/10] Update ConnectionDao.java --- .../java/com/websystique/springmvc/dao/ConnectionDao.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index 2a550ce..1f7f773 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -12,11 +12,14 @@ public class ConnectionDao { Connection con = null; public Connection RetriveConnection() { - try { + try { + System.out.println("connection done"); Class.forName("org.postgresql.Driver"); con=DriverManager.getConnection( "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/test","postgres","javawebapp"); - }catch(Exception e){ System.out.println(e);} + }catch(Exception e){ + System.out.println("connection error"); + System.out.println(e);} return con; } From 8d598a8e4f6802401e5c8a4675492566901e65c2 Mon Sep 17 00:00:00 2001 From: sagargaigol07 <41671594+sagargaigol07@users.noreply.github.com> Date: Tue, 23 Jun 2020 16:00:33 +0530 Subject: [PATCH 10/10] Update ConnectionDao.java --- src/main/java/com/websystique/springmvc/dao/ConnectionDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index 1f7f773..69dd224 100644 --- a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java +++ b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java @@ -13,7 +13,7 @@ public class ConnectionDao { Connection con = null; public Connection RetriveConnection() { try { - System.out.println("connection done"); + System.out.println("connection completed"); Class.forName("org.postgresql.Driver"); con=DriverManager.getConnection( "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/test","postgres","javawebapp");