Merge remote-tracking branch 'upstream/master' into branch-arquillian

Author: cirix

ejb/embeddable/src/test/java/org/javaee7/ejb/embeddable/MyBeanTest.java

@@ -73,7 +73,7 @@ public void tearDown() {
     /**
      * Test of sayHello method, of class MyBean.
      */
-//    @org.junit.Test
+    @org.junit.Test
     public void testSayHello() throws Exception {
         System.out.println("sayHello");
         String name = "Duke";

ejb/stateless/src/main/java/org/javaee7/ejb/stateful/remote/Account.java renamed to ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/Account.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.javaee7.ejb.stateful.remote;
+package org.javaee7.ejb.stateless.remote;
 
 import javax.ejb.Remote;
 

ejb/stateless/src/main/java/org/javaee7/ejb/stateful/remote/AccountSessionBean.java renamed to ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/AccountSessionBean.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.javaee7.ejb.stateful.remote;
+package org.javaee7.ejb.stateless.remote;
 
 import javax.ejb.Stateless;
 

ejb/stateless/src/main/java/org/javaee7/ejb/stateful/remote/TestServlet.java renamed to ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/TestServlet.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.javaee7.ejb.stateful.remote;
+package org.javaee7.ejb.stateless.remote;
 
 import java.io.IOException;
 import java.io.PrintWriter;

el/standalone/src/main/java/org/javaee7/el/standalone/TestServlet.java

@@ -79,7 +79,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             ELProcessor elp = new ELProcessor();
             out.println("Simple array access<br>");
             out.println((elp.eval("a = [1, 2, 3]; a[1]")) + "<br>");
-            out.println("Lamda expressions<br>");
+            out.println("Lambda expressions<br>");
             out.println(((elp.eval("((x,y) -> x+y)(4, 5)"))) + "<br>");            
             out.println("</body>");
             out.println("</html>");

jaxrs/singleton-application.old/pom.xml

@@ -41,6 +41,7 @@
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -50,7 +51,10 @@
 /**
  * @author Arun Gupta
  */
-@MessageDriven(mappedName = "java:global/jms/myAsyncQueue")
+@MessageDriven(activationConfig = {
+    @ActivationConfigProperty(propertyName = "destinationLookup",
+            propertyValue = "java:global/jms/myAsyncQueue")
+})
 public class MessageReceiverAsync implements MessageListener {
 
     @Override