Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 42626 invoked from network); 13 Dec 2006 09:19:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Dec 2006 09:19:25 -0000 Received: (qmail 46480 invoked by uid 500); 13 Dec 2006 09:19:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 46450 invoked by uid 500); 13 Dec 2006 09:19:32 -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 46439 invoked by uid 99); 13 Dec 2006 09:19:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Dec 2006 01:19:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Wed, 13 Dec 2006 01:19:23 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 31E6B1A981A; Wed, 13 Dec 2006 01:18:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486554 - in /geronimo/server/trunk/testsuite: ./ itests/ itests/cxfPojoWS/ itests/cxfPojoWS/server/ itests/cxfPojoWS/server/itests/ itests/cxfPojoWS/server/itests/src/ itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsu... Date: Wed, 13 Dec 2006 09:18:37 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061213091838.31E6B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Wed Dec 13 01:18:35 2006 New Revision: 486554 URL: http://svn.apache.org/viewvc?view=rev&rev=486554 Log: GERONIMO-2616 move integration test apps from javaee5 sandbox. jpa works, cxf doesn't Added: geronimo/server/trunk/testsuite/itests/ - copied from r481196, geronimo/sandbox/javaee5/itests-jee5/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/ - copied from r486553, geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/ - copied from r483590, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/pom.xml - copied, changed from r486553, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/ - copied from r486553, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java (with props) geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml (with props) geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml (with props) geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/wsdl/ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl - copied unchanged from r484849, incubator/cxf/trunk/testutils/src/main/resources/wsdl/greeter_control.wsdl geronimo/server/trunk/testsuite/itests/jpa/ - copied from r486553, geronimo/sandbox/javaee5/itests-jee5/jpa/ geronimo/server/trunk/testsuite/itests/jpa/server/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml (with props) geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java (with props) geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml (with props) geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml (with props) geronimo/server/trunk/testsuite/itests/pom.xml (with props) Removed: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java Modified: geronimo/server/trunk/testsuite/itests/cxfPojoWS/pom.xml geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml geronimo/server/trunk/testsuite/itests/jpa/ear/pom.xml geronimo/server/trunk/testsuite/itests/jpa/ejb/pom.xml geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSession.java geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java geronimo/server/trunk/testsuite/itests/jpa/pom.xml geronimo/server/trunk/testsuite/itests/jpa/war/pom.xml geronimo/server/trunk/testsuite/itests/jpa/war/src/main/java/org/apache/geronimo/itest/TestServlet.java geronimo/server/trunk/testsuite/pom.xml Modified: geronimo/server/trunk/testsuite/itests/cxfPojoWS/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/pom.xml Wed Dec 13 01:18:35 2006 @@ -1,17 +1,14 @@ - org.apache.geronimo - geronimo-jee5 + org.apache.geronimo.testsuite + itests 2.0-SNAPSHOT 4.0.0 - org.apache.geronimo.itest cxf pom - - jpa itest - http://maven.apache.org + cxf pojo ws itest junit @@ -22,5 +19,6 @@ war + server - + Copied: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/pom.xml (from r486553, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/pom.xml?view=diff&rev=486554&p1=geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml&r1=486553&p2=geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/pom.xml&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/pom.xml Wed Dec 13 01:18:35 2006 @@ -20,28 +20,44 @@ - - + + 4.0.0 - + org.apache.geronimo.testsuite - deployment-testsuite + cxf-server 2.0-SNAPSHOT ../pom.xml - - test-deployments - Geronimo TestSuite, Deployment :: Test Deployments + + cxfPojows-itests + Geronimo TestSuite, cxf itests jar - + Tests for the test-deployables. Note the parent artifactId and the relativePath. maven-maven-plugin:invoke executes the 'child' profile. - Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent. + Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other + configurations and executions from parent. + + + org.apache.geronimo.testsupport + testsupport-common + test + + + org.apache.geronimo.testsuite + cxf-pojo-war + ${version} + war + + + child @@ -56,13 +72,13 @@ - + org.apache.geronimo.plugins geronimo-maven-plugin - deploy-ears + deploy pre-integration-test deploy-module @@ -70,24 +86,17 @@ - org.apache.geronimo.testsupport - test-ear-j2ee_1.3 + org.apache.geronimo.testsuite + cxf-pojo-war ${version} - ear - - - - org.apache.geronimo.testsupport - test-ear-j2ee_1.4 - ${version} - ear + war - + - undeploy-ear-as-module + undeploy post-integration-test undeploy-module @@ -95,30 +104,20 @@ - org.apache.geronimo.testsupport - test-ear-j2ee_1.3 + org.apache.geronimo.testsuite + cxf-pojo-war ${version} - ear + war - - - undeploy-ear-as-moduleId - post-integration-test - - undeploy-module - - - org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear - - + - + Added: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java (added) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java Wed Dec 13 01:18:35 2006 @@ -0,0 +1,42 @@ +/** + * 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.deployment; + +import org.testng.annotations.Test; + +/** + * ??? + * + * @version $Rev$ $Date$ + */ +@Test +public class CxfPojoWSTest + extends SeleniumTestSupport +{ + @Test + public void testIndexContent() throws Exception { +/* selenium.open("/test-1_4/"); + selenium.waitForPageToLoad("30000"); + assertEquals("Hello J2EE 1.4", selenium.getTitle()); + assertEquals("Hello J2EE 1.4", selenium.getText("xpath=/html/body")); +*/ + } +} + Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/CxfPojoWSTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml (added) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,75 @@ + + + + org.apache.geronimo.testsuite + cxf + 2.0-SNAPSHOT + + 4.0.0 + cxf-server + pom + cxf pojo ws itest server + + + + org.apache.geronimo.testsupport + testsupport-common + test + + + + + + + + org.apache.geronimo.plugins + testsuite-maven-plugin + + + generate-surefire-xml + install + + generate-surefire-xml + + + + + + + + + + default + + true + + + + + + org.apache.geronimo.plugins + selenium-maven-plugin + + + + org.apache.geronimo.plugins + geronimo-maven-plugin + + + + org.apache.geronimo.genesis.plugins + maven-maven-plugin + + + + + + + child + + + Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/server/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/pom.xml Wed Dec 13 01:18:35 2006 @@ -2,15 +2,13 @@ cxf - org.apache.geronimo.itest + org.apache.geronimo.testsuite 2.0-SNAPSHOT 4.0.0 cxf-pojo-war cxf pojo ws war war - - http://maven.apache.org Modified: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml (original) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml Wed Dec 13 01:18:35 2006 @@ -26,13 +26,13 @@ Geronimo CXF POJO WS - servlet + cxfPojoServlet org.apache.hello_world_soap_http.GreeterImpl 0 - servlet + cxfPojoServlet /servlet Added: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml (added) +++ geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,42 @@ + + + + + + + + cxfPojo + WEB-INF/wsdl/greeter_control.wsdl + + cxfPojoName + + false + org.apache.hello_world_soap_http.Greeter + + cxfPojoServlet + + + + + \ No newline at end of file Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/cxfPojoWS/war/src/main/webapp/WEB-INF/webservices.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/trunk/testsuite/itests/jpa/ear/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/ear/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/ear/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/jpa/ear/pom.xml Wed Dec 13 01:18:35 2006 @@ -2,15 +2,13 @@ jpa - org.apache.geronimo.itest + org.apache.geronimo.testsuite 2.0-SNAPSHOT 4.0.0 jpa-ear jpa itest ear ear - - http://maven.apache.org @@ -21,13 +19,13 @@ 1.4 - org.apache.geronimo.itest + org.apache.geronimo.testsuite jpa-war /jpa web.war - org.apache.geronimo.itest + org.apache.geronimo.testsuite jpa-ejb ejb.jar @@ -38,13 +36,13 @@ - org.apache.geronimo.itest + org.apache.geronimo.testsuite jpa-ejb ${pom.version} ejb - org.apache.geronimo.itest + org.apache.geronimo.testsuite jpa-war ${pom.version} war Modified: geronimo/server/trunk/testsuite/itests/jpa/ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/ejb/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/ejb/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/jpa/ejb/pom.xml Wed Dec 13 01:18:35 2006 @@ -2,15 +2,13 @@ jpa - org.apache.geronimo.itest + org.apache.geronimo.testsuite 2.0-SNAPSHOT 4.0.0 jpa-ejb jpa itest ejb jar ejb - - http://maven.apache.org Modified: geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSession.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSession.java?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSession.java (original) +++ geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSession.java Wed Dec 13 01:18:35 2006 @@ -21,7 +21,7 @@ * @version $Rev$ $Date$ */ public interface TestSession extends javax.ejb.EJBObject { - void testEntityManager(); + boolean testEntityManager(); - void testEntityManagerFactory(); + boolean testEntityManagerFactory(); } Modified: geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java (original) +++ geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java Wed Dec 13 01:18:35 2006 @@ -33,20 +33,22 @@ SessionContext sessionContext; - public void testEntityManager() { + public boolean testEntityManager() { try { EntityManager entityManager = (EntityManager) new InitialContext().lookup("java:comp/env/jpa/test"); System.out.println("Accessed entity manager"); AllFieldTypes allFieldTypes = new AllFieldTypes(); entityManager.persist(allFieldTypes); System.out.println("saved object"); + return true; } catch (Exception e) { e.printStackTrace(); System.out.println("Could not access entity manager"); + return false; } } - public void testEntityManagerFactory() { + public boolean testEntityManagerFactory() { try { EntityManagerFactory entityManagerFactory = (EntityManagerFactory) new InitialContext().lookup("java:comp/env/jpa/testEMF"); System.out.println("Accessed entity manager factory"); @@ -56,9 +58,11 @@ System.out.println("saved object"); entityManager.close(); System.out.println("Closed entity manager"); + return true; } catch (Exception e) { e.printStackTrace(); System.out.println("Could not access entity manager"); + return false; } } Modified: geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java (original) +++ geronimo/server/trunk/testsuite/itests/jpa/ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java Wed Dec 13 01:18:35 2006 @@ -22,7 +22,7 @@ import javax.ejb.CreateException; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public interface TestSessionHome extends javax.ejb.EJBHome { Modified: geronimo/server/trunk/testsuite/itests/jpa/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/jpa/pom.xml Wed Dec 13 01:18:35 2006 @@ -1,28 +1,19 @@ - org.apache.geronimo - geronimo-jee5 + org.apache.geronimo.testsuite + itests 2.0-SNAPSHOT 4.0.0 - org.apache.geronimo.itest jpa pom - jpa itest - http://maven.apache.org - - - junit - junit - 3.8.1 - test - - ejb war ear + server + Added: geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml (added) +++ geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,123 @@ + + + + + + + + 4.0.0 + + + org.apache.geronimo.testsuite + jpa-server + 2.0-SNAPSHOT + ../pom.xml + + + jpa-itests + Geronimo TestSuite, jpa itests + jar + + + Tests for the test-deployables. + Note the parent artifactId and the relativePath. + maven-maven-plugin:invoke executes the 'child' profile. + Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other + configurations and executions from parent. + + + + + org.apache.geronimo.testsupport + testsupport-common + test + + + org.apache.geronimo.testsuite + jpa-ear + ${version} + ear + + + + + + child + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.directory}/test-classes/testng.xml + + + + + + org.apache.geronimo.plugins + geronimo-maven-plugin + + + deploy + pre-integration-test + + deploy-module + + + + + org.apache.geronimo.testsuite + jpa-ear + ${version} + ear + + + + + + + undeploy + post-integration-test + + undeploy-module + + + + + org.apache.geronimo.testsuite + jpa-ear + ${version} + ear + + + + + + + + + + + + + Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java (added) +++ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java Wed Dec 13 01:18:35 2006 @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.geronimo.testsuite.deployment; + +import org.testng.annotations.Test; +import org.apache.geronimo.testsupport.SeleniumTestSupport; + +/** + * ??? + * + * @version $Rev$ $Date$ + */ +@Test +public class JPATest + extends SeleniumTestSupport +{ + @Test + public void testIndexContent() throws Exception { + selenium.open("/jpa/servlet"); + selenium.waitForPageToLoad("30000"); + //assertEquals("Hello J2EE 1.4", selenium.getTitle()); + assertEquals("TestServlet\nTest Servlet container managed entity manager test OK: true\nTest Servlet app managed entity manager factory test OK: true", selenium.getText("xpath=/html/body")); + + } +} + Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/java/org/apache/geronimo/testsuite/deployment/JPATest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml (added) +++ geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/itests/src/test/resources/testng.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml (added) +++ geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,75 @@ + + + + org.apache.geronimo.testsuite + jpa + 2.0-SNAPSHOT + + 4.0.0 + jpa-server + pom + jpa itest server + + + + org.apache.geronimo.testsupport + testsupport-common + test + + + + + + + + org.apache.geronimo.plugins + testsuite-maven-plugin + + + generate-surefire-xml + install + + generate-surefire-xml + + + + + + + + + + default + + true + + + + + + org.apache.geronimo.plugins + selenium-maven-plugin + + + + org.apache.geronimo.plugins + geronimo-maven-plugin + + + + org.apache.geronimo.genesis.plugins + maven-maven-plugin + + + + + + + child + + + Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/jpa/server/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/trunk/testsuite/itests/jpa/war/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/war/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/war/pom.xml (original) +++ geronimo/server/trunk/testsuite/itests/jpa/war/pom.xml Wed Dec 13 01:18:35 2006 @@ -2,15 +2,13 @@ jpa - org.apache.geronimo.itest + org.apache.geronimo.testsuite 2.0-SNAPSHOT 4.0.0 jpa-war jpa war war - - http://maven.apache.org @@ -35,27 +33,25 @@ - org.apache.geronimo.itest + org.apache.geronimo.testsuite jpa-ejb - ${pom.version} + ${version} true org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.0.1 provided org.apache.geronimo.specs geronimo-ejb_2.1_spec - 1.0.1 provided org.apache.geronimo.modules geronimo-security - 2.0-SNAPSHOT + ${version} provided Modified: geronimo/server/trunk/testsuite/itests/jpa/war/src/main/java/org/apache/geronimo/itest/TestServlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/jpa/war/src/main/java/org/apache/geronimo/itest/TestServlet.java?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/jpa/war/src/main/java/org/apache/geronimo/itest/TestServlet.java (original) +++ geronimo/server/trunk/testsuite/itests/jpa/war/src/main/java/org/apache/geronimo/itest/TestServlet.java Wed Dec 13 01:18:35 2006 @@ -39,14 +39,14 @@ } protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { - httpServletResponse.getOutputStream().print("TestServlet"); + httpServletResponse.getOutputStream().print("TestServlet\n"); try { InitialContext ctx = new InitialContext(); TestSessionHome home = (TestSessionHome)ctx.lookup("java:comp/env/TestSession"); - home.create().testEntityManager(); - httpServletResponse.getOutputStream().print("Test Servlet container managed entity manager test OK"); - home.create().testEntityManagerFactory(); - httpServletResponse.getOutputStream().print("Test Servlet app managed entity manager factory test OK"); + boolean result = home.create().testEntityManager(); + httpServletResponse.getOutputStream().print("Test Servlet container managed entity manager test OK: " + result); + result = home.create().testEntityManagerFactory(); + httpServletResponse.getOutputStream().print("\nTest Servlet app managed entity manager factory test OK: " + result); } catch (NamingException e) { System.out.print("Exception:"); e.printStackTrace(); Added: geronimo/server/trunk/testsuite/itests/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/itests/pom.xml?view=auto&rev=486554 ============================================================================== --- geronimo/server/trunk/testsuite/itests/pom.xml (added) +++ geronimo/server/trunk/testsuite/itests/pom.xml Wed Dec 13 01:18:35 2006 @@ -0,0 +1,47 @@ + + + + + + + + 4.0.0 + + + org.apache.geronimo.testsuite + testsuite + 2.0-SNAPSHOT + ../pom.xml + + + itests + Geronimo Test Support, Small Test Apps + pom + + + Small apps to test various geronimo features. + + + + + jpa + + + Propchange: geronimo/server/trunk/testsuite/itests/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/itests/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/itests/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: geronimo/server/trunk/testsuite/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=486554&r1=486553&r2=486554 ============================================================================== --- geronimo/server/trunk/testsuite/pom.xml (original) +++ geronimo/server/trunk/testsuite/pom.xml Wed Dec 13 01:18:35 2006 @@ -71,6 +71,7 @@ deployment-testsuite enterprise-testsuite web-testsuite + itests @@ -87,7 +88,7 @@ testsuite-maven-plugin ${version} - + @@ -298,5 +299,5 @@ child - +