cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment WARConfigBuilder.java

[jboynes]

jboynes     2004/02/20 07:49:56

  Modified:    
modules/deployment/src/java/org/apache/geronimo/deployment/service
                        ServiceConfigBuilder.java
               modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        WARConfigBuilder.java
  Log:
  Tidy up method sig
  
  Revision  Changes    Path
  1.5       +3 -4      
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
  
  Index: ServiceConfigBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceConfigBuilder.java 20 Feb 2004 07:19:13 -0000      1.4
  +++ ServiceConfigBuilder.java 20 Feb 2004 15:49:56 -0000      1.5
  @@ -153,7 +153,7 @@
               addIncludes(context, configType);
               addDependencies(context, configType.getDependencyArray());
               ClassLoader cl = context.getClassLoader(repository);
  -            addGBeans(context, configType, cl);
  +            addGBeans(context, configType.getGbeanArray(), cl);
               context.close();
               os.flush();
           } finally {
  @@ -238,8 +238,7 @@
           return uri;
       }
   
  -    private void addGBeans(DeploymentContext context, ConfigurationType 
configType, ClassLoader cl) throws DeploymentException {
  -        GbeanType[] gbeans = configType.getGbeanArray();
  +    private void addGBeans(DeploymentContext context, GbeanType[] gbeans, 
ClassLoader cl) throws DeploymentException {
           for (int i = 0; i < gbeans.length; i++) {
               GbeanType gbean = gbeans[i];
               GBeanBuilder builder = new GBeanBuilder(gbean.getName(), cl, 
gbean.getClass1());
  
  
  
  1.2       +10 -4     
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WARConfigBuilder.java     20 Feb 2004 07:19:13 -0000      1.1
  +++ WARConfigBuilder.java     20 Feb 2004 15:49:56 -0000      1.2
  @@ -178,7 +178,7 @@
   //            addIncludes(context, configType);
   //            addDependencies(context, configType.getDependencyArray());
               ClassLoader cl = context.getClassLoader(repository);
  -            addGBeans(context, jettyWebApp, cl);
  +            addGBeans(context, jettyWebApp.getGbeanArray(), cl);
               context.close();
               os.flush();
           } finally {
  @@ -186,8 +186,14 @@
           }
       }
   
  -    private void addGBeans(DeploymentContext context, JettyWebAppType 
webApp, ClassLoader cl) throws DeploymentException {
  -        JettyGbeanType[] gbeans = webApp.getGbeanArray();
  +    /**
  +     * Add any GBean explicitly defined in the deployment plan
  +     * @param context the context of this deployment
  +     * @param gbeans the XMLBeans for the <gbean> entries
  +     * @param cl the ClassLoader to use to load the GBeans
  +     * @throws DeploymentException if there is a problem with the plan
  +     */
  +    private void addGBeans(DeploymentContext context, JettyGbeanType[] 
gbeans, ClassLoader cl) throws DeploymentException {
           for (int i = 0; i < gbeans.length; i++) {
               JettyGbeanType gbean = gbeans[i];
               GBeanBuilder builder = new GBeanBuilder(gbean.getName(), cl, 
gbean.getClass1());