geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1024189 - in /geronimo/server/trunk/testsuite/javaee6-testsuite: ./ ejb3.1-test/ ejb3.1-test/asynEJB-test/ ejb3.1-test/asynEJB-test/src/ ejb3.1-test/asynEJB-test/src/main/ ejb3.1-test/asynEJB-test/src/main/java/ ejb3.1-test/asynEJB-test/sr...
Date Tue, 19 Oct 2010 09:33:49 GMT
Author: xiaming
Date: Tue Oct 19 09:33:47 2010
New Revision: 1024189

URL: http://svn.apache.org/viewvc?rev=1024189&view=rev
Log:
GERONIMO-5641 add test cases for ejb 3.1 new features, asynejb and global jndi, provided by LiWenQin

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml   (with props)
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,130 @@
+<?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>ejb3.1-test</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>asynEJB-test</artifactId>
+    <name>Geronimo TestSuite :: Java EE 6 Testsuite :: AsynEJB-test</name>
+   <description>
+    </description>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+          <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_2.0_spec</artifactId>
+			<scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>		
+    </dependencies> 
+	
+	<build>
+		<plugins>
+			<plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <archiveClasses>false</archiveClasses>
+                    </configuration>
+                </plugin>
+			</plugins>
+	</build>
+	
+	<profiles>
+    <profile>
+        <id>it</id>
+        <activation>
+            <property>
+                <name>it</name>
+            </property>
+        </activation>
+    <build>        
+        <plugins>   
+
+		    <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>
+							${project.build.testOutputDirectory}/testng.xml
+						</suiteXmlFile>
+                    </suiteXmlFiles>
+					<systemPropertyVariables>
+                         <appContext>${project.artifactId}</appContext>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-wars</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>undeploy-war-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    </profile>
+</profiles>
+</project>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,100 @@
+/**
+ *  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.javaee6.asynejb.ejb;
+
+import org.apache.geronimo.javaee6.asynejb.entity.Log;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.ejb.AsyncResult;
+import javax.ejb.Schedule;
+import javax.ejb.Stateless;
+import javax.ejb.Asynchronous;
+import javax.ejb.Timer;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+@Stateless
+public class LogSessionBean {
+
+    @PersistenceContext(unitName = "EJBTimerPU")
+    private EntityManager em;
+
+    @Asynchronous
+    public void WriteIntoDB() {
+        int count = 10;
+        int current = 0;
+        while (current < count) {
+            try {
+                Log log = new Log();
+                Date dt = new Date();
+                DateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                String nowTime = df.format(dt);
+                log.setCreateTime(nowTime);
+                log.setEvent("event" + new Random().nextInt());
+//                System.out.println("count is :"+current);
+                create(log);
+               Thread.sleep(2000);
+                current++;
+          }
+           catch (InterruptedException ex) {
+            }
+        }
+    }
+
+    @Asynchronous
+    public Future<Integer> notifyCustomers() {
+        int count = 10;
+        int current = 0;
+        while (current < count) {
+            try {
+//                System.out.println("Notify Time is: " + new Date());
+//                System.out.println("The current id is: " + current);
+                Thread.sleep(1000);
+                current++;
+            } catch (InterruptedException ex) {
+                Logger.getLogger(LogSessionBean.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        Future<Integer> future = new AsyncResult(current);
+        return future;
+    }
+
+    public void create(Log log) {
+
+        em.persist(log);
+    }
+
+    public int count() {
+        CriteriaQuery cq = em.getCriteriaBuilder().createQuery();
+        Root<Log> rt = cq.from(Log.class);
+        cq.select(em.getCriteriaBuilder().count(rt));
+        Query q = em.createQuery(cq);
+//        System.out.println("in LogSessionBean.java, the count res is:"+((Long) q.getSingleResult()).intValue());
+       return ((Long) q.getSingleResult()).intValue();
+    }
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/ejb/LogSessionBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,86 @@
+/**
+ *  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.javaee6.asynejb.entity;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Log implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    String createTime;
+    String event;
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof Log)) {
+            return false;
+        }
+        Log other = (Log) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "org.apache.geronimo.javaee6.asynejb.entity.Log[id=" + id + "]";
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/entity/Log.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,85 @@
+/**
+ *  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.javaee6.asynejb.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.Date;
+import java.util.concurrent.Future;
+
+import javax.ejb.EJB;
+import org.apache.geronimo.javaee6.asynejb.ejb.LogSessionBean;
+
+@WebServlet(name="testServlet", urlPatterns={"/testServlet"})
+public class testServlet extends HttpServlet {
+   @EJB
+    private LogSessionBean myEJB;
+   private String message;
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter out = response.getWriter();
+
+        Future<Integer> future = myEJB.notifyCustomers();
+        if (future.isDone()) {
+            message = "The notify process ended";
+        } else {
+            message = "The notify process is undergoing";
+        }
+
+        try {
+           
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet testServlet</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet testServlet at " + request.getContextPath () + "</h1>");
+            out.println(message+" at testServlet.<br/>");
+            System.out.println(message);
+            out.println("</body>");
+            out.println("</html>");
+
+        } finally { 
+            out.close();
+        }
+    } 
+
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/testServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,72 @@
+/**
+ *  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.javaee6.asynejb.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.annotation.WebServlet;
+
+import javax.ejb.EJB;
+import org.apache.geronimo.javaee6.asynejb.ejb.LogSessionBean;
+
+@WebServlet(name="writeDBServlet", urlPatterns={"/writeDBServlet"})
+public class writeDBServlet extends HttpServlet {
+    @EJB
+    private LogSessionBean myEJB;
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        myEJB.WriteIntoDB();
+        PrintWriter out = response.getWriter();
+        try {
+           
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet AsynEJBTestServlet</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet AsynEJBTestServlet at " + request.getContextPath () + "</h1>");
+            out.println("</body>");
+            out.println("</html>");
+            
+        } finally { 
+            out.close();
+        }
+    } 
+
+    
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/java/org/apache/geronimo/javaee6/asynejb/servlet/writeDBServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="EJBTimerPU" transaction-type="JTA">
+    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+    <jta-data-source>jdbc/sample</jta-data-source>
+    <class>org.apache.geronimo.javaee6.asynejb.entity.Log</class>
+    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+    <properties>
+      <!-- drop and create tables at deployment -->
+      <!-- log sqls executed in server.log -->
+      <property name="eclipselink.logging.level" value="FINE"/>
+      <!-- Instruct EclipseLink to not log execeptions it throws. Lets the application decide about it-->
+      <property name="eclipselink.logging.exceptions" value="false"/>
+      <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="hibernate.connection.url" value="jdbc:derby://localhost:1527/sample"/>
+      <property name="hibernate.connection.username" value="app"/>
+      <property name="hibernate.connection.password" value="app"/>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+      <property name="hibernate.show_sql" value="true"/>
+      <property name="hibernate.hbm2ddl.auto" value="create"/>
+      <property name="eclipselink.ddl-generation" value="create-tables"/>
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/eclipselink_persistence.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="EJBTimerPU" transaction-type="JTA">
+    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>    
+    <class>org.apache.geronimo.javaee6.asynejb.entity.Log</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="openjpa.jdbc.DBDictionary" value="derby"/>
+	  <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/asynEJBdb;create=true"/>
+	  <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="openjpa.ConnectionUserName" value="APP"/>
+      <property name="openjpa.ConnectionPassword" value="APP"/>      
+      <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>   
+      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>      
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="EJBTimerPU" transaction-type="JTA">
+    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>    
+    <class>org.apache.geronimo.javaee6.asynejb.entity.Log</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="openjpa.jdbc.DBDictionary" value="derby"/>
+	  <property name="openjpa.ConnectionURL" value="jdbc:derby://localhost:1527/asynEJBdb;create=true"/>
+	  <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.ClientDriver"/>
+      <property name="openjpa.ConnectionUserName" value="APP"/>
+      <property name="openjpa.ConnectionPassword" value="APP"/>      
+      <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>   
+      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>      
+    </properties>
+  </persistence-unit>
+</persistence>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/resources/META-INF/persistence_openjpa.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
+      <sys:version>${project.version}</sys:version>
+      <sys:type>war</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${project.artifactId}</context-root>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,56 @@
+/**
+ *  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.javaee6.asynejb.test;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.methods.PostMethod;
+
+import java.util.regex.*;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class AsynEJBTest {
+	@Test
+	public void AsynEJBTest()throws Exception
+	{
+		String contextRoot = System.getProperty("appContext");
+		HttpClient nclient = new HttpClient();
+		String url = "http://localhost:8080/"+contextRoot+"/testServlet";
+		HttpMethodBase httpMethod2;
+		httpMethod2 = new PostMethod(url);
+		int status = nclient.executeMethod(httpMethod2);
+		Assert.assertEquals(200, status);
+		String result=null;
+		if(status==200){
+			String response = new String(httpMethod2.getResponseBodyAsString().getBytes("8859_1"));
+			Matcher m = Pattern.compile("The notify process(.)+? testServlet.").matcher(response);
+			
+			while (m.find()) 
+			{
+				result = m.group();
+			}
+		}
+		Assert.assertEquals(result, "The notify process is undergoing at testServlet.");
+		
+		httpMethod2.releaseConnection();
+}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/java/org/apache/geronimo/javaee6/asynejb/test/AsynEJBTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml Tue Oct 19 09:33:47 2010
@@ -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="5">
+    <test name="javaee6-testsuite.EJB3.1">
+        <packages>
+            <package name="org.apache.geronimo.javaee6.asynejb.test"/>
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,132 @@
+<?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>ejb3.1-test</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jndiEJB-test</artifactId>
+    <name>Geronimo TestSuite :: Java EE 6 Testsuite :: jndiEJB-test</name>
+   <description>
+    </description>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+          <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_2.0_spec</artifactId>
+			<scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>		
+    </dependencies> 
+	
+	<build>
+		<plugins>
+			<plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <archiveClasses>false</archiveClasses>
+                    </configuration>
+                </plugin>
+			</plugins>
+	</build>
+	
+	<profiles>
+    <profile>
+        <id>it</id>
+        <activation>
+            <property>
+                <name>it</name>
+            </property>
+        </activation>
+    <build>        
+        <plugins>   
+
+		    <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>
+							${project.build.testOutputDirectory}/testng.xml
+						</suiteXmlFile>
+					</suiteXmlFiles>
+					<systemPropertyVariables>
+                        <moduleVersion>${project.version}</moduleVersion>
+						<appContext>${project.artifactId}</appContext>
+                    </systemPropertyVariables>
+                    
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-wars</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>undeploy-war-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    </profile>
+</profiles>
+</project>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,28 @@
+/**
+ *  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.javaee6.jndi.ejb;
+import javax.ejb.Stateless;
+
+@Stateless
+public class helloBean {
+    public String sayHello(String s){
+        return s+" says:hello";
+    }
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/ejb/helloBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,85 @@
+/**
+ *  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.javaee6.jndi.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.javaee6.jndi.ejb.helloBean;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+@WebServlet(name="globalJNDITest", urlPatterns={"/globalJNDITest"})
+public class globalJNDITest extends HttpServlet {
+
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter out = response.getWriter();
+        try {
+		    String version = request.getParameter("version");
+            helloBean h1 = (helloBean) new InitialContext().lookup("java:global/jndiEJB-test-"+version+"/helloBean");
+            String s1 = h1.sayHello("global");
+            helloBean h2 = (helloBean) new InitialContext().lookup("java:app/jndiEJB-test-"+version+"/helloBean");
+            String s2 = h2.sayHello("app");
+            helloBean h3 = (helloBean) new InitialContext().lookup("java:module/helloBean");
+            String s3 = h3.sayHello("module");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet globalJNDITest</title>");  
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet globalJNDITest at " + request.getContextPath () + "</h1>");
+            out.println("<p>"+s1+" at testServlet.</p>");
+            out.println("<p>"+s2+" at testServlet.</p>");
+            out.println("<p>"+s3+" at testServlet.</p>");
+            out.println("</body>");
+            out.println("</html>");
+        } catch (NamingException e) {
+            e.printStackTrace();
+        }  finally {
+            out.close();
+        }
+    } 
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/java/org/apache/geronimo/javaee6/jndi/servlet/globalJNDITest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
+      <sys:version>${project.version}</sys:version>
+      <sys:type>war</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${project.artifactId}</context-root>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java Tue Oct 19 09:33:47 2010
@@ -0,0 +1,73 @@
+/**
+ *  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.javaee6.jndi.test;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.methods.PostMethod;
+
+import java.util.regex.*;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class jndiEJBTest {
+	
+	@Test
+	public void AsynEJBTest()throws Exception
+	{
+		String VersionPara = System.getProperty("moduleVersion");
+		String contextRoot = System.getProperty("appContext");
+
+		HttpClient nclient = new HttpClient();
+		String url = "http://localhost:8080/"+contextRoot+"/globalJNDITest?version="+VersionPara;
+		HttpMethodBase httpMethod;
+		httpMethod = new PostMethod(url);
+		
+		int status = nclient.executeMethod(httpMethod);
+		Assert.assertEquals(200, status);
+		
+		String result1 = null;
+		String result2 = null;
+		String result3 = null;
+		if(status==200){
+			String response = new String(httpMethod.getResponseBodyAsString().getBytes("8859_1"));
+			result1 = findRes("global (.)+? at testServlet.",response);
+			result2 = findRes("app (.)+? at testServlet.",response);
+			result3 = findRes("module (.)+? at testServlet.",response);
+		}
+		Assert.assertEquals(result1, "global says:hello at testServlet.");
+		Assert.assertEquals(result2, "app says:hello at testServlet.");
+		Assert.assertEquals(result3, "module says:hello at testServlet.");
+		
+		httpMethod.releaseConnection();
+	}
+	
+	private String findRes(String regex,String response){
+		String res=null;
+		Matcher m = Pattern.compile(regex).matcher(response);
+		while (m.find()) 
+		{
+			res = m.group();
+		}
+		//System.out.println(res);
+		return res;
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/java/org/apache/geronimo/javaee6/jndi/test/jndiEJBTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml Tue Oct 19 09:33:47 2010
@@ -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="5">
+    <test name="javaee6-testsuite.EJB3.1">
+        <packages>
+            <package name="org.apache.geronimo.javaee6.jndi.test"/>
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml?rev=1024189&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml Tue Oct 19 09:33:47 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>javaee6-testsuite</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ejb3.1-test</artifactId>
+    <name>Geronimo TestSuite :: Java EE 6 Testsuite :: ejb3.1-test</name>
+    <packaging>pom</packaging>
+
+
+    <modules>
+        <module>asynEJB-test</module>
+		<module>jndiEJB-test</module>
+    </modules>
+</project>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml?rev=1024189&r1=1024188&r2=1024189&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Tue Oct 19 09:33:47 2010
@@ -65,6 +65,7 @@
         <!--<module>servlet3.0-security-test</module>-->
         <module>servlet3.0-test</module>
         <!--<module>webbean1.0-test</module>-->
+        <module>ejb3.1-test</module>
     </modules>
 
 </project>



Mime
View raw message