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

[djencks]

djencks     2005/02/04 19:36:05

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

  if there's an ejb-jar.xml file, its and ejb-jar, and if we can't parse the 
xml, throw a loud exception. Also remove unused kernel field
  
  Revision  Changes    Path
  1.25      +10 -9     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- OpenEJBModuleBuilder.java 26 Jan 2005 14:57:38 -0000      1.24
  +++ OpenEJBModuleBuilder.java 5 Feb 2005 00:36:05 -0000       1.25
  @@ -124,9 +124,8 @@
       private final ContainerSecurityBuilder containerSecurityBuilder;
       private final SkeletonGenerator skeletonGenerator;
       private final Repository repository;
  -    private final Kernel kernel;
   
  -    public OpenEJBModuleBuilder(URI defaultParentId, SkeletonGenerator 
skeletonGenerator, Repository repository, Kernel kernel) {
  +    public OpenEJBModuleBuilder(URI defaultParentId, SkeletonGenerator 
skeletonGenerator, Repository repository) {
           this.defaultParentId = defaultParentId;
           this.skeletonGenerator = skeletonGenerator;
           this.containerSecurityBuilder = new ContainerSecurityBuilder(this);
  @@ -135,7 +134,6 @@
           this.entityBuilder = new EntityBuilder(this);
           this.mdbBuilder = new MdbBuilder(this);
           this.repository = repository;
  -        this.kernel = kernel;
       }
   
       public ContainerSecurityBuilder getSecurityBuilder() {
  @@ -169,12 +167,16 @@
               // read in the entire specDD as a string, we need this for 
getDeploymentDescriptor
               // on the J2ee management object
               specDD = DeploymentUtil.readAll(specDDUrl);
  -
  +        } catch (Exception e) {
  +            return null;
  +        }
  +        //there is a file named ejb-jar.xml in META-INF.  If we can't 
process it, it is an error.
  +        try {
               // parse it
               EjbJarDocument ejbJarDoc = 
SchemaConversionUtils.convertToEJBSchema(SchemaConversionUtils.parse(specDD));
               ejbJar = ejbJarDoc.getEjbJar();
  -        } catch (Exception e) {
  -            return null;
  +        } catch (XmlException e) {
  +            throw new DeploymentException("Error parsing ejb-jar.xml", e);
           }
   
           OpenejbOpenejbJarType openejbJar = getOpenejbJar(plan, moduleFile, 
standAlone, targetPath, ejbJar);
  @@ -531,11 +533,10 @@
           infoBuilder.addAttribute("defaultParentId", URI.class, true);
           infoBuilder.addReference("SkeletonGenerator", 
SkeletonGenerator.class);
           infoBuilder.addReference("Repository", Repository.class);
  -        infoBuilder.addAttribute("kernel", Kernel.class, false);
            infoBuilder.addInterface(ModuleBuilder.class);
           infoBuilder.addInterface(EJBReferenceBuilder.class);
   
  -        infoBuilder.setConstructor(new String[] {"defaultParentId", 
"SkeletonGenerator", "Repository", "kernel"});
  +        infoBuilder.setConstructor(new String[] {"defaultParentId", 
"SkeletonGenerator", "Repository"});
           GBEAN_INFO = infoBuilder.getBeanInfo();
       }