You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/13 19:02:53 UTC

svn commit: r280591 - in /beehive/trunk/netui: src/pageflow/org/apache/beehive/netui/pageflow/ src/pageflow/org/apache/beehive/netui/pageflow/handler/ src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ src/pageflow/org/apache/beehive/ne...

Author: ekoneil
Date: Tue Sep 13 10:02:33 2005
New Revision: 280591

URL: http://svn.apache.org/viewcvs?rev=280591&view=rev
Log:
Fixup the ConfigUtil / ConfigFactory APIs to remove the getNewConfig method and switch to getConfig.

Also adds a validation failure test when a b-n-c.xml file is invalid relative to the XSD.

BB: self
Test: NetUI BVT pass


Added:
    beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/
    beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml
Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
    beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigFactory.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/JspTagConfig.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
    beehive/trunk/netui/test/ant/junitCore.xml
    beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigBeanTest.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java Tue Sep 13 10:02:33 2005
@@ -112,7 +112,7 @@
         //
         // Look for ModuleConfigLocators in netui-config.xml.
         //
-        PageFlowConfig pfConfig = ConfigUtil.getNewConfig().getPageFlowConfig();
+        PageFlowConfig pfConfig = ConfigUtil.getConfig().getPageFlowConfig();
         
         if ( pfConfig != null )
         {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java Tue Sep 13 10:02:33 2005
@@ -58,7 +58,7 @@
     
     static void init( ServletContext servletContext )
     {
-        PageFlowFactoriesConfig factoriesBean = ConfigUtil.getNewConfig().getPageFlowFactories();
+        PageFlowFactoriesConfig factoriesBean = ConfigUtil.getConfig().getPageFlowFactories();
         FacesBackingBeanFactory factory = null;
         
         if ( factoriesBean != null )

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java Tue Sep 13 10:02:33 2005
@@ -69,7 +69,7 @@
 
     static void init( ServletContext servletContext )
     {
-        PageFlowFactoriesConfig factoriesBean = ConfigUtil.getNewConfig().getPageFlowFactories();
+        PageFlowFactoriesConfig factoriesBean = ConfigUtil.getConfig().getPageFlowFactories();
         FlowControllerFactory factory = null;
 
         if ( factoriesBean != null )
@@ -246,7 +246,7 @@
 
         if ( isNestable && pfStack != null )
         {
-            PageFlowConfig options = ConfigUtil.getNewConfig().getPageFlowConfig();
+            PageFlowConfig options = ConfigUtil.getConfig().getPageFlowConfig();
 
             if ( options == null || ! options.isEnableSelfNesting() )
             {
@@ -490,7 +490,7 @@
     LinkedHashMap/*< String, SharedFlowController >*/ getDefaultSharedFlows( RequestContext context )
             throws ClassNotFoundException, InstantiationException, IllegalAccessException
     {
-        SharedFlowRefConfig[] defaultRefs = ConfigUtil.getNewConfig().getSharedFlowRef();
+        SharedFlowRefConfig[] defaultRefs = ConfigUtil.getConfig().getSharedFlowRef();
 
         if ( defaultRefs != null )
         {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java Tue Sep 13 10:02:33 2005
@@ -141,7 +141,7 @@
      */
     private static void initPrefixHandlers()
     {
-        PrefixHandlerConfig[] prefixHandlers = ConfigUtil.getNewConfig().getPrefixHandlers();
+        PrefixHandlerConfig[] prefixHandlers = ConfigUtil.getConfig().getPrefixHandlers();
         if ( prefixHandlers == null )
         {
             return;
@@ -226,7 +226,7 @@
         TemplatedURLFormatter formatter = null;
 
         // check for a default template formatter class name from the config file
-        UrlConfig urlConfig = ConfigUtil.getNewConfig().getUrlConfig();
+        UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
         if ( urlConfig != null )
         {
             String className = urlConfig.getTemplatedUrlFormatterClass();

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Tue Sep 13 10:02:33 2005
@@ -1993,7 +1993,7 @@
 
         if ( ! noCache )
         {
-            PageFlowConfig pfConfig = ConfigUtil.getNewConfig().getPageFlowConfig();
+            PageFlowConfig pfConfig = ConfigUtil.getConfig().getPageFlowConfig();
             
             if ( pfConfig != null )
             {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Tue Sep 13 10:02:33 2005
@@ -1537,7 +1537,7 @@
             throws URISyntaxException
     {
         boolean encoded = false;
-        UrlConfig urlConfig = ConfigUtil.getNewConfig().getUrlConfig();
+        UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
 
         if (urlConfig != null) {
             encoded = !urlConfig.isUrlEncodeUrls();

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java Tue Sep 13 10:02:33 2005
@@ -93,7 +93,7 @@
         //
         // Load/create Handlers.
         //
-        NetUIConfig netuiConfig = ConfigUtil.getNewConfig();
+        NetUIConfig netuiConfig = ConfigUtil.getConfig();
         PageFlowHandlersConfig handlers = netuiConfig.getPageFlowHandlers();
 
         DefaultHandler defaultActionForwardHandler = new DefaultActionForwardHandler( servletContext );

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java Tue Sep 13 10:02:33 2005
@@ -163,7 +163,7 @@
         // We didn't find it in the cache -- build it.
         //
         if ( cacheByPageFlow == null ) cacheByPageFlow = new HashMap/*< String, ArrayList< Interceptor > >*/();
-        PageFlowActionInterceptorsConfig config = ConfigUtil.getNewConfig().getPageFlowActionInterceptors();
+        PageFlowActionInterceptorsConfig config = ConfigUtil.getConfig().getPageFlowActionInterceptors();
         ArrayList/*< Interceptor >*/ interceptorsList = new ArrayList/*< Interceptor >*/();
 
         if ( config == null )

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java Tue Sep 13 10:02:33 2005
@@ -76,7 +76,7 @@
 
     public static void init( ServletContext servletContext )
     {
-        RequestInterceptorsConfig requestInterceptors = ConfigUtil.getNewConfig().getRequestInterceptors();
+        RequestInterceptorsConfig requestInterceptors = ConfigUtil.getConfig().getRequestInterceptors();
 
         if ( requestInterceptors != null )
         {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java Tue Sep 13 10:02:33 2005
@@ -690,7 +690,7 @@
 
     public static MultipartHandler getMultipartHandlerType()
     {
-        PageFlowConfig pfConfig = ConfigUtil.getNewConfig().getPageFlowConfig();
+        PageFlowConfig pfConfig = ConfigUtil.getConfig().getPageFlowConfig();
         return pfConfig != null ? pfConfig.getMultipartHandler() : null;
     }
 
@@ -893,7 +893,7 @@
     {
         if ( request != null && effect.causeMayBeSessionExpiration() && sessionExpired( request ) )
         {
-            PageFlowConfig pfc = ConfigUtil.getNewConfig().getPageFlowConfig();
+            PageFlowConfig pfc = ConfigUtil.getConfig().getPageFlowConfig();
             if ( pfc == null || pfc.isThrowSessionExpiredException() )
             {
                 throw new SessionExpiredException( effect );

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java Tue Sep 13 10:02:33 2005
@@ -77,7 +77,7 @@
 
     private void loadLegacySettings( ServletContext servletContext )
     {
-        PageFlowConfig pageflowConfig = ConfigUtil.getNewConfig().getPageFlowConfig();
+        PageFlowConfig pageflowConfig = ConfigUtil.getConfig().getPageFlowConfig();
         assert pageflowConfig != null : "Received an invalid PageFlowConfig object";
 
         Integer forwardOverflowCount =

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java Tue Sep 13 10:02:33 2005
@@ -46,7 +46,7 @@
     public static final URIContext getInstance()
     {
         URIContext uriContext = MutableURI.getDefaultContext();
-        UrlConfig urlConfig = ConfigUtil.getNewConfig().getUrlConfig();
+        UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
 
         if ( urlConfig != null)
         {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java Tue Sep 13 10:02:33 2005
@@ -81,7 +81,7 @@
     private static final ExpressionEngineFactory initialize(Map factoryMap) {
         assert factoryMap != null;
 
-        NetUIConfig config = ConfigUtil.getNewConfig();
+        NetUIConfig config = ConfigUtil.getConfig();
 
         ExpressionLanguagesConfig elConfig = config.getExpressionLanguages();
         assert elConfig != null;

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Tue Sep 13 10:02:33 2005
@@ -77,7 +77,7 @@
     public static String getTreeImageLocation()
     {
         if (defaultTreeImageLocation == null) {
-            JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
+            JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
             if (tagConfig != null) {
                 String s = tagConfig.getTreeImageLocation();
                 defaultTreeImageLocation = (s != null) ? s : InheritableState.DEFAULT_IMAGES;
@@ -94,7 +94,7 @@
      */
     private static void setLegacyJavaScriptMode()
     {
-        JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
+        JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
         if (tagConfig != null) {
             javascriptMode = tagConfig.getIdJavascript().getValue();
         }

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java Tue Sep 13 10:02:33 2005
@@ -118,7 +118,7 @@
 
         try {
             boolean encoded = false;
-            UrlConfig urlConfig = ConfigUtil.getNewConfig().getUrlConfig();
+            UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
             if (urlConfig != null) {
                 encoded = !urlConfig.isUrlEncodeUrls();
             }

Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Tue Sep 13 10:02:33 2005
@@ -70,7 +70,7 @@
     static
     {
         _defaultDocType = HTML_RENDERING_QUIRKS;
-        JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
+        JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
         if (tagConfig != null) {
             DocType docType = tagConfig.getDocType();
             setDefaultDocType(docType);

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigFactory.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigFactory.java Tue Sep 13 10:02:33 2005
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 
 import org.apache.beehive.netui.util.config.bean.NetUIConfig;
-import org.apache.beehive.netui.util.config.internal.xmlbean.generated.NetuiConfigDocument;
 
 /**
  * <p>
@@ -29,8 +28,6 @@
  */
 public abstract class ConfigFactory {
 
-    public abstract NetUIConfig getNewConfig(NetuiConfigDocument.NetuiConfig config);
-
-    public abstract NetuiConfigDocument.NetuiConfig getConfig(InputStream inputStream);
+    public abstract NetUIConfig getConfig(InputStream inputStream);
 }
 

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=280591&r1=280590&r2=280591&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 Tue Sep 13 10:02:33 2005
@@ -74,10 +74,6 @@
         return CONFIG_BEAN != null;
     }
 
-    public static NetUIConfig getNewConfig() {
-        return CONFIG_BEAN;
-    }
-
     /**
      * Get the NetUI configuration JavaBean.
      *
@@ -106,6 +102,6 @@
     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));
+        CONFIG_BEAN = configFactory.getConfig(is);
     }    
 }

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/JspTagConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/JspTagConfig.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/JspTagConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/JspTagConfig.java Tue Sep 13 10:02:33 2005
@@ -39,6 +39,7 @@
 
         if(docType != null)
             _docType = docType;
+        
         if(_idJavascript != null)
             _idJavascript = idJavascript;
 

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java Tue Sep 13 10:02:33 2005
@@ -76,7 +76,7 @@
 
     private static final String DEFAULT_CONFIG = "org/apache/beehive/netui/util/config/beehive-netui-config-default.xml";
 
-    public NetuiConfigDocument.NetuiConfig getConfig(InputStream is)
+    public NetUIConfig getConfig(InputStream is)
         throws ConfigInitializationException {
 
         NetuiConfigDocument config = null;
@@ -96,12 +96,7 @@
 
         config = parse(is);
 
-        /* todo: convert XMLBean config document into a NetUIConfig object */
-        return config.getNetuiConfig();
-    }
-
-    public NetUIConfig getNewConfig(NetuiConfigDocument.NetuiConfig config) {
-        return convert(config);
+        return convert(config.getNetuiConfig());
     }
 
     private NetuiConfigDocument parse(InputStream is) {

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java Tue Sep 13 10:02:33 2005
@@ -126,7 +126,7 @@
     }
 
     private static final Map readFromConfig() {
-        NetUIConfig config = ConfigUtil.getNewConfig();
+        NetUIConfig config = ConfigUtil.getConfig();
         if(config == null)
             return null;
 

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java Tue Sep 13 10:02:33 2005
@@ -247,7 +247,7 @@
     }
 
     private static final Map/*<String, String>*/ readFromConfig() {
-        NetUIConfig config = ConfigUtil.getNewConfig();
+        NetUIConfig config = ConfigUtil.getConfig();
         if(config == null)
             return null;
 

Modified: beehive/trunk/netui/test/ant/junitCore.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/ant/junitCore.xml?rev=280591&r1=280590&r2=280591&view=diff
==============================================================================
--- beehive/trunk/netui/test/ant/junitCore.xml (original)
+++ beehive/trunk/netui/test/ant/junitCore.xml Tue Sep 13 10:02:33 2005
@@ -45,26 +45,14 @@
             <batchtest fork="yes" todir="${testout.dir}">
                 <fileset dir="${test.classes.dir}/junitTests">
                     <include name="org/apache/beehive/netui/test/core/**/*Test.class"/>
-                    <include name="org/apache/beehive/netui/test/util.config/**/*Test.class"/>
-                </fileset>
-            </batchtest>
-            <batchtest fork="yes" todir="${testout.dir}">
-                <fileset dir="${test.classes.dir}/junitTests">
+                    <include name="org/apache/beehive/netui/test/util/config/**/*Test.class"/>
+                    <include name="org/apache/beehive/netui/test/script/el/**/*Test.class"/>
                     <include name="org/apache/beehive/netui/test/pageflow/**/*Test.class"/>
+                    <include name="org/apache/beehive/netui/test/datagrid/**Test.class"/>
                 </fileset>
             </batchtest>
             <test name="org.apache.beehive.netui.test.databinding.expression.IndexedNameTest" todir="${testout.dir}"/>
             <test name="org.apache.beehive.netui.test.script.simpleaction.InternalExpressionUtilsTest" todir="${testout.dir}"/>
-            <batchtest fork="yes" todir="${testout.dir}">
-                <fileset dir="${test.classes.dir}/junitTests">
-                    <include name="org/apache/beehive/netui/test/script/el/**/*Test.class"/>
-                </fileset>
-            </batchtest>
-            <batchtest fork="yes" todir="${testout.dir}">
-                <fileset dir="${test.classes.dir}/junitTests">
-                    <include name="org/apache/beehive/netui/test/datagrid/**Test.class"/>
-                </fileset>
-            </batchtest>
         </junit>
 
         <echo>Generating a test report into: ${testout.dir}/html</echo>

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=280591&r1=280590&r2=280591&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 Tue Sep 13 10:02:33 2005
@@ -26,6 +26,7 @@
 import org.apache.beehive.netui.util.config.internal.XmlBeanConfigFactory;
 import org.apache.beehive.netui.util.config.ConfigUtil;
 import org.apache.beehive.netui.util.config.ConfigFactory;
+import org.apache.beehive.netui.util.config.ConfigInitializationException;
 import org.apache.beehive.netui.util.config.bean.NetUIConfig;
 import org.apache.beehive.netui.util.config.bean.DocType;
 
@@ -35,7 +36,7 @@
 public class ConfigBeanTest
     extends TestCase {
 
-    public void testParsing()
+    public void testConfigUtil()
         throws Exception {
         InputStream is = null;
         try {
@@ -46,13 +47,45 @@
             NetUIConfig config = ConfigUtil.getConfig();
             assertNotNull(config);
             assertFalse(config.getPageFlowConfig().isEnableSelfNesting());
-            assertFalse(config.getJspTagConfig().getDocType() == DocType.HTML4_LOOSE_QUIRKS);
+            assertTrue(config.getJspTagConfig().getDocType() == DocType.HTML4_LOOSE_QUIRKS);
         }
         finally{
             if(is != null)
                 is.close();
         }
+    }
+
+    public void testValidationFailure()
+        throws Exception {
+        Throwable failureCause = null;
+        try {
+            loadConfigBean("org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml");
+        }
+        catch(Throwable e) {
+            /* assume that a ConfigInitializationException resulted from a failure in XML validation */
+            if(e instanceof ConfigInitializationException)
+                return;
+            else failureCause = e;
+        }
+
+        throw new IllegalStateException("Expected validation failure but did not receive one", failureCause);
+    }
+
+    private NetUIConfig loadConfigBean(String resourcePath)
+        throws Exception {
 
+        NetUIConfig config = null;
+        InputStream is = null;
+        try {
+            is = getClass().getClassLoader().getResourceAsStream(resourcePath);
+            config = (new XmlBeanConfigFactory()).getConfig(is);
+        }
+        finally{
+            if(is != null)
+                is.close();
+        }
+
+        return config;
     }
 
     public ConfigBeanTest(String name) {
@@ -66,6 +99,4 @@
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }
-
-
 }

Added: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml?rev=280591&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml (added)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/instances/beehive-netui-config-fail-validation.xml Tue Sep 13 10:02:33 2005
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<netui-config xmlns="http://beehive.apache.org/netui/2004/server/config">
+    <expression-languages>
+        <default-language>netuiel</default-language>
+        <default-language>no such language</default-language>
+    </expression-languages>    
+</netui-config>
\ No newline at end of file