You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/07/27 06:19:29 UTC
svn commit: r979521 [1/3] - in
/geronimo/server/trunk/testsuite/javaee6-testsuite: ./ servlet3.0-test/
servlet3.0-test/fragment1/ servlet3.0-test/fragment1/src/
servlet3.0-test/fragment1/src/main/
servlet3.0-test/fragment1/src/main/java/ servlet3.0-tes...
Author: xiaming
Date: Tue Jul 27 04:19:27 2010
New Revision: 979521
URL: http://svn.apache.org/viewvc?rev=979521&view=rev
Log:
GERONIMO-5471 Rename the projects in the patch provided by Guang Zhe Wang, and update test cases with flexible web app context config
Added:
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddedServletOnStartup.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CViewerServlet.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerFilter.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerRegis.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerServletListener.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileMessageFilter.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileOnlinePeopleListener.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowFileServlet.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentMessageRecord.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentWelcomePage.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/resources/META-INF/services/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/header.html (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.html (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu-cv.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/selectFile.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml (with props)
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml?rev=979521&r1=979520&r2=979521&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Tue Jul 27 04:19:27 2010
@@ -53,6 +53,7 @@
<modules>
<module>beanvalidation-test</module>
+ <module>servlet3.0-test</module>
</modules>
</project>
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,47 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fragment1</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment1</name>
+ <packaging>jar</packaging>
+
+ <description>Geronimo Testsuite. WEB Fragment Module 1</description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </project>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,47 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+package org.apache.geronimo.samples.javaee6.webfragment.fragment1;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class FilterFragment1 implements Filter {
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse res,
+ FilterChain chain) throws IOException, ServletException {
+
+ String filterMessage = (String)req.getAttribute("filterMessage");
+ if (filterMessage == null) {
+ filterMessage = "";
+ }
+ filterMessage += "This Message is from fragment1 filter.This fragment mainly serves to query all the items.<br>";
+
+ req.setAttribute("filterMessage", filterMessage);
+ chain.doFilter(req, res);
+ }
+
+ public void destroy() {
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/FilterFragment1.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,103 @@
+/**
+* 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.samples.javaee6.webfragment.fragment1;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Random;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class QueryAll extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("text/html;charset=UTF-8");
+ PrintWriter out = response.getWriter();
+ try {
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet QueryAll</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<h1>Query Result:</h1>");
+ out.println("<table border=1>");
+ out.println("<tr><th>ID</th><th>Name</th><th>Price</th></tr>");
+ for(int i=1;i<=10;i++){
+ //int randomPrice=(new Random().nextInt())%100;
+ out.println("<tr><td>"+i+"</td><td>Item"+i+"</td><td>"+(i*10)+"</td></tr>");
+ }
+ out.println("</table>");
+ out.println("<form action=\"ShoppingCart\">");
+ out.println("<h3>I wanna buy:</h3><br>ID:<input type=\"text\" name=\"ID\"/>Quantity:<input type=\"text\" name=\"quantity\"/>");
+ out.println("<br><input type=\"submit\" name=\"addToCart\" value=\"Add To Cart\">" );
+ out.println("</form>");
+ out.println("</body>");
+ out.println("</html>");
+
+ } finally {
+ out.close();
+ }
+ }
+
+ // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ /**
+ * Handles the HTTP <code>GET</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP <code>POST</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment1/QueryAll.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,40 @@
+<?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-fragment metadata-complete="true" version="3.0" 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-fragment_3_0.xsd">
+ <name>fragment1</name>
+ <filter>
+ <icon/>
+ <filter-name>FilterFragment1</filter-name>
+ <filter-class>org.apache.geronimo.samples.javaee6.webfragment.fragment1.FilterFragment1</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>FilterFragment1</filter-name>
+ <url-pattern>/WebFragmentMessageRecord</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>QueryAll</servlet-name>
+ <servlet-class>org.apache.geronimo.samples.javaee6.webfragment.fragment1.QueryAll</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>QueryAll</servlet-name>
+ <url-pattern>/QueryAll</url-pattern>
+ </servlet-mapping>
+</web-fragment>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,47 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fragment2</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment2</name>
+ <packaging>jar</packaging>
+
+ <description>Geronimo Testsuite. WEB Fragment Module 2</description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </project>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,44 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+package org.apache.geronimo.samples.javaee6.webfragment.fragment2;
+
+public class BuyRecordItem {
+ int ID;
+ int quantity;
+
+ public BuyRecordItem(int ID, int quantity) {
+ this.ID = ID;
+ this.quantity = quantity;
+ }
+
+ public int getID() {
+ return ID;
+ }
+
+ public void setID(int ID) {
+ this.ID = ID;
+ }
+
+ public int getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(int quantity) {
+ this.quantity = quantity;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/BuyRecordItem.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,50 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+package org.apache.geronimo.samples.javaee6.webfragment.fragment2;
+
+import java.io.IOException;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+
+@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
+public class FilterFragment2 implements Filter {
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse res,
+ FilterChain chain) throws IOException, ServletException {
+
+ String filterMessage = (String)req.getAttribute("filterMessage");
+ if (filterMessage == null) {
+ filterMessage = "";
+ }
+ filterMessage += "This Message is from fragment2 filter.This fragment mainly serves to add items to shopping cart.<br>";
+
+ req.setAttribute("filterMessage", filterMessage);
+ chain.doFilter(req, res);
+ }
+
+ public void destroy() {
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/FilterFragment2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,136 @@
+/**
+* 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.samples.javaee6.webfragment.fragment2;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Administrator
+ */
+public class ShoppingCart extends HttpServlet {
+
+ ArrayList<BuyRecordItem> shoppingList;
+
+ /**
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("text/html;charset=UTF-8");
+ PrintWriter out = response.getWriter();
+
+ if (null == request.getSession().getAttribute("shoppingList")) {
+ shoppingList = new ArrayList<BuyRecordItem>();
+ } else {
+ shoppingList = (ArrayList) request.getSession().getAttribute("shoppingList");
+ }
+ BuyRecordItem recordItem = new BuyRecordItem(Integer.parseInt(request.getParameter("ID")), Integer.parseInt(request.getParameter("quantity")));
+ addToCart(recordItem, shoppingList);
+ request.getSession().setAttribute("shoppingList", shoppingList);
+ try {
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet ShoppingCart</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<h1>You have already bought:</h1>");
+ out.println("<table border=1>");
+ out.println("<tr><th>ID</th><th>Name</th><th>Price</th><th>Quantity</th><th>Cost</th></tr>");
+ int totalCost = 0;
+ for (BuyRecordItem record : shoppingList) {
+ int ID = record.getID();
+ int quantity = record.getQuantity();
+ int cost = ID * 10 * quantity;
+ totalCost += cost;
+ out.println("<tr><td>" + ID + "</td><td>Item" + ID + "</td><td>" + (ID * 10) + "</td><td>" + quantity + "</td><td>" + cost + "</td></tr>");
+ }
+ out.println("<tr><h2>The total cost is:<font color=green>" + totalCost + "</font><h2></tr>");
+ out.println("</table>");
+ out.println("<a href=\"QueryAll\"><h2>>>Continue shopping!<h2></a><br>");
+ out.println("<a href=\"Payment?totalCost="+totalCost+"\">>>Go to pay!</a>");
+ out.println("</body>");
+ out.println("</html>");
+ } finally {
+ out.close();
+ }
+ }
+
+ // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ /**
+ * Handles the HTTP <code>GET</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP <code>POST</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }
+
+ private void addToCart(BuyRecordItem currentRecordItem, ArrayList<BuyRecordItem> shoppingList) {
+ int currentID=currentRecordItem.getID();
+ int currentQuantity=currentRecordItem.getQuantity();
+ boolean exist=false;
+ for(BuyRecordItem record:shoppingList)
+ {
+ if(currentID==record.getID())
+ {
+ record.setQuantity(record.getQuantity()+currentQuantity);
+ exist=true;
+ break;
+ }
+
+ }
+ if(!exist)
+ this.shoppingList.add(currentRecordItem);
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment2/ShoppingCart.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,40 @@
+<?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-fragment version="3.0" 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-fragment_3_0.xsd">
+ <name>fragment2</name>
+ <filter>
+ <icon/>
+ <filter-name>FilterFragment2</filter-name>
+ <filter-class>org.apache.geronimo.samples.javaee6.webfragment.fragment2.FilterFragment2</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>FilterFragment2</filter-name>
+ <url-pattern>/WebFragmentMessageRecord</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>ShoppingCart</servlet-name>
+ <servlet-class>org.apache.geronimo.samples.javaee6.webfragment.fragment2.ShoppingCart</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ShoppingCart</servlet-name>
+ <url-pattern>/ShoppingCart</url-pattern>
+ </servlet-mapping>
+</web-fragment>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,47 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fragment3</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment3</name>
+ <packaging>jar</packaging>
+
+ <description>Geronimo Testsuite. WEB Fragment Module 3</description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </project>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,51 @@
+/**
+* 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.samples.javaee6.webfragment.fragment3;
+
+import java.io.IOException;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+
+@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
+public class FilterFragment3 implements Filter {
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse res,
+ FilterChain chain) throws IOException, ServletException {
+
+ String filterMessage = (String)req.getAttribute("filterMessage");
+ if (filterMessage == null) {
+ filterMessage = "";
+ }
+ filterMessage += "This Message is from fragment3 filter.This fragment mainly serves to pay for the items you bought.<br> ";
+
+ req.setAttribute("filterMessage", filterMessage);
+ chain.doFilter(req, res);
+ }
+
+ public void destroy() {
+ }
+}
+
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/FilterFragment3.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,110 @@
+/**
+ * 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.samples.javaee6.webfragment.fragment3;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class Payment extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+ *
+ * @param request
+ * servlet request
+ * @param response
+ * servlet response
+ * @throws ServletException
+ * if a servlet-specific error occurs
+ * @throws IOException
+ * if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+ IOException {
+ response.setContentType("text/html;charset=UTF-8");
+ PrintWriter out = response.getWriter();
+ try {
+ int totalCost = Integer.parseInt(request.getParameter("totalCost"));
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet Payment</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<h1>Dear Customer,<br>You have to pay <font color=green>" + totalCost + "</font>.<br></h1>");
+ out.println("<h1>Congratulations!You have successfully finished the payment process.</h1>");
+ out.println("<a href=\"WebFragmentMessageRecord\">See message generated from different fragments.</a>");
+ out.println("</body>");
+ out.println("</html>");
+
+ } finally {
+ out.close();
+ }
+ }
+
+ // <editor-fold defaultstate="collapsed"
+ // desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+ /**
+ * Handles the HTTP <code>GET</code> method.
+ *
+ * @param request
+ * servlet request
+ * @param response
+ * servlet response
+ * @throws ServletException
+ * if a servlet-specific error occurs
+ * @throws IOException
+ * if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP <code>POST</code> method.
+ *
+ * @param request
+ * servlet request
+ * @param response
+ * servlet response
+ * @throws ServletException
+ * if a servlet-specific error occurs
+ * @throws IOException
+ * if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+ IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ *
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }// </editor-fold>
+
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/Payment.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,35 @@
+/**
+* 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.samples.javaee6.webfragment.fragment3;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+
+public class ServletListener implements ServletContextListener {
+
+ public void contextInitialized(ServletContextEvent sce) {
+ ServletContext sc = sce.getServletContext();
+ sc.setAttribute("listenerMessage", "<br>This Message is from fragment3 listener.This fragment mainly serves to pay for the items you bought.");
+ }
+
+ public void contextDestroyed(ServletContextEvent sce) {
+
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/java/org/apache/geronimo/samples/javaee6/webfragment/fragment3/ServletListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,44 @@
+<?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-fragment version="3.0" 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-fragment_3_0.xsd">
+ <name>fragment3</name>
+ <filter>
+ <icon/>
+ <filter-name>FilterFragment3</filter-name>
+ <filter-class>org.apache.geronimo.samples.javaee6.webfragment.fragment3.FilterFragment3</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>FilterFragment3</filter-name>
+ <url-pattern>/WebFragmentMessageRecord</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Payment</servlet-name>
+ <servlet-class>org.apache.geronimo.samples.javaee6.webfragment.fragment3.Payment</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Payment</servlet-name>
+ <url-pattern>/Payment</url-pattern>
+ </servlet-mapping>
+ <listener>
+ <description>ServletContextListener</description>
+ <listener-class>org.apache.geronimo.samples.javaee6.webfragment.fragment3.ServletListener</listener-class>
+ </listener>
+</web-fragment>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/src/main/resources/META-INF/web-fragment.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,55 @@
+<?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.
+-->
+
+
+<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>javaee6-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>servlet3.0-test</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo Java EE 6 Servlet 3.0 testsuite, including tests for these new features:
+ 1. Asynchronous
+ 2. New servlet annotations: @WebServlet, @WebFilter, @WebListener
+ TODO: @WebInitParam, @MultipartConfig
+ 3. Web fragment
+ 4. Resources in jar
+ 5. ServletContainerInitializer
+ 6. Multipart
+ 7. Dynamic registration of servlets, filters, and listeners via ServletContextListener
+ </description>
+
+ <modules>
+ <module>fragment1</module>
+ <module>fragment2</module>
+ <module>fragment3</module>
+ <module>servlet3.0-test-jar</module>
+ <module>servlet3.0-test-war</module>
+ </modules>
+</project>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,41 @@
+<?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>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>servlet3.0-test-jar</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test-jar</name>
+ <packaging>jar</packaging>
+
+ <description>Geronimo Testsuite. A Module Including META-INF/resources</description>
+
+
+</project>
+
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp Tue Jul 27 04:19:27 2010
@@ -0,0 +1,35 @@
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<html>
+<head>
+ <title>Sample for jarresource-javaee6</title>
+ <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<BODY>
+ <font face="Verdana, Helvetica, Arial">
+
+ This is a JSP executed inside a jar file of the web module.
+
+ </FONT>
+<br/>
+The remote host is <%=request.getRemoteHost()%>.
+<br/>
+</body>
+</html>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/src/main/resources/META-INF/resources/jarresource.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml Tue Jul 27 04:19:27 2010
@@ -0,0 +1,138 @@
+<?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>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>servlet3.0-test-war</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test-war</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+
+ <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-ejb_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test-jar</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <appContext>${project.artifactId}</appContext>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java?rev=979521&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java Tue Jul 27 04:19:27 2010
@@ -0,0 +1,41 @@
+/**
+ * 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.servlet3.app;
+
+import java.util.Set;
+
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.annotation.HandlesTypes;
+import javax.servlet.http.HttpServlet;
+@HandlesTypes(HttpServlet.class)
+public class AddServletInitializer implements ServletContainerInitializer {
+
+ public void onStartup(Set<Class<?>> classes, ServletContext ctx)
+ throws ServletException {
+ for (Class tc : classes) {
+ System.out.println(tc.getName());
+ }
+
+ ServletRegistration reg = ctx.addServlet("testAdd", AddedServletOnStartup.class);
+ reg.addMapping("/add");
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain