[openejb-scm] openejb1/modules/webadmin/src/java/org/openejb/webadmin/main DeployerBean.java

[dblevins]

dblevins    2005/08/03 21:20:07

  Modified:    modules/webadmin/src/java/org/openejb/webadmin/main
                        DeployerBean.java
  Log:

  Cleaning statics out of deployment/validation code
  
  Revision  Changes    Path
  1.4       +5 -11     
openejb1/modules/webadmin/src/java/org/openejb/webadmin/main/DeployerBean.java
  
  Index: DeployerBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/webadmin/src/java/org/openejb/webadmin/main/DeployerBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeployerBean.java 19 Jun 2005 22:40:34 -0000      1.3
  +++ DeployerBean.java 4 Aug 2005 01:20:07 -0000       1.4
  @@ -205,10 +205,11 @@
         * @throws OpenEJBException if something goes wrong
         */
        public void startDeployment() throws OpenEJBException {
  +        EjbJarUtils ejbJarUtils = new EjbJarUtils(this.jarFile);
                EjbJar jar = null;
                OpenejbJar initialOpenejbJar = null;
                try { //test for invalid file
  -                     jar = EjbJarUtils.readEjbJar(this.jarFile);
  +            jar = ejbJarUtils.getEjbJar();
   
                        //check for an openejb-jar.xml file
                        if (ConfigUtils.checkForOpenejbJar(this.jarFile)) {
  @@ -246,7 +247,7 @@
                }
   
                openejbJar = new OpenejbJar();
  -             deployerBeans = getBeans(jar);
  +        deployerBeans = ejbJarUtils.getBeans();
        }
   
        /**
  @@ -803,14 +804,7 @@
                }
        }
   
  -     /*------------------------------------------------------*/
  -     /*    Refactored Methods                                */
  -     /*------------------------------------------------------*/
  -     private Bean[] getBeans(EjbJar jar) {
  -             return EjbJarUtils.getBeans(jar);
  -     }
  -
  -     private Container[] getUsableContainers(Bean bean) {
  +    private Container[] getUsableContainers(Bean bean) {
                return EjbJarUtils.getUsableContainers(containers, bean);
        }