You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/01/04 05:23:10 UTC
svn commit: r492404 [3/3] - in /incubator/openejb/trunk/openejb3:
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apache/openejb/alt/assembler/
container/openejb-core/src/main/ja...
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=492404&r1=492403&r2=492404
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Wed Jan 3 20:23:04 2007
@@ -85,12 +85,15 @@
<ejb-name>BasicCmp2Bean</ejb-name>
<home>org.apache.openejb.test.entity.cmp.BasicCmpHome</home>
<remote>org.apache.openejb.test.entity.cmp.BasicCmpObject</remote>
- <ejb-class>org.apache.openejb.test.entity.cmp.BasicCmp2Bean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmp.BasicCmp2Bean</ejb-class>
<persistence-type>Container</persistence-type>
- <cmp-version>1.x</cmp-version>
+ <cmp-version>2.x</cmp-version>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<primkey-field>id</primkey-field>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
<resource-ref>
<description>This is a reference to a JDBC database.</description>
<res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
@@ -149,12 +152,15 @@
<ejb-name>AOBasicCmp2Bean</ejb-name>
<home>org.apache.openejb.test.entity.cmp.BasicCmpHome</home>
<remote>org.apache.openejb.test.entity.cmp.BasicCmpObject</remote>
- <ejb-class>org.apache.openejb.test.entity.cmp.AllowedOperationsCmp2Bean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmp.AllowedOperationsCmp2Bean</ejb-class>
<persistence-type>Container</persistence-type>
- <cmp-version>1.x</cmp-version>
+ <cmp-version>2.x</cmp-version>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<primkey-field>id</primkey-field>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
<resource-ref>
<description>
This is a reference to a JDBC database.
@@ -290,12 +296,15 @@
<ejb-name>EncCmp2Bean</ejb-name>
<home>org.apache.openejb.test.entity.cmp.EncCmpHome</home>
<remote>org.apache.openejb.test.entity.cmp.EncCmpObject</remote>
- <ejb-class>org.apache.openejb.test.entity.cmp.EncCmp2Bean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmp.EncCmp2Bean</ejb-class>
<persistence-type>Container</persistence-type>
<cmp-version>2.x</cmp-version>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<primkey-field>id</primkey-field>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
<env-entry>
<env-entry-name>entity/cmp/references/Boolean</env-entry-name>
<env-entry-type>java.lang.Boolean</env-entry-type>
@@ -536,12 +545,15 @@
<ejb-name>Cmp2 RMI-IIOP Bean</ejb-name>
<home>org.apache.openejb.test.entity.cmp.RmiIiopCmpHome</home>
<remote>org.apache.openejb.test.entity.cmp.RmiIiopCmpObject</remote>
- <ejb-class>org.apache.openejb.test.entity.cmp.RmiIiopCmp2Bean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmp.RmiIiopCmp2Bean</ejb-class>
<persistence-type>Container</persistence-type>
<cmp-version>2.x</cmp-version>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<primkey-field>id</primkey-field>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
<ejb-ref>
<ejb-ref-name>cmp/rmi-iiop/home</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
@@ -571,7 +583,7 @@
<ejb-name>OneToOneA</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.onetoone.ALocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.onetoone.ALocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.onetoone.ABean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.onetoone.ABean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
@@ -603,7 +615,7 @@
<ejb-name>OneToOneB</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.onetoone.BLocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.onetoone.BLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.onetoone.BBean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.onetoone.BBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
@@ -642,7 +654,7 @@
<ejb-name>OneToManyA</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.onetomany.ALocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.onetomany.ALocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.onetomany.ABean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.onetomany.ABean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
@@ -674,7 +686,7 @@
<ejb-name>OneToManyB</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.onetomany.BLocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.onetomany.BLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.onetomany.BBean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.onetomany.BBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
@@ -713,7 +725,7 @@
<ejb-name>OneOwningSideBean</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideLocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideBean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideBean</ejb-class>
<persistence-type>Container</persistence-type>
<!--<prim-key-class>org.apache.openejb.test.entity.cmr.cmrmapping.CompoundPK</prim-key-class>-->
<prim-key-class>java.lang.Integer</prim-key-class>
@@ -737,7 +749,7 @@
<ejb-name>OneInverseSideBean</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideLocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideBean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
@@ -757,7 +769,7 @@
<ejb-name>ManyOwningSideBean</ejb-name>
<local-home>org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideLocalHome</local-home>
<local>org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideBean_JPA</ejb-class>
+ <ejb-class>org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideBean</ejb-class>
<persistence-type>Container</persistence-type>
<!--<prim-key-class>org.apache.openejb.test.entity.cmr.cmrmapping.CompoundPK</prim-key-class>-->
<prim-key-class>java.lang.Integer</prim-key-class>
@@ -1983,6 +1995,7 @@
</relationship-role-source>
<cmr-field>
<cmr-field-name>b</cmr-field-name>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
<cascade-delete/>
</ejb-relationship-role>
@@ -2004,6 +2017,7 @@
</relationship-role-source>
<cmr-field>
<cmr-field-name>bNonCascade</cmr-field-name>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml?view=diff&rev=492404&r1=492403&r2=492404
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml Wed Jan 3 20:23:04 2007
@@ -46,7 +46,7 @@
</attributes>
</entity>
- <entity class="org.apache.openejb.test.entity.cmp.BasicCmpBean" access="FIELD">
+ <entity class="org.apache.openejb.test.entity.cmp.BasicCmpBean">
<description>Simple Entity Bean</description>
<table name="entity"/>
@@ -66,7 +66,7 @@
</attributes>
</entity>
- <entity name="BasicCmp2Bean" class="org.apache.openejb.test.entity.cmp.BasicCmp2Bean_JPA" access="PROPERTY">
+ <entity name="BasicCmp2Bean" class="org.apache.openejb.test.entity.cmp.BasicCmp2Bean_JPA">
<description>Simple Entity Bean</description>
<table name="entity"/>
@@ -105,7 +105,7 @@
</attributes>
</entity>
- <entity name="AllowedOperationsCmp2Bean" class="org.apache.openejb.test.entity.cmp.AllowedOperationsCmp2Bean_JPA" access="PROPERTY">
+ <entity name="AllowedOperationsCmp2Bean" class="org.apache.openejb.test.entity.cmp.AllowedOperationsCmp2Bean_JPA">
<description>Simple Entity Bean</description>
<table name="entity"/>
@@ -161,7 +161,7 @@
</attributes>
</entity>
- <entity name="EncCmp2Bean" class="org.apache.openejb.test.entity.cmp.EncCmp2Bean_JPA" access="PROPERTY">
+ <entity name="EncCmp2Bean" class="org.apache.openejb.test.entity.cmp.EncCmp2Bean_JPA">
<description>Simple Entity Bean</description>
<table name="entity"/>
@@ -198,7 +198,7 @@
</attributes>
</entity>
- <entity name="RmiIiopCmp2Bean" class="org.apache.openejb.test.entity.cmp.RmiIiopCmp2Bean_JPA" access="PROPERTY">
+ <entity name="RmiIiopCmp2Bean" class="org.apache.openejb.test.entity.cmp.RmiIiopCmp2Bean_JPA">
<description>Simple Entity Bean</description>
<table name="entity"/>
@@ -216,7 +216,7 @@
</attributes>
</entity>
- <entity name="OneOwningSideBean" class="org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideBean_JPA" access="PROPERTY">
+ <entity name="OneOwningSideBean" class="org.apache.openejb.test.entity.cmr.cmrmapping.OneOwningSideBean_JPA">
<table name="OneOwning"/>
<attributes>
<id name="id">
@@ -228,7 +228,7 @@
</attributes>
</entity>
- <entity name="OneInverseSideBean" class="org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideBean_JPA" access="PROPERTY">
+ <entity name="OneInverseSideBean" class="org.apache.openejb.test.entity.cmr.cmrmapping.OneInverseSideBean_JPA">
<table name="OneInverse"/>
<attributes>
<id name="id">
@@ -237,7 +237,7 @@
</attributes>
</entity>
- <entity name="ManyOwning" class="org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideBean_JPA" access="PROPERTY">
+ <entity name="ManyOwning" class="org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideBean_JPA">
<table name="ManyOwning"/>
<attributes>
<id name="id">
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml?view=diff&rev=492404&r1=492403&r2=492404
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/persistence.xml Wed Jan 3 20:23:04 2007
@@ -24,6 +24,9 @@
<mapping-file>META-INF/jpa.mapping.xml</mapping-file>
<class>org.apache.openejb.test.entity.cmp.BasicCmpBean</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <!--<properties>-->
+ <!--<property name="openjpa.Log" value="DefaultLevel=TRACE"/>-->
+ <!--</properties>-->
</persistence-unit>
<persistence-unit name="openjpa-test-unit">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>