Author: dblevins
Date: Mon Jun 2 21:46:16 2008
New Revision: 662644
URL: http://svn.apache.org/viewvc?rev=662644&view=rev
Log:
Previous commit message (revision 662623) was supposed to be:
Key the Entity and MappedSuperclass objects by the "class" attribute
Fixed resulting test case incompatabilities -- the "class" attribute is
required to be unique
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-ejb-jar.xml
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MappedSuperclass.java
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jpa-mapping-full.xml
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-ejb-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-ejb-jar.xml?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-ejb-jar.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-ejb-jar.xml
Mon Jun 2 21:46:16 2008
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee";
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml
Mon Jun 2 21:46:16 2008
@@ -15,27 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
version="1.0">
- <mapped-superclass
class="org.apache.openejb.test.entity.cmp.AllowedOperationsCmpBean">
+ <mapped-superclass class="org.apache.openejb.test.entity.cmp.BasicCmpBean">
<attributes>
<id name="primaryKey"/>
<basic name="firstName"/>
<basic name="lastName"/>
<transient name="nextId"/>
- <transient name="number"/>
<transient name="ejbContext"/>
<transient name="allowedOperationsTable"/>
</attributes>
</mapped-superclass>
- <mapped-superclass class="org.apache.openejb.test.entity.cmp.BasicCmpBean">
+ <mapped-superclass
class="org.apache.openejb.test.entity.cmp.AllowedOperationsCmpBean">
<attributes>
<id name="primaryKey"/>
<basic name="firstName"/>
<basic name="lastName"/>
<transient name="nextId"/>
+ <transient name="number"/>
<transient name="ejbContext"/>
<transient name="allowedOperationsTable"/>
</attributes>
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/Entity.java
Mon Jun 2 21:46:16 2008
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.openejb.jee.jpa;
import org.apache.openejb.jee.Keyable;
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
Mon Jun 2 21:46:16 2008
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.openejb.jee.jpa;
import org.apache.openejb.jee.KeyedCollection;
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MappedSuperclass.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MappedSuperclass.java?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MappedSuperclass.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/MappedSuperclass.java
Mon Jun 2 21:46:16 2008
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.openejb.jee.jpa;
import org.apache.openejb.jee.Keyable;
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jpa-mapping-full.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jpa-mapping-full.xml?rev=662644&r1=662643&r2=662644&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jpa-mapping-full.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jpa-mapping-full.xml
Mon Jun 2 21:46:16 2008
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
version="1.0">
