[richfaces-svn-commits] JBoss Rich Faces SVN: r9696 - in trunk/test-applications/jsp/src/main: java/dataGrid and 8 other directories.

Author: adubovsky Date: 2008-07-21 04:15:49 -0400 (Mon, 21 Jul 2008) New Revision: 9696 Added: trunk/test-applications/jsp/src/main/java/dataGrid/ trunk/test-applications/jsp/src/main/java/dataGrid/Car.java trunk/test-applications/jsp/src/main/java/dataGrid/DataGrid.java Removed: trunk/test-applications/jsp/src/main/java/dataTable/Cell.java trunk/test-applications/jsp/src/main/java/dataTable/Table.java trunk/test-applications/jsp/src/main/java/dataTable/TestBean.java Modified: trunk/test-applications/jsp/src/main/java/dnd/DndBean.java trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataTable.xml trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml Log: Added: trunk/test-applications/jsp/src/main/java/dataGrid/Car.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataGrid/Car.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/dataGrid/Car.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -0,0 +1,49 @@ +package dataGrid; + +public class Car { + + private String make; + private String model; + private String mileage; + private String price; + + public Car(String make, String model, String mileage, String price) { + this.make = make; + this.model = model; + this.mileage = mileage; + this.price = price; + } + + public String getMake() { + return make; + } + + public void setMake(String make) { + this.make = make; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getMileage() { + return mileage; + } + + public void setMileage(String mileage) { + this.mileage = mileage; + } + + public String getPrice() { + return price; + } + + public void setPrice(String price) { + this.price = price; + } + +} Added: trunk/test-applications/jsp/src/main/java/dataGrid/DataGrid.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataGrid/DataGrid.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/dataGrid/DataGrid.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -0,0 +1,172 @@ +package dataGrid; +import java.util.ArrayList; +import java.util.List; +import org.richfaces.component.html.HtmlDataGrid; + + +import util.componentInfo.ComponentInfo; + +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; + +public class DataGrid { + + public static final String[] carMake = {"Mersedes-Benz", "Audi", "BMW", "Ford", "Ferrari"}; + public static final String[] carModel = {"S65AMG", "RS4", "M6", "GT40", "550 Maranello"}; + public static final String[] carMileage = {"0 km", "0 km", "0 km", "0 km", "0 km"}; + public static final String[] carPrice = {"125000 eur", "55000 eur", "75000 eur", "255000 eur", "246000 eur"}; + + public DataGrid() { + border = "2px"; + dir = "LTR"; + bindLabel = "not ready"; + elements = "4"; + first = "0"; + columns = "2"; + cellpadding = "1"; + cellspacing = "1"; + rendered = true; + width = ""; + + for(int i = 0; i < carMake.length; i++) { + Car car = new Car(carMake[i], carModel[i], carMileage[i], carPrice[i]); + allCars.add(car); + } + } + + private List<Car> allCars = new ArrayList<Car>(); + private HtmlDataGrid myDataGrid = null; + private String bindLabel; + private String elements; + private HtmlDataGrid htmlDataGrid = null; + private String border; + private String dir; + private String first; + private String columns; + private String cellpadding; + private String cellspacing; + private boolean rendered; + private String width; + + public String getWidth() { + return width; + } + + public void setWidth(String width) { + this.width = width; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getCellpadding() { + return cellpadding; + } + + public void setCellpadding(String cellpadding) { + this.cellpadding = cellpadding; + } + + public String getCellspacing() { + return cellspacing; + } + + public void setCellspacing(String cellspacing) { + this.cellspacing = cellspacing; + } + + public String getColumns() { + return columns; + } + + public void setColumns(String columns) { + this.columns = columns; + } + + public String getFirst() { + return first; + } + + public void setFirst(String first) { + this.first = first; + } + + public void addHtmlDataGrid(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlDataGrid); + } + + public String getElements() { + return elements; + } + + public void setElements(String elements) { + this.elements = elements; + } + + public String submit() { + return null; + } + + public void submitAjax() { + + } + + public void checkBinding(ActionEvent actionEvent){ + FacesContext context = FacesContext.getCurrentInstance(); + bindLabel = myDataGrid.getBaseClientId(context); + } + + public List<Car> getAllCars() { + return allCars; + } + + public void setAllCars(List<Car> allCars) { + this.allCars = allCars; + } + + public HtmlDataGrid getMyDataGrid() { + return myDataGrid; + } + + public void setMyDataGrid(HtmlDataGrid myDataGrid) { + this.myDataGrid = myDataGrid; + } + + public String getBindLabel() { + return bindLabel; + } + + public void setBindLabel(String bindLabel) { + this.bindLabel = bindLabel; + } + + public HtmlDataGrid getHtmlDataGrid() { + return htmlDataGrid; + } + + public void setHtmlDataGrid(HtmlDataGrid htmlDataGrid) { + this.htmlDataGrid = htmlDataGrid; + } + + public String getBorder() { + return border; + } + + public void setBorder(String border) { + this.border = border; + } + + public String getDir() { + return dir; + } + + public void setDir(String dir) { + this.dir = dir; + } +} Deleted: trunk/test-applications/jsp/src/main/java/dataTable/Cell.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataTable/Cell.java 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/java/dataTable/Cell.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -1,13 +0,0 @@ -package dataTable; -public class Cell { - private Integer value; - - public Integer getValue() { - return value; - } - - public void setValue(Integer value) { - this.value = value; - } - -} Deleted: trunk/test-applications/jsp/src/main/java/dataTable/Table.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataTable/Table.java 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/java/dataTable/Table.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -1,15 +0,0 @@ -package dataTable; -import java.util.ArrayList; -import java.util.List; - -public class Table { - private List<Cell> cells = new ArrayList<Cell>(); - - public List<Cell> getCells() { - return cells; - } - - public void setCells(List<Cell> cells) { - this.cells = cells; - } -} Deleted: trunk/test-applications/jsp/src/main/java/dataTable/TestBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dataTable/TestBean.java 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/java/dataTable/TestBean.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -1,73 +0,0 @@ -package dataTable; -import java.util.ArrayList; -import java.util.List; -import org.richfaces.component.html.HtmlDataGrid; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -public class TestBean { - - private List<Table> tables = new ArrayList<Table>(); - private HtmlDataGrid myDataGrid = null; - private String bindLabel; - private String elements; - - public String getElements() { - return elements; - } - - public void setElements(String elements) { - this.elements = elements; - } - - public TestBean() { - Table t1 = new Table(); - tables.add(t1); - t1.getCells().add(new Cell()); - t1.getCells().add(new Cell()); - - Table t2 = new Table(); - tables.add(t2); - t2.getCells().add(new Cell()); - t2.getCells().add(new Cell()); - bindLabel = "not ready"; - elements = "0"; - } - - public String submit() { - return null; - } - - public void submitAjax() { - - } - - public void checkBinding(ActionEvent actionEvent){ - FacesContext context = FacesContext.getCurrentInstance(); - bindLabel = myDataGrid.getBaseClientId(context); - } - - public List<Table> getTables() { - return tables; - } - - public void setTables(List<Table> tables) { - this.tables = tables; - } - - public HtmlDataGrid getMyDataGrid() { - return myDataGrid; - } - - public void setMyDataGrid(HtmlDataGrid myDataGrid) { - this.myDataGrid = myDataGrid; - } - - public String getBindLabel() { - return bindLabel; - } - - public void setBindLabel(String bindLabel) { - this.bindLabel = bindLabel; - } -} Modified: trunk/test-applications/jsp/src/main/java/dnd/DndBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -6,7 +6,6 @@ import javax.faces.event.ActionEvent; -import org.richfaces.component.html.HtmlDragIndicator; import org.richfaces.component.html.HtmlDragSupport; import org.richfaces.component.html.HtmlDropSupport; import org.richfaces.event.DragEvent; @@ -25,41 +24,9 @@ private String actionListenerDrop; private String actionDrag; private String actionListenerDrag; - private HtmlDropSupport htmlDropSupport = null; - private HtmlDragSupport htmlDragSupport = null; - private HtmlDragIndicator htmlDragIndicator = null; + private HtmlDragSupport htmlDrag = null; + private HtmlDropSupport htmlDrop = null; - public void addHtmlDnD(){ - ComponentInfo info = ComponentInfo.getInstance(); - info.addField(htmlDropSupport); - info.addField(htmlDragSupport); - info.addField(htmlDragIndicator); - } - - public HtmlDropSupport getHtmlDropSupport() { - return htmlDropSupport; - } - - public void setHtmlDropSupport(HtmlDropSupport htmlDropSupport) { - this.htmlDropSupport = htmlDropSupport; - } - - public HtmlDragSupport getHtmlDragSupport() { - return htmlDragSupport; - } - - public void setHtmlDragSupport(HtmlDragSupport htmlDragSupport) { - this.htmlDragSupport = htmlDragSupport; - } - - public HtmlDragIndicator getHtmlDragIndicator() { - return htmlDragIndicator; - } - - public void setHtmlDragIndicator(HtmlDragIndicator htmlDragIndicator) { - this.htmlDragIndicator = htmlDragIndicator; - } - public DndBean() { super(); @@ -72,12 +39,14 @@ actionListenerDrop = "---"; } - public void actListenerDrag(ActionEvent e) { + public String actListenerDrag(ActionEvent e) { actionListenerDrag = "actionListenerDrag work!"; + return null; } - public void actListenerDrop(ActionEvent e) { + public String actListenerDrop(ActionEvent e) { actionListenerDrop = "actionListenerDrop work!"; + return null; } public void processDrop(DropEvent event) { @@ -149,4 +118,32 @@ public void setActionListenerDrag(String actionListenerDrag) { this.actionListenerDrag = actionListenerDrag; } + + public HtmlDragSupport getHtmlDrag() { + return htmlDrag; + } + + public void setHtmlDrag(HtmlDragSupport htmlDrag) { + this.htmlDrag = htmlDrag; + } + + public HtmlDropSupport getHtmlDrop() { + return htmlDrop; + } + + public void setHtmlDrop(HtmlDropSupport htmlDrop) { + this.htmlDrop = htmlDrop; + } + + public String add1(){ + ComponentInfo info1 = ComponentInfo.getInstance(); + info1.addField(htmlDrag); + return null; + } + + public String add2(){ + ComponentInfo info1 = ComponentInfo.getInstance(); + info1.addField(htmlDrop); + return null; + } } \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-07-21 08:15:49 UTC (rev 9696) @@ -71,6 +71,7 @@ map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false})); map.add("HotKey", add("/HotKey/HotKey", new boolean [] {true, false, false})); map.add("Validator", add("/Validator/Validator", new boolean [] {true, true, true})); + map.add("DataGrid", add("/DataGrid/DataGrid", new boolean [] {false, true, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-07-21 08:15:49 UTC (rev 9696) @@ -36,7 +36,8 @@ <f:facet name="single"> <f:verbatim>{marker} {nodeParam}({treeParam})</f:verbatim> </f:facet> - </rich:dragIndicator> + </rich:dragIndicator> + <rich:dataTable id="dataTableID" binding="#{dataTable.htmlDataTable}" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" captionClass="#{style.captionClass}" rowClasses="#{style.rowClasses}" headerClass="#{style.headerClass}" footerClass="#{style.footerClass}" styleClass="#{style.styleClass}" captionStyle="#{style.captionStyle}" columnClasses="#{style.columnClasses}" onRowClick="#{event.onRowClick};alert('row #{key}');" rendered="#{dataTable.rendered}" @@ -135,55 +136,5 @@ <rich:column id="total" footerClass="#{style.footerClassA}" headerClass="#{style.headerClassA}" style="#{style.styleA}" styleClass="#{style.styleClassA}" colspan="2"> <h:outputText value="#{dataTableID.total}" /> </rich:column> - </rich:dataTable> - - <h1>Test page</h1> - <a4j:outputPanel id="panel"> - <h:dataTable id="c1" border="1" value="#{testBean.tables}" - var="table"> - <h:column> - <rich:dataGrid id="c2" columns="2" value="#{table.cells}" - var="cell" border="12px" dir="LTR" - elements="#{testBean.elements}" footerClass="style, test" headerClass="style,test" - onclick="#{event.onclick}" - ondblclick="#{event.ondblclick}" - onkeydown="#{event.onkeydown}" - onkeypress="#{event.onkeypress}" - onkeyup="#{event.onkeyup}" - onmousedown="#{event.onmousedown}" - onmousemove="#{event.onmousemove}" - onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" - onmouseup="#{event.onmouseup}" - onRowClick="#{event.onRowClick}" - onRowDblClick="#{event.onRowDblClick}" - onRowMouseDown="#{event.onRowMouseDown}" - onRowMouseMove="#{event.onRowMouseMove}" - onRowMouseOut="#{event.onRowMouseOut}" - onRowMouseOver="#{event.onRowMouseOver}" - onRowMouseUp="#{event.onRowMouseUp}" - rowKeyVar="myVar"> - - <f:facet name="header"> - <f:verbatim>HEADER</f:verbatim> - </f:facet> - - <h:outputLabel value="Value:" for="field" /> - <h:inputText id="field" value="#{cell.value}" /> - <h:outputText value="rowKeyVar:"></h:outputText> - <h:outputText value="#{myVar}"></h:outputText> - - <f:facet name="footer"> - <f:verbatim>FOOTER</f:verbatim> - </f:facet> - </rich:dataGrid> - </h:column> - </h:dataTable> - <h:messages /> - </a4j:outputPanel> - <h:commandButton action="#{testBean.submit}" value="Submit" /> - <a4j:commandButton action="#{testBean.submitAjax}" value="Submit Ajax" reRender="panel"/> - <br/> - <rich:spacer width="300" height="10"></rich:spacer> - + </rich:dataTable> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-07-21 08:15:49 UTC (rev 9696) @@ -37,9 +37,6 @@ <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" onclick="submit();" /> - <h:outputText value="elements:"></h:outputText> - <h:outputText value="#{testBean.elements}"></h:outputText> - <h:outputText value="Selected Node: "></h:outputText> <h:outputText escape="false" value="#{treeDndBean.leftSelectedNodeTitle}" id="selectedNodeL" /> Modified: trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-07-21 08:15:49 UTC (rev 9696) @@ -22,14 +22,15 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="dragType" binding="#{dndBean.htmlDragSupport}" dragValue="#{type} - value" + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" actionListener="#{dndBean.actListenerDrag}" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" oncomplete="#{event.oncomplete}" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" onbeforedomupdate="#{event.onbeforedomupdate}" - ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" id="dragSupportID"> + ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" + id="dragSupportID" binding="#{dndBean.htmlDrag}" > </rich:dragSupport> </h:panelGrid> </h:column> @@ -39,19 +40,22 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport binding="#{dndBean.htmlDropSupport}" reRender="dragValueText" id="dropSupportID" + <rich:dropSupport reRender="dragValueText" id="dropSupportID" actionListener="#{dndBean.actListenerDrop}" action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" - onbeforedomupdate="#{event.onbeforedomupdate}"> + onbeforedomupdate="#{event.onbeforedomupdate}" binding="#{dndBean.htmlDrop}"> </rich:dropSupport> </h:panelGrid> </h:column> </h:dataTable> + <h:panelGrid id="dndActionID" columns="1"> + <h:commandButton action="#{dndBean.add1}" value="add Drag test" /> + <h:commandButton action="#{dndBean.add2}" value="add Drop test" /> <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> <h:outputText value="#{dndBean.actionDrag}" /> @@ -60,7 +64,7 @@ <h:outputText value="#{dndBean.actionListenerDrop}" /> </h:panelGrid> </h:panelGrid> - <rich:dragIndicator id="indicator" acceptClass="accept" binding="#{dndBean.htmlDragIndicator}" + <rich:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject" style="#{style.style}" styleClass="#{style.styleClass}"> <f:facet name="single"> @@ -120,7 +124,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid3"> <f:verbatim>Accepts none... Customizes</f:verbatim> <rich:dropSupport typeMapping="{file: testDrop}" - oncomplete="#{event.oncomplete}" + oncomplete="#{event.oncomplete}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}"> @@ -145,7 +149,7 @@ <h:panelGrid id="grid5"> <rich:dragSupport dragType="file" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" - ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" + ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> @@ -157,8 +161,7 @@ <rich:dragSupport dragType="file" dragIndicator="indicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - oncomplete="#{event.oncomplete}" - onbeforedomupdate="#{event.onbeforedomupdate}"> + oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -182,7 +185,7 @@ <h:panelGrid id="grid8"> <rich:dragSupport dragType="folder" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" - ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" + ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> @@ -251,5 +254,4 @@ <h:outputText value="#{rich:findComponent('indicator').acceptClass}" /> </rich:column> </h:panelGrid> -<h:commandButton value="add test" action="#{dndBean.addHtmlDnD}"></h:commandButton> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-07-21 08:15:49 UTC (rev 9696) @@ -4,15 +4,37 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="GmapSubviewID"> - <rich:gmap id="gMapID" binding="#{gmap.htmlGmap}" locale="#{gmap.locale}" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}" - warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" - enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" - gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" + <rich:gmap id="gMapID" + binding="#{gmap.htmlGmap}" + locale="#{gmap.locale}" + enableInfoWindow="#{gmap.enableInfoWindow}" + mapType="#{gmap.mapType}" lng="#{gmap.lng}" + lat="#{gmap.lat}" + warningMessage="#{gmap.warningMessage}" + rendered="#{gmap.rendered}" + zoom="#{gmap.zoom}" + enableContinuousZoom="#{gmap.continuousZoom}" + enableDoubleClickZoom="#{gmap.doubleClickZoom}" + enableDragging="#{gmap.dragging}" + gmapVar="map" + oninit="#{event.oninit}" + showGLargeMapControl="#{gmap.showGLargeMapControl}" + showGMapTypeControl="#{gmap.showGMapTypeControl}" showGScaleControl="#{gmap.showGScaleControl}" - onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="#{style.style}" styleClass="#{style.styleClass}" /> + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" + onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" + onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}" + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" + style="#{style.style}" + styleClass="#{style.styleClass}" /> - <h:panelGroup> + <h:panelGroup><br /> <f:verbatim> Controls:<br /> <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a> Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-07-21 08:15:49 UTC (rev 9696) @@ -6,7 +6,7 @@ <f:subview id="virtualEarthSubviewID"> <h:panelGrid columns="2"> - <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" + <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="#{event.onLoadMap}" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" binding="#{virtualEarth.myVirtualEarth}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataTable.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataTable.xml 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataTable.xml 2008-07-21 08:15:49 UTC (rev 9696) @@ -7,22 +7,4 @@ <managed-bean-class>dataTable.DataTable</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> - - <managed-bean> - <managed-bean-name>testBean</managed-bean-name> - <managed-bean-class>dataTable.TestBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>table</managed-bean-name> - <managed-bean-class>dataTable.Table</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>cell</managed-bean-name> - <managed-bean-class>dataTable.Cell</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> </faces-config> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-07-21 08:13:24 UTC (rev 9695) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-07-21 08:15:49 UTC (rev 9696) @@ -20,7 +20,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.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.x! ml,/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-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,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/fac! es-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF /faces-config-Custom.xml</param-value> + <param-value>/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.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,/W! EB-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-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,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-co! nfig-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF /faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> @@ -29,7 +29,7 @@ <context-param> <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> <param-value>NONE</param-value> - </context-param> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name>