svn commit: rev 47025 - in incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow: . annotations

[ri...@apache.org]

Author: rich
Date: Tue Sep 21 22:23:11 2004
New Revision: 47025

Modified:
   incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
   incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
Log:
- Changed the startup behavior to fail, clearly, when the netui-config.xml file cannot be parsed.  Previously, an unparseable file gave nonfatal errors about a missing configuration file.
- Dropped the 'none' value from the Jpf.NavigateTo enum, used in the navigateTo attribute on @Jpf.Forward.  It was originally the default value for this attribute, but since the annotation processor can tell the  difference between a missing value and a default value, it is not needed.

DRT: netui (WinXP)
BB: self (linux)



Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java	(original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java	Tue Sep 21 22:23:11 2004
@@ -31,6 +31,7 @@
 import javax.servlet.ServletContextListener;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import java.io.InputStream;
 import java.io.IOException;
 
@@ -44,7 +45,7 @@
     private static final Logger _log = Logger.getInstance( PageFlowContextListener.class );
     
     
-    public void contextInitialized(ServletContextEvent event)
+    public void contextInitialized( ServletContextEvent event )
     {
         performInitializations( event.getServletContext() );
     }
@@ -85,7 +86,8 @@
         }
         catch ( ConfigInitializationException e )
         {
-            _log.error( "Could not initialize from " + CONFIG_FILE, e );
+            _log.fatal( "Could not initialize from " + CONFIG_FILE, e );
+            throw new IllegalStateException( "Could not initialize from " + CONFIG_FILE, e );
         }
         
         ContextCache.init( servletContext );

Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java	(original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java	Tue Sep 21 22:23:11 2004
@@ -125,7 +125,7 @@
          * A symbolic name for the page/action to which to navigate.  Mutually-exclusive with <code>returnAction</code>
          * and <code>path</code>.
          */ 
-        NavigateTo navigateTo() default NavigateTo.none;
+        NavigateTo navigateTo() default NavigateTo.currentPage;
         
         /**
          * Tells whether the original query string will be restored on a rerun of a previous action.  Only valid when
@@ -264,7 +264,7 @@
          * A symbolic name for the page/action to which to navigate.  Mutually-exclusive with <code>returnAction</code>
          * and <code>path</code>.
          */ 
-        NavigateTo navigateTo() default NavigateTo.none;
+        NavigateTo navigateTo() default NavigateTo.currentPage;
         
         /**
          * Tells whether the original query string will be restored on a rerun of a previous action.  Only valid when
@@ -363,7 +363,7 @@
          * A symbolic name for the page/action to which to navigate.  Mutually-exclusive with <code>returnAction</code>
          * and <code>path</code>.
          */ 
-        NavigateTo navigateTo() default NavigateTo.none;
+        NavigateTo navigateTo() default NavigateTo.currentPage;
         
         /**
          * Tells whether the original query string will be restored on a rerun of a previous action.  Only valid when
@@ -409,8 +409,7 @@
         currentPage,
         previousPage,
         previousAction,
-        page,
-        none
+        page
     }
 
     /**