svn commit: r230891 - in /beehive/trunk: docs/forrest/release/src/documentation/content/xdocs/pageflow/ netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/

[ri...@apache.org]

Author: rich
Date: Mon Aug  8 13:52:25 2005
New Revision: 230891

URL: http://svn.apache.org/viewcvs?rev=230891&view=rev
Log:
Committing a few changes from before the depot move...

    - Delete unused class RuntimeAnnotationReader.
    - Made building an info-level logging message conditional on INFO logging being enabled.
    - Fixed a typo in the JSF docs.
    - Added a more informative explanation for why the 'popup' attribute is not available on netui-:imageButton.
    - A bit of minor cleanup in the Action Interceptors sample.

tests: BVT in netui (WinXP)
BB: self (linux)
    

Removed:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java
Modified:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/popupWindows.xml
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java
    beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/MyInterceptor.java

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml?rev=230891&r1=230890&r2=230891&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml Mon Aug  8 13:52:25 2005
@@ -23,7 +23,7 @@
                     the JSF page.
                 </li>
                 <li>
-                    Componenents in JSF pages can also raise Page Flow actions directly, with or 
+                    Components in JSF pages can also raise Page Flow actions directly, with or 
                     without form beans attached, using the built-in <code>action</code> attribute.
                 </li>
                 <li>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/popupWindows.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/popupWindows.xml?rev=230891&r1=230890&r2=230891&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/popupWindows.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/popupWindows.xml Mon Aug  8 13:52:25 2005
@@ -225,7 +225,7 @@
 	<li><a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/button.html">&lt;netui:button></a></li>
 	<li><a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/area.html">&lt;netui:area></a></li>
 	</ol>
-<p>Note - <a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/imageButton.html">&lt;netui:imageButton></a> should be used for submitting a form *without* javascript.</p>
+<p>Note - Popup window support uses JavaScript behind the scenes.  <a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/imageButton.html">&lt;netui:imageButton></a> is used for submitting a form <em>without</em> JavaScript, and thus cannot accept the <code>popup</code> attribute.</p>
 </section>
 	<section id="configurePopupTag"><title>The &lt;netui:configurePopupTag></title>
 	<p>Use the <a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/configurePopup.html">&lt;netui:configurePopup></a>

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java?rev=230891&r1=230890&r2=230891&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java Mon Aug  8 13:52:25 2005
@@ -117,16 +117,19 @@
                 // No descriptor
                 _urlTemplates = new URLTemplates();
 
-                String contextName = servletContext.getServletContextName();
-                InternalStringBuilder message = new InternalStringBuilder();
-                if ( contextName != null )
+                if ( _log.isInfoEnabled() )
                 {
-                    message.append( contextName ).append( " - " );
+                    String contextName = servletContext.getServletContextName();
+                    InternalStringBuilder message = new InternalStringBuilder();
+                    if ( contextName != null )
+                    {
+                        message.append( contextName ).append( " - " );
+                    }
+    
+                    message.append( "Running without URL template descriptor, " );
+                    message.append( _configFilePath );
+                    _log.info( message.toString() );
                 }
-
-                message.append( "Running without URL template descriptor, " );
-                message.append( _configFilePath );
-                _log.info( message.toString() );
             }
         }
         catch ( XmlException xe )

Modified: beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/MyInterceptor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/MyInterceptor.java?rev=230891&r1=230890&r2=230891&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/MyInterceptor.java (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/netui/actioninterceptors/MyInterceptor.java Mon Aug  8 13:52:25 2005
@@ -24,7 +24,6 @@
 import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
 import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
 import java.net.URI;
-import java.net.URISyntaxException;
 
 
 /**
@@ -40,15 +39,8 @@
             throws InterceptorException
     {
         System.out.println("in preAction() in " + getClass().getName());
-        try
-        {
-            URI uri = new URI("/actioninterceptors/nested/Controller.jpf");
-            setOverrideForward(new InterceptorForward(uri), context);
-        }
-        catch (URISyntaxException e)
-        {
-            throw new InterceptorException(e);
-        }
+        InterceptorForward fwd = new InterceptorForward("/actioninterceptors/nested/Controller.jpf");
+        setOverrideForward(fwd, context);
         chain.continueChain();
     }