geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment WARConfigBuilder.java
Date Sun, 21 Mar 2004 18:12:42 GMT
adc         2004/03/21 10:12:42

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        WARConfigBuilder.java
  Log:
  Method rename.
  
  Revision  Changes    Path
  1.15      +5 -3      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java
  
  Index: WARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WARConfigBuilder.java	10 Mar 2004 09:58:56 -0000	1.14
  +++ WARConfigBuilder.java	21 Mar 2004 18:12:42 -0000	1.15
  @@ -45,7 +45,7 @@
   import org.apache.geronimo.deployment.DeploymentContext;
   import org.apache.geronimo.deployment.DeploymentException;
   import org.apache.geronimo.deployment.service.GBeanHelper;
  -import org.apache.geronimo.deployment.util.XmlBeansUtil;
  +import org.apache.geronimo.common.xml.XmlBeansUtil;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
  @@ -64,6 +64,8 @@
   import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
   import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
   import org.apache.geronimo.xbeans.j2ee.WebAppType;
  +import org.apache.geronimo.common.xml.XmlBeansUtil;
  +
   import org.apache.xmlbeans.SchemaTypeLoader;
   import org.apache.xmlbeans.XmlBeans;
   import org.apache.xmlbeans.XmlException;
  @@ -99,7 +101,7 @@
               } else {
                   moduleBase = new URL("jar:" + module.toString() + "!/");
               }
  -            XmlObject plan = XmlBeansUtil.getPlan(new URL(moduleBase, "WEB-INF/geronimo-jetty.xml"),
JettyWebAppDocument.type);
  +            XmlObject plan = XmlBeansUtil.getXmlObject(new URL(moduleBase, "WEB-INF/geronimo-jetty.xml"),
JettyWebAppDocument.type);
   // todo needs generic web XMLBeans
   //            if (plan == null) {
   //                plan = getPlan(new URL(moduleBase, "WEB-INF/geronimo-web.xml"));
  
  
  

Mime
View raw message