geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <parent>
-        <groupId>org.apache.geronimo</groupId>
-        <artifactId>geronimo-jee5</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>itests</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.itest</groupId>
   <artifactId>cxf</artifactId>
   <packaging>pom</packaging>
-  <!--<version>1.0-SNAPSHOT</version>-->
-  <name>jpa itest</name>
-  <url>http://maven.apache.org</url>
+  <name>cxf pojo ws itest</name>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -22,5 +19,6 @@
   </dependencies>
   <modules>
     <module>war</module>
+    <module>server</module>
   </modules>
-</project>
+ </project>

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 @@
 
 <!-- $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">
-    
+<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>deployment-testsuite</artifactId>
+        <artifactId>cxf-server</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
-    <artifactId>test-deployments</artifactId>
-    <name>Geronimo TestSuite, Deployment :: Test Deployments</name>
+
+    <artifactId>cxfPojows-itests</artifactId>
+    <name>Geronimo TestSuite, cxf itests</name>
     <packaging>jar</packaging>
-    
+
     <description>
         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.
     </description>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>cxf-pojo-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
     <profiles>
         <profile>
             <id>child</id>
@@ -56,13 +72,13 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-                    
+
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>deploy-ears</id>
+                                <id>deploy</id>
                                 <phase>pre-integration-test</phase>
                                 <goals>
                                     <goal>deploy-module</goal>
@@ -70,24 +86,17 @@
                                 <configuration>
                                     <modules>
                                         <module>
-                                            <groupId>org.apache.geronimo.testsupport</groupId>
-                                            <artifactId>test-ear-j2ee_1.3</artifactId>
+                                            <groupId>org.apache.geronimo.testsuite</groupId>
+                                            <artifactId>cxf-pojo-war</artifactId>
                                             <version>${version}</version>
-                                            <type>ear</type>
-                                        </module>
-                                        
-                                        <module>
-                                            <groupId>org.apache.geronimo.testsupport</groupId>
-                                            <artifactId>test-ear-j2ee_1.4</artifactId>
-                                            <version>${version}</version>
-                                            <type>ear</type>
+                                            <type>war</type>
                                         </module>
                                     </modules>
                                 </configuration>
                             </execution>
-                            
+
                             <execution>
-                                <id>undeploy-ear-as-module</id>
+                                <id>undeploy</id>
                                 <phase>post-integration-test</phase>
                                 <goals>
                                     <goal>undeploy-module</goal>
@@ -95,30 +104,20 @@
                                 <configuration>
                                     <modules>
                                         <module>
-                                            <groupId>org.apache.geronimo.testsupport</groupId>
-                                            <artifactId>test-ear-j2ee_1.3</artifactId>
+                                            <groupId>org.apache.geronimo.testsuite</groupId>
+                                            <artifactId>cxf-pojo-war</artifactId>
                                             <version>${version}</version>
-                                            <type>ear</type>
+                                            <type>war</type>
                                         </module>
                                     </modules>
                                 </configuration>
                             </execution>
-                            
-                            <execution>
-                                <id>undeploy-ear-as-moduleId</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy-module</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
-                                </configuration>
-                            </execution>
+
                         </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
-   
+
 </project>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>cxf</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cxf-server</artifactId>
+    <packaging>pom</packaging>
+    <name>cxf pojo ws itest server</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- This plugin is needed for all suite poms. -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <!--
+            TODO: Hook up m-m-p to allow child modules to be built early during this modules
+                  compile (or something) phase.
+            -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>child</id>
+        </profile>
+    </profiles>
+</project>

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 @@
 <project>
     <parent>
         <artifactId>cxf</artifactId>
-        <groupId>org.apache.geronimo.itest</groupId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-pojo-war</artifactId>
     <name>cxf pojo ws war</name>
     <packaging>war</packaging>
-    <!--<version>1.0-SNAPSHOT</version>-->
-    <url>http://maven.apache.org</url>
     <build>
         <plugins>
             <!--<plugin>-->

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 @@
 
     <servlet>
         <display-name>Geronimo CXF POJO WS</display-name>
-        <servlet-name>servlet</servlet-name>
+        <servlet-name>cxfPojoServlet</servlet-name>
         <servlet-class>org.apache.hello_world_soap_http.GreeterImpl</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>servlet</servlet-name>
+        <servlet-name>cxfPojoServlet</servlet-name>
         <url-pattern>/servlet</url-pattern>
     </servlet-mapping>
 

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 @@
+<?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$ -->
+
+<webservices 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/javaee_web_services_1_2.xsd"
+             version="1.2">
+    <webservice-description>
+        <webservice-description-name>cxfPojo</webservice-description-name>
+        <wsdl-file>WEB-INF/wsdl/greeter_control.wsdl</wsdl-file>
+        <port-component>
+            <port-component-name>cxfPojoName</port-component-name>
+            <wsdl-service></wsdl-service>
+            <enable-mtom>false</enable-mtom>
+            <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
+            <service-impl-bean>
+                <servlet-link>cxfPojoServlet</servlet-link>
+            </service-impl-bean>
+        </port-component>
+    </webservice-description>
+
+</webservices>
\ 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 @@
 <project>
     <parent>
         <artifactId>jpa</artifactId>
-        <groupId>org.apache.geronimo.itest</groupId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jpa-ear</artifactId>
     <name>jpa itest ear</name>
     <packaging>ear</packaging>
-    <!--<version>1.0-SNAPSHOT</version>-->
-    <url>http://maven.apache.org</url>
     <build>
         <plugins>
             <plugin>
@@ -21,13 +19,13 @@
                     <version>1.4</version>
                     <modules>
                         <webModule>
-                            <groupId>org.apache.geronimo.itest</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>jpa-war</artifactId>
                             <contextRoot>/jpa</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.apache.geronimo.itest</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>jpa-ejb</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
@@ -38,13 +36,13 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.itest</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-ejb</artifactId>
             <version>${pom.version}</version>
             <type>ejb</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.itest</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-war</artifactId>
             <version>${pom.version}</version>
             <type>war</type>

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 @@
 <project>
     <parent>
         <artifactId>jpa</artifactId>
-        <groupId>org.apache.geronimo.itest</groupId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jpa-ejb</artifactId>
     <name>jpa itest ejb jar</name>
     <packaging>ejb</packaging>
-    <!--<version>1.0-SNAPSHOT</version>-->
-    <url>http://maven.apache.org</url>
     <build>
         <plugins>
             <plugin>

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <parent>
-        <groupId>org.apache.geronimo</groupId>
-        <artifactId>geronimo-jee5</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>itests</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.itest</groupId>
   <artifactId>jpa</artifactId>
   <packaging>pom</packaging>
-  <!--<version>1.0-SNAPSHOT</version>-->
   <name>jpa itest</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
   <modules>
     <module>ejb</module>
     <module>war</module>
     <module>ear</module>
+    <module>server</module>
   </modules>
+
 </project>

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 @@
+<?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>jpa-server</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jpa-itests</artifactId>
+    <name>Geronimo TestSuite, jpa itests</name>
+    <packaging>jar</packaging>
+
+    <description>
+        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.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jpa-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <modules>
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsuite</groupId>
+                                            <artifactId>jpa-ear</artifactId>
+                                            <version>${version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                    </modules>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <modules>
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsuite</groupId>
+                                            <artifactId>jpa-ear</artifactId>
+                                            <version>${version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                    </modules>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

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 @@
+<?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$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="deployment">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.deployment"/>
+        </packages>
+    </test>
+</suite>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>jpa</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jpa-server</artifactId>
+    <packaging>pom</packaging>
+    <name>jpa itest server</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- This plugin is needed for all suite poms. -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <!--
+            TODO: Hook up m-m-p to allow child modules to be built early during this modules
+                  compile (or something) phase.
+            -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>child</id>
+        </profile>
+    </profiles>
+</project>

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 @@
 <project>
     <parent>
         <artifactId>jpa</artifactId>
-        <groupId>org.apache.geronimo.itest</groupId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jpa-war</artifactId>
     <name>jpa war</name>
     <packaging>war</packaging>
-    <!--<version>1.0-SNAPSHOT</version>-->
-    <url>http://maven.apache.org</url>
     <build>
         <plugins>
             <!--<plugin>-->
@@ -35,27 +33,25 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.itest</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.1_spec</artifactId>
-            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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 @@
+<?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>testsuite</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itests</artifactId>
+    <name>Geronimo Test Support, Small Test Apps</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Small apps to test various geronimo features.
+    </description>
+    
+    <modules>
+        <!--<module>cxfPojoWS</module>-->
+        <module>jpa</module>
+    </modules>
+
+</project>

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 @@
         <module>deployment-testsuite</module>
         <module>enterprise-testsuite</module>
         <module>web-testsuite</module>
+        <module>itests</module>
     </modules>
 
     <build>
@@ -87,7 +88,7 @@
                     <artifactId>testsuite-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
-                
+
                 <!--
                 NOTE: Using 2.3-SNAPSHOT for TestNG w/JDK 1.5 support.
                 -->
@@ -298,5 +299,5 @@
             <id>child</id>
         </profile>
     </profiles>
-    
+
 </project>



Mime
View raw message