[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment EJBConfigBuilderTest.java

[djencks]

djencks     2005/01/18 01:13:40

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        EJBConfigBuilderTest.java
  Log:

  Add ServiceReferenceBuilder where appropriate, fix DefaultWorkManager so it 
starts
  
  Revision  Changes    Path
  1.11      +16 -4     
openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java
  
  Index: EJBConfigBuilderTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EJBConfigBuilderTest.java 27 Dec 2004 02:03:25 -0000      1.10
  +++ EJBConfigBuilderTest.java 18 Jan 2005 06:13:40 -0000      1.11
  @@ -60,14 +60,18 @@
   import java.util.Collections;
   import java.util.HashSet;
   import java.util.Set;
  +import java.util.Map;
  +import java.util.List;
   import java.util.jar.JarFile;
   import javax.ejb.EJBHome;
   import javax.management.ObjectName;
   import javax.naming.Reference;
   import javax.sql.DataSource;
  +import javax.xml.namespace.QName;
   
   import junit.framework.TestCase;
   import org.apache.geronimo.deployment.util.DeploymentUtil;
  +import org.apache.geronimo.deployment.DeploymentContext;
   import org.apache.geronimo.common.DeploymentException;
   import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
  @@ -75,6 +79,7 @@
   import org.apache.geronimo.j2ee.deployment.Module;
   import org.apache.geronimo.j2ee.deployment.RefContext;
   import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
  +import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  @@ -128,6 +133,13 @@
           }
       };
   
  +    private final ServiceReferenceBuilder serviceReferenceBuilder = new 
ServiceReferenceBuilder() {
  +        //it could return a Service or a Reference, we don't care
  +        public Object createService(Class serviceInterface, URI wsdlURI, URI 
jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlers, 
DeploymentContext deploymentContext, ClassLoader classLoader) throws 
DeploymentException {
  +            return null;
  +        }
  +    };
  +
       private J2eeContext j2eeContext = new J2eeContextImpl(j2eeDomainName, 
j2eeServerName, NameFactory.NULL, "testejbmodule", "testapp", 
NameFactory.J2EE_APPLICATION);
       private URI defaultParentId;
   
  @@ -196,7 +208,7 @@
                       DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME,
                       DeploymentHelper.TRANSACTIONALTIMER_NAME,
                       DeploymentHelper.NONTRANSACTIONALTIMER_NAME,
  -                    new RefContext(moduleBuilder, resourceReferenceBuilder));
  +                    new RefContext(moduleBuilder, resourceReferenceBuilder, 
serviceReferenceBuilder));
   
               
moduleBuilder.installModule(DeploymentUtil.createJarFile(ejbJarFile), 
earContext, module);
               earContext.getClassLoader(null);
  @@ -240,7 +252,7 @@
                       null, null, resourceReferenceBuilder, // web
                       // connector
                       null, // app client
  -                    null // kernel
  +                    serviceReferenceBuilder, null // kernel
               );
   
               JarFile jarFile = null;
  @@ -289,7 +301,7 @@
                       null, null, resourceReferenceBuilder, // web
                       // connector
                       null, // app client
  -                    null // kernel
  +                    serviceReferenceBuilder, null // kernel
               );
   
               JarFile jarFile = DeploymentUtil.createJarFile(earFile);