geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r497601 - in /geronimo/server/trunk/testsuite/web-testsuite: ./ test-2.1-jsps/ test-2.1-jsps/src/ test-2.1-jsps/src/main/ test-2.1-jsps/src/main/java/ test-2.1-jsps/src/main/java/com/ test-2.1-jsps/src/main/java/com/test/ test-2.1-jsps/src/...
Date Thu, 18 Jan 2007 22:16:07 GMT
Author: prasad
Date: Thu Jan 18 14:16:06 2007
New Revision: 497601

URL: http://svn.apache.org/viewvc?view=rev&rev=497601
Log:
* GERONIMO-2755
* web-testsuite/test-2.1-jsps
* Thanx Paul

Added:
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/web.xml
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
  (with props)
Modified:
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?view=diff&rev=497601&r1=497600&r2=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Thu Jan 18 14:16:06 2007
@@ -86,14 +86,21 @@
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>
                     
-                    <!-- Skipping this for now until Geronimo-2664 gets fixed.
-                     It hangs the jetty testrun.
                      
                     <plugin>
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>maven-maven-plugin</artifactId>
+                        <!-- Skipping servlets tests  for now until Geronimo-2664 gets
fixed.
+                         It hangs the jetty testrun.
+                        -->
+                        <configuration>
+                          <fileset>
+                            <excludes>
+                              <exclude>test-2.5-servlets/pom.xml</exclude>
+                            </excludes>
+                          </fileset>
+                        </configuration>
                     </plugin>
-                    -->
 
                 </plugins>
             </build>

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Thu Jan 18 14:16:06
2007
@@ -0,0 +1,123 @@
+<?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>web-testsuite</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>test-2.1-jsps</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test JSPs</name>
+    <packaging>war</packaging>
+    
+
+    <description>
+        Tests for the test-deployables.
+        maven-maven-plugin:invoke executes the 'child' profile.
+        Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                    <artifactId>tools-maven-plugin</artifactId>
+                    <extensions>true</extensions>
+                  </plugin>
+
+                    <!--
+                     FIXME: Need to reset the default values here since our parent sets up
wars
+                     for use with jspc.  Remove once parent pom has been fixed.
+                     -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</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}/${artifactId}-${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>Samples/SampleJsp/2.0/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,37 @@
+/**
+ *  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 com.test.jsp;
+
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+public class HelloTag extends TagSupport {
+   public int doStartTag() throws JspException {
+      try {
+          pageContext.getOut().print("Hello");
+      } catch (Exception e) {
+          throw new JspTagException(e.getMessage());
+      }
+      return SKIP_BODY;
+   }
+   public int doEndTag() {
+      return EVAL_PAGE;
+   }
+}

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/test/jsp/HelloTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,28 @@
+<?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-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+  <dep:environment>
+    <dep:moduleId>
+      <dep:groupId>Samples</dep:groupId>
+      <dep:artifactId>SampleJsp</dep:artifactId>
+      <dep:version>2.0</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+  </dep:environment>
+  <context-root>/jsp21</context-root>
+</web-app>

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

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+    <tlibversion>0.1</tlibversion>
+    <jspversion>2.1</jspversion>
+    <shortname>test taglib</shortname>
+    <uri>/tlt</uri>
+    <tag>
+       <name>hello</name>
+       <tagclass>com.test.jsp.HelloTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/web.xml?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/web.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/web.xml
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="testapp" version="2.5" 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_2_5.xsd">
+	<display-name>jsptest</display-name>
+        <welcome-file-list>
+                <welcome-file>index.html</welcome-file>
+        </welcome-file-list>
+</web-app>

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

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,6 @@
+<ul>
+<li><a href="testDeferral.jsp">testDeferral.jsp</a>
+<li><a href="testScopes.jsp">testScopes.jsp</a>
+<li><a href="testTrimWhitespace.jsp">testTrimWhitespace.jsp</a>
+<li><a href="testTaglibs.jsp">testTaglibs.jsp</a>
+</ul>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head><title>test</title></head>
+<% 
+java.util.ArrayList locations = new java.util.ArrayList();
+locations.add("One");
+locations.add("Two");
+pageContext.setAttribute("locations", locations);
+%>
+<body>
+<c:forEach var="location" items="#{locations}">
+<c:out value="${location}"/>
+</c:forEach>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testDeferral.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head><title>test</title></head>
+<body>
+<c:set var="var1" value="value1" scope="page"/>
+<c:set var="var2" value="value2" scope="request"/>
+<c:set var="var3" value="value3" scope="session"/>
+<c:set var="var4" value="value4" scope="application"/>
+<c:out value='${pageScope.var1}' />
+<c:out value='${requestScope.var2}' />
+<c:out value='${sessionScope.var3}' />
+<c:out value='${applicationScope.var4}' />
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,8 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<%@ taglib uri="/tlt" prefix="tlt" %>
+<html>
+<head><title>test</title></head>
+<body>
+<tlt:hello/>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTaglibs.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,19 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<html>
+<head><title>test</title></head>
+<body>source html of this page should not contain empty lines<%--
+
+
+
+
+
+
+                    this whitespace should be trimmed in the JSP output
+
+
+
+
+
+
+--%></body>
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testTrimWhitespace.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,59 @@
+/**
+ *  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.jsps;
+
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+public class TestJsps extends SeleniumTestSupport
+{
+
+    @Test
+    public void testDeferral() throws Exception {
+        selenium.open("/jsp21/testDeferral.jsp");
+        selenium.waitForPageToLoad("30000");
+        
+        //throw new Exception(selenium.getText("xpath=/html/body"));
+        assertEquals("One Two", selenium.getText("xpath=/html/body"));
+    }
+
+    @Test
+    public void testScopes() throws Exception {
+        selenium.open("/jsp21/testScopes.jsp");
+        selenium.waitForPageToLoad("30000");
+        assertEquals("value1 value2 value3 value4", selenium.getText("xpath=/html/body"));
+    }
+
+    @Test
+    public void testTaglibs() throws Exception {
+        selenium.open("/jsp21/testTaglibs.jsp");
+        selenium.waitForPageToLoad("30000");
+        assertEquals("Hello", selenium.getText("xpath=/html/body"));
+    }
+
+    @Test
+    public void testTrimWhitespace() throws Exception {
+        selenium.open("/jsp21/testTrimWhitespace.jsp");
+        selenium.waitForPageToLoad("30000");
+        assertEquals("source html of this page should not contain empty lines", selenium.getText("xpath=/html/body"));
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml?view=auto&rev=497601
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
Thu Jan 18 14:16:06 2007
@@ -0,0 +1,31 @@
+<?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="5">
+    <test name="web-testsuite.jsps">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.jsps"/>
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message