geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r980368 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/geronimo/ src/main/java/org/apache/geronimo/testsuite/ src/ma...
Date Thu, 29 Jul 2010 09:03:32 GMT
Author: xiaming
Date: Thu Jul 29 09:03:31 2010
New Revision: 980368

URL: http://svn.apache.org/viewvc?rev=980368&view=rev
Log:
GERONIMO-5482 commit this new test cases provided by Guang Zhe Wang

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/test.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
  (with props)

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml Thu Jul 29 09:03:31
2010
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>javaee6-testsuite</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>el2.2-test</artifactId>
+	<name>Geronimo TestSuite :: Java EE 6 Testsuite :: el2.2-test</name>
+	<packaging>war</packaging>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_2.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.2_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.myfaces.core</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<version>2.0.0</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>it</id>
+			<activation>
+				<property>
+					<name>it</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>selenium-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.geronimo.buildsupport</groupId>
+						<artifactId>geronimo-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>deploy-wars</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+								</configuration>
+							</execution>
+							<execution>
+								<id>undeploy-war-as-moduleId</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy-module</goal>
+								</goals>
+								<configuration>
+									<moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<configuration>
+							<suiteXmlFiles>
+								<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+							<systemPropertyVariables>
+								<appContext>${project.artifactId}</appContext>
+							</systemPropertyVariables>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,41 @@
+/**
+ *  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.geronimo.testsuite.el22.app;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+@ManagedBean
+@RequestScoped
+public class User {
+	private String name;
+	private int age;
+
+	public String getName() {
+		return name;
+	}
+	public int getAge() {
+		return age;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public void setAge(int age) {
+		this.age = age;
+	}
+	public int calYear(int x) {
+		return (age + x);
+	}
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
+      <sys:version>${project.version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${project.artifactId}</context-root>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app version="3.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-app_3_0.xsd"
id="el2.2-javaee6">
+
+    <description>el2.2-javaee6 Servlet Sample</description>
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>    
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+        <!--<welcome-file>faces/criteriaapi/index.xhtml</welcome-file>-->
+    </welcome-file-list>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,55 @@
+<!--
+   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.
+-->
+
+<html>
+    <head>
+        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
  
+        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache
Geronimo Sample Applications</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    </head>
+    
+    <body onload="init()">
+        
+        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif"
border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tbody>
+                <tr>
+                    <td valing="top" align="left">
+                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif"
border="0"></a>
+                    </td>
+                    <td width="100%">
+                        &nbsp;
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        
+        <table border="0" cellpadding="2" cellspacing="0" width="100%">
+            <tbody>
+                <tr class="topBar">
+                    <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                        &nbsp;<a href="http://geronimo.apache.org/" title="Apache
Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/"
title="Geronimo Documentation"target="_blank">Documentation</a> | <a href="http://cwiki.apache.org/GMOxSAMPLES/"
title="Sample Applications"target="_blank">Sample Applications</a>
+                    </td>
+                    <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                        <a href="xref/index.html" target="source_window">Source Code</a>
| <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+    </body>
+</html>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,29 @@
+<!--
+   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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
class="cell"">
+<html>
+<head>
+  <title>Apache Geronimo Sample Application</title>
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="86px,*" frameborder="0">
+    <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0"
marginwidth="0" noresize scrolling="no">
+    <FRAME src="./faces/index.xhtml" name="sampleDocumentFrame" title="Sample Document
Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="yes">
+</FRAMESET>
+  
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.xhtml?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.xhtml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/webapp/index.xhtml
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+   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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+<h:head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link href="./css/default.css" rel="stylesheet"
+		type="text/css" />
+	<title>EL2.2 Testsuite</title>
+</h:head>
+
+<h:body>
+	<h:form id="el">
+		<table>
+			<tr>
+				<td>Please enter your name:</td>
+				<td>
+					<h:inputText label = "name" id = "name" value = "#{user.name}" required = "true"
/>
+				</td>
+			</tr>
+			<tr>
+				<td>Please enter your age:</td>
+				<td>
+					<h:inputText label = "age" id = "age" value = "#{user.age}" required = "true" />
+				</td>
+			</tr>
+		</table>
+		<h:commandButton id ="button" value = "Enter" action = "test.xhtml" />
+	</h:form>
+</h:body>
+
+</html>

Added: 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=980368&view=auto
==============================================================================
--- 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/webapp/test.xhtml
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+   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.
+-->
+<!--This app test Method invocation with param in EL 2.2-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+<h:head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link href="./css/default.css" rel="stylesheet"
+		type="text/css" />
+	<title>EL2.2 Sample</title>
+</h:head>
+
+<h:body>
+	<table>
+			<tr>
+				<td>Hi,<h:outputText value = "#{user.name}" /></td>
+			</tr>
+			<tr>
+				<td>You will be <h:outputText value = "#{user.calYear(5)}" /> years old after
five years.</td>
+			</tr>
+		</table>
+</h:body>
+
+</html>

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,39 @@
+/**
+ *  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.geronimo.testsuite.el22;
+
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+public class TestEL extends SeleniumTestSupport {
+
+	@Test
+	public void testMethodWithParameters() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.selectFrame("sampleDocumentFrame");
+		selenium.type("el:name", "qq");
+		selenium.type("el:age", "6");
+		selenium.click("el:button");
+		waitForPageLoad();
+		assertTrue(selenium.isTextPresent("Hello,qq"));
+		assertTrue(selenium.isTextPresent("You will be 11 years old after five years."));
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml?rev=980368&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
Thu Jul 29 09:03:31 2010
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="Java EE 6-EL2.2-Testsuite">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.el22"/>
+        </packages>
+    </test>
+</suite>
+

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message