diff --git a/Acceptancetest/src/test/java/acceptancetest/acat.java b/Acceptancetest/src/test/java/acceptancetest/acat.java index 36d8be00f6..a1e348176c 100644 --- a/Acceptancetest/src/test/java/acceptancetest/acat.java +++ b/Acceptancetest/src/test/java/acceptancetest/acat.java @@ -12,8 +12,8 @@ public class acat { public HtmlUnitDriver driver; //public WebDriver driver; public WebDriverWait wait; - public String URL = "http://34.67.190.183:8080/ProdWebapp"; - public String URL1 = "http://34.67.190.183:8080/ProdWebapp/avncreatepage.jsp"; + public String URL = "http://35.202.86.135:8080/ProdWebapp"; + public String URL1 = "http://35.202.86.135:8080/ProdWebapp/avncreatepage.jsp"; //public String URL = "http://localhost:8080/AVNCommunication-1.0/avnlogin.jsp"; //public String URL1 = "http://localhost:8080/AVNCommunication-1.0/avncreatepage.jsp"; diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..73c8a02b62 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM ajit5144/ubuntu-tcat-x2-1 +COPY ./target/*.war /usr/local/tomcat/webapps +EXPOSE 8080 +EXPOSE 8081 +CMD ["/etc/init.d/postgresql","start"] +CMD ["/usr/local/tomcat/bin/catalina.sh","run"] diff --git a/avnsqlreadme.txt b/avnsqlreadme.txt index ce69ed3313..2c86d59e44 100644 --- a/avnsqlreadme.txt +++ b/avnsqlreadme.txt @@ -1,4 +1,5 @@ -SQL Commands +SQL Commands Testing pol Scm +Testing pol Scm 2 ------------ SELECT *FROM avn; @@ -21,4 +22,4 @@ INSERT INTO public.avn(statuss) VALUES ('NEW') RETURNING *; delete FROM public.avn; -username \ No newline at end of file +username diff --git a/functionaltest/src/test/java/functionaltest/ftat.java b/functionaltest/src/test/java/functionaltest/ftat.java index 6015b3152d..f64ac23910 100644 --- a/functionaltest/src/test/java/functionaltest/ftat.java +++ b/functionaltest/src/test/java/functionaltest/ftat.java @@ -16,8 +16,8 @@ public class ftat { public HtmlUnitDriver driver; //public WebDriver driver; public WebDriverWait wait; - public String URL = "http://34.121.221.156:8080/QAWebapp/"; - public String URL1 = "http://34.121.221.156:8080/QAWebapp/avncreatepage.jsp"; + public String URL = "http://35.226.133.141:8080/QAWebapp/"; + public String URL1 = "http://35.226.133.141:8080/QAWebapp/avncreatepage.jsp"; //public String URL = "http://localhost:8080/AVNCommunication-1.0/avnlogin.jsp"; //public String URL1 = "http://localhost:8080/AVNCommunication-1.0/avncreatepage.jsp"; diff --git a/pom.xml b/pom.xml index 8de9a9bad6..3841e217ee 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,11 @@ mockito-all 1.9.5 + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + src diff --git a/src/test/java/servlet/cancelpage.java b/src/test/java/servlet/cancelpage.java index d79a2b8f9a..6b750210f7 100644 --- a/src/test/java/servlet/cancelpage.java +++ b/src/test/java/servlet/cancelpage.java @@ -17,7 +17,7 @@ public void doPost(HttpServletRequest req,HttpServletResponse res) try { Class.forName("org.postgresql.Driver"); - String jdbcUrl="jdbc:postgresql://34.121.221.156:5432/postgres"; + String jdbcUrl="jdbc:postgresql://35.226.133.141:5432/postgres"; String username="postgres"; String password="password"; diff --git a/src/test/java/servlet/createpage.java b/src/test/java/servlet/createpage.java index 4fb900205d..890524ed43 100644 --- a/src/test/java/servlet/createpage.java +++ b/src/test/java/servlet/createpage.java @@ -17,7 +17,7 @@ public void doPost(HttpServletRequest req,HttpServletResponse res) try { Class.forName("org.postgresql.Driver"); - String jdbcUrl="jdbc:postgresql://34.121.221.156:5432/postgres"; + String jdbcUrl="jdbc:postgresql://35.226.133.141:5432/postgres"; String username="postgres"; String password="password"; diff --git a/src/test/java/servlet/viewticket.java b/src/test/java/servlet/viewticket.java index acdca0730d..b8ee79a1c1 100644 --- a/src/test/java/servlet/viewticket.java +++ b/src/test/java/servlet/viewticket.java @@ -16,7 +16,7 @@ public void service(HttpServletRequest req,HttpServletResponse res) try { Class.forName("org.postgresql.Driver"); - String jdbcUrl="jdbc:postgresql://34.121.221.156:5432/postgres"; + String jdbcUrl="jdbc:postgresql://35.226.133.141:5432/postgres"; String username="postgres"; String password="password";