Author: ayanul Date: 2008-01-15 08:38:38 -0500 (Tue, 15 Jan 2008) New Revision: 5381 Modified: trunk/test-applications/facelets/src/main/java/rich/MapComponent.java trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml Log: Modified: trunk/test-applications/facelets/src/main/java/rich/MapComponent.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/MapComponent.java 2008-01-15 13:06:06 UTC (rev 5380) +++ trunk/test-applications/facelets/src/main/java/rich/MapComponent.java 2008-01-15 13:38:38 UTC (rev 5381) @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import java.util.Set; public class MapComponent { private Map<String, ArrayList<String>> m; @@ -19,8 +18,4 @@ public ArrayList<String> get(String key){ return m.get(key); } - - public Set getSet() { - return m.keySet(); - } } Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-01-15 13:06:06 UTC (rev 5380) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-01-15 13:38:38 UTC (rev 5381) @@ -1,7 +1,6 @@ package rich; import java.util.ArrayList; -import java.util.List; import org.richfaces.VersionBean; @@ -13,15 +12,13 @@ private boolean reComponent; private boolean reProperty; private boolean reStraightforward; - private boolean log; //private String [] menu = {"Blank", "Calendar", "DataFilterSlider", "DataScroller", "DataTable", "DragAndDrop", "DropDownMenu", "Effect", "Gmap", "InputNumberSlider", "InputNumberSpinner", "Insert", "Message", "ModalPanel", "Paint2D", "Panel", "Panel2", "PanelBar", "PanelMenu", "Separator", "SimpleTogglePanel", "Spacer", "SuggestionBox", "TabPanel", "TogglePanel", "ToolBar", "Tooltip", "Tree", "VirtualEarth", "ScrollableDataTable", "jQuery", "OrderingList"}; - + public RichBean() { src = "Blank"; reComponent = true; reProperty = true; reStraightforward = true; - log = false; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); @@ -123,12 +120,4 @@ public void setVersion(String version) { this.version = version; } - - public boolean isLog() { - return log; - } - - public void setLog(boolean log) { - this.log = log; - } } Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2008-01-15 13:06:06 UTC (rev 5380) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2008-01-15 13:38:38 UTC (rev 5381) @@ -125,6 +125,10 @@ <to-view-id>/pages/Select/Map.xhtml</to-view-id> </navigation-case> <navigation-case> + <from-outcome>RichTest</from-outcome> + <to-view-id>/RichTest/RichTest.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-outcome>CustomizePage</from-outcome> <to-view-id>/CustomizePage/CustomizePage.xhtml</to-view-id> </navigation-case> @@ -159,11 +163,14 @@ </navigation-case> </navigation-rule> <application> - <locale-config> - <default-locale>en</default-locale> - </locale-config> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> </application> <lifecycle> <phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener> </lifecycle> + <application> + <locale-config> + <default-locale>en</default-locale> + </locale-config> + </application> </faces-config> Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-01-15 13:06:06 UTC (rev 5380) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-01-15 13:38:38 UTC (rev 5381) @@ -33,20 +33,20 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, - /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, - /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, - /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, - /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, - /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, - /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, - /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, - /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, - /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, - /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, - /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, - /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml, + <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, + /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, + /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, + /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, + /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, + /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, + /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, + /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, + /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, + /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, + /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, + /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml, /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml</param-value> </context-param> <context-param>