You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2005/11/09 15:44:27 UTC

svn commit: r332047 - in /myfaces/examples/trunk: conf/web-develop.xml simple/error.jsp simple/jscookmenu.jsp simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java

Author: tomsp
Date: Wed Nov  9 06:44:07 2005
New Revision: 332047

URL: http://svn.apache.org/viewcvs?rev=332047&view=rev
Log:
ActionSource functionality for HtmlNavigationMenu and JSCookmenu

Added:
    myfaces/examples/trunk/simple/error.jsp
Modified:
    myfaces/examples/trunk/conf/web-develop.xml
    myfaces/examples/trunk/simple/jscookmenu.jsp
    myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java

Modified: myfaces/examples/trunk/conf/web-develop.xml
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/conf/web-develop.xml?rev=332047&r1=332046&r2=332047&view=diff
==============================================================================
--- myfaces/examples/trunk/conf/web-develop.xml (original)
+++ myfaces/examples/trunk/conf/web-develop.xml Wed Nov  9 06:44:07 2005
@@ -35,7 +35,7 @@
     <context-param>
         <param-name>javax.faces.CONFIG_FILES</param-name>
         <param-value>
-            /WEB-INF/examples-config.xml,/WEB-INF/sandbox/faces-config.xml
+            /WEB-INF/examples-config.xml,/WEB-INF/faces-config.xml
         </param-value>
         <description>
             Comma separated list of URIs of (additional) faces config files.
@@ -67,7 +67,7 @@
         <param-value>true</param-value>
         <description>
             Only applicable if state saving method is "server" (= default).
-            If true (default) the state will be serialized to a byte stream before it 
+            If true (default) the state will be serialized to a byte stream before it
             is written to the session.
             If false the state will not be serialized to a byte stream.
         </description>
@@ -188,6 +188,10 @@
         <url-pattern>/faces/*</url-pattern>
     </filter-mapping>
 
+    <listener>
+      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+
     <!-- Faces Servlet -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
@@ -223,12 +227,20 @@
         <url-pattern>*.source</url-pattern>
     </servlet-mapping>
 
+
+    <!-- Welcome files -->
+    <error-page>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/error.jsp</location>
+    </error-page>
+
     <!-- Welcome files -->
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
+
 
     <taglib>
     	<taglib-uri>http://myfaces.apache.org/sandbox</taglib-uri>

Added: myfaces/examples/trunk/simple/error.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/error.jsp?rev=332047&view=auto
==============================================================================
--- myfaces/examples/trunk/simple/error.jsp (added)
+++ myfaces/examples/trunk/simple/error.jsp Wed Nov  9 06:44:07 2005
@@ -0,0 +1 @@
+<%if (pageContext.getException() != null) pageContext.getException().printStackTrace();%>
\ No newline at end of file

Modified: myfaces/examples/trunk/simple/jscookmenu.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/jscookmenu.jsp?rev=332047&r1=332046&r2=332047&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/jscookmenu.jsp (original)
+++ myfaces/examples/trunk/simple/jscookmenu.jsp Wed Nov  9 06:44:07 2005
@@ -93,7 +93,9 @@
 					itemLabel="#{example_messages['nav_newspaperTable']}"
 					action="go_newspaperTable" icon="images/myfaces.gif" />
 			</t:navigationMenuItem>
-		</t:navigationMenuItem>
+        </t:navigationMenuItem>
+        <t:navigationMenuItem id="nav_3"
+            itemLabel="Apache MyFaces Home" action="http://myfaces.apache.org" />
 	</t:jscookMenu>
 </f:view>
 <%@include file="inc/page_footer.jsp"%>

Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java?rev=332047&r1=332046&r2=332047&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/misc/NavigationMenu.java Wed Nov  9 06:44:07 2005
@@ -55,25 +55,32 @@
     {
         List menu = new ArrayList();
         // Products
-        NavigationMenuItem products = new NavigationMenuItem("#{example_messages['panelnav_products']}", null);
+        NavigationMenuItem products = getMenuNaviagtionItem("#{example_messages['panelnav_products']}", null);
         menu.add(products);
-        products.add(new NavigationMenuItem("#{example_messages['panelnav_serach']}", "#{navigationMenu.getAction2}"));
-        products.add(new NavigationMenuItem("#{example_messages['panelnav_serach_acc']}", "#{navigationMenu.getAction2}"));
-        NavigationMenuItem item = new NavigationMenuItem("#{example_messages['panelnav_search_adv']}", "#{navigationMenu.getAction2}");
+        products.add(getMenuNaviagtionItem("#{example_messages['panelnav_serach']}", "#{navigationMenu.getAction2}"));
+        products.add(getMenuNaviagtionItem("#{example_messages['panelnav_serach_acc']}", "#{navigationMenu.getAction2}"));
+        NavigationMenuItem item = getMenuNaviagtionItem("#{example_messages['panelnav_search_adv']}", "#{navigationMenu.getAction2}");
         item.setActive(true);
         item.setOpen(true);
         products.add(item);
         // Shop
-        menu.add(new NavigationMenuItem("#{example_messages['panelnav_shop']}", "#{navigationMenu.getAction2}"));
+        menu.add(getMenuNaviagtionItem("#{example_messages['panelnav_shop']}", "#{navigationMenu.getAction2}"));
         // Corporate Info
-        NavigationMenuItem corporateInfo = new NavigationMenuItem("#{example_messages['panelnav_corporate']}", null);
+        NavigationMenuItem corporateInfo = getMenuNaviagtionItem("#{example_messages['panelnav_corporate']}", null);
         menu.add(corporateInfo);
-        corporateInfo.add(new NavigationMenuItem("#{example_messages['panelnav_news']}", "#{navigationMenu.getAction2}"));
-        item =  new NavigationMenuItem("#{example_messages['panelnav_investor']}", "#{navigationMenu.getAction3}");
+        corporateInfo.add(getMenuNaviagtionItem("#{example_messages['panelnav_news']}", "#{navigationMenu.getAction2}"));
+        item =  getMenuNaviagtionItem("#{example_messages['panelnav_investor']}", "#{navigationMenu.getAction3}");
         corporateInfo.add(item);
         // Contact
-        menu.add(new NavigationMenuItem("#{example_messages['panelnav_contact']}", "#{navigationMenu.getAction2}"));
+        menu.add(getMenuNaviagtionItem("#{example_messages['panelnav_contact']}", "#{navigationMenu.getAction2}"));
         return menu;
+    }
+
+    private static NavigationMenuItem getMenuNaviagtionItem(String label, String action)
+    {
+        NavigationMenuItem item = new NavigationMenuItem(label, action);
+        item.setActionListener("#{navigationMenu.actionListener}");
+        return item;
     }
 
     public String getAction1()