Skip to content

Rmbranch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: animos3d-branch
Choose a base branch
from
Open

Rmbranch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b0ae0d
dodano jUnit
Oct 25, 2014
94e564e
EJB 3.1 Hello World Example
Nov 8, 2014
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
70 changes: 42 additions & 28 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,43 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>HackerspaceDev</groupId>
<artifactId>WebApp</artifactId>
<version>0.0.1</version>
<packaging>war</packaging>
<name>HackerspaceDev-WebApp</name>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>HackerspaceDev</groupId>
<artifactId>WebApp</artifactId>
<version>0.0.1</version>
<packaging>war</packaging>
<name>HackerspaceDev-WebApp</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>4.0</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
</project>
12 changes: 12 additions & 0 deletions src/pl/hackerspaceDev/webApp/service/HelloBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package pl.hackerspaceDev.webApp.service;

import javax.ejb.Stateless;

@Stateless
public class HelloBean {

public String getHello(){
return "Hello from Bean!";
}

}
26 changes: 14 additions & 12 deletions src/pl/hackerspaceDev/webApp/view/HelloServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);


}
Expand Down