dblevins 2004/08/27 21:25:15
Modified: modules/core/src/java/org/openejb/alt/config
AutoDeployer.java ConfigurationFactory.java
Log:
One more local interface support fix.
The usage of ejb-local-ref wasn't working out. Works now.
Revision Changes Path
1.3 +6 -15
openejb1/modules/core/src/java/org/openejb/alt/config/AutoDeployer.java
Index: AutoDeployer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/config/AutoDeployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AutoDeployer.java 14 Aug 2004 10:35:36 -0000 1.2
+++ AutoDeployer.java 28 Aug 2004 01:25:15 -0000 1.3
@@ -44,27 +44,17 @@
*/
package org.openejb.alt.config;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Properties;
-import java.util.StringTokenizer;
import org.openejb.OpenEJBException;
import org.openejb.alt.config.ejb11.EjbDeployment;
import org.openejb.alt.config.ejb11.EjbJar;
-import org.openejb.alt.config.ejb11.MethodParams;
import org.openejb.alt.config.ejb11.OpenejbJar;
-import org.openejb.alt.config.ejb11.QueryMethod;
import org.openejb.alt.config.ejb11.ResourceLink;
import org.openejb.alt.config.ejb11.ResourceRef;
import org.openejb.alt.config.sys.Connector;
import org.openejb.alt.config.sys.Container;
import org.openejb.alt.config.sys.Openejb;
-import org.openejb.util.JarUtils;
-import org.openejb.util.Messages;
import org.openejb.util.SafeToolkit;
/**
@@ -111,6 +101,7 @@
/* Load resource list */
this.resources = config.getConnector();
+ System.out.println("resources "+resources.length);
}
public void init() throws OpenEJBException {
@@ -149,7 +140,7 @@
}
for (int i = 0; i < refs.length; i++) {
- deployment.addResourceLink(resolveResourceRef(refs[i]));
+ deployment.addResourceLink(autoAssingResourceRef(refs[i]));
}
if (bean.getType().equals("CMP_ENTITY")){
@@ -170,7 +161,7 @@
return deployment;
}
- private boolean hasFinderMethods(Class bean)
+ private boolean hasFinderMethods(Class bean)
throws OpenEJBException {
Method[] methods = bean.getMethods();
@@ -200,7 +191,7 @@
return cs[0].getId();
}
- private ResourceLink resolveResourceRef(ResourceRef ref) throws
OpenEJBException {
+ private ResourceLink autoAssingResourceRef(ResourceRef ref) throws
OpenEJBException {
if (resources.length == 0) {
throw new OpenEJBException("A Connector must be declared in the
configuration file to satisfy the resource-ref "+ref.getResRefName());
}
@@ -209,7 +200,7 @@
link.setResRefName(ref.getResRefName());
link.setResId(resources[0].getId());
return link;
- }
+ }
/*------------------------------------------------------*/
/* Refactored Methods */
1.5 +3 -2
openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java
Index: ConfigurationFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConfigurationFactory.java 14 Aug 2004 10:35:36 -0000 1.4
+++ ConfigurationFactory.java 28 Aug 2004 01:25:15 -0000 1.5
@@ -775,7 +775,7 @@
/* Build EJB References **********************/
while (ejbLocalRefs.hasMoreElements()) {
EjbLocalRef ejb = (EjbLocalRef) ejbLocalRefs.nextElement();
- EjbReferenceInfo info = new EjbReferenceInfo();
+ EjbLocalReferenceInfo info = new EjbLocalReferenceInfo();
info.homeType = ejb.getLocalHome();
info.referenceName = ejb.getEjbRefName();
@@ -827,6 +827,7 @@
envRef.copyInto(jndi.envEntries);
ejbRef.copyInto(jndi.ejbReferences);
resRef.copyInto(jndi.resourceRefs);
+ ejbLocalRef.copyInto(jndi.ejbLocalReferences);
bean.jndiEnc = jndi;
