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/05/25 00:17:07 UTC
svn commit: r541453 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/assembler/classic/
main/java/org/apache/openejb/config/
test/resources/convert/oej2/cmp/daytrader/
test/resources/convert/oej2/cmp/itest...
Author: dain
Date: Thu May 24 15:17:04 2007
New Revision: 541453
URL: http://svn.apache.org/viewvc?view=rev&rev=541453
Log:
When converting plans link entities using absolute moduleId#ejbName to avoid duplicates
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/unidirectional-orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/many-unidirectional-orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/one-unidirectional-orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/orm.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/unidirectional-orm.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java Thu May 24 15:17:04 2007
@@ -70,6 +70,7 @@
}
}
if (appInfo.cmpMappingsXml != null) {
+ // System.out.println(appInfo.cmpMappingsXml);
addJarEntry(jarOutputStream, "META-INF/openejb-cmp-generated-orm.xml", appInfo.cmpMappingsXml.getBytes());
}
} catch (IOException e) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java Thu May 24 15:17:04 2007
@@ -200,7 +200,7 @@
Entity entity = new Entity();
// description: contains the name of the entity bean
- entity.setDescription(bean.getEjbName());
+ entity.setDescription(ejbModule.getModuleId() + "#" + bean.getEjbName());
// name: the name of the entity in queries
String entityName = bean.getAbstractSchemaName();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java Thu May 24 15:17:04 2007
@@ -71,7 +71,7 @@
if (altDD instanceof OpenejbJarType) {
convertEjbRefs(ejbModule.getEjbJar(), ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
convertMdbConfigs(ejbModule.getEjbJar(), (OpenejbJarType) altDD);
- mergeEntityMappings(appModule.getCmpMappings(), ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
+ mergeEntityMappings(ejbModule.getModuleId(), appModule.getCmpMappings(), ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
}
}
return appModule;
@@ -218,7 +218,7 @@
}
}
- public void mergeEntityMappings(EntityMappings entityMappings, OpenejbJar openejbJar, OpenejbJarType openejbJarType) {
+ public void mergeEntityMappings(String moduleId, EntityMappings entityMappings, OpenejbJar openejbJar, OpenejbJarType openejbJarType) {
Map<String, EntityData> entities = new TreeMap<String, EntityData>();
for (Entity entity : entityMappings.getEntity()) {
entities.put(entity.getDescription(), new EntityData(entity));
@@ -228,7 +228,7 @@
continue;
}
EntityBeanType bean = (EntityBeanType) enterpriseBean;
- EntityData entityData = entities.get(bean.getEjbName());
+ EntityData entityData = entities.get(moduleId + "#" + bean.getEjbName());
if (entityData == null) {
// todo warn no such ejb in the ejb-jar.xml
continue;
@@ -295,7 +295,7 @@
EjbRelationshipRoleType leftRole = roles.get(0);
EjbRelationshipRoleType.RelationshipRoleSource leftRoleSource = leftRole.getRelationshipRoleSource();
String leftEjbName = leftRoleSource == null ? null : leftRoleSource.getEjbName();
- EntityData leftEntityData = entities.get(leftEjbName);
+ EntityData leftEntityData = entities.get(moduleId + "#" + leftEjbName);
String leftFieldName = leftRole.getCmrField().getCmrFieldName();
RelationField field;
@@ -352,7 +352,7 @@
RelationField left = null;
if (leftRole.getRelationshipRoleSource() != null) {
String leftEjbName = leftRole.getRelationshipRoleSource().getEjbName();
- EntityData leftEntityData = entities.get(leftEjbName);
+ EntityData leftEntityData = entities.get(moduleId + "#" + leftEjbName);
if (leftEntityData == null) {
// todo warn no such entity in ejb-jar.xml
continue;
@@ -387,7 +387,7 @@
}
if (rightRole.getRelationshipRoleSource() != null) {
String rightEjbName = rightRole.getRelationshipRoleSource().getEjbName();
- EntityData rightEntityData = entities.get(rightEjbName);
+ EntityData rightEntityData = entities.get(moduleId + "#" + rightEjbName);
if (rightEntityData == null) {
// todo warn no such entity in ejb-jar.xml
continue;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Thu May 24 15:17:04 2007
@@ -242,13 +242,13 @@
// merge data from sun-ejb-jar.xml file
SunEjbJar sunEjbJar = getSunEjbJar(ejbModule);
mergeEjbConfig(ejbModule.getOpenejbJar(), sunEjbJar);
- mergeEntityMappings(entities, ejbModule.getEjbJar(), ejbModule.getOpenejbJar(), sunEjbJar);
+ mergeEntityMappings(entities, ejbModule.getModuleId(), ejbModule.getEjbJar(), ejbModule.getOpenejbJar(), sunEjbJar);
// merge data from sun-cmp-mappings.xml file
SunCmpMappings sunCmpMappings = getSunCmpMappings(ejbModule);
if (sunCmpMappings != null) {
for (SunCmpMapping sunCmpMapping : sunCmpMappings.getSunCmpMapping()) {
- mergeEntityMappings(entities, ejbModule, entityMappings, sunCmpMapping);
+ mergeEntityMappings(entities, ejbModule.getModuleId(), ejbModule, entityMappings, sunCmpMapping);
}
}
}
@@ -331,7 +331,7 @@
}
}
- private void mergeEntityMappings(Map<String, EntityData> entities, EjbJar ejbJar, OpenejbJar openejbJar, SunEjbJar sunEjbJar) {
+ private void mergeEntityMappings(Map<String, EntityData> entities, String moduleId, EjbJar ejbJar, OpenejbJar openejbJar, SunEjbJar sunEjbJar) {
if (openejbJar == null) return;
if (sunEjbJar == null) return;
if (sunEjbJar.getEnterpriseBeans() == null) return;
@@ -350,7 +350,7 @@
continue;
}
EntityBean bean = (EntityBean) enterpriseBean;
- EntityData entityData = entities.get(ejb.getEjbName());
+ EntityData entityData = entities.get(moduleId + "#" + ejb.getEjbName());
if (entityData == null) {
// todo warn no such ejb in the ejb-jar.xml
continue;
@@ -390,9 +390,9 @@
}
}
- public void mergeEntityMappings(Map<String, EntityData> entities, EjbModule ejbModule, EntityMappings entityMappings, SunCmpMapping sunCmpMapping) {
+ public void mergeEntityMappings(Map<String, EntityData> entities, String moduleId, EjbModule ejbModule, EntityMappings entityMappings, SunCmpMapping sunCmpMapping) {
for (EntityMapping bean : sunCmpMapping.getEntityMapping()) {
- SunConversion.EntityData entityData = entities.get(bean.getEjbName());
+ SunConversion.EntityData entityData = entities.get(moduleId + "#" + bean.getEjbName());
if (entityData == null) {
// todo warn no such ejb in the ejb-jar.xml
continue;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="Holding" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Holding">
- <description>HoldingEJB</description>
+ <description>TestModule#HoldingEJB</description>
<table name="HOLDINGEJB"/>
<named-query name="Holding.ejbSelectQuoteFromSymbol(java.lang.String)">
<query>SELECT OBJECT(q) from Quote q WHERE q.symbol = ?1</query>
@@ -41,7 +41,7 @@
</attributes>
</entity>
<entity name="AccountProfile" class="openejb.org.apache.geronimo.samples.daytrader.ejb.AccountProfile">
- <description>AccountProfileEJB</description>
+ <description>TestModule#AccountProfileEJB</description>
<table name="AccountProfileEJB"/>
<named-query name="AccountProfile.findAll">
<query>SELECT OBJECT(a) FROM AccountProfile a</query>
@@ -72,7 +72,7 @@
</attributes>
</entity>
<entity name="Quote" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Quote">
- <description>QuoteEJB</description>
+ <description>TestModule#QuoteEJB</description>
<table name="QuoteEJB"/>
<named-query name="Quote.findAll">
<query>SELECT OBJECT(q) FROM Quote q</query>
@@ -129,7 +129,7 @@
</attributes>
</entity>
<entity name="KeyGen" class="openejb.org.apache.geronimo.samples.daytrader.ejb.KeyGen">
- <description>KeyGenEJB</description>
+ <description>TestModule#KeyGenEJB</description>
<table name="KeyGenEJB"/>
<named-query name="KeyGen.findByPrimaryKeyForUpdate(java.lang.String)">
<query>SELECT OBJECT(kg) FROM KeyGen kg where kg.keyName = ?1</query>
@@ -144,7 +144,7 @@
</attributes>
</entity>
<entity name="Account" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Account">
- <description>AccountEJB</description>
+ <description>TestModule#AccountEJB</description>
<table name="AccountEJB"/>
<named-query name="Account.findByUserID(java.lang.String)">
<query>SELECT OBJECT(a) FROM Account a WHERE a.profile.userID = ?1</query>
@@ -202,7 +202,7 @@
</attributes>
</entity>
<entity name="Orders" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Orders">
- <description>OrderEJB</description>
+ <description>TestModule#OrderEJB</description>
<table name="OrderEJB"/>
<named-query name="Orders.findAll">
<query>SELECT OBJECT(o) FROM Orders o</query>
Modified: incubator/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/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-orm.xml Thu May 24 15:17:04 2007
@@ -40,7 +40,7 @@
</attributes>
</mapped-superclass>
<entity name="BasicCmpBean" class="openejb.org.apache.openejb.test.entity.cmp.BasicCmpBean">
- <description>BasicCmpBean</description>
+ <description>TestModule#BasicCmpBean</description>
<table name="entity"/>
<named-query name="BasicCmpBean.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM BasicCmpBean AS o WHERE o.lastName = ?1</query>
@@ -59,7 +59,7 @@
</attribute-override>
</entity>
<entity name="BasicCmpBeanExplicitPK" class="openejb.org.apache.openejb.test.entity.cmp.BasicCmpBeanExplicitPK">
- <description>BasicCmpBeanExplicitPK</description>
+ <description>TestModule#BasicCmpBeanExplicitPK</description>
<table name="entity_explicit_pk"/>
<named-query name="BasicCmpBeanExplicitPK.findEmptyCollection">
<query>SELECT OBJECT(o) FROM BasicCmpBeanExplicitPK AS o WHERE 1 = 0</query>
@@ -81,7 +81,7 @@
</attribute-override>
</entity>
<entity name="AOBasicCmpBean" class="openejb.org.apache.openejb.test.entity.cmp.AOBasicCmpBean">
- <description>AOBasicCmpBean</description>
+ <description>TestModule#AOBasicCmpBean</description>
<table name="entity"/>
<named-query name="AOBasicCmpBean.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM AOBasicCmpBean AS o WHERE o.lastName = ?1</query>
@@ -100,7 +100,7 @@
</attribute-override>
</entity>
<entity name="EncCmpBean" class="openejb.org.apache.openejb.test.entity.cmp.EncCmpBean">
- <description>EncCmpBean</description>
+ <description>TestModule#EncCmpBean</description>
<table name="entity"/>
<named-query name="EncCmpBean.findEmptyCollection">
<query>SELECT OBJECT(o) FROM EncCmpBean AS o WHERE 1 = 0</query>
@@ -116,7 +116,7 @@
</attribute-override>
</entity>
<entity name="CmpRMIIIOPBean" class="openejb.org.apache.openejb.test.entity.cmp.CmpRMIIIOPBean">
- <description>CmpRMIIIOPBean</description>
+ <description>TestModule#CmpRMIIIOPBean</description>
<table name="entity"/>
<named-query name="CmpRMIIIOPBean.findEmptyCollection">
<query>SELECT OBJECT(o) FROM CmpRMIIIOPBean AS o WHERE 1 = 0</query>
@@ -132,7 +132,7 @@
</attribute-override>
</entity>
<entity name="BasicCmp2" class="openejb.org.apache.openejb.test.entity.cmp.BasicCmp2">
- <description>BasicCmp2Bean</description>
+ <description>TestModule#BasicCmp2Bean</description>
<table name="entity"/>
<named-query name="BasicCmp2.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM BasicCmp2 AS o WHERE o.lastName = ?1</query>
@@ -154,7 +154,7 @@
</attributes>
</entity>
<entity name="AOBasicCmp2" class="openejb.org.apache.openejb.test.entity.cmp.AOBasicCmp2">
- <description>AOBasicCmp2Bean</description>
+ <description>TestModule#AOBasicCmp2Bean</description>
<table name="entity"/>
<named-query name="AOBasicCmp2.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM AOBasicCmp2 AS o WHERE o.lastName = ?1</query>
@@ -176,7 +176,7 @@
</attributes>
</entity>
<entity name="EncCmp2" class="openejb.org.apache.openejb.test.entity.cmp.EncCmp2">
- <description>EncCmp2Bean</description>
+ <description>TestModule#EncCmp2Bean</description>
<table name="entity"/>
<named-query name="EncCmp2.findEmptyCollection">
<query>SELECT OBJECT(o) FROM EncCmp2 AS o WHERE 1 = 0</query>
@@ -195,7 +195,7 @@
</attributes>
</entity>
<entity name="Cmp2RmiIiop" class="openejb.org.apache.openejb.test.entity.cmp.Cmp2RmiIiop">
- <description>Cmp2RMIIIOPBean</description>
+ <description>TestModule#Cmp2RMIIIOPBean</description>
<table name="entity"/>
<named-query name="Cmp2RmiIiop.findEmptyCollection">
<query>SELECT OBJECT(o) FROM Cmp2RmiIiop AS o WHERE 1 = 0</query>
@@ -214,7 +214,7 @@
</attributes>
</entity>
<entity name="Order" class="openejb.org.apache.openejb.test.entity.cmp2.cmrmapping.Order">
- <description>OneOwningSideBean</description>
+ <description>TestModule#OneOwningSideBean</description>
<table name="OneOwning"/>
<attributes>
<basic name="id">
@@ -229,7 +229,7 @@
</attributes>
</entity>
<entity name="Order" class="openejb.org.apache.openejb.test.entity.cmp2.cmrmapping.Order">
- <description>OneInverseSideBean</description>
+ <description>TestModule#OneInverseSideBean</description>
<table name="OneInverse"/>
<attributes>
<id name="id">
@@ -240,7 +240,7 @@
</attributes>
</entity>
<entity name="Order" class="openejb.org.apache.openejb.test.entity.cmp2.cmrmapping.Order">
- <description>ManyOwningSideBean</description>
+ <description>TestModule#ManyOwningSideBean</description>
<table name="ManyOwning"/>
<named-query name="Order.ejbSelectSomething(java.lang.Integer)">
<query>SELECT m.oneInverseSide FROM Order m WHERE m.id = ?1</query>
@@ -258,7 +258,7 @@
</attributes>
</entity>
<entity name="Address" class="openejb.org.apache.openejb.test.entity.cmp2.petstore.Address">
- <description>AddressEJB</description>
+ <description>TestModule#AddressEJB</description>
<table name="address"/>
<attributes>
<id name="OpenEJB_pk">
@@ -273,7 +273,7 @@
</attributes>
</entity>
<entity name="Storage" class="openejb.org.apache.openejb.test.entity.cmp2.model.Storage">
- <description>StorageBean</description>
+ <description>TestModule#StorageBean</description>
<table name="storage"/>
<attributes>
<id name="id">
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="manytomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="manytomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM manytomanyA A</query>
@@ -22,7 +22,7 @@
</attributes>
</entity>
<entity name="manytomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<attributes>
<id name="field1">
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/unidirectional-orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/unidirectional-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/unidirectional-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/manytomany/simplepk/unidirectional-orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="manytomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="manytomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM manytomanyA A</query>
@@ -22,7 +22,7 @@
</attributes>
</entity>
<entity name="manytomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<attributes>
<id name="field1">
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/many-unidirectional-orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/many-unidirectional-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/many-unidirectional-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/many-unidirectional-orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
@@ -21,7 +21,7 @@
</attributes>
</entity>
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/one-unidirectional-orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/one-unidirectional-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/one-unidirectional-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/one-unidirectional-orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
@@ -21,7 +21,7 @@
</attributes>
</entity>
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetomany/simplepk/orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
@@ -21,7 +21,7 @@
</attributes>
</entity>
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="OneToOneA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="OneToOneA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM OneToOneA A</query>
@@ -17,7 +17,7 @@
</attributes>
</entity>
<entity name="OneToOneB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<named-query name="OneToOneB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM OneToOneB B</query>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/unidirectional-orm.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/unidirectional-orm.xml?view=diff&rev=541453&r1=541452&r2=541453
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/unidirectional-orm.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/onetoone/simplepk/unidirectional-orm.xml Thu May 24 15:17:04 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
<entity name="OneToOneA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneA">
- <description>A</description>
+ <description>TestModule#A</description>
<table name="A"/>
<named-query name="OneToOneA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM OneToOneA A</query>
@@ -17,7 +17,7 @@
</attributes>
</entity>
<entity name="OneToOneB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneB">
- <description>B</description>
+ <description>TestModule#B</description>
<table name="B"/>
<named-query name="OneToOneB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM OneToOneB B</query>