geronimo-scm mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ga...@apache.org
Subject	svn commit: r598396 - in /geronimo/server/trunk/testsuite/web-testsuite/test-web-forward: ./ web-forward-ear/ web-forward-ear/src/ web-forward-ear/src/main/ web-forward-ear/src/main/resources/ web-forward-ear/src/main/resources/META-INF/ web-forward-ea...
Date	Mon, 26 Nov 2007 19:48:00 GMT
Author: gawor Date: Mon Nov 26 11:47:57 2007 New Revision: 598396 URL: http://svn.apache.org/viewvc?rev=598396&view=rev Log: test case for jndi lookup issues (GERONIMO-3609) Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml (with props) geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml (with props) Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,48 @@ +<?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: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.geronimo.testsuite</groupId> + <artifactId>web-testsuite</artifactId> + <version>2.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>test-web-forward</artifactId> + <name>Geronimo TestSuite :: Web Testsuite :: Test Servlet Forwarding</name> + <packaging>pom</packaging> + + <description> + Geronimo test for web testsuite. Testing Servlet forwarding + </description> + + <profiles> + <profile> + <id>child</id> + <modules> + <module>web-forward-war-1</module> + <module>web-forward-war-2</module> + <module>web-forward-ear</module> + </modules> + </profile> + </profiles> +</project> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,5 @@ +Apache Geronimo +Copyright 2003-2007 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,146 @@ +<?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: 577928 $ $Date: 2007-09-20 17:20:00 -0400 (Thu, 20 Sep 2007) $ --> +<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-web-forward</artifactId> + <version>2.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>web-forward-ear</artifactId> + <name>Geronimo Test Suite :: Test Servlet Forwarding :: EAR</name> + <packaging>ear</packaging> + + <description> + Geronimo test EAR for Servlet forwarding + </description> + + <dependencies> + + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>web-forward-war-1</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>web-forward-war-2</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + </plugin> + + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <modules> + <webModule> + <groupId>${pom.groupId}</groupId> + <artifactId>web-forward-war-1</artifactId> + <contextRoot>/dispatch1</contextRoot> + <bundleFileName>web-forward-war-1.war</bundleFileName> + </webModule> + <webModule> + <groupId>${pom.groupId}</groupId> + <artifactId>web-forward-war-2</artifactId> + <contextRoot>/dispatch2</contextRoot> + <bundleFileName>web-forward-war-2.war</bundleFileName> + </webModule> + </modules> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + + <!-- "ear" packaging doesn't compile test classes --> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- "ear" packaging doesn't process test resources --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>testResources</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.geronimo.plugins</groupId> + <artifactId>geronimo-maven-plugin</artifactId> + <executions> + <execution> + <id>deploy-ears</id> + <phase>pre-integration-test</phase> + <goals> + <goal>deploy-module</goal> + </goals> + <configuration> + <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive> + </configuration> + </execution> + + <execution> + <id>undeploy-ear-as-moduleId</id> + <phase>post-integration-test</phase> + <goals> + <goal>undeploy-module</goal> + </goals> + <configuration> + <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,29 @@ +<?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: 577928 $ $Date: 2007-09-20 17:20:00 -0400 (Thu, 20 Sep 2007) $ --> +<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" application-name="TomcatApp"> + <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"> + <dep:moduleId> + <dep:groupId>${pom.groupId}</dep:groupId> + <dep:artifactId>${pom.artifactId}</dep:artifactId> + <dep:version>${version}</dep:version> + <dep:type>ear</dep:type> + </dep:moduleId> + </dep:environment> +</application> \ No newline at end of file Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/resources/META-INF/geronimo-application.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java Mon Nov 26 11:47:57 2007 @@ -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.geronimo.testsuite.web.forward; + +import org.apache.geronimo.testsupport.SeleniumTestSupport; +import org.testng.annotations.Test; + +@Test +public class ServletForwardTest extends SeleniumTestSupport { + + @Test + public void testServletForward() throws Exception { + selenium.open("/dispatch1/TestServlet"); + selenium.waitForPageToLoad("30000"); + System.out.println(selenium.getBodyText()); + assertTrue("Servlet1", selenium.isTextPresent("TestServlet1: 10")); + + selenium.open("/dispatch2/TestServlet"); + selenium.waitForPageToLoad("30000"); + System.out.println(selenium.getBodyText()); + assertTrue("Servlet2", selenium.isTextPresent("TestServlet2: 20")); + + selenium.open("/dispatch2/TestServlet?mode=forward"); + selenium.waitForPageToLoad("30000"); + System.out.println(selenium.getBodyText()); + assertTrue("Servlet2->Servlet1 forward", selenium.isTextPresent("TestServlet1: 10")); + + + } +} + Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<!-- $Rev: 514087 $ $Date: 2007-03-03 01:13:40 -0500 (Sat, 03 Mar 2007) $ --> + +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> + +<suite name="Suite1" verbose="1"> + <test name="web-testsuite.forward"> + <packages> + <package name="org.apache.geronimo.testsuite.web.forward"/> + </packages> + </test> +</suite> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,5 @@ +Apache Geronimo +Copyright 2003-2007 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,53 @@ +<?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: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ --> +<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-web-forward</artifactId> + <version>2.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>web-forward-war-1</artifactId> + <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR I</name> + <packaging>war</packaging> + + <description> + Geronimo test WAR for Servlet forwarding + </description> + <dependencies> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jsp_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.5_spec</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + +</project> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java Mon Nov 26 11:47:57 2007 @@ -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.geronimo.test; + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class TestServlet extends HttpServlet { + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + PrintWriter out = response.getWriter(); + Integer value = lookup("java:comp/env/value", request); + + out.println("TestServlet1: " + value); + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + } + + + private Integer lookup(String name, HttpServletRequest request) { + try { + Context ctx = new InitialContext(); + Integer value = (Integer)ctx.lookup(name); + return value; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"> + <dep:environment> + <dep:moduleId> + <dep:groupId>${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>/dispatch1</context-root> +</web-app> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,49 @@ +<?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: 561486 $ $Date: 2007-07-31 16:22:15 -0400 (Tue, 31 Jul 2007) $ --> + +<web-app id="WebApp_ID" 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"> + + <display-name>TestServlet</display-name> + + <servlet> + <description></description> + <display-name>TestServlet</display-name> + <servlet-name>TestServlet</servlet-name> + <servlet-class> + org.apache.geronimo.test.TestServlet + </servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/TestServlet</url-pattern> + </servlet-mapping> + + <env-entry> + <description>Value</description> + <env-entry-name>value</env-entry-name> + <env-entry-type>java.lang.Integer</env-entry-type> + <env-entry-value>10</env-entry-value> + </env-entry> + +</web-app> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt Mon Nov 26 11:47:57 2007 @@ -0,0 +1,5 @@ +Apache Geronimo +Copyright 2003-2007 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,53 @@ +<?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: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 2007) $ --> +<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-web-forward</artifactId> + <version>2.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>web-forward-war-2</artifactId> + <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR II</name> + <packaging>war</packaging> + + <description> + Geronimo test WAR for Servlet forwarding + </description> + <dependencies> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jsp_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.5_spec</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + +</project> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java Mon Nov 26 11:47:57 2007 @@ -0,0 +1,60 @@ +/* + * 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; + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class TestServlet extends HttpServlet { + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String mode = request.getParameter("mode"); + + if ("forward".equals(mode)) { + getServletConfig().getServletContext().getContext("/dispatch1").getRequestDispatcher("/TestServlet").forward(request, response); + } else { + PrintWriter out = response.getWriter(); + Integer value = lookup("java:comp/env/value", request); + + out.println("TestServlet2: " + value); + } + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + } + + + private Integer lookup(String name, HttpServletRequest request) { + try { + Context ctx = new InitialContext(); + Integer value = (Integer)ctx.lookup(name); + return value; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,35 @@ +<?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>/dispatch2</context-root> + <container-config> + <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0"> + <cross-context/> + </tomcat> + </container-config> +</web-app> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml?rev=598396&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml (added) +++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml Mon Nov 26 11:47:57 2007 @@ -0,0 +1,49 @@ +<?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: 561486 $ $Date: 2007-07-31 16:22:15 -0400 (Tue, 31 Jul 2007) $ --> + +<web-app id="WebApp_ID" 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"> + + <display-name>TestServlet</display-name> + + <servlet> + <description></description> + <display-name>TestServlet</display-name> + <servlet-name>TestServlet</servlet-name> + <servlet-class> + org.apache.geronimo.test.TestServlet + </servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/TestServlet</url-pattern> + </servlet-mapping> + + <env-entry> + <description>Value</description> + <env-entry-name>value</env-entry-name> + <env-entry-type>java.lang.Integer</env-entry-type> + <env-entry-value>20</env-entry-value> + </env-entry> + +</web-app> Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:eol-style = native
Mime	Unnamed text/plain (inline, 7-Bit, 85611 bytes)
	View raw message