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

[dblevins]

dblevins    2005/08/04 16:17:43

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

  Moved openejb-jar methods into the EjbJarUtils class.
  Killed tons more of static methods
  
  Revision  Changes    Path
  1.5       +4 -4      
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeployerBean.java 4 Aug 2005 01:20:07 -0000       1.4
  +++ DeployerBean.java 4 Aug 2005 20:17:43 -0000       1.5
  @@ -212,8 +212,8 @@
               jar = ejbJarUtils.getEjbJar();
   
                        //check for an openejb-jar.xml file
  -                     if (ConfigUtils.checkForOpenejbJar(this.jarFile)) {
  -                             initialOpenejbJar = 
ConfigUtils.readOpenejbJar(this.jarFile);
  +                     if (EjbJarUtils.checkForOpenejbJar(this.jarFile)) {
  +                             initialOpenejbJar = ejbJarUtils.getOpenejbJar();
                        }
                } catch (OpenEJBException oe) {
                        throw new OpenEJBException(this.jarFile + " is not a 
valid jar file. ");
  @@ -441,7 +441,7 @@
         * @return the the best container for this bean
         */
        private void saveChanges(String jarFile, OpenejbJar openejbJar) throws 
OpenEJBException {
  -             ConfigUtils.writeOpenejbJar("META-INF/openejb-jar.xml", 
openejbJar);
  +             EjbJarUtils.writeOpenejbJar("META-INF/openejb-jar.xml", 
openejbJar);
                JarUtils.addFileToJar(jarFile, "META-INF/openejb-jar.xml");
   
                if (configChanged) {