Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 73971 invoked from network); 28 Sep 2007 18:22:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Sep 2007 18:22:50 -0000 Received: (qmail 53044 invoked by uid 500); 28 Sep 2007 18:22:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 52907 invoked by uid 500); 28 Sep 2007 18:22:40 -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 52896 invoked by uid 99); 28 Sep 2007 18:22:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2007 11:22:40 -0700 X-ASF-Spam-Status: No, hits=-98.8 required=10.0 tests=ALL_TRUSTED,DNS_FROM_DOB,RCVD_IN_DOB X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2007 18:25:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7B7F61A9832; Fri, 28 Sep 2007 11:22:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r580450 - in /geronimo/server/branches/2.0/testsuite: deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/ enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/ enterprise-testsuite/jpa... Date: Fri, 28 Sep 2007 18:22:25 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070928182226.7B7F61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Fri Sep 28 11:22:25 2007 New Revision: 580450 URL: http://svn.apache.org/viewvc?rev=580450&view=rev Log: merge some testsuite fixes from trunk Modified: geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp Modified: geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java (original) +++ geronimo/server/branches/2.0/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java Fri Sep 28 11:22:25 2007 @@ -33,10 +33,16 @@ { @Test public void testIndexContent() throws Exception { + /* + * Disabled until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed + * since the module is not deployed, see pom.xml. + */ + /* selenium.open("/test-1_3/"); selenium.waitForPageToLoad("30000"); assertEquals("Hello J2EE 1.3", selenium.getTitle()); assertEquals("Hello J2EE 1.3", selenium.getText("xpath=/html/body")); + */ } } Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml Fri Sep 28 11:22:25 2007 @@ -62,7 +62,11 @@ TestJMS - org.apache.geronimo.modules/geronimo-activemq-ra/${version}/rar + + org.apache.geronimo.modules + geronimo-activemq-ra + rar + Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Fri Sep 28 11:22:25 2007 @@ -39,7 +39,7 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec - test + provided Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Sep 28 11:22:25 2007 @@ -53,6 +53,22 @@ + + test-realm + + + + test-realm + org.apache.geronimo.itest.TestLoginModule + foo,bar + + + + + ServerInfo + + @@ -82,22 +98,6 @@ - - - test-realm - - - - test-realm - org.apache.geronimo.itest.TestLoginModule - foo,bar - - - - - ServerInfo - Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java Fri Sep 28 11:22:25 2007 @@ -17,6 +17,7 @@ package org.apache.geronimo.itest; import java.io.IOException; +import java.io.PrintWriter; import java.rmi.AccessException; import java.rmi.RemoteException; @@ -40,7 +41,7 @@ } protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { - ServletOutputStream out = httpServletResponse.getOutputStream(); + PrintWriter out = httpServletResponse.getWriter(); out.println("TestServlet principal: " + httpServletRequest.getUserPrincipal().getName()); try { InitialContext ctx = new InitialContext(); @@ -65,7 +66,7 @@ } catch (CreateException e) { e.printStackTrace(); } - httpServletResponse.flushBuffer(); + out.flush(); } Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp?rev=580450&r1=580449&r2=580450&view=diff ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp Fri Sep 28 11:22:25 2007 @@ -18,12 +18,13 @@ <%@ page import="javax.naming.InitialContext" %> <%@ page import="org.apache.geronimo.itest.TestSessionHome" %> <%@ page import="javax.naming.NamingException" %> +<%@ page import="java.io.PrintWriter" %> <%@ page import="java.rmi.AccessException" %> <%@ page import="java.rmi.RemoteException" %> <%@ page import="javax.ejb.CreateException" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% - ServletOutputStream myout = response.getOutputStream(); + PrintWriter myout = response.getWriter(); myout.println("TestServlet principal: " + request.getUserPrincipal().getName()); try { InitialContext ctx = new InitialContext(); @@ -48,5 +49,5 @@ } catch (CreateException e) { e.printStackTrace(); } - myout.flush(); + out.flush(); %>