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/02/16 03:06:09 UTC
svn commit: r508279 - in /incubator/openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/assembler/classic/
openejb-core/src/main/java/org/apache/openejb/config/
openejb-core/src/main/java/org/apache/openejb/core/ openejb-cor...
Author: dain
Date: Thu Feb 15 18:06:08 2007
New Revision: 508279
URL: http://svn.apache.org/viewvc?view=rev&rev=508279
Log:
Queries are now named ${entityName}.${methodName)(${param1},${param2}...)
entity name is the abstract schema name of the cmp bean
abstract schema name is now stored in the deployment info
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.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/OpenEjb2CmpConversion.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/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.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
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?view=diff&rev=508279&r1=508278&r2=508279
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Thu Feb 15 18:06:08 2007
@@ -211,6 +211,7 @@
String cmpImplClassName = CmpUtil.getCmpImplClassName(entity.abstractSchemaName, entity.ejbClass);
cmpImplClass = loadClass(cmpImplClassName, "classNotFound.cmpImplClass");
deployment.setCmpImplClass(cmpImplClass);
+ deployment.setAbstractSchemaName(entity.abstractSchemaName);
for (QueryInfo query : entity.queries) {
List<Method> finderMethods = new ArrayList<Method>();
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -145,10 +145,6 @@
continue;
}
EntityBean bean = (EntityBean) enterpriseBean;
- EjbDeployment ejbDeployment = openejbJar.getDeploymentsByEjbName().get(bean.getEjbName());
- if (ejbDeployment == null) {
- throw new OpenEJBException("No deploument info found for ejb " + bean.getEjbName());
- }
// Always set the abstract schema name
if (bean.getAbstractSchemaName() == null) {
@@ -170,9 +166,6 @@
// name: the name of the entity in queries
String entityName = bean.getAbstractSchemaName();
- if (entityName == null) {
- entityName = bean.getEjbName().trim().replaceAll("[ \\t\\n\\r-]+", "_");
- }
entity.setName(entityName);
// add the entity
@@ -201,7 +194,7 @@
// todo deployment id could change in one of the later conversions... use entity name instead, but we need to save it off
StringBuilder name = new StringBuilder();
- name.append(ejbDeployment.getDeploymentId()).append(".").append(queryMethod.getMethodName());
+ name.append(entityName).append(".").append(queryMethod.getMethodName());
if (queryMethod.getMethodParams() != null && !queryMethod.getMethodParams().getMethodParam().isEmpty()) {
name.append('(');
boolean first = true;
@@ -218,27 +211,30 @@
entity.getNamedQuery().add(namedQuery);
}
// todo: there should be a common interface between ejb query object and openejb query object
- for (org.apache.openejb.jee.oejb3.Query query : ejbDeployment.getQuery()) {
- NamedQuery namedQuery = new NamedQuery();
- org.apache.openejb.jee.oejb3.QueryMethod queryMethod = query.getQueryMethod();
-
- // todo deployment id could change in one of the later conversions... use entity name instead, but we need to save it off
- StringBuilder name = new StringBuilder();
- name.append(ejbDeployment.getDeploymentId()).append(".").append(queryMethod.getMethodName());
- if (queryMethod.getMethodParams() != null && !queryMethod.getMethodParams().getMethodParam().isEmpty()) {
- name.append('(');
- boolean first = true;
- for (String methodParam : queryMethod.getMethodParams().getMethodParam()) {
- if (!first) name.append(",");
- name.append(methodParam);
- first = false;
+ EjbDeployment ejbDeployment = openejbJar.getDeploymentsByEjbName().get(bean.getEjbName());
+ if (ejbDeployment != null) {
+ for (org.apache.openejb.jee.oejb3.Query query : ejbDeployment.getQuery()) {
+ NamedQuery namedQuery = new NamedQuery();
+ org.apache.openejb.jee.oejb3.QueryMethod queryMethod = query.getQueryMethod();
+
+ // todo deployment id could change in one of the later conversions... use entity name instead, but we need to save it off
+ StringBuilder name = new StringBuilder();
+ name.append(entityName).append(".").append(queryMethod.getMethodName());
+ if (queryMethod.getMethodParams() != null && !queryMethod.getMethodParams().getMethodParam().isEmpty()) {
+ name.append('(');
+ boolean first = true;
+ for (String methodParam : queryMethod.getMethodParams().getMethodParam()) {
+ if (!first) name.append(",");
+ name.append(methodParam);
+ first = false;
+ }
+ name.append(')');
}
- name.append(')');
- }
- namedQuery.setName(name.toString());
+ namedQuery.setName(name.toString());
- namedQuery.setQuery(query.getObjectQl());
- entity.getNamedQuery().add(namedQuery);
+ namedQuery.setQuery(query.getObjectQl());
+ entity.getNamedQuery().add(namedQuery);
+ }
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java?view=diff&rev=508279&r1=508278&r2=508279
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java Thu Feb 15 18:06:08 2007
@@ -16,15 +16,13 @@
*/
package org.apache.openejb.config;
+import java.io.ByteArrayInputStream;
+import java.net.URL;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.io.ByteArrayInputStream;
-import java.net.URL;
-
import javax.xml.bind.JAXBElement;
-import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.jpa.Attributes;
import org.apache.openejb.jee.jpa.Basic;
import org.apache.openejb.jee.jpa.Column;
@@ -32,27 +30,26 @@
import org.apache.openejb.jee.jpa.EntityMappings;
import org.apache.openejb.jee.jpa.Field;
import org.apache.openejb.jee.jpa.GeneratedValue;
+import org.apache.openejb.jee.jpa.GenerationType;
import org.apache.openejb.jee.jpa.Id;
import org.apache.openejb.jee.jpa.JoinColumn;
import org.apache.openejb.jee.jpa.JoinTable;
+import org.apache.openejb.jee.jpa.NamedQuery;
import org.apache.openejb.jee.jpa.OneToMany;
import org.apache.openejb.jee.jpa.OneToOne;
import org.apache.openejb.jee.jpa.RelationField;
import org.apache.openejb.jee.jpa.Table;
-import org.apache.openejb.jee.jpa.NamedQuery;
-import org.apache.openejb.jee.jpa.GenerationType;
import org.apache.openejb.jee.oejb2.EjbRelationType;
import org.apache.openejb.jee.oejb2.EjbRelationshipRoleType;
import org.apache.openejb.jee.oejb2.EnterpriseBean;
import org.apache.openejb.jee.oejb2.EntityBeanType;
+import org.apache.openejb.jee.oejb2.JaxbOpenejbJar2;
import org.apache.openejb.jee.oejb2.OpenejbJarType;
import org.apache.openejb.jee.oejb2.QueryType;
-import org.apache.openejb.jee.oejb2.JaxbOpenejbJar2;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
public class OpenEjb2CmpConversion implements DynamicDeployer {
- public AppModule deploy(AppModule appModule) throws OpenEJBException {
+ public AppModule deploy(AppModule appModule) {
for (EjbModule ejbModule : appModule.getEjbModules()) {
Object altDD = getOpenejbJarType(ejbModule);
if (altDD instanceof OpenejbJarType) {
@@ -87,7 +84,7 @@
return null;
}
- public void mergeEntityMappings(EntityMappings entityMappings, OpenejbJar openejbJar, OpenejbJarType openejbJarType) throws OpenEJBException {
+ public void mergeEntityMappings(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));
@@ -103,11 +100,6 @@
continue;
}
- EjbDeployment ejbDeployment = openejbJar.getDeploymentsByEjbName().get(bean.getEjbName());
- if (ejbDeployment == null) {
- throw new OpenEJBException("No deploument info found for ejb " + bean.getEjbName());
- }
-
Table table = new Table();
table.setName(bean.getTableName());
entityData.entity.setTable(table);
@@ -145,7 +137,7 @@
// todo deployment id could change in one of the later conversions... use entity name instead, but we need to save it off
StringBuilder name = new StringBuilder();
- name.append(ejbDeployment.getDeploymentId()).append(".").append(queryMethod.getMethodName());
+ name.append(entityData.entity.getName()).append(".").append(queryMethod.getMethodName());
if (queryMethod.getMethodParams() != null && !queryMethod.getMethodParams().getMethodParam().isEmpty()) {
name.append('(');
boolean first = true;
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -28,7 +28,6 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
-import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.CmpField;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.EnterpriseBean;
@@ -42,6 +41,7 @@
import org.apache.openejb.jee.jpa.Field;
import org.apache.openejb.jee.jpa.Id;
import org.apache.openejb.jee.jpa.JoinColumn;
+import org.apache.openejb.jee.jpa.JoinTable;
import org.apache.openejb.jee.jpa.ManyToOne;
import org.apache.openejb.jee.jpa.NamedQuery;
import org.apache.openejb.jee.jpa.OneToMany;
@@ -50,8 +50,6 @@
import org.apache.openejb.jee.jpa.RelationField;
import org.apache.openejb.jee.jpa.SecondaryTable;
import org.apache.openejb.jee.jpa.Table;
-import org.apache.openejb.jee.jpa.JoinTable;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
import org.apache.openejb.jee.sun.Cmp;
import org.apache.openejb.jee.sun.CmpFieldMapping;
@@ -60,7 +58,6 @@
import org.apache.openejb.jee.sun.ColumnPair;
import org.apache.openejb.jee.sun.Ejb;
import org.apache.openejb.jee.sun.EntityMapping;
-import org.apache.openejb.jee.sun.FetchedWith;
import org.apache.openejb.jee.sun.Finder;
import org.apache.openejb.jee.sun.JaxbSun;
import org.apache.openejb.jee.sun.OneOneFinders;
@@ -75,7 +72,7 @@
//
public class SunConversion implements DynamicDeployer {
- public AppModule deploy(AppModule appModule) throws OpenEJBException {
+ public AppModule deploy(AppModule appModule) {
for (EjbModule ejbModule : appModule.getEjbModules()) {
convertModule(ejbModule, appModule.getCmpMappings());
}
@@ -127,7 +124,7 @@
return null;
}
- public void convertModule(EjbModule ejbModule, EntityMappings entityMappings) throws OpenEJBException {
+ public void convertModule(EjbModule ejbModule, EntityMappings entityMappings) {
Map<String, EntityData> entities = new TreeMap<String, EntityData>();
for (Entity entity : entityMappings.getEntity()) {
entities.put(entity.getDescription(), new SunConversion.EntityData(entity));
@@ -146,7 +143,7 @@
}
}
- private void mergeEntityMappings(Map<String, EntityData> entities, EjbJar ejbJar, OpenejbJar openejbJar, SunEjbJar sunEjbJar) throws OpenEJBException {
+ private void mergeEntityMappings(Map<String, EntityData> entities, EjbJar ejbJar, OpenejbJar openejbJar, SunEjbJar sunEjbJar) {
if (openejbJar == null) return;
if (sunEjbJar == null) return;
if (sunEjbJar.getEnterpriseBeans() == null) return;
@@ -176,13 +173,6 @@
cmpFields.add(cmpField.getFieldName());
}
-
-
- EjbDeployment ejbDeployment = openejbJar.getDeploymentsByEjbName().get(ejb.getEjbName());
- if (ejbDeployment == null) {
- throw new OpenEJBException("No deploument info found for ejb " + ejb.getEjbName());
- }
-
OneOneFinders oneOneFinders = cmp.getOneOneFinders();
if (oneOneFinders != null) {
for (Finder finder : oneOneFinders.getFinder()) {
@@ -191,9 +181,9 @@
String ejbQl = convertToEjbQl(entityData.entity.getName(), cmpFields, finder.getQueryParams(), queryFilter);
NamedQuery namedQuery = new NamedQuery();
- // todo deployment id could change in one of the later conversions... use entity name instead, but we need to save it off
+
StringBuilder name = new StringBuilder();
- name.append(ejbDeployment.getDeploymentId()).append(".").append(finder.getMethodName());
+ name.append(entityData.entity.getName()).append(".").append(finder.getMethodName());
if (!params.isEmpty()) {
name.append('(');
boolean first = true;
@@ -212,7 +202,7 @@
}
}
- public void mergeEntityMappings(Map<String, EntityData> entities, EjbModule ejbModule, EntityMappings entityMappings, SunCmpMapping sunCmpMapping) throws OpenEJBException {
+ public void mergeEntityMappings(Map<String, EntityData> entities, EjbModule ejbModule, EntityMappings entityMappings, SunCmpMapping sunCmpMapping) {
for (EntityMapping bean : sunCmpMapping.getEntityMapping()) {
SunConversion.EntityData entityData = entities.get(bean.getEjbName());
if (entityData == null) {
@@ -273,8 +263,8 @@
}
field.setColumn(column);
}
- FetchedWith fetchedWith = cmpFieldMapping.getFetchedWith();
// todo set fetch lazy when fetchWith is null
+ // FetchedWith fetchedWith = cmpFieldMapping.getFetchedWith();
}
for (CmrFieldMapping cmrFieldMapping : bean.getCmrFieldMapping()) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?view=diff&rev=508279&r1=508278&r2=508279
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java Thu Feb 15 18:06:08 2007
@@ -849,6 +849,7 @@
private String primaryKeyField;
private String[] cmrFields;
private Class cmpImplClass;
+ private String abstractSchemaName;
private Map<Method, String> queryMethodMap = new HashMap<Method, String>();
@@ -898,6 +899,14 @@
public void setCmpImplClass(Class cmpImplClass) {
this.cmpImplClass = cmpImplClass;
+ }
+
+ public String getAbstractSchemaName() {
+ return abstractSchemaName;
+ }
+
+ public void setAbstractSchemaName(String abstractSchemaName) {
+ this.abstractSchemaName = abstractSchemaName;
}
public void setJarPath(String jarPath) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?view=diff&rev=508279&r1=508278&r2=508279
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Thu Feb 15 18:06:08 2007
@@ -169,7 +169,7 @@
EntityManager entityManager = getEntityManager(deploymentInfo);
StringBuilder queryName = new StringBuilder();
- queryName.append(deploymentInfo.getDeploymentID()).append(".").append(queryMethod.getName());
+ queryName.append(deploymentInfo.getAbstractSchemaName()).append(".").append(queryMethod.getName());
String shortName = queryName.toString();
if (queryMethod.getParameterTypes().length > 0) {
queryName.append('(');
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,19 +3,19 @@
<entity name="Holding" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Holding">
<description>HoldingEJB</description>
<table name="HOLDINGEJB"/>
- <named-query name="HoldingEJB.ejbSelectQuoteFromSymbol(java.lang.String)">
+ <named-query name="Holding.ejbSelectQuoteFromSymbol(java.lang.String)">
<query>SELECT OBJECT(q) from Quote q WHERE q.symbol = ?1</query>
</named-query>
- <named-query name="HoldingEJB.findAll">
+ <named-query name="Holding.findAll">
<query>SELECT OBJECT(h) from Holding h</query>
</named-query>
- <named-query name="HoldingEJB.findByUserID(java.lang.String)">
+ <named-query name="Holding.findByUserID(java.lang.String)">
<query>SELECT OBJECT(h) FROM Holding h WHERE h.account.profile.userID = ?1</query>
</named-query>
- <named-query name="HoldingEJB.findByAccountID(java.lang.Integer)">
+ <named-query name="Holding.findByAccountID(java.lang.Integer)">
<query>SELECT OBJECT(h) FROM Holding h WHERE h.account.accountID = ?1</query>
</named-query>
- <named-query name="HoldingEJB.findByPrimaryKeyForUpdate(java.lang.Integer)">
+ <named-query name="Holding.findByPrimaryKeyForUpdate(java.lang.Integer)">
<query>SELECT OBJECT(h) FROM Holding h WHERE h.holdingID = ?1</query>
</named-query>
<attributes>
@@ -45,10 +45,10 @@
<entity name="AccountProfile" class="openejb.org.apache.geronimo.samples.daytrader.ejb.AccountProfile">
<description>AccountProfileEJB</description>
<table name="AccountProfileEJB"/>
- <named-query name="AccountProfileEJB.findAll">
+ <named-query name="AccountProfile.findAll">
<query>SELECT OBJECT(a) FROM AccountProfile a</query>
</named-query>
- <named-query name="AccountProfileEJB.findByPrimaryKeyForUpdate(java.lang.String)">
+ <named-query name="AccountProfile.findByPrimaryKeyForUpdate(java.lang.String)">
<query>SELECT OBJECT(a) FROM AccountProfile a where a.userID = ?1</query>
</named-query>
<attributes>
@@ -80,25 +80,25 @@
<entity name="Quote" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Quote">
<description>QuoteEJB</description>
<table name="QuoteEJB"/>
- <named-query name="QuoteEJB.findAll">
+ <named-query name="Quote.findAll">
<query>SELECT OBJECT(q) FROM Quote q</query>
</named-query>
- <named-query name="QuoteEJB.findQuotes(java.lang.String)">
+ <named-query name="Quote.findQuotes(java.lang.String)">
<query>SELECT OBJECT(q) FROM Quote q</query>
</named-query>
- <named-query name="QuoteEJB.findOne">
+ <named-query name="Quote.findOne">
<query>SELECT OBJECT(q) FROM Quote q where q.symbol = 's:0'</query>
</named-query>
- <named-query name="QuoteEJB.findTSIAQuotesOrderByChange">
+ <named-query name="Quote.findTSIAQuotesOrderByChange">
<query>SELECT OBJECT(q) FROM Quote q WHERE q.symbol LIKE 's:1__' ORDER BY q.change DESC</query>
</named-query>
- <named-query name="QuoteEJB.ejbSelectTotalVolume">
+ <named-query name="Quote.ejbSelectTotalVolume">
<query>SELECT q.volume FROM Quote q</query>
</named-query>
- <named-query name="QuoteEJB.findTSIAQuotes">
+ <named-query name="Quote.findTSIAQuotes">
<query>SELECT OBJECT(q) FROM Quote q WHERE q.symbol LIKE 's:1__'</query>
</named-query>
- <named-query name="QuoteEJB.findByPrimaryKeyForUpdate(java.lang.String)">
+ <named-query name="Quote.findByPrimaryKeyForUpdate(java.lang.String)">
<query>SELECT OBJECT(q) FROM Quote q where q.symbol = ?1</query>
</named-query>
<attributes>
@@ -132,7 +132,7 @@
<entity name="KeyGen" class="openejb.org.apache.geronimo.samples.daytrader.ejb.KeyGen">
<description>KeyGenEJB</description>
<table name="KeyGenEJB"/>
- <named-query name="KeyGenEJB.findByPrimaryKeyForUpdate(java.lang.String)">
+ <named-query name="KeyGen.findByPrimaryKeyForUpdate(java.lang.String)">
<query>SELECT OBJECT(kg) FROM KeyGen kg where kg.keyName = ?1</query>
</named-query>
<attributes>
@@ -147,19 +147,19 @@
<entity name="Account" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Account">
<description>AccountEJB</description>
<table name="AccountEJB"/>
- <named-query name="AccountEJB.findByUserID(java.lang.String)">
+ <named-query name="Account.findByUserID(java.lang.String)">
<query>SELECT OBJECT(a) FROM Account a WHERE a.profile.userID = ?1</query>
</named-query>
- <named-query name="AccountEJB.findAll">
+ <named-query name="Account.findAll">
<query>SELECT OBJECT(a) FROM Account a</query>
</named-query>
- <named-query name="AccountEJB.findByUserIDForUpdate(java.lang.String)">
+ <named-query name="Account.findByUserIDForUpdate(java.lang.String)">
<query>SELECT OBJECT(a) FROM Account a WHERE a.profile.userID = ?1</query>
</named-query>
- <named-query name="AccountEJB.ejbSelectClosedOrders(java.lang.Integer)">
+ <named-query name="Account.ejbSelectClosedOrders(java.lang.Integer)">
<query>SELECT o.orderID FROM Orders o WHERE o.orderStatus = 'closed' AND o.account.accountID = ?1</query>
</named-query>
- <named-query name="AccountEJB.findByPrimaryKeyForUpdate(java.lang.Integer)">
+ <named-query name="Account.findByPrimaryKeyForUpdate(java.lang.Integer)">
<query>SELECT OBJECT(a) FROM Account a where a.accountID = ?1</query>
</named-query>
<attributes>
@@ -194,19 +194,19 @@
<entity name="Orders" class="openejb.org.apache.geronimo.samples.daytrader.ejb.Orders">
<description>OrderEJB</description>
<table name="OrderEJB"/>
- <named-query name="OrderEJB.findAll">
+ <named-query name="Orders.findAll">
<query>SELECT OBJECT(o) FROM Orders o</query>
</named-query>
- <named-query name="OrderEJB.findClosedOrders(java.lang.String)">
+ <named-query name="Orders.findClosedOrders(java.lang.String)">
<query>SELECT OBJECT(o) FROM Orders o WHERE o.orderStatus = 'closed' AND o.account.profile.userID = ?1</query>
</named-query>
- <named-query name="OrderEJB.findByUserID(java.lang.String)">
+ <named-query name="Orders.findByUserID(java.lang.String)">
<query>SELECT OBJECT(o) FROM Orders o WHERE o.account.profile.userID = ?1 ORDER BY o.orderID DESC</query>
</named-query>
- <named-query name="OrderEJB.findByPrimaryKeyForUpdate(java.lang.Integer)">
+ <named-query name="Orders.findByPrimaryKeyForUpdate(java.lang.Integer)">
<query>SELECT OBJECT(o) FROM Orders o WHERE o.orderID = ?1</query>
</named-query>
- <named-query name="OrderEJB.findClosedOrdersForUpdate(java.lang.String)">
+ <named-query name="Orders.findClosedOrdersForUpdate(java.lang.String)">
<query>SELECT OBJECT(o) FROM Orders o WHERE o.orderStatus = 'closed' AND o.account.profile.userID = ?1</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -148,10 +148,10 @@
<entity name="BasicCmp2" class="openejb.org.apache.openejb.test.entity.cmp.BasicCmp2">
<description>BasicCmp2Bean</description>
<table name="entity"/>
- <named-query name="BasicCmp2Bean.findByLastName(java.lang.String)">
+ <named-query name="BasicCmp2.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM BasicCmp2 AS o WHERE o.lastName = ?1</query>
</named-query>
- <named-query name="BasicCmp2Bean.findEmptyCollection">
+ <named-query name="BasicCmp2.findEmptyCollection">
<query>SELECT OBJECT(o) FROM BasicCmp2 AS o WHERE 1 = 0</query>
</named-query>
<attributes>
@@ -170,10 +170,10 @@
<entity name="AOBasicCmp2" class="openejb.org.apache.openejb.test.entity.cmp.AOBasicCmp2">
<description>AOBasicCmp2Bean</description>
<table name="entity"/>
- <named-query name="AOBasicCmp2Bean.findByLastName(java.lang.String)">
+ <named-query name="AOBasicCmp2.findByLastName(java.lang.String)">
<query>SELECT OBJECT(o) FROM AOBasicCmp2 AS o WHERE o.lastName = ?1</query>
</named-query>
- <named-query name="AOBasicCmp2Bean.findEmptyCollection">
+ <named-query name="AOBasicCmp2.findEmptyCollection">
<query>SELECT OBJECT(o) FROM AOBasicCmp2 AS o WHERE 1 = 0</query>
</named-query>
<attributes>
@@ -192,7 +192,7 @@
<entity name="EncCmp2" class="openejb.org.apache.openejb.test.entity.cmp.EncCmp2">
<description>EncCmp2Bean</description>
<table name="entity"/>
- <named-query name="EncCmp2Bean.findEmptyCollection">
+ <named-query name="EncCmp2.findEmptyCollection">
<query>SELECT OBJECT(o) FROM EncCmp2 AS o WHERE 1 = 0</query>
</named-query>
<attributes>
@@ -211,7 +211,7 @@
<entity name="Cmp2RmiIiop" class="openejb.org.apache.openejb.test.entity.cmp.Cmp2RmiIiop">
<description>Cmp2RMIIIOPBean</description>
<table name="entity"/>
- <named-query name="Cmp2RMIIIOPBean.findEmptyCollection">
+ <named-query name="Cmp2RmiIiop.findEmptyCollection">
<query>SELECT OBJECT(o) FROM Cmp2RmiIiop AS o WHERE 1 = 0</query>
</named-query>
<attributes>
@@ -256,7 +256,7 @@
<entity name="Order" class="openejb.org.apache.openejb.test.entity.cmp2.cmrmapping.Order">
<description>ManyOwningSideBean</description>
<table name="ManyOwning"/>
- <named-query name="ManyOwningSideBean.ejbSelectSomething(java.lang.Integer)">
+ <named-query name="Order.ejbSelectSomething(java.lang.Integer)">
<query>SELECT m.oneInverseSide FROM Order m WHERE m.id = ?1</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="manytomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="manytomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM manytomanyA A</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="manytomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.manytomany.manytomanyA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="manytomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM manytomanyA A</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
</named-query>
<attributes>
@@ -18,7 +18,7 @@
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
<description>B</description>
<table name="B"/>
- <named-query name="B.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
</named-query>
<attributes>
@@ -21,7 +21,7 @@
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
<description>B</description>
<table name="B"/>
- <named-query name="B.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="onetomanyA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM onetomanyA A</query>
</named-query>
<attributes>
@@ -19,7 +19,7 @@
<entity name="onetomanyB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetomany.onetomanyB">
<description>B</description>
<table name="B"/>
- <named-query name="B.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="onetomanyB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM onetomanyB B</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="OneToOneA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="OneToOneA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM OneToOneA A</query>
</named-query>
<attributes>
@@ -23,7 +23,7 @@
<entity name="OneToOneB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneB">
<description>B</description>
<table name="B"/>
- <named-query name="B.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="OneToOneB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM OneToOneB B</query>
</named-query>
<attributes>
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=508279&r1=508278&r2=508279
==============================================================================
--- 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 Feb 15 18:06:08 2007
@@ -3,7 +3,7 @@
<entity name="OneToOneA" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneA">
<description>A</description>
<table name="A"/>
- <named-query name="A.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="OneToOneA.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(A) FROM OneToOneA A</query>
</named-query>
<attributes>
@@ -18,7 +18,7 @@
<entity name="OneToOneB" class="openejb.org.apache.openejb.deployment.entity.cmp.cmr.onetoone.OneToOneB">
<description>B</description>
<table name="B"/>
- <named-query name="B.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
+ <named-query name="OneToOneB.findByPrimaryKey(org.apache.openejb.deployment.entity.cmp.cmr.CompoundPK)">
<query>SELECT OBJECT(B) FROM OneToOneB B</query>
</named-query>
<attributes>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java?view=diff&rev=508279&r1=508278&r2=508279
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java Thu Feb 15 18:06:08 2007
@@ -23,7 +23,6 @@
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.ArrayList;