dain 2004/04/19 18:30:46
Modified: modules/core/src/java/org/openejb/deployment
EJBConfigBuilder.java
Log:
Finished basic cmp integration
All itests now run successfully
Revision Changes Path
1.14 +17 -1
openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java
Index: EJBConfigBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EJBConfigBuilder.java 19 Apr 2004 03:10:31 -0000 1.13
+++ EJBConfigBuilder.java 19 Apr 2004 22:30:46 -0000 1.14
@@ -103,6 +103,7 @@
import org.openejb.ContainerBuilder;
import org.openejb.EJBModule;
+import org.openejb.dispatch.MethodSignature;
import org.openejb.entity.bmp.BMPContainerBuilder;
import org.openejb.entity.cmp.CMPContainerBuilder;
import org.openejb.proxy.ProxyObjectFactory;
@@ -117,6 +118,7 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
+import org.openejb.xbeans.ejbjar.OpenejbQueryType;
import org.openejb.xbeans.ejbjar.impl.OpenejbOpenejbJarDocumentImpl;
import org.tranql.ejb.CMPField;
import org.tranql.ejb.EJB;
@@ -573,6 +575,20 @@
builder.setEJB(ejb);
builder.setConnectionFactoryName(connectionFactoryName);
+ Map queries = new HashMap();
+ if (openejbEntityBean != null) {
+ OpenejbQueryType[] queryTypes = openejbEntityBean.getQueryArray();
+ for (int i = 0; i < queryTypes.length; i++) {
+ OpenejbQueryType queryType = queryTypes[i];
+ MethodSignature signature = new MethodSignature(
+ queryType.getQueryMethod().getMethodName(),
+
queryType.getQueryMethod().getMethodParams().getMethodParamArray());
+ String sql = queryType.getSql();
+ queries.put(signature, sql);
+ }
+ }
+ builder.setQueries(queries);
+
try {
GBeanMBean gbean = builder.createConfiguration();
gbean.setReferencePatterns("TransactionManager",
Collections.singleton(new ObjectName("*:type=TransactionManager,*")));