Author: dblevins Date: Sat Oct 10 09:00:12 2009 New Revision: 823823 URL: http://svn.apache.org/viewvc?rev=823823&view=rev Log: Merging r823642 - http://svn.apache.org/viewvc?rev=823642&view=rev
svn merge -r 823641:823642 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r823642 | dblevins | 2009-10-09 10:57:08 -0700 (Fri, 09 Oct 2009) | 1 line Corrected comments -- some of them were wrong ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.2/ (props changed) openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:12 2009 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:823293 +/openejb/trunk/openejb3:823293,823642 Modified: openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java?rev=823823&r1=823822&r2=823823&view=diff ============================================================================== --- openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java (original) +++ openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java Sat Oct 10 09:00:12 2009 @@ -100,11 +100,11 @@ * * <persistence-unit name="orange-unit"> * <jta-data-source>Orange</jta-data-source> - * <non-jta-data-source>OrangeUnmanagedamanged</non-jta-data-source> + * <non-jta-data-source>OrangeUnmanaged</non-jta-data-source> * </persistence-unit> * <persistence-unit name="lime-unit"> * <jta-data-source>Lime</jta-data-source> - * <non-jta-data-source>LimeUnmanagedamanged</non-jta-data-source> + * <non-jta-data-source>LimeUnmanaged</non-jta-data-source> * </persistence-unit> * * This is the happy path. @@ -538,8 +538,8 @@ } /** - * Existing data source "OrangeOne", not jta managed - * Existing data source "OrangeTwo", not jta managed + * Existing data source "OrangeOne", jta managed + * Existing data source "OrangeTwo", jta managed * * Persistence xml like so: * @@ -596,7 +596,7 @@ } /** - * Existing data source "OrangeOne", not jta managed + * Existing data source "OrangeOne", jta managed * * Persistence xml like so: * @@ -663,16 +663,16 @@ } /** - * Existing data source "Orange" not jta managed + * Existing data source "Orange" jta managed * * Persistence xml like so: * * <persistence-unit name="orange-unit"> - * <non-jta-data-source>Orange</non-jta-data-source> + * <jta-data-source>Orange</jta-data-source> * </persistence-unit> * - * We should generate a <jta-data-source> based on - * the <non-jta-data-source> + * We should generate a <non-jta-data-source> based on + * the <jta-data-source> * * @throws Exception */ @@ -712,7 +712,8 @@ * </persistence-unit> * * We should generate a <jta-data-source> based on - * the <non-jta-data-source> + * the <non-jta-data-source>. We should not select + * the Lime datasource which is for a different database. * * @throws Exception */ @@ -743,8 +744,8 @@ } /** - * Existing data source "Orange", not jta managed - * Existing data source "Lime", jta managed + * Existing data source "Orange", jta managed + * Existing data source "Lime", non jta managed * * Persistence xml like so: * @@ -753,7 +754,8 @@ * </persistence-unit> * * We should generate a <non-jta-data-source> based on - * the <jta-data-source> + * the <jta-data-source>. We should not select the + * Lime datasource which is for a different database. * * @throws Exception */ @@ -789,6 +791,7 @@ /** * Existing data source "Orange", not jta managed * Existing data source "Lime", jta managed + * Existing data source "JtaOrange", jta managed * * Persistence xml like so: * @@ -821,8 +824,9 @@ } /** - * Existing data source "Orange", not jta managed - * Existing data source "Lime", jta managed + * Existing data source "Orange", jta managed + * Existing data source "Lime", not jta managed + * Existing data source "OrangeUnamanged", not jta managed * * Persistence xml like so: * @@ -947,11 +951,13 @@ * <persistence-unit name="orange-unit"> * </persistence-unit> * + * A set of default data sources should be generated + * * The <non-jta-data-source> should be auto linked - * to the Orange data source + * to the Default JDBC Database data source * - * We should generate a <jta-data-source> based on - * the <non-jta-data-source> + * The <jta-data-source> should be auto linked + * to the Default Unmanaged JDBC Database data source * * @throws Exception */ Propchange: openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:12 2009 @@ -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:823293 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:823293,823642 Propchange: openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:12 2009 @@ -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:823293 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:823293,823642
