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:50:28 UTC
svn commit: r1040283 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/main/resources/
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
examples/lookup-of-ejbs/ exampl...
Author: dblevins
Date: Mon Nov 29 20:50:27 2010
New Revision: 1040283
URL: http://svn.apache.org/viewvc?rev=1040283&view=rev
Log:
svn merge -r 1040221:1040222 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1040222
------------------------------------------------------------------------
r1040222 | dblevins | 2010-11-29 10:41:26 -0800 (Mon, 29 Nov 2010) | 3 lines
OPENEJB-1406: Example: Lookup of EJBs
trimmed down version of the injection-of-ejbs example
------------------------------------------------------------------------
Added:
openejb/trunk/openejb3/examples/lookup-of-ejbs/ (props changed)
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/
openejb/trunk/openejb3/examples/lookup-of-ejbs/README.txt
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/README.txt
openejb/trunk/openejb3/examples/lookup-of-ejbs/build.xml
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/build.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs/pom.xml
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/pom.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/java/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/java/org/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/java/org/superbiz/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/BlueBean.java
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/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
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/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
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/java/org/superbiz/ejblookup/RedBean.java
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/resources/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/resources/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/resources/META-INF/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/resources/META-INF/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/main/resources/META-INF/ejb-jar.xml
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/main/resources/META-INF/ejb-jar.xml
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/java/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/java/org/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/java/org/superbiz/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/
- copied from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/
openejb/trunk/openejb3/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
- copied unchanged from r1040222, openejb/branches/openejb-3.1.x/examples/lookup-of-ejbs/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
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)
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 29 20:50:27 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
+/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-jcdi:984659-985270
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties?rev=1040283&r1=1040282&r2=1040283&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties Mon Nov 29 20:50:27 2010
@@ -49,13 +49,13 @@
log4j.rootLogger = fatal,C
log4j.category.OpenEJB = warn
-log4j.category.OpenEJB.options = info
-log4j.category.OpenEJB.server = info
-log4j.category.OpenEJB.startup = info
+log4j.category.OpenEJB.options = warn
+log4j.category.OpenEJB.server = warn
+log4j.category.OpenEJB.startup = warn
log4j.category.OpenEJB.startup.service = warn
-log4j.category.OpenEJB.startup.config = info
-log4j.category.OpenEJB.hsql = info
-log4j.category.CORBA-Adapter = info
+log4j.category.OpenEJB.startup.config = warn
+log4j.category.OpenEJB.hsql = warn
+log4j.category.CORBA-Adapter = warn
log4j.category.Transaction = warn
log4j.category.org.apache.activemq = error
log4j.category.org.apache.geronimo = error
@@ -63,3 +63,4 @@ log4j.category.openjpa = war
log4j.appender.C = org.apache.log4j.ConsoleAppender
log4j.appender.C.layout = org.apache.log4j.SimpleLayout
+openejb.nobanner = false
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:50:27 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
+/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-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:50:27 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
+/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-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Propchange: openejb/trunk/openejb3/examples/lookup-of-ejbs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 29 20:50:27 2010
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+