You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/29 21:51:12 UTC
svn commit: r1040284 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
examples/lookup-of-ejbs-with-descriptor/ examples/lookup-of-ejbs-with-desc...
Author: dblevins
Date: Mon Nov 29 20:51:11 2010
New Revision: 1040284
URL: http://svn.apache.org/viewvc?rev=1040284&view=rev
Log:
svn merge -r 1040249:1040250 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1040250
------------------------------------------------------------------------
r1040250 | dblevins | 2010-11-29 11:46:38 -0800 (Mon, 29 Nov 2010) | 2 lines
OPENEJB-342: Example: Lookup of EJBs with descriptor
------------------------------------------------------------------------
Added:
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/ (props changed)
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/README.txt
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/README.txt
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/build.xml
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/build.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/pom.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/BlueBean.java
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/Friend.java
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/java/org/superbiz/ejblookup/RedBean.java
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/resources/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/java/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/
- copied from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
- copied unchanged from r1040250, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 29 20:51:11 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi:984659-985270
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 29 20:51:11 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 29 20:51:11 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Propchange: openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 29 20:51:11 2010
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java?rev=1040284&r1=1040283&r2=1040284&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java (original)
+++ openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java Mon Nov 29 20:51:11 2010
@@ -31,7 +31,7 @@ public class BlueBean implements Friend
return "Blue says, Hello!";
}
- public String helloToFriend() {
+ public String helloFromFriend() {
try {
Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
return "My friend " + friend.sayHello();
Modified: openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java?rev=1040284&r1=1040283&r2=1040284&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java (original)
+++ openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/Friend.java Mon Nov 29 20:51:11 2010
@@ -30,7 +30,7 @@ import javax.ejb.Local;
public interface Friend {
public String sayHello();
- public String helloToFriend();
+ public String helloFromFriend();
}
//END SNIPPET: code
Modified: openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java?rev=1040284&r1=1040283&r2=1040284&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java (original)
+++ openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java Mon Nov 29 20:51:11 2010
@@ -31,7 +31,7 @@ public class RedBean implements Friend {
return "Red says, Hello!";
}
- public String helloToFriend() {
+ public String helloFromFriend() {
try {
Friend friend = (Friend) new InitialContext().lookup("java:comp/env/myFriend");
return "My friend " + friend.sayHello();
Modified: openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java?rev=1040284&r1=1040283&r2=1040284&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java (original)
+++ openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java Mon Nov 29 20:51:11 2010
@@ -41,7 +41,7 @@ public class EjbDependencyTest extends T
assertNotNull(red);
assertEquals("Red says, Hello!", red.sayHello());
- assertEquals("My friend Blue says, Hello!", red.helloToFriend());
+ assertEquals("My friend Blue says, Hello!", red.helloFromFriend());
}
@@ -51,7 +51,7 @@ public class EjbDependencyTest extends T
assertNotNull(blue);
assertEquals("Blue says, Hello!", blue.sayHello());
- assertEquals("My friend Red says, Hello!", blue.helloToFriend());
+ assertEquals("My friend Red says, Hello!", blue.helloFromFriend());
}