diff --git a/pom.xml b/pom.xml index 356b7b1..eb26d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,29 +1,43 @@ - - 4.0.0 - HackerspaceDev - WebApp - 0.0.1 - war - HackerspaceDev-WebApp - - src - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - maven-war-plugin - 2.4 - - WebContent - false - - - - + + 4.0.0 + HackerspaceDev + WebApp + 0.0.1 + war + HackerspaceDev-WebApp + + + junit + junit + 3.8.1 + test + + + org.primefaces + primefaces + 4.0 + + + + src + + + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + maven-war-plugin + 2.4 + + WebContent + false + + + + \ No newline at end of file diff --git a/src/pl/hackerspaceDev/webApp/service/HelloBean.java b/src/pl/hackerspaceDev/webApp/service/HelloBean.java new file mode 100644 index 0000000..2dbcffa --- /dev/null +++ b/src/pl/hackerspaceDev/webApp/service/HelloBean.java @@ -0,0 +1,12 @@ +package pl.hackerspaceDev.webApp.service; + +import javax.ejb.Stateless; + +@Stateless +public class HelloBean { + + public String getHello(){ + return "Hello from Bean!"; + } + +} diff --git a/src/pl/hackerspaceDev/webApp/view/HelloServlet.java b/src/pl/hackerspaceDev/webApp/view/HelloServlet.java index 76a2a42..f3134f4 100644 --- a/src/pl/hackerspaceDev/webApp/view/HelloServlet.java +++ b/src/pl/hackerspaceDev/webApp/view/HelloServlet.java @@ -1,32 +1,34 @@ package pl.hackerspaceDev.webApp.view; import java.io.IOException; + +import javax.ejb.EJB; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -/** - * Servlet implementation class HelloServlet - */ +import pl.hackerspaceDev.webApp.service.HelloBean; + @WebServlet({ "/HelloServlet", "/Hello", "/hello" }) public class HelloServlet extends HttpServlet { private static final long serialVersionUID = 1L; - /** - * Default constructor. - */ + @EJB + HelloBean helloBean;//=new HelloBean(); + public HelloServlet() { - // TODO Auto-generated constructor stub + super(); } - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("Hello!"); - response.getWriter().println("Hello!"); + String s = helloBean.getHello(); + + System.out.println("Hello from servlet!"); + System.out.println(s); + response.getWriter().println("Hello from servlet! "); + response.getWriter().println(s); }