geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1127351 - in /geronimo/server/trunk/testsuite/aries-testsuite: ./ jsp/ jsp/jsp-eba/ jsp/jsp-eba/src/ jsp/jsp-eba/src/test/ jsp/jsp-eba/src/test/java/ jsp/jsp-eba/src/test/java/org/ jsp/jsp-eba/src/test/java/org/apache/ jsp/jsp-eba/src/test...
Date Wed, 25 May 2011 01:07:32 GMT
Author: gawor
Date: Wed May 25 01:07:31 2011
New Revision: 1127351

URL: http://svn.apache.org/viewvc?rev=1127351&view=rev
Log:
GERONIMO-5976: Test case for loading JSP taglibs from bundles

Added:
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
  (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml   (with props)
Modified:
    geronimo/server/trunk/testsuite/aries-testsuite/pom.xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml Wed May 25 01:07:31
2011
@@ -0,0 +1,118 @@
+<?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>jsp</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jsp-eba</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JSP EBA</name>
+    <packaging>eba</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jsp-taglib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jsp-wab</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <generateManifest>true</generateManifest>
+                    <instructions>
+                        <Application-Version>1.0.0</Application-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <webAppName>jsp</webAppName>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-eba</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-eba</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
Wed May 25 01:07:31 2011
@@ -0,0 +1,72 @@
+/**
+ *  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.jpa;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.geronimo.testsupport.HttpUtils;
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class JSPTest extends TestSupport {
+
+    private String baseURL = "http://localhost:8080/";
+
+    @Test
+    public void testJSP() throws Exception {
+        checkReply("/hello.jsp");
+    }
+
+    private void checkReply(String address)
+        throws Exception {
+        String warName = System.getProperty("webAppName");
+        assertNotNull(warName);
+        URL url = new URL(baseURL + warName + address);
+        /**
+         * WABs are deployed asynchronously so it might take a
+         * bit to actually invoke the servlet.
+         */
+        String reply = doGET(url, 6, 10 * 1000);
+        
+        assertTrue("WAB heading tag", 
+                   reply.contains("Hello JSP in WAB"));
+        
+        assertTrue("WAB date tag", 
+                reply.contains("Today is:"));
+    }
+  
+    private String doGET(URL url, int repeat, long delay) {
+        for (int i = 0; i < repeat; i++) {
+            try {
+                return HttpUtils.doGET(url); 
+            } catch (IOException e) {
+                // ignore
+                try {
+                    Thread.sleep(delay);
+                } catch (Exception ee) {
+                    break;
+                }
+            }
+        }
+        fail("Did not get servlet response in time");
+        return "";
+    }
+        
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml Wed May 25 01:07:31
2011
@@ -0,0 +1,59 @@
+<?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>jsp</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jsp-taglib</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JSP Tag Library</name>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
Wed May 25 01:07:31 2011
@@ -0,0 +1,45 @@
+/**
+ *  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.test.jsp.taglib;
+
+import java.util.Date;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+public class DateTag extends TagSupport {
+
+    public DateTag() {
+    }
+    
+    @Override
+    public int doStartTag() throws JspException {
+        try {
+            pageContext.getOut().print("Today is: " + (new Date()));
+        } catch (Exception e) {
+            throw new JspTagException(e.getMessage());
+        }
+        return SKIP_BODY;
+     }
+    
+    @Override
+     public int doEndTag() {
+        return EVAL_PAGE;
+     }
+         
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/java/org/apache/geronimo/test/jsp/taglib/DateTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
Wed May 25 01:07:31 2011
@@ -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>dateTagLib</shortname>
+    <uri>http://geronimo.apache.org/jsf/date</uri>
+    <tag>
+       <name>date</name>
+       <tagclass>org.apache.geronimo.test.jsp.taglib.DateTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml Wed May 25 01:07:31
2011
@@ -0,0 +1,80 @@
+<?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>jsp</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jsp-wab</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JSP WAB</name>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jsp-taglib</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Web-ContextPath>/jsp</Web-ContextPath>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Private-Package>org.apache.geronimo.test.jsp.web</Private-Package>
+                        <Export-Package>!org.apache.geronimo.test.jsp.web</Export-Package>
+                        <Import-Package>
+                            org.apache.geronimo.test.jsp.taglib,
+                            javax.servlet,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
Wed May 25 01:07:31 2011
@@ -0,0 +1,43 @@
+/**
+ *  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.test.jsp.web;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+public class HeadingTag extends TagSupport {
+
+    public HeadingTag() {
+    }
+    
+    @Override
+    public int doStartTag() throws JspException {
+        try {
+            pageContext.getOut().print("Hello JSP in WAB");
+        } catch (Exception e) {
+            throw new JspTagException(e.getMessage());
+        }
+        return SKIP_BODY;
+     }
+    
+    @Override
+     public int doEndTag() {
+        return EVAL_PAGE;
+     }
+    
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/java/org/apache/geronimo/test/jsp/web/HeadingTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld
Wed May 25 01:07:31 2011
@@ -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>dateTagLib</shortname>
+    <uri>http://geronimo.apache.org/jsf/heading</uri>
+    <tag>
+       <name>heading</name>
+       <tagclass>org.apache.geronimo.test.jsp.web.HeadingTag</tagclass>
+       <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/taglib.tld
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
Wed May 25 01:07:31 2011
@@ -0,0 +1,35 @@
+<?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.
+-->
+<web-app 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"
+         metadata-complete="false"
+         version="2.5">
+
+    <description>MyProject web.xml</description>
+   
+    <!-- Welcome files -->
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
Wed May 25 01:07:31 2011
@@ -0,0 +1,29 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true"
%>
+<%@ taglib uri="http://geronimo.apache.org/jsf/heading" prefix="heading" %>
+<%@ taglib uri="http://geronimo.apache.org/jsf/date" prefix="date" %>
+<html>
+<head>
+    <title>Hello World</title>
+</head>
+<body>
+    <heading:heading />
+    <br/>
+    <date:date />
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
Wed May 25 01:07:31 2011
@@ -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="hello.jsp">hello</a>
+</ul>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml?rev=1127351&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml Wed May 25 01:07:31 2011
@@ -0,0 +1,43 @@
+<?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>aries-testsuite</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>jsp</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JSP Test</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jsp-taglib</module>
+        <module>jsp-wab</module>
+        <module>jsp-eba</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jsp/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/pom.xml?rev=1127351&r1=1127350&r2=1127351&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Wed May 25 01:07:31 2011
@@ -43,6 +43,7 @@
         <module>osgi-service-custom</module>
         <module>mail-osgi-service</module>
         <module>jsf</module>
+        <module>jsp</module>
     </modules>
 
     <build>



Mime
View raw message