geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r980371 - in /geronimo/server/trunk/testsuite/javaee6-testsuite: ./ jsp2.2-test/ jsp2.2-test/src/ jsp2.2-test/src/main/ jsp2.2-test/src/main/webapp/ jsp2.2-test/src/main/webapp/WEB-INF/ jsp2.2-test/src/main/webapp/defaultCtype/ jsp2.2-test/...
Date Thu, 29 Jul 2010 09:10:31 GMT
Author: xiaming
Date: Thu Jul 29 09:10:30 2010
New Revision: 980371

URL: http://svn.apache.org/viewvc?rev=980371&view=rev
Log:
GERONIMO-5481 committed the new test cases for JSP 2.2 new features provided by Guang Zhe
Wang

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/web.xml
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/index.html
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
  (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/testng.xml
  (with props)
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml Thu Jul 29 09:10:30
2010
@@ -0,0 +1,122 @@
+<?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.
+-->
+<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>jsp2.2-test</artifactId>
+	<name>Geronimo TestSuite :: Java EE 6 Testsuite :: jsp2.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>
+	<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/jsp2.2-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
Thu Jul 29 09:10:30 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/jsp2.2-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/web.xml?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/web.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/WEB-INF/web.xml
Thu Jul 29 09:10:30 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.
+-->
+
+<!-- $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>jsp2.2-javaee6 Testsuite</description>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    <jsp-config>
+    	<jsp-property-group>
+    		<url-pattern>/defaultCtype/*</url-pattern>
+    		<default-content-type>text/xml</default-content-type>    		
+    	</jsp-property-group>
+    	<jsp-property-group>
+    		<url-pattern>/error/page1.jsp</url-pattern>
+    		<error-on-undeclared-namespace>true</error-on-undeclared-namespace>
+    	</jsp-property-group>
+    </jsp-config>
+</web-app>

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
Thu Jul 29 09:10:30 2010
@@ -0,0 +1,25 @@
+<!--
+   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.
+-->
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<html>
+<head>
+<title>Page with contentType uses tag:default-content-type.</title>
+</head>
+<body>
+<h3>Page with contentType uses tag:default-content-type which value is text/xml.</h3>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page1.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
Thu Jul 29 09:10:30 2010
@@ -0,0 +1,25 @@
+<!--
+   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.
+-->
+<%@ page pageEncoding="UTF-8" %>
+<html>
+<head>
+<title>Page without contentType.</title>
+</head>
+<body>
+<h3>Page without contentType uses tag: default-content-type which value is text/xml.</h3>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/defaultCtype/page2.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
Thu Jul 29 09:10:30 2010
@@ -0,0 +1,26 @@
+<!--
+   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.
+-->
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<html>
+<head>
+<title>Page with tag: error-on-undeclared-namespace = true.</title>
+</head>
+<body>
+<h3>Page with tag: error-on-undeclared-namespace = true.</h3>
+<qq:value>error namespace value</qq:value>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page1.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
Thu Jul 29 09:10:30 2010
@@ -0,0 +1,26 @@
+<!--
+   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.
+-->
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<html>
+<head>
+<title>Page with tag: error-on-undeclared-namespace = false.</title>
+</head>
+<body>
+<h3>Page with tag: error-on-undeclared-namespace = false.</h3>
+<qq:value>error namespace value</qq:value>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/error/page2.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/index.html?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/index.html
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/main/webapp/index.html
Thu Jul 29 09:10:30 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>
+<body>
+<a href="./defaultCtype/page1.jsp">Page with contentType.</a><br />
+<a href="./defaultCtype/page2.jsp">Page without contentType.</a><br />
+<a href="./error/page1.jsp">Page with tag: error-on-undeclared-namespace = true.</a><br
/>
+<a href="./error/page2.jsp">Page with tag: error-on-undeclared-namespace = false.</a><br
/>
+</body>
+</html>

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
Thu Jul 29 09:10:30 2010
@@ -0,0 +1,70 @@
+/**
+ *  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.jsp22;
+
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+public class TestJSP extends SeleniumTestSupport {
+
+	@Test
+	public void testWithDefaultContentType() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=Page with contentType.");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("Page with contentType uses tag:default-content-type which value is text/xml."));
+		assertFalse(selenium.isTextPresent("<html>"));
+	}
+
+	// XML page test error in Selenium. This test is excluded at this time.
+	@Test
+	public void testWithoutDefaultContentType() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=Page without contentType.");
+		waitForPageLoad();
+		assertTrue(selenium.isTextPresent("<html>"));
+		assertTrue(selenium
+				.isTextPresent("Page without contentType uses tag: default-content-type which value is
text/xml."));
+	}
+
+	@Test
+	public void testWithErrorNamespace() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=Page with tag: error-on-undeclared-namespace = true.");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("A custom tag was encountered with an undeclared namespace [qq]"));
+	}
+
+	@Test
+	public void testWithoutErrorNamespace() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=Page with tag: error-on-undeclared-namespace = false.");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("Page with tag: error-on-undeclared-namespace = false."));
+		assertTrue(selenium.isTextPresent("error namespace value"));
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/testng.xml?rev=980371&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/resources/testng.xml
Thu Jul 29 09:10:30 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="Java EE 6-JSP2.2-Testsuite">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.jsp22"/>
+        </packages>
+        <classes>
+        	<class name="org.apache.geronimo.testsuite.jsp22.TestJSP">
+        		<methods>
+        			<exclude name="testWithoutDefaultContentType"></exclude>
+        		</methods>
+        	</class>
+        </classes>
+    </test>
+</suite>
+

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

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

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

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml?rev=980371&r1=980370&r2=980371&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Thu Jul 29 09:10:30 2010
@@ -56,6 +56,8 @@
         <module>servlet3.0-test</module>
         <module>servlet3.0-security-test</module>
         <module>ejb3.1lite-test</module>
+        <module>el2.2-test</module>
+        <module>jsp2.2-test</module>
     </modules>
 
 </project>



Mime
View raw message