geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r903902 - in /geronimo/server/trunk/testsuite/web-testsuite: ./ test-tld/ test-tld/test-tld-jar/ test-tld/test-tld-jar/src/ test-tld/test-tld-jar/src/main/ test-tld/test-tld-jar/src/main/java/ test-tld/test-tld-jar/src/main/java/org/ test-t...
Date Wed, 27 Jan 2010 23:26:37 GMT
Author: gawor
Date: Wed Jan 27 23:26:36 2010
New Revision: 903902

URL: http://svn.apache.org/viewvc?rev=903902&view=rev
Log:
GERONIMO-5051: added test case for tld scanning

Added:
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
  (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/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?rev=903902&r1=903901&r2=903902&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Wed Jan 27 23:26:36 2010
@@ -56,6 +56,7 @@
                 <module>test-tomcat</module>
                 <module>test-web-forward</module>
                 <module>test-web-references</module>
+                <module>test-tld</module>
             </modules>
         </profile>
     </profiles>

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt Wed Jan 27 23:26:36 2010
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/pom.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/pom.xml Wed Jan 27 23:26:36 2010
@@ -0,0 +1,42 @@
+<?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>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>test-tld</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test TLD</name>
+    <packaging>pom</packaging>
+    
+    <modules>
+        <module>test-tld-jar</module>
+        <module>test-tld-war</module>
+    </modules>
+
+</project>

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

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/pom.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/pom.xml Wed Jan 27
23:26:36 2010
@@ -0,0 +1,45 @@
+<?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>test-tld</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>test-tld-jar</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test TLD Jar</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

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

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,39 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.testsuite.taglib;
+
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+public class TestTag extends TagSupport {
+
+   public int doStartTag() throws JspException {
+      try {
+          pageContext.getOut().print("TestTag");
+      } 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-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/java/org/apache/geronimo/testsuite/taglib/TestTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,30 @@
+<?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">
+<!--
+   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.
+-->
+<taglib>
+    <tlibversion>0.1</tlibversion>
+    <jspversion>2.1</jspversion>
+    <shortname>testtaglib</shortname>
+    <uri>http://geronimo.apache.org/jar</uri>
+    <tag>
+       <name>jar</name>
+       <tagclass>org.apache.geronimo.testsuite.taglib.TestTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-jar/src/main/resources/META-INF/embedded.tld
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml Wed Jan 27
23:26:36 2010
@@ -0,0 +1,103 @@
+<?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>test-tld</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>test-tld-war</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test TLD War</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>test-tld-jar</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-wars</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${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>${groupId}/${artifactId}/${version}/war</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
Wed Jan 27 23:26:36 2010
@@ -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 org.apache.geronimo.testsuite.jsps;
+
+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-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/java/org/apache/geronimo/testsuite/jsps/HelloTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Jan 27 23:26:36 2010
@@ -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>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
+      <dep:type>war</dep:type>
+    </dep:moduleId>
+  </dep:environment>
+  <context-root>/tld</context-root>
+</web-app>

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

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:executable = *

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,30 @@
+<?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">
+<!--
+   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.
+-->
+<taglib>
+    <tlibversion>0.1</tlibversion>
+    <jspversion>2.1</jspversion>
+    <shortname>localtesttaglib</shortname>
+    <uri>http://geronimo.apache.org/local</uri>
+    <tag>
+       <name>local</name>
+       <tagclass>org.apache.geronimo.testsuite.jsps.HelloTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.tld
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,30 @@
+<?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">
+<!--
+   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.
+-->
+<taglib>
+    <tlibversion>0.1</tlibversion>
+    <jspversion>2.1</jspversion>
+    <shortname>webtesttaglib</shortname>
+    <uri>http://geronimo.apache.org/web</uri>
+    <tag>
+       <name>web</name>
+       <tagclass>org.apache.geronimo.testsuite.jsps.HelloTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/taglib.wtld
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml
Wed Jan 27 23:26:36 2010
@@ -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.
+-->
+<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>tldtest</display-name>
+        <welcome-file-list>
+                <welcome-file>index.html</welcome-file>
+        </welcome-file-list>
+
+<jsp-config>
+  <taglib>
+    <taglib-uri>http://geronimo.apache.org/web</taglib-uri>
+    <taglib-location>/WEB-INF/taglib.wtld</taglib-location>
+  </taglib>
+</jsp-config>
+
+</web-app>

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

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:executable = *

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,19 @@
+<!--
+   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.
+-->
+<ul>
+<li><a href="testTaglibs.jsp">testTaglibs.jsp</a>
+</ul>

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

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:executable = *

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,28 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<%@ taglib uri="http://geronimo.apache.org/local" prefix="localns" %>
+<%@ taglib uri="http://geronimo.apache.org/web" prefix="webns" %>
+<%@ taglib uri="http://geronimo.apache.org/jar" prefix="jarns" %>
+<html>
+<head><title>test</title></head>
+<body>
+<localns:local/>
+<webns:web/>
+<jarns:jar/>
+</body>
+</html>

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

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/main/webapp/testTaglibs.jsp
------------------------------------------------------------------------------
    svn:executable = *

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

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

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
Wed Jan 27 23:26:36 2010
@@ -0,0 +1,34 @@
+/**
+ *  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.tld;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+public class TestTLD extends SeleniumTestSupport {
+
+    @Test
+    public void testTaglibs() throws Exception {
+        selenium.open("/tld/testTaglibs.jsp");
+        waitForPageLoad();
+        assertEquals("HelloHelloTestTag", selenium.getText("xpath=/html/body"));
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/testng.xml?rev=903902&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/testng.xml
Wed Jan 27 23:26:36 2010
@@ -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.tld">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.tld"/>
+        </packages>
+    </test>
+</suite>

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

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:executable = *

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

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



Mime
View raw message