Author: dblevins Date: Thu May 27 21:02:28 2010 New Revision: 948997 URL: http://svn.apache.org/viewvc?rev=948997&view=rev Log: svn merge -r 948021:948022 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=948022&view=rev ------------------------------------------------------------------------ r948022 | jgallimore | 2010-05-25 05:24:48 -0700 (Tue, 25 May 2010) | 1 line Correcting some file encoding issues ------------------------------------------------------------------------ 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-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java openejb/branches/openejb-3.1.x/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java 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 21:02:28 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022 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 21:02:28 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,946792,946814,946861,946863-946864,947010,947017,947042 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022 Modified: openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java?rev=948997&r1=948996&r2=948997&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Entity.java Thu May 27 21:02:28 2010 @@ -30,27 +30,27 @@ import org.apache.openejb.jee.was.v6.jav * The entity element declares an entity bean. The declaration consists of: an * optional description; optional display name; optional small icon file name; * optional large icon file name; a unique name assigned to the enterprise bean - * in the deployment descriptor; the names of the entity beans home and remote - * interfaces, if any; the names of the entity beans local home and local - * interface, if any; the entity beans implementation class; the entity beans - * persistence management type; the entity beans primary key class name; an - * indication of the entity beans reentrancy; an optional specification of the - * entity beans cmp-version; an optional specification of the entity beans + * in the deployment descriptor; the names of the entity bean's home and remote + * interfaces, if any; the names of the entity bean's local home and local + * interface, if any; the entity bean's implementation class; the entity bean's + * persistence management type; the entity bean's primary key class name; an + * indication of the entity bean's reentrancy; an optional specification of the + * entity bean's cmp-version; an optional specification of the entity bean's * abstract schema name; an optional list of container-managed fields; an * optional specification of the primary key field; an optional declaration of - * the beans environment entries; an optional declaration of the beans EJB - * references; an optional declaration of the beans local EJB references; an + * the bean's environment entries; an optional declaration of the bean's EJB + * references; an optional declaration of the bean's local EJB references; an * optional declaration of the security role references; an optional declaration - * of the security identity to be used for the execution of the beans methods; - * an optional declaration of the beans resource manager connection factory - * references; an optional declaration of the beans resource environment + * of the security identity to be used for the execution of the bean's methods; + * an optional declaration of the bean's resource manager connection factory + * references; an optional declaration of the bean's resource environment * references; an optional set of query declarations for finder and select * methods for an entity bean with cmp-version 2.x. The optional * abstract-schema-name element must be specified for an entity bean with * container managed persistence and cmp-version 2.x. The optional primkey-field - * may be present in the descriptor if the entitys persistence-type is + * may be present in the descriptor if the entity's persistence-type is * Container. The optional cmp-version element may be present in the descriptor - * if the entitys persistence-type is Container. If the persistence-type is + * if the entity's persistence-type is Container. If the persistence-type is * Container and the cmp-version element is not specified, its value defaults to * 2.x. The optional home and remote elements must be specified if the entity * bean cmp-version is 1.x. The optional local-home and local elements must be @@ -60,8 +60,8 @@ import org.apache.openejb.jee.was.v6.jav * been defined for the entity bean. The other elements that are optional are * "optional" in the sense that they are omitted if the lists represented by * them are empty. At least one cmp-field element must be present in the - * descriptor if the entitys persistence-type is Container and the cmp-version - * is 1.x, and none must not be present if the entitys persistence-type is + * descriptor if the entity's persistence-type is Container and the cmp-version + * is 1.x, and none must not be present if the entity's persistence-type is * Bean. * * Modified: openejb/branches/openejb-3.1.x/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java?rev=948997&r1=948996&r2=948997&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-spring/src/main/java/org/apache/openejb/spring/OpenEJB.java Thu May 27 21:02:28 2010 @@ -436,7 +436,7 @@ public class OpenEJB implements Applicat } private <T extends ServiceInfo> T initPassthrough(T info, String serviceType, Object instance) { - return initPassthrough("Spring SuppliedÊ" + serviceType, info, serviceType, instance); + return initPassthrough("Spring Supplied " + serviceType, info, serviceType, instance); } private <T extends ServiceInfo> T initPassthrough(String id, T info, String serviceType, Object instance) { 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 21:02:28 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,946792,946814,946861,946863-946864,947010,947017,947042 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022
