Author: dblevins Date: Tue May 26 07:18:31 2009 New Revision: 778590 URL: http://svn.apache.org/viewvc?rev=778590&view=rev Log: Merging r778585 - http://svn.apache.org/viewvc?rev=778585&view=rev
svn merge -r 778584:778585 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r778585 | dblevins | 2009-05-26 00:12:52 -0700 (Tue, 26 May 2009) | 2 lines Updates to ensure ant build files work or are removed if they don't ------------------------------------------------------------------------ Removed: openejb/branches/openejb-3.1.1/examples/spring-integration/build.xml openejb/branches/openejb-3.1.1/examples/webapps/ejb-examples/build.xml Modified: openejb/branches/openejb-3.1.1/ (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/AppPathsTest.java (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java (props changed) openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/calculator/CalculatorLocal.java (props changed) openejb/branches/openejb-3.1.1/examples/testcase-injection/build.xml Propchange: openejb/branches/openejb-3.1.1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 07:18:31 2009 @@ -0,0 +1 @@ +/openejb/trunk/openejb3:778585 Propchange: openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/AppPathsTest.java ('svn:mergeinfo' removed) Propchange: openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidEjbRefTest.java ('svn:mergeinfo' removed) Propchange: openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java ('svn:mergeinfo' removed) Propchange: openejb/branches/openejb-3.1.1/examples/simple-webservice/src/main/java/org/superbiz/calculator/CalculatorLocal.java ('svn:mergeinfo' removed) Modified: openejb/branches/openejb-3.1.1/examples/testcase-injection/build.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/examples/testcase-injection/build.xml?rev=778590&r1=778589&r2=778590&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/examples/testcase-injection/build.xml (original) +++ openejb/branches/openejb-3.1.1/examples/testcase-injection/build.xml Tue May 26 07:18:31 2009 @@ -50,6 +50,7 @@ <!-- Test Build Classpath --> <artifact:dependencies pathId="classpath.test.build"> <dependency groupId="junit" artifactId="junit" version="4.3.1"/> + <dependency groupId="org.apache.openejb" artifactId="openejb-api" version="3.1.1-SNAPSHOT"/> </artifact:dependencies> <!-- Test Run Classpath -->
