djencks     2004/02/09 15:11:04

  Modified:    modules/deployment/src/java/org/apache/geronimo/deployment/plugin
                        DConfigBeanSupport.java
               modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        WebAppDConfigBean.java WebAppDConfigRoot.java
  Log:
  make it more likely that dconfigbeans can have default constructors and be initialized later
  
  Revision  Changes    Path
  1.6       +12 -3     incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
  
  Index: DConfigBeanSupport.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DConfigBeanSupport.java	6 Feb 2004 08:55:04 -0000	1.5
  +++ DConfigBeanSupport.java	9 Feb 2004 23:11:04 -0000	1.6
  @@ -78,8 +78,8 @@
    */
   public abstract class DConfigBeanSupport implements DConfigBean {
       protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
  -    private final DDBean ddBean;
  -    protected XmlObject xmlObject;
  +    private DDBean ddBean;
  +    private XmlObject xmlObject;
       private final SchemaTypeLoader schemaTypeLoader;
   
       public DConfigBeanSupport(DDBean ddBean, XmlObject xmlObject, SchemaTypeLoader schemaTypeLoader) {
  @@ -88,8 +88,17 @@
           this.schemaTypeLoader = schemaTypeLoader;
       }
   
  +    protected void setParent(DDBean ddBean, XmlObject xmlObject) {
  +        this.ddBean = ddBean;
  +        this.xmlObject = xmlObject;
  +    }
  +
       public DDBean getDDBean() {
           return ddBean;
  +    }
  +
  +    protected XmlObject getXmlObject() {
  +        return xmlObject;
       }
   
       public DConfigBean getDConfigBean(DDBean bean) throws ConfigurationException {
  
  
  
  1.7       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
  
  Index: WebAppDConfigBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebAppDConfigBean.java	8 Feb 2004 02:06:13 -0000	1.6
  +++ WebAppDConfigBean.java	9 Feb 2004 23:11:04 -0000	1.7
  @@ -85,7 +85,7 @@
       }
   
       JettyWebAppType getWebApp() {
  -        return (JettyWebAppType)xmlObject;
  +        return (JettyWebAppType)getXmlObject();
       }
   
       public String getContextRoot() {
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java
  
  Index: WebAppDConfigRoot.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebAppDConfigRoot.java	6 Feb 2004 08:55:49 -0000	1.3
  +++ WebAppDConfigRoot.java	9 Feb 2004 23:11:04 -0000	1.4
  @@ -95,7 +95,7 @@
       }
   
       JettyWebAppDocument getWebAppDocument() {
  -        return (JettyWebAppDocument)xmlObject;
  +        return (JettyWebAppDocument)getXmlObject();
       }
   
       public String[] getXpaths() {