Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ejb/ejb-client/pom.xml
#	ejb/ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
#	ejb/ejb-client/src/main/resources/jboss-ejb-client.properties
#	ejb/ejb-remote/pom.xml
#	ejb/ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
#	ejb/pom.xml
This commit is contained in:
Pritam Banerjee
2016-11-15 23:22:27 -08:00
156 changed files with 5051 additions and 340 deletions
@@ -15,4 +15,5 @@ public class HelloWorldBean implements HelloWorld {
return "Welcome to EJB Tutorial!";
}
}