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 2006/03/10 19:41:08 UTC
svn commit: r384888 - in /beehive/trunk/netui/src:
pageflow/org/apache/beehive/netui/pageflow/
util/org/apache/beehive/netui/util/config/
Author: ekoneil
Date: Fri Mar 10 10:41:02 2006
New Revision: 384888
URL: http://svn.apache.org/viewcvs?rev=384888&view=rev
Log:
Few todo(s) in some core JPF code. Seems like we should just require the use of the PageFlowContextListener in order to initialize the runtime rather than working with or without it. Making notes of this.
BB: self
Test: NetUI BVT pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java?rev=384888&r1=384887&r2=384888&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java Fri Mar 10 10:41:02 2006
@@ -118,6 +118,7 @@
public void init()
throws ServletException
{
+ /* todo: NetUI 1.1 -- need to perform initialization in one place; the ServletContextListener */
// Ensure that we get to do our initializations, even if there's no context listener registered in web.xml.
ServletContext servletContext = getServletContext();
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=384888&r1=384887&r2=384888&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 Fri Mar 10 10:41:02 2006
@@ -17,32 +17,31 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.pageflow.internal.PageFlowInitialization;
-import org.apache.beehive.netui.util.logging.Logger;
-
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-
+import org.apache.beehive.netui.pageflow.internal.PageFlowInitialization;
+import org.apache.beehive.netui.util.logging.Logger;
/**
- * Performs various initialization at ServletContext-init time.
+ * Initialize the NetUI framework at {@link javax.servlet.ServletContext} init time.
*/
public class PageFlowContextListener
- implements ServletContextListener
+ implements ServletContextListener
{
- private static final Logger _log = Logger.getInstance( PageFlowContextListener.class );
+ private static final Logger LOG = Logger.getInstance( PageFlowContextListener.class );
public void contextInitialized( ServletContextEvent event )
{
- if (_log.isDebugEnabled()) {
- _log.debug("In " + getClass().getName() + "; performing initializations.");
- }
+ LOG.info("In " + getClass().getName() + "; web application " +
+ event.getServletContext().getServletContextName() + " is being initialized");
PageFlowInitialization.performInitializations(event.getServletContext(), null);
}
public void contextDestroyed( ServletContextEvent event )
{
+ LOG.info("In " + getClass().getName() + "; web application " +
+ event.getServletContext().getServletContextName() + " is being destroyed");
}
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?rev=384888&r1=384887&r2=384888&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java Fri Mar 10 10:41:02 2006
@@ -69,6 +69,7 @@
{
_servletContext = filterConfig.getServletContext();
+ /* todo: NetUI 1.1 -- need to perform initialization in one place; the ServletContextListener */
if ( ! PageFlowInitialization.isInit( _servletContext ) )
{
PageFlowInitialization.performInitializations(_servletContext, null);
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=384888&r1=384887&r2=384888&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 Fri Mar 10 10:41:02 2006
@@ -67,11 +67,6 @@
internalInit(xmlInputStreamResolver);
}
- protected static void internalInit(XmlInputStreamResolver xmlInputStreamResolver) {
- NetUIConfigParser configParser = new NetUIConfigParser();
- CONFIG_BEAN = configParser.parse(xmlInputStreamResolver);
- }
-
public static boolean isInit() {
return CONFIG_BEAN != null;
}
@@ -82,9 +77,8 @@
* @return a JavaBean that provides configuration information for the NetUI runtime.
*/
public static NetUIConfig getConfig() {
- if(CONFIG_BEAN != null) {
+ if(CONFIG_BEAN != null)
return CONFIG_BEAN;
- }
/*
If the config file wasn't initialized, attempt to initialize a configuration
from the default config file contained in the utility JAR.
@@ -93,11 +87,15 @@
/*
This hopefully never happens and would only occur if the default config file isn't found in the util JAR.
*/
- if(LOGGER.isErrorEnabled())
- LOGGER.error("An error occurred parsing the default config file. " +
- "The NetUI runtime is not properly configured.");
+ LOGGER.error("An error occurred parsing the default config file. " +
+ "The NetUI runtime is not properly configured.");
throw new IllegalStateException("The NetUI runtime could not find the default config file. The webapp may not function properly.");
}
+ }
+
+ protected static void internalInit(XmlInputStreamResolver xmlInputStreamResolver) {
+ NetUIConfigParser configParser = new NetUIConfigParser();
+ CONFIG_BEAN = configParser.parse(xmlInputStreamResolver);
}
}