jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r767821 - in /jakarta/taglibs/proper/standard/trunk/standard-test: ./ src/ src/main/ src/main/java/ src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/org/ src/main/webapp/org/apache/ src/main/webapp/org/apache/taglibs/ src/main/weba...
Date Thu, 23 Apr 2009 07:03:37 GMT
Author: bayard
Date: Thu Apr 23 07:03:35 2009
New Revision: 767821

URL: http://svn.apache.org/viewvc?rev=767821&view=rev
Log:
Attempt at a separate Maven2 build for the Cactus tests, attempting to run th
em in Jetty. Not complete yet. 

Added:
    jakarta/taglibs/proper/standard/trunk/standard-test/
    jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/java/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java   (with props)
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/
    jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java   (with props)

Added: jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml Thu Apr 23 07:03:35 2009
@@ -0,0 +1,234 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<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.taglibs</groupId>
+    <artifactId>taglibs-parent</artifactId>
+    <version>1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>taglibs-standard-test</artifactId>
+  <version>1.2-SNAPSHOT</version>
+  <name>Jakarta Standard Taglib Cactus Tests</name>
+  <packaging>war</packaging>
+
+  <inceptionYear>2003</inceptionYear>
+  <description>
+    The Cactus tests for the Jakarta Standard JSTL implementation
+  </description>
+
+  <url>http://jakarta.apache.org/taglibs/standard/</url>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/taglibs/proper/standard/trunk/standard-test</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/taglibs/proper/standard/trunk/standard-test</developerConnection>
+    <url>http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test</url>
+  </scm>
+
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <name>Apache Website</name>
+      <url>scpexe://people.apache.org/www/jakarta.apache.org/taglibs/standard/standard-test/</url>
+    </site>
+  </distributionManagement>
+
+  <developers>
+    <developer><name>Henri Yandell</name></developer>
+    <developer><name>Bjorn Townsend</name></developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>el-api</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.cactus</groupId>
+      <artifactId>cactus.core.framework.javaEE.12-13-14</artifactId>
+      <version>1.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies> 
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.cactus</groupId>
+        <artifactId>cactus.integration.maven2</artifactId>
+        <version>1.8.1</version>
+        <configuration>
+          <srcFile>target/taglibs-standard-test-1.2-SNAPSHOT.war</srcFile>
+          <destFile>cactifiedByMaven2.war</destFile>
+        </configuration>
+        <executions>
+          <execution>
+            <id>cactus-cactifywar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>cactifywar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <version>1.0-beta-2</version>
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <wait>false</wait>
+          <timeout>20000</timeout>
+          <container>
+            <containerId>tomcat5x</containerId>
+            <zipUrlInstaller>
+              <url>http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip</url>
+              <installDir>${basedir}/install</installDir>
+            </zipUrlInstaller>
+          </container>
+          <configuration>
+             <deployables>
+              <deployable>
+                 <location>cactifiedByMaven2.war</location>
+                 <pingURL>http://localhost:8080/jstl_test/</pingURL>
+                 <properties>
+                    <context>/jstl_test</context>
+                 </properties>
+              </deployable>
+            </deployables>
+          </configuration>
+        </configuration> 
+      </plugin>
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      <!--
+        <executions>
+          <execution>
+            <id>surefire-it</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>false</skip>
+              <systemProperties>
+                <property>
+                  <name>cactus.contextURL</name>
+                  <value>http://localhost:8080/taglibs-standard-test/</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </execution>
+        </executions>
+      -->
+      </plugin>
+
+      <!--
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8080</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+
+    </plugins>
+  </build>
+
+
+</project>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml Thu Apr 23 07:03:35 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <description>jstl test</description>
+    <display-name>jstl test</display-name>
+<!--
+    <filter>
+        <filter-name>FilterRedirectory</filter-name>
+        <filter-class>
+            org.apache.cactus.server.FilterTestRedirector
+        </filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>FilterRedirector</filter-name>
+        <url-pattern>/FilterRedirector</url-pattern>
+    </filter-mapping>
+-->
+
+    <servlet>
+        <servlet-name>ServletRedirector</servlet-name>
+        <servlet-class>
+            org.apache.cactus.server.ServletTestRedirector
+        </servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JspRedirector</servlet-name>
+        <jsp-file>/jspRedirector.jsp</jsp-file>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>ServletRedirector</servlet-name>
+        <url-pattern>/ServletRedirector</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>JspRedirector</servlet-name>
+        <url-pattern>/JspRedirector</url-pattern>
+    </servlet-mapping>
+    
+</web-app>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,5 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fm" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<c:set var="var1" value="${fm:endsWith('abcda','a')}" scope="application"/>
+

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/functions/TestEndsWith.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,5 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<c:set var="genurl" scope="application">
+  <c:url context="/foo/" value="/test.jsp"/>
+</c:set>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test34109.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,23 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<c:import url="/org/apache/taglibs/standard/tag/el/core/Test37466.xml" varReader="xmlSource">
+<%
+	java.io.StringReader o = (java.io.StringReader)pageContext.getAttribute("xmlSource");
+	System.out.println("o: " + o);
+	char[] buf = new char[1];
+	while (o.read(buf) > 0)
+	{
+		System.out.print(buf);
+	}
+	System.out.println("");
+	System.out.println("------");
+	o.reset();
+%>
+	<x:parse xml="${xmlSource}" var="xmldoc" />
+</c:import>
+<%
+	System.out.println("XX parsed ok");
+%>
+
+worked: ${xmldoc}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml Thu Apr 23 07:03:35 2009
@@ -0,0 +1,3 @@
+<foo>
+	data data data
+</foo>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/Test37466.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,4 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<c:set var="var1" value="value1" scope="application"/>
+<c:out value="${var1}"/>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestSetTag.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,18 @@
+<!-- Use this via the web browser to show that things are fine             -->
+<!-- Unfortunately with Cactus the server isn't getting the correct locale -->
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<jsp:useBean id="date" class="java.util.Date" />
+
+<fmt:formatDate value="${date}" var="varDate" scope="application" pattern="yyyy-MM-dd"/>
+<c:out value="${varDate}"/>
+
+<fmt:formatDate value="${date}" var="varTime" scope="application" pattern="HH:mm:ss" type="time"/>
+<c:out value="${varTime}"/>
+
+<fmt:formatDate value="${date}" dateStyle="short" var="varDate2" scope="application"/>
+<c:out value="${varDate2}"/>
+
+<fmt:formatDate value="${date}" timeStyle="short" var="varTime2" scope="application" type="time"/>
+<c:out value="${varTime2}"/>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
+
+
+  <sql:setDataSource url="jdbc:derby:cactustest" driver="org.apache.derby.jdbc.EmbeddedDriver"/>
+
+  <sql:query var="db">
+    SELECT id, name, id as id1, name as name1, id as id2, name as name2 FROM Bug33054
+  </sql:query>
+
+  <c:set var="bug33054" value="" scope="application"/>
+  <c:forEach var="row" items="${db.rows}">
+      <c:forEach var="column" items="${row}">
+        <c:set var="bug33054" value="${bug33054}${column}" scope="application"/>
+      </c:forEach>
+  </c:forEach>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test33054.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
+
+
+  <sql:setDataSource url="jdbc:derby:cactustest" driver="org.apache.derby.jdbc.EmbeddedDriver"/>
+
+  <sql:query var="db">
+    SELECT name as wonka FROM Bug43831
+  </sql:query>
+
+  <c:set var="bug43831Label" value="" scope="application"/>
+  <c:set var="bug43831Name" value="" scope="application"/>
+  <c:forEach var="row" items="${db.rows}">
+      <c:set var="bug43831Label" value="${row.wonka}" scope="application"/>
+      <c:set var="bug43831Name" value="${row.name}" scope="application"/>
+  </c:forEach>
+
+  <c:forEach var="columnName" items="${db.columnNames}">
+      <c:set var="bug43831" value="${columnName}" scope="application"/>
+  </c:forEach>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/sql/Test43831.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+
+<x:parse var="sample">
+<sample>
+  <link href="/org/apache/taglibs/standard/tag/el/xml/Test30068.xml"/>
+</sample>
+</x:parse>
+
+<x:forEach select="$sample/sample/link">
+  <c:set var="link">
+    <x:out select="@href"/>
+  </c:set>
+
+  <c:import url="${link}" varReader="r2">
+    <x:parse var="sample2" doc="${r2}"/>
+  </c:import>
+
+  <!-- *** this does not work *** -->
+  <c:set var="correct" scope="application"><x:out select="$sample2/sample/text"/></c:set>
+
+  <!-- this does work, but is not correct -->
+  <c:set var="incorrect" scope="application"><x:out select="$sample2/text"/></c:set>
+
+</x:forEach>
+
+<!-- for manual testing -->
+Correct: ${correct}<br/>
+Incorrect: ${incorrect}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml Thu Apr 23 07:03:35 2009
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<sample>
+  <text>42</text>
+</sample>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp Thu Apr 23 07:03:35 2009
@@ -0,0 +1,8 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
+
+<x:parse xml="<content/>" var="doc" scope="request" />
+
+<x:forEach select="$doc//*">
+    foo
+</x:forEach>

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/xml/Test35216.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,47 @@
+/*
+ * 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.taglibs.standard.functions;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class TestEndsWith
+    extends JspTestCase {
+
+    public TestEndsWith(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testEndsWith() throws Exception {
+        String var = "var1";
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+        Boolean actual = (Boolean) pageContext.getAttribute(var,
+            PageContext.APPLICATION_SCOPE);
+        assertEquals(Boolean.TRUE, actual);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,46 @@
+/*
+ * 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.taglibs.standard.tag.el.core;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test34109 extends JspTestCase {
+
+    public Test34109(String name) {
+	super(name);
+    }
+
+    protected void setUp() throws Exception {
+	super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+	super.tearDown();
+    }
+
+    public void test34109() throws Exception {
+	String toInclude = TestUtil.getTestJsp(this);
+	pageContext.include(toInclude);
+
+	String genurl = (String) pageContext.getAttribute("genurl", PageContext.APPLICATION_SCOPE);
+
+	assertEquals("The URL should be /foo/test.jsp", "/foo/test.jsp", genurl);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,54 @@
+/*
+ * 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.taglibs.standard.tag.el.core;
+
+import java.net.*;
+import javax.servlet.jsp.*;
+import javax.servlet.http.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test37466 extends JspTestCase {
+
+    public Test37466(String name) {
+	super(name);
+    }
+
+    protected void setUp() throws Exception {
+	super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+	super.tearDown();
+    }
+
+    public void test37466() throws Exception {
+	String serverName = pageContext.getRequest().getServerName();
+	int serverPort = pageContext.getRequest().getServerPort();
+	String contextPath = ( (HttpServletRequest) pageContext.getRequest() ).getContextPath();
+	String jspPath = TestUtil.getTestJsp(this);
+	String testPath = "http://" + serverName + ":" + serverPort + contextPath + jspPath;;
+
+	URL url = new URL(testPath);
+	HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+	connection.setRequestMethod("HEAD");
+	
+	String responseCode = Integer.toString(connection.getResponseCode());
+	assertEquals(testPath + "The response code should be 200", "200", responseCode);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,49 @@
+/*
+ * 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.taglibs.standard.tag.el.core;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class TestSetTag
+    extends JspTestCase {
+//    private SetTag setTag = null;
+
+    public TestSetTag(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testSetTag() throws Exception {
+        String var = "var1";
+        String expected = "value1";
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+        String actual = (String) pageContext.getAttribute(var,
+            PageContext.APPLICATION_SCOPE);
+        assertEquals(expected, actual);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,50 @@
+/*
+ * 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.taglibs.standard.tag.el.fmt;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class TestDateTag extends JspTestCase {
+
+    public TestDateTag(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testDateTag() throws Exception {
+        String var = "varDate";
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+        String actual = (String) pageContext.getAttribute(var, PageContext.APPLICATION_SCOPE);
+
+        // This isn't desired; Cactus doesn't set things up right
+        assertEquals(new java.util.Date().toString().length(), actual.length());
+        
+        // Ideally we would run this, or something like it
+//        assertEquals("yyyy-MM-dd".length(), actual.length());
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,69 @@
+/*
+ * 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.taglibs.standard.tag.el.sql;
+
+import java.sql.*;
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test33054 extends JspTestCase {
+
+    public Test33054(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        Connection conn = DriverManager.getConnection("jdbc:derby:cactustest;create=true");
+        Statement stmt = conn.createStatement();
+        try { stmt.execute("DROP TABLE Bug33054"); } catch(SQLException sqle) { } // ignore
+        stmt.execute("CREATE TABLE Bug33054 ( id int primary key, name varchar(80) )");
+        stmt.execute("INSERT INTO Bug33054 VALUES(1, 'a')");
+
+        ResultSet rs = stmt.executeQuery("SELECT * FROM Bug33054");
+        rs.next();
+        assertEquals( 1, rs.getInt(1) );
+        assertEquals( "a", rs.getString(2) );
+
+        rs.close();
+        stmt.close();
+        conn.close();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        Connection conn = DriverManager.getConnection("jdbc:derby:cactustest");
+        Statement stmt = conn.createStatement();
+        stmt.execute("DROP TABLE Bug33054");
+        stmt.close();
+        conn.close();
+    }
+
+    public void test33054() throws Exception {
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+
+        String data = (String) pageContext.getAttribute("bug33054", PageContext.APPLICATION_SCOPE);
+
+        // This fails and isn't something that can easily be fixed. 
+        // See: http://issues.apache.org/bugzilla/show_bug.cgi?id=33054
+        //assertEquals( "ID=1NAME=1" + "ID1=1NAME1=a" + "ID2=1NAME2=a", data );
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,71 @@
+/*
+ * 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.taglibs.standard.tag.el.sql;
+
+import java.sql.*;
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test43831 extends JspTestCase {
+
+    public Test43831(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        Connection conn = DriverManager.getConnection("jdbc:derby:cactustest;create=true");
+        Statement stmt = conn.createStatement();
+        try { stmt.execute("DROP TABLE Bug43831"); } catch(SQLException sqle) { } // ignore
+        stmt.execute("CREATE TABLE Bug43831 ( id int primary key, name varchar(80) )");
+        stmt.execute("INSERT INTO Bug43831 VALUES(1, 'a')");
+
+        ResultSet rs = stmt.executeQuery("SELECT * FROM Bug43831");
+        rs.next();
+        assertEquals( 1, rs.getInt(1) );
+        assertEquals( "a", rs.getString(2) );
+
+        rs.close();
+        stmt.close();
+        conn.close();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        Connection conn = DriverManager.getConnection("jdbc:derby:cactustest");
+        Statement stmt = conn.createStatement();
+        stmt.execute("DROP TABLE Bug43831");
+        stmt.close();
+        conn.close();
+    }
+
+    public void test43831() throws Exception {
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+
+        String label = (String) pageContext.getAttribute("bug43831Label", PageContext.APPLICATION_SCOPE);
+        String name = (String) pageContext.getAttribute("bug43831Name", PageContext.APPLICATION_SCOPE);
+        String column = (String) pageContext.getAttribute("bug43831", PageContext.APPLICATION_SCOPE);
+
+        assertEquals( "Failed to find 'label'", "a", label);
+        assertNull( "Failed to not find 'name'", name);
+        assertEquals( "Failed to find label as column name", "wonka", column.toLowerCase());
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,48 @@
+/*
+ * 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.taglibs.standard.tag.el.xml;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test30068 extends JspTestCase {
+
+    public Test30068(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void test30068() throws Exception {
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+
+        String correct = (String) pageContext.getAttribute("correct", PageContext.APPLICATION_SCOPE);
+        String incorrect = (String) pageContext.getAttribute("incorrect", PageContext.APPLICATION_SCOPE);
+
+        assertEquals("The incorrect answer is not an empty string", "", incorrect);
+        assertEquals("The correct answer would be 42", "42", correct);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,44 @@
+/*
+ * 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.taglibs.standard.tag.el.xml;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test35216 extends JspTestCase {
+
+    public Test35216(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void test35216() throws Exception {
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+
+        // fail case throws an exception; so nothing further needed
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java?rev=767821&view=auto
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java (added)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java Thu Apr 23 07:03:35 2009
@@ -0,0 +1,38 @@
+/*
+ * 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.taglibs.standard.testutil;
+
+/**
+ * Helper class for Cactus tests
+ */
+public class TestUtil {
+    
+    private TestUtil() {}
+
+    /**
+     * Gets the corresponding test jsp for this test case.  As a convention,
+     * test class and test jsp should have the same package and directory
+     * structure, and the same base name.
+     * @return a context-relative path to the test jsp.
+     */
+     public static String getTestJsp(Object obj) {
+         String className = obj.getClass().getName();
+         String baseName = className.replace('.', '/');
+         return "/" + baseName + ".jsp";
+     }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org


Mime
View raw message