Diff
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCollectionValuedQuery.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCollectionValuedQuery.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCollectionValuedQuery.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -49,10 +49,11 @@
import java.util.ArrayList;
import java.util.Collection;
+
import javax.ejb.FinderException;
+import org.tranql.builder.IdentityDefinerBuilder;
import org.tranql.ejb.EJBQLQuery;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.ql.QueryException;
import org.tranql.query.CollectionResultHandler;
import org.tranql.query.QueryCommand;
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCommandBuilder.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCommandBuilder.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlCommandBuilder.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -48,19 +48,18 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import javax.transaction.TransactionManager;
+import org.tranql.builder.IdentityDefinerBuilder;
+import org.tranql.builder.SQLQueryBuilder;
+import org.tranql.cache.CacheFlushStrategyFactory;
import org.tranql.cache.CacheRowAccessor;
import org.tranql.cache.CacheTable;
import org.tranql.cache.EmptySlotLoader;
import org.tranql.cache.FaultHandler;
import org.tranql.cache.GlobalSchema;
import org.tranql.cache.QueryFaultHandler;
-import org.tranql.cache.CacheFlushStrategyFactory;
-import org.tranql.cache.cache.CacheFaultHandler;
-import org.tranql.cache.cache.CacheFieldFaultTransform;
-import org.tranql.cache.cache.FindByPKCacheQueryCommand;
-import org.tranql.cache.cache.FrontEndCache;
import org.tranql.ejb.CMPFieldAccessor;
import org.tranql.ejb.CMPFieldFaultTransform;
import org.tranql.ejb.CMPFieldIdentityExtractorAccessor;
@@ -86,8 +85,11 @@
import org.tranql.field.FieldTransform;
import org.tranql.field.ReferenceAccessor;
import org.tranql.identity.IdentityDefiner;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.identity.IdentityTransform;
+import org.tranql.intertxcache.CacheFaultHandler;
+import org.tranql.intertxcache.CacheFieldFaultTransform;
+import org.tranql.intertxcache.FindByPKCacheQueryCommand;
+import org.tranql.intertxcache.FrontEndCache;
import org.tranql.ql.QueryException;
import org.tranql.query.QueryCommand;
import org.tranql.schema.Association;
@@ -95,7 +97,6 @@
import org.tranql.schema.Attribute;
import org.tranql.schema.Entity;
import org.tranql.schema.FKAttribute;
-import org.tranql.sql.SQLQueryBuilder;
/**
* @version $Revision$ $Date$
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEjbCmpEngine.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEjbCmpEngine.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEjbCmpEngine.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -50,40 +50,41 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.LinkedHashSet;
+
import javax.ejb.DuplicateKeyException;
import javax.ejb.EJBException;
import javax.ejb.EJBLocalObject;
import javax.ejb.NoSuchEntityException;
import javax.ejb.RemoveException;
+import org.apache.geronimo.transaction.context.Flushable;
import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.Flushable;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.proxy.ProxyInfo;
+import org.tranql.builder.IdentityDefinerBuilder;
+import org.tranql.cache.CacheFlushStrategy;
+import org.tranql.cache.CacheFlushStrategyFactory;
import org.tranql.cache.CacheRow;
import org.tranql.cache.CacheRowState;
import org.tranql.cache.CacheTable;
import org.tranql.cache.DuplicateIdentityException;
import org.tranql.cache.FaultHandler;
import org.tranql.cache.InTxCache;
-import org.tranql.cache.CacheFlushStrategy;
-import org.tranql.cache.CacheFlushStrategyFactory;
-import org.tranql.cache.cache.FrontEndCache;
-import org.tranql.cache.cache.InTxCacheTracker;
import org.tranql.ejb.CMPFieldTransform;
import org.tranql.ejb.EJB;
import org.tranql.ejb.FinderEJBQLQuery;
import org.tranql.ejb.SelectEJBQLQuery;
import org.tranql.identity.GlobalIdentity;
import org.tranql.identity.IdentityDefiner;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.identity.IdentityTransform;
+import org.tranql.intertxcache.FrontEndCache;
+import org.tranql.intertxcache.InTxCacheTracker;
import org.tranql.pkgenerator.PrimaryKeyGenerator;
import org.tranql.ql.QueryException;
import org.tranql.query.QueryCommand;
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEnumerationValuedQuery.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEnumerationValuedQuery.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlEnumerationValuedQuery.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -51,10 +51,11 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
+
import javax.ejb.FinderException;
+import org.tranql.builder.IdentityDefinerBuilder;
import org.tranql.ejb.EJBQLQuery;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.ql.QueryException;
import org.tranql.query.CollectionResultHandler;
import org.tranql.query.QueryCommand;
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlModuleCmpEngine.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlModuleCmpEngine.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlModuleCmpEngine.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -44,24 +44,24 @@
*/
package org.openejb.entity.cmp;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.kernel.Kernel;
import org.openejb.proxy.ProxyInfo;
+import org.tranql.builder.IdentityDefinerBuilder;
+import org.tranql.builder.SQLQueryBuilder;
import org.tranql.cache.CacheTable;
import org.tranql.cache.GlobalSchema;
-import org.tranql.cache.cache.Cache;
-import org.tranql.cache.cache.FrontEndCache;
-import org.tranql.cache.cache.FrontEndCacheDelegate;
-import org.tranql.cache.cache.FrontEndToCacheAdaptor;
import org.tranql.ejb.EJB;
import org.tranql.ejb.EJBSchema;
-import org.tranql.identity.IdentityDefinerBuilder;
-import org.tranql.sql.SQLQueryBuilder;
+import org.tranql.intertxcache.Cache;
+import org.tranql.intertxcache.FrontEndCache;
+import org.tranql.intertxcache.FrontEndCacheDelegate;
+import org.tranql.intertxcache.FrontEndToCacheAdaptor;
import org.tranql.sql.SQLSchema;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
/**
* @version $Revision$ $Date$
*/
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSchemaBuilder.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSchemaBuilder.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSchemaBuilder.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -49,25 +49,24 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
+
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.kernel.ClassLoading;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.ClassLoading;
import org.openejb.dispatch.MethodSignature;
+import org.tranql.builder.DynamicCommandBuilder;
+import org.tranql.builder.GlobalSchemaBuilder;
+import org.tranql.builder.StaticCommandBuilder;
import org.tranql.cache.CacheFlushStrategyFactory;
import org.tranql.cache.CacheTable;
import org.tranql.cache.EnforceRelationshipsFlushStrategyFactory;
import org.tranql.cache.GlobalSchema;
-import org.tranql.cache.GlobalSchemaLoader;
import org.tranql.cache.SimpleFlushStrategyFactory;
-import org.tranql.cache.cache.CacheFactory;
-import org.tranql.cache.cache.ReadCommittedCacheFactory;
-import org.tranql.cache.cache.ReadUncommittedCacheFactory;
-import org.tranql.cache.cache.RepeatableReadCacheFactory;
import org.tranql.ejb.CMPField;
import org.tranql.ejb.CMRField;
import org.tranql.ejb.EJB;
@@ -79,6 +78,10 @@
import org.tranql.ejb.SelectEJBQLQuery;
import org.tranql.ejbqlcompiler.DerbyDBSyntaxtFactory;
import org.tranql.ejbqlcompiler.DerbyEJBQLCompilerFactory;
+import org.tranql.intertxcache.CacheFactory;
+import org.tranql.intertxcache.ReadCommittedCacheFactory;
+import org.tranql.intertxcache.ReadUncommittedCacheFactory;
+import org.tranql.intertxcache.RepeatableReadCacheFactory;
import org.tranql.pkgenerator.SQLPrimaryKeyGenerator;
import org.tranql.pkgenerator.SequenceTablePrimaryKeyGenerator;
import org.tranql.ql.QueryBindingImpl;
@@ -94,8 +97,6 @@
import org.tranql.sql.SQLSchema;
import org.tranql.sql.Table;
import org.tranql.sql.TypeConverter;
-import org.tranql.sql.DynamicCommandBuilder;
-import org.tranql.sql.StaticCommandBuilder;
import org.tranql.sql.UpdateCommandBuilder;
import org.tranql.sql.jdbc.SQLTypeLoader;
import org.tranql.sql.jdbc.binding.BindingFactory;
@@ -186,7 +187,7 @@
processEnterpriseBeans();
processRelationships();
processGroups();
- GlobalSchemaLoader loader = new GlobalSchemaLoader(globalSchema, ejbSchema, sqlSchema);
+ GlobalSchemaBuilder loader = new GlobalSchemaBuilder(globalSchema, ejbSchema, sqlSchema);
loader.build();
processEnterpriseBeanCaches();
} catch (Exception e) {
@@ -528,13 +529,13 @@
String[] cmpFieldsArray = (String[]) cmpFields.toArray(new String[cmpFields.size()]);
Map cmrFields = group.getCmrFields();
- PrefetchGroupDictionary.EndTableDesc[] endTableDescs = new PrefetchGroupDictionary.EndTableDesc[cmrFields.size()];
+ PrefetchGroupDictionary.AssociationEndDesc[] endTableDescs = new PrefetchGroupDictionary.AssociationEndDesc[cmrFields.size()];
int i = 0;
for (Iterator iterator2 = cmrFields.entrySet().iterator(); iterator2.hasNext();) {
Map.Entry entry2 = (Map.Entry) iterator2.next();
String cmrFieldName = (String) entry2.getKey();
String cmrGroupName = (String) entry2.getValue();
- endTableDescs[i++] = new PrefetchGroupDictionary.EndTableDesc(cmrFieldName, cmrGroupName);
+ endTableDescs[i++] = new PrefetchGroupDictionary.AssociationEndDesc(cmrFieldName, cmrGroupName);
}
groupDictionary.addPrefetchGroup(groupName, ejbName, cmpFieldsArray, endTableDescs);
}
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSelectQuery.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSelectQuery.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSelectQuery.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -55,18 +55,17 @@
*/
package org.openejb.entity.cmp;
+import org.tranql.builder.IdentityDefinerBuilder;
import org.tranql.cache.InTxCache;
import org.tranql.ejb.EJBQLQuery;
import org.tranql.field.FieldTransform;
import org.tranql.field.Row;
import org.tranql.identity.IdentityDefiner;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.ql.Query;
import org.tranql.ql.QueryException;
import org.tranql.query.QueryCommand;
import org.tranql.query.ResultHandler;
import org.tranql.schema.Entity;
-import org.tranql.sql.prefetch.PrefetchGroupHandler;
public abstract class TranqlSelectQuery implements SelectQuery {
private final EJBQLQuery ejbqlQuery;
@@ -123,15 +122,7 @@
command = remoteCommand;
}
- PrefetchGroupHandler groupHandler = command.getQuery().getPrefetchGroupHandler();
- if (groupHandler != null) {
- PrefetchGroupHandler newHandler = new PrefetchGroupHandler(groupHandler, resultHandler);
- return newHandler.execute(cache, command, new Row(args), results);
- }
- if (idDefiner != null) {
- resultHandler = new CacheFiller(resultHandler, idDefiner, idInjector, cache);
- }
-
- return command.execute(resultHandler, new Row(args), results);
+ resultHandler = new CacheFiller(resultHandler, idDefiner, idInjector, cache);
+ return command.execute(cache, resultHandler, new Row(args), results);
}
}
\ No newline at end of file
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSetValuedQuery.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSetValuedQuery.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSetValuedQuery.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -49,10 +49,11 @@
import java.util.LinkedHashSet;
import java.util.Set;
+
import javax.ejb.FinderException;
+import org.tranql.builder.IdentityDefinerBuilder;
import org.tranql.ejb.EJBQLQuery;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.ql.QueryException;
import org.tranql.query.CollectionResultHandler;
import org.tranql.query.QueryCommand;
Modified: trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSingleValuedQuery.java (2464 => 2465)
--- trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSingleValuedQuery.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/core/src/java/org/openejb/entity/cmp/TranqlSingleValuedQuery.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -50,11 +50,11 @@
import javax.ejb.FinderException;
import javax.ejb.ObjectNotFoundException;
+import org.tranql.builder.IdentityDefinerBuilder;
import org.tranql.ejb.EJBQLQuery;
import org.tranql.field.FieldTransform;
import org.tranql.field.FieldTransformException;
import org.tranql.field.Row;
-import org.tranql.identity.IdentityDefinerBuilder;
import org.tranql.ql.QueryException;
import org.tranql.query.QueryCommand;
import org.tranql.query.ResultHandler;
Modified: trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2464 => 2465)
--- trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -163,7 +163,7 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
// create module cmp enging GBeanData
- EJBModule ejbModule = new EJBModule(true, configId, null, null, tempDir.getAbsolutePath(), ejbJarType, openejbJarType, "");
+ EJBModule ejbModule = new EJBModule(true, configId, null, null, tempDir.getAbsoluteFile().toURI().toString(), ejbJarType, openejbJarType, "");
CmpSchemaBuilder cmpSchemaBuilder = new TranqlCmpSchemaBuilder();
cmpSchemaBuilder.addBeans(earContext, j2eeContext, ejbModule, cl);
ObjectName moduleCmpEngineName = ejbModule.getModuleCmpEngineName();
Modified: trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2464 => 2465)
--- trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-02-19 06:21:24 UTC (rev 2464)
+++ trunk/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-02-19 06:35:14 UTC (rev 2465)
@@ -178,7 +178,7 @@
ClassLoader cl = this.getClass().getClassLoader();
// create module cmp enging GBeanData
- EJBModule ejbModule = new EJBModule(true, configId, null, null, tempDir.getAbsolutePath(), ejbJarType, openejbJarType, "");
+ EJBModule ejbModule = new EJBModule(true, configId, null, null, tempDir.getAbsoluteFile().toURI().toString(), ejbJarType, openejbJarType, "");
CmpSchemaBuilder cmpSchemaBuilder = new TranqlCmpSchemaBuilder();
cmpSchemaBuilder.addBeans(earContext, j2eeContext, ejbModule, cl);
ObjectName moduleCmpEngineName = ejbModule.getModuleCmpEngineName();
