You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/20 12:49:36 UTC

svn commit: r1186730 [2/22] - in /myfaces/commons/branches/jsf_20: examples/ examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/examples/ examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/examples/access...

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/renderone/RenderOneBean.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/renderone/RenderOneBean.java?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/renderone/RenderOneBean.java (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/renderone/RenderOneBean.java Thu Oct 20 10:49:18 2011
@@ -1,107 +1,107 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.commons.renderone;
-
-import java.io.Serializable;
-
-/**
- * @author Andrew Robinson (latest modification by $Author: skitching $)
- * @version $Revision: 676967 $ $Date: 2008-07-15 18:57:23 +0200 (Tue, 15 Jul 2008) $
- */
-public class RenderOneBean implements Serializable
-{
-    private boolean aRendered = false;
-    private boolean cRendered = true;
-    private boolean dRendered = true;
-    private boolean bRendered = true;
-    
-    private Integer index = new Integer("2");
-    
-    /**
-     * @return the index
-     */
-    public Integer getIndex()
-    {
-        return this.index;
-    }
-
-    /**
-     * @return the aRendered
-     */
-    public boolean isARendered()
-    {
-        return this.aRendered;
-    }
-
-    /**
-     * @param rendered the aRendered to set
-     */
-    public void setARendered(boolean rendered)
-    {
-        this.aRendered = rendered;
-    }
-
-    /**
-     * @return the cRendered
-     */
-    public boolean isCRendered()
-    {
-        return this.cRendered;
-    }
-
-    /**
-     * @param rendered the cRendered to set
-     */
-    public void setCRendered(boolean rendered)
-    {
-        this.cRendered = rendered;
-    }
-
-    /**
-     * @return the dRendered
-     */
-    public boolean isDRendered()
-    {
-        return this.dRendered;
-    }
-
-    /**
-     * @param rendered the dRendered to set
-     */
-    public void setDRendered(boolean rendered)
-    {
-        this.dRendered = rendered;
-    }
-
-    /**
-     * @return the bRendered
-     */
-    public boolean isBRendered()
-    {
-        return this.bRendered;
-    }
-
-    /**
-     * @param rendered the bRendered to set
-     */
-    public void setBRendered(boolean rendered)
-    {
-        this.bRendered = rendered;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.commons.renderone;
+
+import java.io.Serializable;
+
+/**
+ * @author Andrew Robinson (latest modification by $Author: skitching $)
+ * @version $Revision: 676967 $ $Date: 2008-07-15 18:57:23 +0200 (Tue, 15 Jul 2008) $
+ */
+public class RenderOneBean implements Serializable
+{
+    private boolean aRendered = false;
+    private boolean cRendered = true;
+    private boolean dRendered = true;
+    private boolean bRendered = true;
+    
+    private Integer index = new Integer("2");
+    
+    /**
+     * @return the index
+     */
+    public Integer getIndex()
+    {
+        return this.index;
+    }
+
+    /**
+     * @return the aRendered
+     */
+    public boolean isARendered()
+    {
+        return this.aRendered;
+    }
+
+    /**
+     * @param rendered the aRendered to set
+     */
+    public void setARendered(boolean rendered)
+    {
+        this.aRendered = rendered;
+    }
+
+    /**
+     * @return the cRendered
+     */
+    public boolean isCRendered()
+    {
+        return this.cRendered;
+    }
+
+    /**
+     * @param rendered the cRendered to set
+     */
+    public void setCRendered(boolean rendered)
+    {
+        this.cRendered = rendered;
+    }
+
+    /**
+     * @return the dRendered
+     */
+    public boolean isDRendered()
+    {
+        return this.dRendered;
+    }
+
+    /**
+     * @param rendered the dRendered to set
+     */
+    public void setDRendered(boolean rendered)
+    {
+        this.dRendered = rendered;
+    }
+
+    /**
+     * @return the bRendered
+     */
+    public boolean isBRendered()
+    {
+        return this.bRendered;
+    }
+
+    /**
+     * @param rendered the bRendered to set
+     */
+    public void setBRendered(boolean rendered)
+    {
+        this.bRendered = rendered;
+    }
+}

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/java/org/apache/myfaces/commons/renderone/RenderOneBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertBoolean.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertBoolean.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertBoolean.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertBoolean.jsp Thu Oct 20 10:49:18 2011
@@ -1,76 +1,76 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-	<h:panelGroup id="body">
-        <p>This example check how mcc:convertBoolean works. This converter 
-        translates between boolean values (true/false)
-        and alternate versions of those boolean values like
-        (yes/no), (1/0), and (way/no way).</p>
-		<h:form id="form1">
-		    <h:messages showDetail="false" showSummary="true" ></h:messages>
-            <p>Current value: <h:outputText value="#{booleanBean.way}"/></p>
-			<h:panelGrid columns="3">
-
-				<h:outputLabel for="boolVal" value="" />
-				<h:inputText id="boolVal" value="#{booleanBean.way}" required="true">
-					<mcc:convertBoolean trueValue="way" falseValue="no way" />
-				</h:inputText>
-				<h:message for="boolVal" styleClass="error" />
-
-				<h:panelGroup />
-				<h:commandButton id="validateButton"
-					value="#{example_messages['button_submit']}"
-					action="#{booleanBean.submit}" />
-				<h:panelGroup />
-
-			</h:panelGrid>
-		</h:form>
-
-	</h:panelGroup>
-<%@include file="inc/page_footer.jsp"%>
-</div>
-</body>
-
-</f:view>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+	<h:panelGroup id="body">
+        <p>This example check how mcc:convertBoolean works. This converter 
+        translates between boolean values (true/false)
+        and alternate versions of those boolean values like
+        (yes/no), (1/0), and (way/no way).</p>
+		<h:form id="form1">
+		    <h:messages showDetail="false" showSummary="true" ></h:messages>
+            <p>Current value: <h:outputText value="#{booleanBean.way}"/></p>
+			<h:panelGrid columns="3">
+
+				<h:outputLabel for="boolVal" value="" />
+				<h:inputText id="boolVal" value="#{booleanBean.way}" required="true">
+					<mcc:convertBoolean trueValue="way" falseValue="no way" />
+				</h:inputText>
+				<h:message for="boolVal" styleClass="error" />
+
+				<h:panelGroup />
+				<h:commandButton id="validateButton"
+					value="#{example_messages['button_submit']}"
+					action="#{booleanBean.submit}" />
+				<h:panelGroup />
+
+			</h:panelGrid>
+		</h:form>
+
+	</h:panelGroup>
+<%@include file="inc/page_footer.jsp"%>
+</div>
+</body>
+
+</f:view>
 </html>
\ No newline at end of file

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertBoolean.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertDateTime.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertDateTime.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertDateTime.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertDateTime.jsp Thu Oct 20 10:49:18 2011
@@ -1,86 +1,86 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-	<h:panelGroup id="body">
-        <p>This example shows how mcc:convertDateTime component works. It works almost
-        the same as f:convertDateTime, but it has as TimeZone default 
-        TimeZone.getDefault() instead GMT and it evaluate EL expressions when the value
-        is being validated instead when the converter is built. </p>
-        <p>Current Locale: <h:outputText value="#{facesContext.viewRoot.locale}"/></p>
-		<h:form id="form1">
-		    <h:messages showDetail="false" showSummary="true" ></h:messages>
-			<h:panelGrid columns="3">
-
-                <h:outputLabel for="type"
-                    value="Insert a type" />
-                <h:selectOneMenu id="type" immediate="true" value="#{dateTimeBean.type}" binding="#{dateTimeBean.typeSelect}" >
-                    <f:selectItem itemLabel="date" itemValue="date"/>
-                    <f:selectItem itemLabel="time" itemValue="time"/>
-                    <f:selectItem itemLabel="both" itemValue="both"/>
-                </h:selectOneMenu>
-                <h:message for="type" styleClass="error" />
-
-				<h:outputLabel for="date1"
-					value="Insert a date/time" />
-				<h:inputText id="date1" value="#{dateTimeBean.date1}" required="true">
-                   <mcc:convertDateTime type="#{dateTimeBean.typeFromSelect}"/>
-				</h:inputText>
-				<h:message for="date1" styleClass="error" />
-
-				<h:panelGroup />
-				<h:commandButton id="validateButton"
-					value="#{example_messages['button_submit']}"
-					action="#{dateTimeBean.submit}" />
-				<h:panelGroup />
-
-			</h:panelGrid>
-		</h:form>
-
-	</h:panelGroup>
-<%@include file="inc/page_footer.jsp"%>
-</div>
-</body>
-
-</f:view>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+	<h:panelGroup id="body">
+        <p>This example shows how mcc:convertDateTime component works. It works almost
+        the same as f:convertDateTime, but it has as TimeZone default 
+        TimeZone.getDefault() instead GMT and it evaluate EL expressions when the value
+        is being validated instead when the converter is built. </p>
+        <p>Current Locale: <h:outputText value="#{facesContext.viewRoot.locale}"/></p>
+		<h:form id="form1">
+		    <h:messages showDetail="false" showSummary="true" ></h:messages>
+			<h:panelGrid columns="3">
+
+                <h:outputLabel for="type"
+                    value="Insert a type" />
+                <h:selectOneMenu id="type" immediate="true" value="#{dateTimeBean.type}" binding="#{dateTimeBean.typeSelect}" >
+                    <f:selectItem itemLabel="date" itemValue="date"/>
+                    <f:selectItem itemLabel="time" itemValue="time"/>
+                    <f:selectItem itemLabel="both" itemValue="both"/>
+                </h:selectOneMenu>
+                <h:message for="type" styleClass="error" />
+
+				<h:outputLabel for="date1"
+					value="Insert a date/time" />
+				<h:inputText id="date1" value="#{dateTimeBean.date1}" required="true">
+                   <mcc:convertDateTime type="#{dateTimeBean.typeFromSelect}"/>
+				</h:inputText>
+				<h:message for="date1" styleClass="error" />
+
+				<h:panelGroup />
+				<h:commandButton id="validateButton"
+					value="#{example_messages['button_submit']}"
+					action="#{dateTimeBean.submit}" />
+				<h:panelGroup />
+
+			</h:panelGrid>
+		</h:form>
+
+	</h:panelGroup>
+<%@include file="inc/page_footer.jsp"%>
+</div>
+</body>
+
+</f:view>
 </html>
\ No newline at end of file

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertDateTime.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertNumber.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertNumber.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertNumber.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertNumber.jsp Thu Oct 20 10:49:18 2011
@@ -1,87 +1,87 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-	<h:panelGroup id="body">
-        <p>This example shows how mcc:convertNumber component works. It works almost
-        the same as f:convertNumber, but it has "destType" attribute that define the
-        target attribute to the backing bean property (useful when maps are used because
-        ValueExpression.getType return null) and it evaluate EL expressions when the value
-        is being validated instead when the converter is built. </p>
-        <p>Current Locale: <h:outputText value="#{facesContext.viewRoot.locale}"/></p>
-		<h:form id="form1">
-		    <h:messages showDetail="false" showSummary="true" ></h:messages>
-			<h:panelGrid columns="3">
-
-                <h:outputLabel for="type"
-                    value="Insert a type" />
-                <h:selectOneMenu id="type" immediate="true" value="#{numberBean.type}" binding="#{numberBean.typeSelect}" >
-                    <f:selectItem itemLabel="number" itemValue="number"/>
-                    <f:selectItem itemLabel="currency" itemValue="currency"/>
-                    <f:selectItem itemLabel="percent" itemValue="percent"/>
-                </h:selectOneMenu>
-                <h:message for="type" styleClass="error" />
-
-				<h:outputLabel for="number1"
-					value="Insert a number" />
-				<h:inputText id="number1" value="#{numberBean.numberMap['number1']}" required="true">
-                   <mcc:convertNumber destType="java.lang.Double" type="#{numberBean.typeFromSelect}"/>
-				</h:inputText>
-				<h:message for="number1" styleClass="error" />
-
-				<h:panelGroup />
-				<h:commandButton id="validateButton"
-					value="#{example_messages['button_submit']}"
-					action="#{numberBean.submit}" />
-				<h:panelGroup />
-
-			</h:panelGrid>
-		</h:form>
-     
-	</h:panelGroup>
-<%@include file="inc/page_footer.jsp"%>
-</div>
-</body>
-
-</f:view>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+	<h:panelGroup id="body">
+        <p>This example shows how mcc:convertNumber component works. It works almost
+        the same as f:convertNumber, but it has "destType" attribute that define the
+        target attribute to the backing bean property (useful when maps are used because
+        ValueExpression.getType return null) and it evaluate EL expressions when the value
+        is being validated instead when the converter is built. </p>
+        <p>Current Locale: <h:outputText value="#{facesContext.viewRoot.locale}"/></p>
+		<h:form id="form1">
+		    <h:messages showDetail="false" showSummary="true" ></h:messages>
+			<h:panelGrid columns="3">
+
+                <h:outputLabel for="type"
+                    value="Insert a type" />
+                <h:selectOneMenu id="type" immediate="true" value="#{numberBean.type}" binding="#{numberBean.typeSelect}" >
+                    <f:selectItem itemLabel="number" itemValue="number"/>
+                    <f:selectItem itemLabel="currency" itemValue="currency"/>
+                    <f:selectItem itemLabel="percent" itemValue="percent"/>
+                </h:selectOneMenu>
+                <h:message for="type" styleClass="error" />
+
+				<h:outputLabel for="number1"
+					value="Insert a number" />
+				<h:inputText id="number1" value="#{numberBean.numberMap['number1']}" required="true">
+                   <mcc:convertNumber destType="java.lang.Double" type="#{numberBean.typeFromSelect}"/>
+				</h:inputText>
+				<h:message for="number1" styleClass="error" />
+
+				<h:panelGroup />
+				<h:commandButton id="validateButton"
+					value="#{example_messages['button_submit']}"
+					action="#{numberBean.submit}" />
+				<h:panelGroup />
+
+			</h:panelGrid>
+		</h:form>
+     
+	</h:panelGroup>
+<%@include file="inc/page_footer.jsp"%>
+</div>
+</body>
+
+</f:view>
 </html>
\ No newline at end of file

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/convertNumber.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/creditcardvalidator.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/creditcardvalidator.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/creditcardvalidator.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/creditcardvalidator.jsp Thu Oct 20 10:49:18 2011
@@ -1,87 +1,87 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-        <h:messages showDetail="true" showSummary="false"/>
-        
-        <h:form id="myform">
-            <p>Some valid test numbers</p>
-            
-            <ul>
-              <li>Mastercard : 5555555555554444</li>
-              <li>Mastercard : 5105105105105100</li>
-              <li>Visa : 4111111111111111</li>
-              <li>Visa : 4111111111111111</li>
-              <li>Discover : 6011111111111117</li>
-              <li>Discover : 6011000990139424</li>
-              <li>American Express : 378282246310005</li>
-              <li>American Express : 371449635398431</li>
-            </ul>
-            
-            <h:panelGrid columns ="3">
-              <h:outputLabel for="creditCardType" value="#{example_messages['credit_type']}" />
-              <h:selectOneRadio id="creditCardType" value="#{validateCreditCard.creditCardType}" immediate="true" binding="#{validateCreditCard.creditCardTypeSelect}">
-                  <f:selectItems value="#{validateCreditCard.creditCardTypes}"/>
-              </h:selectOneRadio>
-              <h:message id="creditCardTypeError" for="creditCardType" styleClass="error" />
-              
-              <h:outputLabel for="creditCardNumber" value="#{example_messages['credit_number']}" />
-              <h:inputText id="creditCardNumber" value="#{validateCreditCard.creditCardNumber}" required="true">
-                  <mcv:validateCreditCard 
-                      amex="#{validateCreditCard.creditCardTypeFromSelect == 'AMEX'}"
-                      visa="#{validateCreditCard.creditCardTypeFromSelect == 'VISA'}"
-                      discover="#{validateCreditCard.creditCardTypeFromSelect == 'DISCOVER'}"
-                      mastercard="#{validateCreditCard.creditCardTypeFromSelect == 'MASTERCARD'}" />
-              </h:inputText>
-              <h:message id="creditCardNumberError" for="creditCardNumber" styleClass="error" />
-            </h:panelGrid>
-            <h:panelGroup/>
-            <h:commandButton id="validateButton" value="#{example_messages['button_submit']}" action="#{validateCreditCard.submit}"/>
-            <h:panelGroup/>
-        </h:form>     
-<%@include file="inc/page_footer.jsp"%>
-</div>
-</body>
-
-</f:view>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+        <h:messages showDetail="true" showSummary="false"/>
+        
+        <h:form id="myform">
+            <p>Some valid test numbers</p>
+            
+            <ul>
+              <li>Mastercard : 5555555555554444</li>
+              <li>Mastercard : 5105105105105100</li>
+              <li>Visa : 4111111111111111</li>
+              <li>Visa : 4111111111111111</li>
+              <li>Discover : 6011111111111117</li>
+              <li>Discover : 6011000990139424</li>
+              <li>American Express : 378282246310005</li>
+              <li>American Express : 371449635398431</li>
+            </ul>
+            
+            <h:panelGrid columns ="3">
+              <h:outputLabel for="creditCardType" value="#{example_messages['credit_type']}" />
+              <h:selectOneRadio id="creditCardType" value="#{validateCreditCard.creditCardType}" immediate="true" binding="#{validateCreditCard.creditCardTypeSelect}">
+                  <f:selectItems value="#{validateCreditCard.creditCardTypes}"/>
+              </h:selectOneRadio>
+              <h:message id="creditCardTypeError" for="creditCardType" styleClass="error" />
+              
+              <h:outputLabel for="creditCardNumber" value="#{example_messages['credit_number']}" />
+              <h:inputText id="creditCardNumber" value="#{validateCreditCard.creditCardNumber}" required="true">
+                  <mcv:validateCreditCard 
+                      amex="#{validateCreditCard.creditCardTypeFromSelect == 'AMEX'}"
+                      visa="#{validateCreditCard.creditCardTypeFromSelect == 'VISA'}"
+                      discover="#{validateCreditCard.creditCardTypeFromSelect == 'DISCOVER'}"
+                      mastercard="#{validateCreditCard.creditCardTypeFromSelect == 'MASTERCARD'}" />
+              </h:inputText>
+              <h:message id="creditCardNumberError" for="creditCardNumber" styleClass="error" />
+            </h:panelGrid>
+            <h:panelGroup/>
+            <h:commandButton id="validateButton" value="#{example_messages['button_submit']}" action="#{validateCreditCard.submit}"/>
+            <h:panelGroup/>
+        </h:form>     
+<%@include file="inc/page_footer.jsp"%>
+</div>
+</body>
+
+</f:view>
 </html>
\ No newline at end of file

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/creditcardvalidator.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/css/basic.css
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/css/basic.css?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/css/basic.css (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/css/basic.css Thu Oct 20 10:49:18 2011
@@ -1,658 +1,658 @@
-body {
-    background-color: rgb(0, 35, 75);
-    font-family : arial, verdana, Geneva, Arial, Helvetica, sans-serif;
-    font-size : 12px;
-}
-
-#container {
-    margin: 10px auto;
-    width: 900px;
-    background-color: white;
-    padding: 3px;
-}
-
-h1 {
-    font-size: 20px;
-}
-
-.standard {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-}
-
-.standard_bold {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    font-weight: bold;
-}
-
-.scrollerTable {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: solid;
-    border-width: 1px;
-    width: 400px;
-}
-
-.scroller {
-    padding-left:20px;
-}
-
-.paginator {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-}
-
-
-.standardTable {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: solid;
-    border-width: 1px;
-}
-
-.standardTable_Header {
-	color: #000000;
-    background-color: #FFDD00;
-    padding: 3;
-    text-align: center;
-    border: none;
-}
-
-.standardTable_SortHeader {
-    background-color: #FFDD00;
-    color: #000000;
-    padding: 3;
-    text-align: center;
-    border: none;
-    font-weight: bold;
-}
-
-.standardTable_Footer {
-    background-color: #FFFFE0;
-}
-
-.standardTable_Row1 {
-    background-color: #FFFFE0;
-}
-
-.standardTable_Row2 {
-    background-color: #FFFFE0;
-}
-
-.standardTable_Column {
-}
-
-.standardTable_ColumnCentered {
-    text-align: center
-}
-
-a
-{
-	color: #333366;
-    text-decoration: underline;
-    font-size: 12px;
-}
-
-a:hover
-{
-	color: #333366;
-    text-decoration: underline;
-}
-
-.error {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	color: #FF0000;
-}
-
-.sortLink {
-	color: #333366;
-    text-decoration: none;
-}
-
-
-.pageLayout {
-    width:760px;
-    height:100%;
-}
-
-.pageHeader {
-    background-color: #6392C6;
-    text-align: center;
-    vertical-align: middle;
-    height:1px;
-    overflow:visible;
-    color: #FFFFFF;
-    padding: 0px;
-    margin: 0px;
-}
-
-.pageHeader1 {
-}
-.pageHeader2 {
-    width:100%;
-}
-.pageHeader2col1 {
-    background-color: #FFFFFF;
-}
-
-.pageNavigation {
-    text-align: left;
-    vertical-align: top;
-    width: 200px;
-    background-color: #E7EFF7;
-    border: 1px solid #6392C6;
-    padding: 10px;
-}
-
-.pageBody {
-    text-align: left;
-    vertical-align: top;
-    width: 560px;
-    padding: 20px;
-    background-color: #FFFFFF;
-}
-
-.pageFooter {
-    text-align: right;
-    font-size: xx-small;
-    height:1px;
-    overflow:visible;
-    background-color: #6392C6;
-    color: #FFFFFF;
-}
-
-
-
-.navigation {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-    width: 100%;
-}
-
-.navitem {
-	white-space : nowrap;
-    text-decoration : none;
-}
-
-a.navitem:hover,active {
-	white-space : nowrap;
-	text-decoration: none;
-    color: #6392C6;
-}
-
-.navitem_open {
-	white-space : nowrap;
-	text-decoration: none;
-	font-weight : bold;
-}
-
-a.navitem_open:hover,active {
-	white-space : nowrap;
-	text-decoration: none;
-	font-weight : bold;
-    color: #6392C6;
-}
-
-.navitem_active {
-	white-space : nowrap;
-	text-decoration: none;
-	font-weight : bold;
-    background-color: #6392C6;
-	width: 100%;
-    color: #FFFFFF;
-}
-
-a.navitem_active:hover,active {
-	white-space : nowrap;
-	text-decoration: none;
-	font-weight : bold;
-    background-color: #6392C6;
-	width: 100%;
-    color: #FFFFFF;
-}
-
-
-.navseparator {
-    line-height: 12px;
-    border-bottom: 1px solid #A2B7C5;
-}
-
-
-
-.fileUploadInput {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    width: 250px;
-}
-
-
-
-
-.emptyHeader {
-    background-color: #FFFFFF;
-    border-top: 0px none;
-    border-right: 0px none;
-    border-bottom: 0px none;
-    border-left: 0px none;
-}
-
-
-
-div.titlebar {
-  background: #C7D0D9;
-  color: black;
-  border: 1px solid #8CACBB;
-  padding-left: 1px;
-  padding-right: 1px;
-  padding-top: 1px;
-  padding-bottom: 1px;
-  margin: 1px 1px;
-  clear: both;
-}
-
-/*
-   ------------------------------------------------------------
-   Calendar component
-   ------------------------------------------------------------
-*/
-
-.yearMonthHeader {
-    background-color: #DDDDDD;
-    color: #000000;
-    text-align: center;
-    border: none;
-    font-weight: bold;
-}
-
-.weekHeader {
-    background-color: #E7E7E7;
-    color: #000000;
-    text-align: center;
-    border: none;
-}
-
-.currentDayCell {
-    background-color: #DDDDDD;
-    color: #000000;
-    border: none;
-}
-
-
-/*
-   ------------------------------------------------------------
-   End Calendar component
-   ------------------------------------------------------------
-*/
-
-/*
-   ------------------------------------------------------------
-   Popup component
-   ------------------------------------------------------------
-*/
-
-.popup {
-    background-color:rgb(255,255,255);
-    color: #000000;
-    border: 1px solid #CCCCCC;
-    font-size:smaller;
-    padding: 5px;
-}
-
-.popup table {
-    font-size:smaller;
-}
-
-
-/*
-   ------------------------------------------------------------
-   End popup component
-   ------------------------------------------------------------
-*/
-
-
-.countryFormTable {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: solid;
-    border-width: 1px;
-}
-
-.countryFormHeader {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: none;
-    background-color: #FFDD00;
-    text-align: center;
-	font-weight : normal;
-}
-
-.countryFormFooter {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: none;
-    background-color: #FFDD00;
-    text-align: center;
-	font-weight : normal;
-}
-
-.countryFormLabels {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: none;
-    text-align: right;
-	font-weight : bold;
-}
-
-.countryFormInputs {
-	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-    padding: 2;
-    border-style: none;
-}
-
-/*
-   ------------------------------------------------------------
-   Tree component
-   ------------------------------------------------------------
-*/
-
-.nodeFolder
-{
-    font-size: 10px;
-    font-family: Verdana, Geneva, sans-serif;
-    text-decoration: none
-}
-.document
-{
-    color: blue;
-    font-size: 10px;
-    font-family: Verdana, Geneva, sans-serif;
-    text-decoration: none
-}
-.documentSelected
-{
-    color: blue;
-    font-size: 10px;
-    font-family: Verdana, Geneva, sans-serif;
-    text-decoration: none;
-    font-weight: bold
-}
-
-.childCount
-{
-    color: blue;
-    font-size: 10px;
-    font-family: Verdana, Geneva, sans-serif;
-    text-decoration: none
-}
-
-/*
-   ------------------------------------------------------------
-   Panelnavigation
-   ------------------------------------------------------------
-*/
-#subnavigation {
-margin-left: 0px;
-margin-right: 20px;
-padding: 0px 0px 20px 0px;
-border: 1px solid #546359;
-background-color: #EAF4F4;
-}
-
-#subnavigation_outer {
-float: left;
-width: 220px;
-padding: 0px;
-margin: 0px 0px 0px 0px;
-}
-#subnavigation_outer h1  {
-font-size: 1.5em;
-margin: 0px;
-padding: 0px 0px 15px 0px;
-}
-
-/*
-   --------------------------------------------------------------
-    Horizontal Panelnavigation
-   --------------------------------------------------------------
-*/
-#hNav_outer {
-    margin: 0;
-    padding: 0;   
-    height: 60px;
-    width: 800px;
-}
-#hNav_outer ul {    
-    padding: 0;
-    margin: 0;    
-}
-#hNav_outer ul li ul {
-    margin: 0;
-    padding: 0;
-}
-#hNav_outer ul a {
-    text-decoration: none;
-}
-#hNav_outer ul li { /*float the main list items*/
-    margin: 0;
-    float: left;
-    display: block;
-    padding: 5px;
-}
-#hNav_outer ul li ul {
-    display: none;
-}
-#hNav_outer ul li.off ul, #hNav_outer ul li.on ul { /*put the subnav below*/
-    position: absolute;
-    top: 36px;
-    *top: 44px;/*reposition for IE*/    
-    background: #224d6f;    
-    left: 13px;
-    *left: 15px;
-    width: 740px;    
-}
-#hNav_outer ul li.on ul {    
-    display: block;
-    background: #f90;
-}
-#hNav_outer ul li.on:hover ul, #hNav_outer ul li.over ul { /*for ie*/
-    background: #224d6f;
-}
-#hNav_outer ul li a {
-    color: #224d6f;
-    font-weight: bold;
-    display: block;
-    padding: 5;
-}
-#hNav_outer ul li.on a {   
-    color: #fff;
-    background: #f90;
-}
-#hNav_outer ul li.on ul a, #hNav_outer ul li.off ul a {
-    float: left; /*ie doesn't inherit the float*/
-    border: 0;
-    color: #f90;
-    width: auto;    
-}
-#hNav_outer ul li.on:hover ul a, #hNav_outer ul li.over ul li a { /*for ie - the specificity is necessary*/
-    background: #224d6f;
-}
-#hNav_outer ul li.off:hover ul, #hNav_outer ul li.over ul {
-    display: block;
-    z-index: 6000;
-}		
-#hNav_outer ul li.off a:hover, #hNav_outer ul li:hover a, #hNav_outer ul li.over a {
-    background: #29497b;
-    color: #f90;
-}
-#hNav_outer ul li.off a:hover, #hNav_outer ul li.on a:hover { 
-    color: #f90;
-}		
-/*subnav formatting*/
-#hNav_outer ul li.off ul a {
-    display: block;
-    background: #224d6f;
-    color: #fff;    
-}		
-#hNav_outer ul li.on ul a {       
-    display: block;
-    background: #f90;
-    color: #fff;    
-}
-
-/**************************************************
- * css layers and classes for list navigation list
- **************************************************/
-#subnavigation ul li  a {
-display:block;
-background-color: #D1E4E4;
-color: #294747;
-text-decoration: none;
-border-bottom: 1px solid #87A8A8;
-padding: 2px 20px;
-margin: 0px;
-}
-
-#subnavigation ul li a:visited {color:#294747;}
-#subnavigation ul li a:hover {color: #FFFFFF;  background-color: #87A8A8;}
-#subnavigation ul li a:active { color:#294747;}
-
-#subnavigation ul li a.selected {
-font-weight: bold;
-color:#294747;
-background-color: #FFFFFF;
-}
-
-#subnavigation ul ul li a {
-padding: 2px 20px 2px 25px;
-margin: 0px;
-background-color: #FFFFFF;}
-
-#subnavigation ul ul li ul li a {
-padding: 2px 20px 2px 30px;
-margin: 0px;
-}
-
-#subnavigation ul {
-list-style-type: none;
-padding: 0px;
-margin: 0px;
-}
-
-#subnavigation li{
-margin: 0px;
-padding: 0px;
-display:inline;
-}
-
-#subnavigation ul.mypage li a {
-padding: 2px 20px 2px 20px;
-margin: 0px;
-background-color: #EAF4F4;
-}
-
-#subnavigation ul.mypage ul li a:hover {color: #FFFFFF;  background-color: #87A8A8;}
-/*
-    body, th, td, input, select {
-        font-family: Verdana, Helvetica, Arial, sans-serif;
-    }
-
-    table, th, td {
-        font-size: small;
-        border: none;
-    }
-
-    .treeHeader {
-        background-color: #bbb;
-        border: 0.75px solid #fff;
-        padding: 2px 3px;
-        text-align: left;
-    }
-
-    .treeFooter {
-        padding: 5px;
-        margin: .67em 2px;
-        margin-top: 0;
-        background-color: #ddd;
-        background-image: url(../images/sw_med_rond.gif);
-        background-repeat: no-repeat;
-        background-position: bottom left;
-    }
-
-    input, .treeFooter {
-        font-size: xx-small;
-        font-size: x-small;
-    }
-
-    .a td {
-        background: #ddd;
-        border-bottom: 1px solid #fff;
-    }
-
-    .b td {
-        background: #efefef;
-        border-bottom: 1px solid #fff;
-    }
-
-    .col1 {
-        border-right: 1px solid #fff;
-        padding: 2px 15px 2px 5px;
-    }
-
-    .col2 {
-        border-left: 1px solid #fff;
-        padding: 2px 15px 2px 5px;
-    }
-
-    .tree {
-       lineheight: 18px;
-       font-family: arial, sans-serif;
-    }
-
-    .treenode {
-       padding: 2px 15px 2px 5px;
-    }
-
-    .treenode a {
-       text-decoration: none;
-    }
-
-    .treenodeSelected {
-       padding: 2px 15px 2px 5px;
-    }
-
-    .treenodeSelected a {
-       text-decoration: none;
-       font-weight: bold;
-    }
-
-    table .selectOneRadio {
-        font-weight: bold;
-    }
-
-
-    .standardList {
-        font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
-        font-size: 12px;
-        color: #000000;
-    }
-
-    */
+body {
+    background-color: rgb(0, 35, 75);
+    font-family : arial, verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size : 12px;
+}
+
+#container {
+    margin: 10px auto;
+    width: 900px;
+    background-color: white;
+    padding: 3px;
+}
+
+h1 {
+    font-size: 20px;
+}
+
+.standard {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+}
+
+.standard_bold {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    font-weight: bold;
+}
+
+.scrollerTable {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: solid;
+    border-width: 1px;
+    width: 400px;
+}
+
+.scroller {
+    padding-left:20px;
+}
+
+.paginator {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+}
+
+
+.standardTable {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: solid;
+    border-width: 1px;
+}
+
+.standardTable_Header {
+	color: #000000;
+    background-color: #FFDD00;
+    padding: 3;
+    text-align: center;
+    border: none;
+}
+
+.standardTable_SortHeader {
+    background-color: #FFDD00;
+    color: #000000;
+    padding: 3;
+    text-align: center;
+    border: none;
+    font-weight: bold;
+}
+
+.standardTable_Footer {
+    background-color: #FFFFE0;
+}
+
+.standardTable_Row1 {
+    background-color: #FFFFE0;
+}
+
+.standardTable_Row2 {
+    background-color: #FFFFE0;
+}
+
+.standardTable_Column {
+}
+
+.standardTable_ColumnCentered {
+    text-align: center
+}
+
+a
+{
+	color: #333366;
+    text-decoration: underline;
+    font-size: 12px;
+}
+
+a:hover
+{
+	color: #333366;
+    text-decoration: underline;
+}
+
+.error {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: #FF0000;
+}
+
+.sortLink {
+	color: #333366;
+    text-decoration: none;
+}
+
+
+.pageLayout {
+    width:760px;
+    height:100%;
+}
+
+.pageHeader {
+    background-color: #6392C6;
+    text-align: center;
+    vertical-align: middle;
+    height:1px;
+    overflow:visible;
+    color: #FFFFFF;
+    padding: 0px;
+    margin: 0px;
+}
+
+.pageHeader1 {
+}
+.pageHeader2 {
+    width:100%;
+}
+.pageHeader2col1 {
+    background-color: #FFFFFF;
+}
+
+.pageNavigation {
+    text-align: left;
+    vertical-align: top;
+    width: 200px;
+    background-color: #E7EFF7;
+    border: 1px solid #6392C6;
+    padding: 10px;
+}
+
+.pageBody {
+    text-align: left;
+    vertical-align: top;
+    width: 560px;
+    padding: 20px;
+    background-color: #FFFFFF;
+}
+
+.pageFooter {
+    text-align: right;
+    font-size: xx-small;
+    height:1px;
+    overflow:visible;
+    background-color: #6392C6;
+    color: #FFFFFF;
+}
+
+
+
+.navigation {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+    width: 100%;
+}
+
+.navitem {
+	white-space : nowrap;
+    text-decoration : none;
+}
+
+a.navitem:hover,active {
+	white-space : nowrap;
+	text-decoration: none;
+    color: #6392C6;
+}
+
+.navitem_open {
+	white-space : nowrap;
+	text-decoration: none;
+	font-weight : bold;
+}
+
+a.navitem_open:hover,active {
+	white-space : nowrap;
+	text-decoration: none;
+	font-weight : bold;
+    color: #6392C6;
+}
+
+.navitem_active {
+	white-space : nowrap;
+	text-decoration: none;
+	font-weight : bold;
+    background-color: #6392C6;
+	width: 100%;
+    color: #FFFFFF;
+}
+
+a.navitem_active:hover,active {
+	white-space : nowrap;
+	text-decoration: none;
+	font-weight : bold;
+    background-color: #6392C6;
+	width: 100%;
+    color: #FFFFFF;
+}
+
+
+.navseparator {
+    line-height: 12px;
+    border-bottom: 1px solid #A2B7C5;
+}
+
+
+
+.fileUploadInput {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    width: 250px;
+}
+
+
+
+
+.emptyHeader {
+    background-color: #FFFFFF;
+    border-top: 0px none;
+    border-right: 0px none;
+    border-bottom: 0px none;
+    border-left: 0px none;
+}
+
+
+
+div.titlebar {
+  background: #C7D0D9;
+  color: black;
+  border: 1px solid #8CACBB;
+  padding-left: 1px;
+  padding-right: 1px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  margin: 1px 1px;
+  clear: both;
+}
+
+/*
+   ------------------------------------------------------------
+   Calendar component
+   ------------------------------------------------------------
+*/
+
+.yearMonthHeader {
+    background-color: #DDDDDD;
+    color: #000000;
+    text-align: center;
+    border: none;
+    font-weight: bold;
+}
+
+.weekHeader {
+    background-color: #E7E7E7;
+    color: #000000;
+    text-align: center;
+    border: none;
+}
+
+.currentDayCell {
+    background-color: #DDDDDD;
+    color: #000000;
+    border: none;
+}
+
+
+/*
+   ------------------------------------------------------------
+   End Calendar component
+   ------------------------------------------------------------
+*/
+
+/*
+   ------------------------------------------------------------
+   Popup component
+   ------------------------------------------------------------
+*/
+
+.popup {
+    background-color:rgb(255,255,255);
+    color: #000000;
+    border: 1px solid #CCCCCC;
+    font-size:smaller;
+    padding: 5px;
+}
+
+.popup table {
+    font-size:smaller;
+}
+
+
+/*
+   ------------------------------------------------------------
+   End popup component
+   ------------------------------------------------------------
+*/
+
+
+.countryFormTable {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: solid;
+    border-width: 1px;
+}
+
+.countryFormHeader {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: none;
+    background-color: #FFDD00;
+    text-align: center;
+	font-weight : normal;
+}
+
+.countryFormFooter {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: none;
+    background-color: #FFDD00;
+    text-align: center;
+	font-weight : normal;
+}
+
+.countryFormLabels {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: none;
+    text-align: right;
+	font-weight : bold;
+}
+
+.countryFormInputs {
+	font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+    padding: 2;
+    border-style: none;
+}
+
+/*
+   ------------------------------------------------------------
+   Tree component
+   ------------------------------------------------------------
+*/
+
+.nodeFolder
+{
+    font-size: 10px;
+    font-family: Verdana, Geneva, sans-serif;
+    text-decoration: none
+}
+.document
+{
+    color: blue;
+    font-size: 10px;
+    font-family: Verdana, Geneva, sans-serif;
+    text-decoration: none
+}
+.documentSelected
+{
+    color: blue;
+    font-size: 10px;
+    font-family: Verdana, Geneva, sans-serif;
+    text-decoration: none;
+    font-weight: bold
+}
+
+.childCount
+{
+    color: blue;
+    font-size: 10px;
+    font-family: Verdana, Geneva, sans-serif;
+    text-decoration: none
+}
+
+/*
+   ------------------------------------------------------------
+   Panelnavigation
+   ------------------------------------------------------------
+*/
+#subnavigation {
+margin-left: 0px;
+margin-right: 20px;
+padding: 0px 0px 20px 0px;
+border: 1px solid #546359;
+background-color: #EAF4F4;
+}
+
+#subnavigation_outer {
+float: left;
+width: 220px;
+padding: 0px;
+margin: 0px 0px 0px 0px;
+}
+#subnavigation_outer h1  {
+font-size: 1.5em;
+margin: 0px;
+padding: 0px 0px 15px 0px;
+}
+
+/*
+   --------------------------------------------------------------
+    Horizontal Panelnavigation
+   --------------------------------------------------------------
+*/
+#hNav_outer {
+    margin: 0;
+    padding: 0;   
+    height: 60px;
+    width: 800px;
+}
+#hNav_outer ul {    
+    padding: 0;
+    margin: 0;    
+}
+#hNav_outer ul li ul {
+    margin: 0;
+    padding: 0;
+}
+#hNav_outer ul a {
+    text-decoration: none;
+}
+#hNav_outer ul li { /*float the main list items*/
+    margin: 0;
+    float: left;
+    display: block;
+    padding: 5px;
+}
+#hNav_outer ul li ul {
+    display: none;
+}
+#hNav_outer ul li.off ul, #hNav_outer ul li.on ul { /*put the subnav below*/
+    position: absolute;
+    top: 36px;
+    *top: 44px;/*reposition for IE*/    
+    background: #224d6f;    
+    left: 13px;
+    *left: 15px;
+    width: 740px;    
+}
+#hNav_outer ul li.on ul {    
+    display: block;
+    background: #f90;
+}
+#hNav_outer ul li.on:hover ul, #hNav_outer ul li.over ul { /*for ie*/
+    background: #224d6f;
+}
+#hNav_outer ul li a {
+    color: #224d6f;
+    font-weight: bold;
+    display: block;
+    padding: 5;
+}
+#hNav_outer ul li.on a {   
+    color: #fff;
+    background: #f90;
+}
+#hNav_outer ul li.on ul a, #hNav_outer ul li.off ul a {
+    float: left; /*ie doesn't inherit the float*/
+    border: 0;
+    color: #f90;
+    width: auto;    
+}
+#hNav_outer ul li.on:hover ul a, #hNav_outer ul li.over ul li a { /*for ie - the specificity is necessary*/
+    background: #224d6f;
+}
+#hNav_outer ul li.off:hover ul, #hNav_outer ul li.over ul {
+    display: block;
+    z-index: 6000;
+}		
+#hNav_outer ul li.off a:hover, #hNav_outer ul li:hover a, #hNav_outer ul li.over a {
+    background: #29497b;
+    color: #f90;
+}
+#hNav_outer ul li.off a:hover, #hNav_outer ul li.on a:hover { 
+    color: #f90;
+}		
+/*subnav formatting*/
+#hNav_outer ul li.off ul a {
+    display: block;
+    background: #224d6f;
+    color: #fff;    
+}		
+#hNav_outer ul li.on ul a {       
+    display: block;
+    background: #f90;
+    color: #fff;    
+}
+
+/**************************************************
+ * css layers and classes for list navigation list
+ **************************************************/
+#subnavigation ul li  a {
+display:block;
+background-color: #D1E4E4;
+color: #294747;
+text-decoration: none;
+border-bottom: 1px solid #87A8A8;
+padding: 2px 20px;
+margin: 0px;
+}
+
+#subnavigation ul li a:visited {color:#294747;}
+#subnavigation ul li a:hover {color: #FFFFFF;  background-color: #87A8A8;}
+#subnavigation ul li a:active { color:#294747;}
+
+#subnavigation ul li a.selected {
+font-weight: bold;
+color:#294747;
+background-color: #FFFFFF;
+}
+
+#subnavigation ul ul li a {
+padding: 2px 20px 2px 25px;
+margin: 0px;
+background-color: #FFFFFF;}
+
+#subnavigation ul ul li ul li a {
+padding: 2px 20px 2px 30px;
+margin: 0px;
+}
+
+#subnavigation ul {
+list-style-type: none;
+padding: 0px;
+margin: 0px;
+}
+
+#subnavigation li{
+margin: 0px;
+padding: 0px;
+display:inline;
+}
+
+#subnavigation ul.mypage li a {
+padding: 2px 20px 2px 20px;
+margin: 0px;
+background-color: #EAF4F4;
+}
+
+#subnavigation ul.mypage ul li a:hover {color: #FFFFFF;  background-color: #87A8A8;}
+/*
+    body, th, td, input, select {
+        font-family: Verdana, Helvetica, Arial, sans-serif;
+    }
+
+    table, th, td {
+        font-size: small;
+        border: none;
+    }
+
+    .treeHeader {
+        background-color: #bbb;
+        border: 0.75px solid #fff;
+        padding: 2px 3px;
+        text-align: left;
+    }
+
+    .treeFooter {
+        padding: 5px;
+        margin: .67em 2px;
+        margin-top: 0;
+        background-color: #ddd;
+        background-image: url(../images/sw_med_rond.gif);
+        background-repeat: no-repeat;
+        background-position: bottom left;
+    }
+
+    input, .treeFooter {
+        font-size: xx-small;
+        font-size: x-small;
+    }
+
+    .a td {
+        background: #ddd;
+        border-bottom: 1px solid #fff;
+    }
+
+    .b td {
+        background: #efefef;
+        border-bottom: 1px solid #fff;
+    }
+
+    .col1 {
+        border-right: 1px solid #fff;
+        padding: 2px 15px 2px 5px;
+    }
+
+    .col2 {
+        border-left: 1px solid #fff;
+        padding: 2px 15px 2px 5px;
+    }
+
+    .tree {
+       lineheight: 18px;
+       font-family: arial, sans-serif;
+    }
+
+    .treenode {
+       padding: 2px 15px 2px 5px;
+    }
+
+    .treenode a {
+       text-decoration: none;
+    }
+
+    .treenodeSelected {
+       padding: 2px 15px 2px 5px;
+    }
+
+    .treenodeSelected a {
+       text-decoration: none;
+       font-weight: bold;
+    }
+
+    table .selectOneRadio {
+        font-weight: bold;
+    }
+
+
+    .standardList {
+        font-family : verdana, Geneva, Arial, Helvetica, sans-serif;
+        font-size: 12px;
+        color: #000000;
+    }
+
+    */

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/css/basic.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/exporter.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/exporter.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/exporter.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/exporter.jsp Thu Oct 20 10:49:18 2011
@@ -1,101 +1,101 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-    <h:form>
-    	<p>This component allows to export the datatable contents to an excel or pdf file.</p>
-		
-		<br>
-		
-		<h:dataTable id="tbl_cars"
-                styleClass="scrollerTable"
-                headerClass="standardTable_Header"
-                footerClass="standardTable_Header"
-                rowClasses="standardTable_Row1,standardTable_Row2"
-                columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
-                var="car"
-                value="#{exporterBean.carsList}">
-           <h:column>
-               <f:facet name="header">
-                   <h:outputText value="Id" />
-               </f:facet>
-               <h:outputText value="#{car.id}" />
-           </h:column>
-
-           <h:column>
-               <f:facet name="header">
-                  <h:outputText value="Type" />
-               </f:facet>
-               <h:outputText value="#{car.type}" />
-           </h:column>
-
-           <h:column>
-               <f:facet name="header">
-                  <h:outputText value="Color" />
-               </f:facet>
-               <h:outputText value="#{car.color}" />
-           </h:column>
-
-        </h:dataTable>
-        
-		<br>
-		
-		<h:commandButton action="#{exporterBean.export}" value="Export as excel">
-			<mc:exporterActionListener for="tbl_cars" fileType="XLS" filename="excel"/>
-		</h:commandButton>			
-		
-		<br>
-		
-		<h:commandButton action="#{exporterBean.export}" value="Export as pdf">
-			<mc:exporterActionListener for="tbl_cars" fileType="PDF" filename="pdf"/>
-		</h:commandButton>
-			
-		
-    </h:form>
-
-
-<%@ include file="inc/page_footer.jsp" %>
-</div>
-</body>
-</f:view>
-</html>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+    <h:form>
+    	<p>This component allows to export the datatable contents to an excel or pdf file.</p>
+		
+		<br>
+		
+		<h:dataTable id="tbl_cars"
+                styleClass="scrollerTable"
+                headerClass="standardTable_Header"
+                footerClass="standardTable_Header"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+                columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
+                var="car"
+                value="#{exporterBean.carsList}">
+           <h:column>
+               <f:facet name="header">
+                   <h:outputText value="Id" />
+               </f:facet>
+               <h:outputText value="#{car.id}" />
+           </h:column>
+
+           <h:column>
+               <f:facet name="header">
+                  <h:outputText value="Type" />
+               </f:facet>
+               <h:outputText value="#{car.type}" />
+           </h:column>
+
+           <h:column>
+               <f:facet name="header">
+                  <h:outputText value="Color" />
+               </f:facet>
+               <h:outputText value="#{car.color}" />
+           </h:column>
+
+        </h:dataTable>
+        
+		<br>
+		
+		<h:commandButton action="#{exporterBean.export}" value="Export as excel">
+			<mc:exporterActionListener for="tbl_cars" fileType="XLS" filename="excel"/>
+		</h:commandButton>			
+		
+		<br>
+		
+		<h:commandButton action="#{exporterBean.export}" value="Export as pdf">
+			<mc:exporterActionListener for="tbl_cars" fileType="PDF" filename="pdf"/>
+		</h:commandButton>
+			
+		
+    </h:form>
+
+
+<%@ include file="inc/page_footer.jsp" %>
+</div>
+</body>
+</f:view>
+</html>

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/exporter.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/outputClientId.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/outputClientId.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/outputClientId.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/outputClientId.jsp Thu Oct 20 10:49:18 2011
@@ -1,70 +1,70 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-
-        <h:messages showDetail="true" showSummary="false"/>
-        
-        <p>
-            <a href="javascript:void" onclick="testJavascript(event);return false;">Test link</a>
-
-            <script type="text/javascript">
-                function testJavascript(event) {
-                    var element = document.getElementById('<mc:outputClientId for="myContainer" />');
-                }
-            </script>
-        </p>
-        
-        <h:form id="myContainer">
-            mc:outputClientId  is useful when a component id is needed as reference within an inline javascript.
-            <ul>
-                <li>ClientId of containing container is <code><mc:outputClientId for="myContainer"/></code></li>
-                <li>ClientId of current parent is <code><mc:outputClientId /></code></li>
-            </ul>            
-        </h:form>
-<%@include file="inc/page_footer.jsp"%>
-</div>
-</body>
-
-</f:view>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+
+        <h:messages showDetail="true" showSummary="false"/>
+        
+        <p>
+            <a href="javascript:void" onclick="testJavascript(event);return false;">Test link</a>
+
+            <script type="text/javascript">
+                function testJavascript(event) {
+                    var element = document.getElementById('<mc:outputClientId for="myContainer" />');
+                }
+            </script>
+        </p>
+        
+        <h:form id="myContainer">
+            mc:outputClientId  is useful when a component id is needed as reference within an inline javascript.
+            <ul>
+                <li>ClientId of containing container is <code><mc:outputClientId for="myContainer"/></code></li>
+                <li>ClientId of current parent is <code><mc:outputClientId /></code></li>
+            </ul>            
+        </h:form>
+<%@include file="inc/page_footer.jsp"%>
+</div>
+</body>
+
+</f:view>
 </html>
\ No newline at end of file

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/outputClientId.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/renderOne.jsp
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/renderOne.jsp?rev=1186730&r1=1186729&r2=1186730&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/renderOne.jsp (original)
+++ myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/renderOne.jsp Thu Oct 20 10:49:18 2011
@@ -1,73 +1,73 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/converters"
-    prefix="mcc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/components"
-    prefix="mc"%>
-<%@ taglib uri="http://myfaces.apache.org/commons/validators"
-    prefix="mcv"%>
-
-<html>
-<f:view>
-
-<%@include file="inc/head.inc"%>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//-->
-
-<body>
-<div id="container">
-    <f:loadBundle
-        basename="org.apache.myfaces.examples.resource.example_messages"
-        var="example_messages" />
-
-   <h1><h:outputText value="#{example_messages['title']}"/></h1>
-   <br/>
-    <h:form>
-
-        <h:outputText value="Output:" />
-        <h:panelGrid columns="2">
-            <h:outputText value="'first' will display the first rendered child component only (will render only B):" />
-            <mc:renderOne>
-                <h:outputText value="<b>A - FirstItem</b>" rendered="#{renderOne.ARendered}" escape="false"/>
-                <h:outputText value="<b>B - SecondItem</b>" rendered="#{renderOne.BRendered}" escape="false"/>
-                <h:outputText value="<b>C - ThirdItem</b>" rendered="#{renderOne.CRendered}" escape="false"/>
-                <h:outputText value="<b>D - FourthItem</b>" rendered="#{renderOne.DRendered}" escape="false"/>
-            </mc:renderOne>
-
-            <h:outputText value="'index' will display the third component only (will render only C):" />
-            <mc:renderOne type="index" value="#{renderOne.index}">
-                <h:outputText value="<b>A - FirstItem</b>" rendered="#{renderOne.ARendered}" escape="false"/>
-                <h:outputText value="<b>B - SecondItem</b>" rendered="#{renderOne.BRendered}" escape="false"/>
-                <h:outputText value="<b>C - ThirdItem</b>" rendered="#{renderOne.CRendered}"  escape="false"/>
-                <h:outputText value="<b>D - FourthItem</b>" rendered="#{renderOne.DRendered}" escape="false"/>
-            </mc:renderOne>
-        
-        </h:panelGrid>
-        
-    </h:form>
-
-<%@include file="inc/page_footer.jsp" %>
-</div>
-</body>
-</f:view>
-</html>
+<%@ page session="false" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters"
+    prefix="mcc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/components"
+    prefix="mc"%>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators"
+    prefix="mcv"%>
+
+<html>
+<f:view>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+//-->
+
+<body>
+<div id="container">
+    <f:loadBundle
+        basename="org.apache.myfaces.examples.resource.example_messages"
+        var="example_messages" />
+
+   <h1><h:outputText value="#{example_messages['title']}"/></h1>
+   <br/>
+    <h:form>
+
+        <h:outputText value="Output:" />
+        <h:panelGrid columns="2">
+            <h:outputText value="'first' will display the first rendered child component only (will render only B):" />
+            <mc:renderOne>
+                <h:outputText value="<b>A - FirstItem</b>" rendered="#{renderOne.ARendered}" escape="false"/>
+                <h:outputText value="<b>B - SecondItem</b>" rendered="#{renderOne.BRendered}" escape="false"/>
+                <h:outputText value="<b>C - ThirdItem</b>" rendered="#{renderOne.CRendered}" escape="false"/>
+                <h:outputText value="<b>D - FourthItem</b>" rendered="#{renderOne.DRendered}" escape="false"/>
+            </mc:renderOne>
+
+            <h:outputText value="'index' will display the third component only (will render only C):" />
+            <mc:renderOne type="index" value="#{renderOne.index}">
+                <h:outputText value="<b>A - FirstItem</b>" rendered="#{renderOne.ARendered}" escape="false"/>
+                <h:outputText value="<b>B - SecondItem</b>" rendered="#{renderOne.BRendered}" escape="false"/>
+                <h:outputText value="<b>C - ThirdItem</b>" rendered="#{renderOne.CRendered}"  escape="false"/>
+                <h:outputText value="<b>D - FourthItem</b>" rendered="#{renderOne.DRendered}" escape="false"/>
+            </mc:renderOne>
+        
+        </h:panelGrid>
+        
+    </h:form>
+
+<%@include file="inc/page_footer.jsp" %>
+</div>
+</body>
+</f:view>
+</html>

Propchange: myfaces/commons/branches/jsf_20/examples/myfaces-commons-examples/src/main/webapp/renderOne.jsp
------------------------------------------------------------------------------
    svn:eol-style = native