Skip to content

Commit 422a726

Browse files
cirixcirix
committed
Merge remote-tracking branch 'upstream/master' into branch-arquillian
2 parents c0ac3a4 + 0e29e1b commit 422a726

File tree

54 files changed

+345
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+345
-588
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void tearDown() {
7373
/**
7474
* Test of sayHello method, of class MyBean.
7575
*/
76-
// @org.junit.Test
76+
@org.junit.Test
7777
public void testSayHello() throws Exception {
7878
System.out.println("sayHello");
7979
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* only if the new code is made subject to such option by the copyright
3838
* holder.
3939
*/
40-
package org.javaee7.ejb.stateful.remote;
40+
package org.javaee7.ejb.stateless.remote;
4141

4242
import javax.ejb.Remote;
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* only if the new code is made subject to such option by the copyright
3838
* holder.
3939
*/
40-
package org.javaee7.ejb.stateful.remote;
40+
package org.javaee7.ejb.stateless.remote;
4141

4242
import javax.ejb.Stateless;
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* only if the new code is made subject to such option by the copyright
3838
* holder.
3939
*/
40-
package org.javaee7.ejb.stateful.remote;
40+
package org.javaee7.ejb.stateless.remote;
4141

4242
import java.io.IOException;
4343
import java.io.PrintWriter;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
7979
ELProcessor elp = new ELProcessor();
8080
out.println("Simple array access<br>");
8181
out.println((elp.eval("a = [1, 2, 3]; a[1]")) + "<br>");
82-
out.println("Lamda expressions<br>");
82+
out.println("Lambda expressions<br>");
8383
out.println(((elp.eval("((x,y) -> x+y)(4, 5)"))) + "<br>");
8484
out.println("</body>");
8585
out.println("</html>");

‎jaxrs/singleton-application.old/pom.xml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎jaxrs/singleton-application.old/src/main/java/org/javaee7/jaxrs/singelton/application/MyResource.java‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎jaxrs/singleton-application.old/src/main/java/org/javaee7/jaxrs/singelton/application/TestServlet.java‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎jaxrs/singleton-application.old/src/main/webapp/WEB-INF/beans.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎jms/send-receive/src/main/java/org/javaee7/jms/send/receive/MessageReceiverAsync.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import java.util.logging.Level;
4343
import java.util.logging.Logger;
44+
import javax.ejb.ActivationConfigProperty;
4445
import javax.ejb.MessageDriven;
4546
import javax.jms.JMSException;
4647
import javax.jms.Message;
@@ -50,7 +51,10 @@
5051
/**
5152
* @author Arun Gupta
5253
*/
53-
@MessageDriven(mappedName = "java:global/jms/myAsyncQueue")
54+
@MessageDriven(activationConfig = {
55+
@ActivationConfigProperty(propertyName = "destinationLookup",
56+
propertyValue = "java:global/jms/myAsyncQueue")
57+
})
5458
public class MessageReceiverAsync implements MessageListener {
5559

5660
@Override

0 commit comments

Comments
 (0)