diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..65c7c23 --- /dev/null +++ b/Dockerfile @@ -0,0 +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"] diff --git a/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java b/src/main/java/com/websystique/springmvc/dao/ConnectionDao.java index 07dc3c3..69dd224 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 { - Class.forName("com.mysql.jdbc.Driver"); + try { + System.out.println("connection completed"); + Class.forName("org.postgresql.Driver"); con=DriverManager.getConnection( - "jdbc:mysql://awsrds.cuaofirbrh2o.us-west-2.rds.amazonaws.com:3306/user","username","password"); - }catch(Exception e){ System.out.println(e);} + "jdbc:postgresql://java-application.cqgqd1oplv07.ap-south-1.rds.amazonaws.com:5432/test","postgres","javawebapp"); + }catch(Exception e){ + System.out.println("connection error"); + System.out.println(e);} return con; } 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; 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,