svn commit: r279573 - in /beehive/trunk/netui: src/util/org/apache/beehive/netui/util/config/ test/src/junitTests/org/apache/beehive/netui/test/util/config/

[ekoneil]

Author: ekoneil
Date: Thu Sep  8 08:15:20 2005
New Revision: 279573

URL: http://svn.apache.org/viewcvs?rev=279573&view=rev
Log:
Remove the old XMLBean-based configuration APIs.

BB: self
Test: NetUI DRT pass


Removed:
    
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
Modified:
    
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
    
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java

Modified: 
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java?rev=279573&r1=279572&r2=279573&view=diff
==============================================================================
--- 
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 (original)
+++ 
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 Thu Sep  8 08:15:20 2005
@@ -21,7 +21,6 @@
 
 import org.apache.beehive.netui.util.config.bean.NetUIConfig;
 import org.apache.beehive.netui.util.config.internal.XmlBeanConfigFactory;
-import 
org.apache.beehive.netui.util.config.internal.xmlbean.generated.NetuiConfigDocument;
 import org.apache.beehive.netui.util.logging.Logger;
 
 /**
@@ -41,19 +40,15 @@
  */
 public class ConfigUtil {
 
-    // @todo: need to provide a read-only implementation so that users can't 
edit the config file on the fly
-
     private static final Logger LOGGER = Logger.getInstance(ConfigUtil.class);
-
-    private static NetuiConfigDocument.NetuiConfig _config = null;
-    private static NetUIConfig _newConfig = null;
+    private static NetUIConfig CONFIG_BEAN = null;
 
     /* do not construct */
     protected ConfigUtil() {}
 
     /**
      * <p/>
-     * Initialize the NetUI configuration data.
+     * Initialize the NetUI configuration JavaBean.
      * <br/>
      * <br/>
      * This method can be called exactly once in a J2EE web application.  The
@@ -69,36 +64,28 @@
     public static void init(InputStream is)
         throws ConfigInitializationException {
 
-        if(_config != null)
+        if(CONFIG_BEAN != null)
             throw new ConfigInitializationException("Config initialization 
already completed; unable to reload the NetUI config file.");
 
         internalInit(is);
     }
 
-    protected static void internalInit(InputStream is) {
-        ConfigFactory configFactory = new XmlBeanConfigFactory();
-
-        _config = configFactory.getConfig(is);
-        _newConfig = configFactory.getNewConfig(_config);
-    }
-    
     public static boolean isInit() {
-        return _config != null;
+        return CONFIG_BEAN != null;
     }
 
     public static NetUIConfig getNewConfig() {
-        return _newConfig;
+        return CONFIG_BEAN;
     }
 
     /**
-     * Get the NetUI configuration object.
+     * Get the NetUI configuration JavaBean.
      *
-     * @return a configuration bean that contains data
-     *         parsed from the netui-config.xml file.
+     * @return a JavaBean that provides configuration information for the 
NetUI runtime.
      */
-    public static NetuiConfigDocument.NetuiConfig getConfig() {
-        if(_config != null) {
-            return _config;
+    public static NetUIConfig getConfig() {
+        if(CONFIG_BEAN != null) {
+            return CONFIG_BEAN;
         }
         /*
           If the config file wasn't initialized, attempt to initialize a 
configuration
@@ -115,4 +102,10 @@
             throw new IllegalStateException("The NetUI runtime could not find 
the default config file.  The webapp may not function properly.");
         }
     }
+
+    protected static void internalInit(InputStream is) {
+        /* todo: this factory should be created via a ServletContext param */
+        ConfigFactory configFactory = new XmlBeanConfigFactory();
+        CONFIG_BEAN = configFactory.getNewConfig(configFactory.getConfig(is));
+    }    
 }

Modified: 
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java?rev=279573&r1=279572&r2=279573&view=diff
==============================================================================
--- 
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java
 (original)
+++ 
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java
 Thu Sep  8 08:15:20 2005
@@ -43,9 +43,7 @@
 
             ConfigUtil.init(is);
 
-            NetuiConfigDocument.NetuiConfig xConfig = ConfigUtil.getConfig();
-            ConfigFactory configFactory = new XmlBeanConfigFactory();
-            NetUIConfig config = configFactory.getNewConfig(xConfig);
+            NetUIConfig config = ConfigUtil.getConfig();
             assertNotNull(config);
             assertFalse(config.getPageFlowConfig().isEnableSelfNesting());
             assertFalse(config.getJspTagConfig().getDocType() == 
DocType.HTML4_LOOSE_QUIRKS);