You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/08/04 04:46:58 UTC
svn commit: r1153732 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main:
resources/ resources/META-INF/ resources/META-INF/faces-config.xml
webapp/test.xhtml
Author: violalu
Date: Thu Aug 4 02:46:57 2011
New Revision: 1153732
URL: http://svn.apache.org/viewvc?rev=1153732&view=rev
Log:
GERONIMO-5482 update el-testsuite, thanks the batch from Louis
Added:
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/faces-config.xml
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/faces-config.xml?rev=1153732&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/faces-config.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/resources/META-INF/faces-config.xml Thu Aug 4 02:46:57 2011
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<faces-config version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2.0.xsd">
+
+</faces-config>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml?rev=1153732&r1=1153731&r2=1153732&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml Thu Aug 4 02:46:57 2011
@@ -33,10 +33,10 @@
<h:body>
<table>
<tr>
- <td>Hi,<h:outputText value = "#{user.name}" /></td>
+ <td>Hello,<h:outputText value ="#{user.name}" /></td>
</tr>
<tr>
- <td>You will be <h:outputText value = "#{user.calYear(5)}" /> years old after five years.</td>
+ <td>You will be <h:outputText value ="#{user.calYear(5)}" /> years old after five years.</td>
</tr>
</table>
</h:body>