Author: dblevins Date: Thu May 27 22:04:50 2010 New Revision: 949018 URL: http://svn.apache.org/viewvc?rev=949018&view=rev Log: svn merge -r 946488:946489 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=946489&view=rev ------------------------------------------------------------------------ r946489 | dblevins | 2010-05-19 17:08:44 -0700 (Wed, 19 May 2010) | 2 lines Patch from Andy Gumbrecht, OPENEJB-1268: Spring test.xml has incorrect reference Thanks, Andy! ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/container/openejb-spring/src/test/resources/org/apache/openejb/spring/test.xml openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:04:50 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946485,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:04:50 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946485,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 Modified: openejb/branches/openejb-3.1.x/container/openejb-spring/src/test/resources/org/apache/openejb/spring/test.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-spring/src/test/resources/org/apache/openejb/spring/test.xml?rev=949018&r1=949017&r2=949018&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-spring/src/test/resources/org/apache/openejb/spring/test.xml (original) +++ openejb/branches/openejb-3.1.x/container/openejb-spring/src/test/resources/org/apache/openejb/spring/test.xml Thu May 27 22:04:50 2010 @@ -30,6 +30,6 @@ </bean> <bean name="first" class="org.apache.openejb.spring.LinkedBean"> - <property name="next" ref="nextBean"/> + <property name="next" ref="next"/> </bean> </beans> \ No newline at end of file Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:04:50 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946485,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548
