Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 45887 invoked from network); 12 Feb 2009 00:00:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2009 00:00:58 -0000 Received: (qmail 33908 invoked by uid 500); 12 Feb 2009 00:00:58 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 33870 invoked by uid 500); 12 Feb 2009 00:00:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 33860 invoked by uid 99); 12 Feb 2009 00:00:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2009 16:00:58 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 00:00:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BBBFD2388B38; Thu, 12 Feb 2009 00:00:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r743576 - in /geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src: main/java/com/test/servlet/AddressServlet.java main/webapp/WEB-INF/web.xml test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java Date: Thu, 12 Feb 2009 00:00:36 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090212000036.BBBFD2388B38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Feb 12 00:00:36 2009 New Revision: 743576 URL: http://svn.apache.org/viewvc?rev=743576&view=rev Log: add a simple test to check getRemoteAddr is working Added: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java - copied, changed from r743429, geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/SampleServlet.java Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java Copied: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java (from r743429, geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/SampleServlet.java) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java?p2=geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java&p1=geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/SampleServlet.java&r1=743429&r2=743576&rev=743576&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/SampleServlet.java (original) +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java Thu Feb 12 00:00:36 2009 @@ -27,27 +27,19 @@ * Servlet implementation class for Servlet: SampleServlet * * @web.servlet - * name="SampleServlet" - * display-name="SampleServlet" + * name="AddressServlet" + * display-name="AddressServlet" * * @web.servlet-mapping - * url-pattern="/SampleServlet" + * url-pattern="/AddressServlet" * */ - public class SampleServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet { - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#HttpServlet() - */ - public SampleServlet() { - super(); - - } + public class AddressServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet { /* (non-Java-doc) * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) */ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub doPost(request,response); } @@ -55,13 +47,12 @@ * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) */ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub PrintWriter out = response.getWriter(); out.println("Sample application with Servlets 2.5"); out.println(""); - out.println("Welcome to Servlets 2.5 samples."); - out.println("Sample Servlet!"); + out.println("Address Test"); + out.println("Remote Address:" + request.getRemoteAddr() + ""); out.println(""); } Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml?rev=743576&r1=743575&r2=743576&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml (original) +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml Thu Feb 12 00:00:36 2009 @@ -34,6 +34,12 @@ SampleServlet2 com.test.servlet.SampleServlet2 + + + AddressServlet + AddressServlet + com.test.servlet.AddressServlet + SampleServlet /SampleServlet @@ -44,6 +50,11 @@ /SampleServlet2 /SampleServlet2/* + + AddressServlet + /AddressServlet + /AddressServlet/* + Sample Filter /* Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java?rev=743576&r1=743575&r2=743576&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java (original) +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java Thu Feb 12 00:00:36 2009 @@ -42,4 +42,12 @@ assertEquals("Welcome to Servlets 2.5 samples. Another Sample Servlet!", selenium.getText("xpath=/html/body")); } + @Test + public void testAddress() throws Exception { + selenium.open("/servlet25/AddressServlet"); + waitForPageLoad(); + assertEquals("Sample application with Servlets 2.5", selenium.getTitle()); + String actual = selenium.getText("xpath=/html/body"); + assertEquals(actual, "Address Test Remote Address:127.0.0.1", actual); + } } \ No newline at end of file