[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment EJBConfigBuilder.java

[dain]

dain        2004/04/22 23:40:23

  Modified:    modules/core/src/java/org/openejb/deployment
                        EJBConfigBuilder.java
  Log:

  Updated config builder to latest changes in geronimo
  
  Revision  Changes    Path
  1.16      +5 -4      
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- EJBConfigBuilder.java     21 Apr 2004 23:45:59 -0000      1.15
  +++ EJBConfigBuilder.java     23 Apr 2004 03:40:23 -0000      1.16
  @@ -64,6 +64,7 @@
   import java.util.Map;
   import java.util.Properties;
   import java.util.jar.JarOutputStream;
  +import java.util.jar.Manifest;
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   import javax.naming.NamingException;
  @@ -191,13 +192,13 @@
           return doc;
       }
   
  -    public void buildConfiguration(File outfile, File module, XmlObject plan) 
throws IOException, DeploymentException {
  +    public void buildConfiguration(File outfile, Manifest manifest, File module, 
XmlObject plan) throws IOException, DeploymentException {
           if (module.isDirectory()) {
               throw new DeploymentException("Unpacked ejb-jars are not supported");
           }
           FileInputStream is = new FileInputStream(module);
           try {
  -            buildConfiguration(outfile, is, plan);
  +            buildConfiguration(outfile, manifest, is, plan);
               return;
           } finally {
               try {
  @@ -208,7 +209,7 @@
           }
       }
   
  -    public void buildConfiguration(File outfile, InputStream module, XmlObject 
plan) throws IOException, DeploymentException {
  +    public void buildConfiguration(File outfile, Manifest manifest, InputStream 
module, XmlObject plan) throws IOException, DeploymentException {
           OpenejbOpenejbJarType openejbEjbJar = ((OpenejbOpenejbJarDocument) 
plan).getOpenejbJar();
           URI configID = getConfigID(openejbEjbJar);
           URI parentID = getParentID(openejbEjbJar);