You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/08/18 05:43:10 UTC
svn commit: r986560 - in /geronimo/server/trunk/testsuite/javaee6-testsuite:
./ jta1.1-test/ jta1.1-test/src/ jta1.1-test/src/main/
jta1.1-test/src/main/java/ jta1.1-test/src/main/java/org/
jta1.1-test/src/main/java/org/apache/ jta1.1-test/src/main/jav...
Author: xiaming
Date: Wed Aug 18 03:43:09 2010
New Revision: 986560
URL: http://svn.apache.org/viewvc?rev=986560&view=rev
Log:
GERONIMO-5523 add test case to test JTA support, provided by LiWenQin
Added:
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java (with props)
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/
geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml (with props)
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml Wed Aug 18 03:43:09 2010
@@ -0,0 +1,113 @@
+<?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>javaee6-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jta1.1-test</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: jta1.1-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-jta_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>
+ ${project.build.testOutputDirectory}/testng.xml
+ </suiteXmlFile>
+ </suiteXmlFiles>
+ </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/jta1.1-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java Wed Aug 18 03:43:09 2010
@@ -0,0 +1,49 @@
+/**
+ * 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.sample.servlet;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.annotation.sql.DataSourceDefinitions;
+import javax.sql.DataSource;
+
+ @DataSourceDefinition(name="java:app/BJAcc",
+ className="org.apache.derby.jdbc.ClientXADataSource",
+ url="jdbc:derby://localhost:1527/BJAcc",
+ user="system",
+ databaseName="BJAcc",
+ transactional=true,
+ maxPoolSize=10,
+ properties = {"createDatabase = create"})
+
+public class BJAcc extends BaseServlet {
+
+ @Resource(lookup="java:app/BJAcc")
+ DataSource dataSource;
+
+ @Override
+ DataSource getDataSourceA() {
+ return dataSource;
+ }
+
+ @Override
+ DataSource getDataSourceB() {
+ return dataSource;
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BJAcc.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java Wed Aug 18 03:43:09 2010
@@ -0,0 +1,148 @@
+/**
+ * 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.sample.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+
+public abstract class BaseServlet extends HttpServlet {
+
+ abstract DataSource getDataSourceA();
+
+ abstract DataSource getDataSourceB();
+
+ String getTitle() {
+ return getClass().getName();
+ }
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doPost(request,response);
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ PrintWriter out = response.getWriter();
+ out.println("<html><head><title>");
+ out.println(getTitle());
+ out.println("</title></head></html><body>");
+
+ try {
+ initDB();
+ } catch (SQLException e) {
+ throw new ServletException("Error creating database", e);
+ }
+
+ List<Account> Accounts;
+
+ try {
+ Accounts = getAccounts();
+ } catch (SQLException e) {
+ throw new ServletException("Error accessing database", e);
+ }
+
+ for (Account c : Accounts) {
+ out.println(c.savings + "<br>");
+ }
+
+ out.println("<a href=\"index.jsp\">Return</a>");
+ out.println("</body></html>");
+
+ }
+
+ public void init(ServletConfig config) {
+ //System.out.println("Initializing servlet");
+ }
+
+ public void initDB() throws SQLException {
+ Connection con = getDataSourceA().getConnection();
+ Statement stmt = con.createStatement();
+
+ try {
+ stmt.executeUpdate("DROP TABLE ACCOUNTS");
+ } catch (SQLException e) {
+ // ignore
+ }
+
+ try {
+ stmt.executeUpdate("CREATE TABLE ACCOUNTS (ID INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY, SAVINGS INTEGER)");
+ //System.out.println(this.getTitle()+"says:After create table!");
+ } finally {
+ stmt.close();
+ con.close();
+ }
+
+
+ addAccount(200);
+ //addAccount(100);
+ }
+
+ public List<Account> getAccounts() throws SQLException {
+ List<Account> Accounts = new ArrayList<Account>();
+ Connection con = getDataSourceB().getConnection();
+ Statement stmt = con.createStatement();
+ try {
+ ResultSet rs = stmt.executeQuery(
+ "SELECT ID, SAVINGS FROM ACCOUNTS");
+ while (rs.next()) {
+ Account c = new Account();
+ c.id = rs.getLong(1);
+ c.savings = rs.getLong(2);
+ Accounts.add(c);
+ }
+ } finally {
+ stmt.close();
+ con.close();
+ }
+
+ return Accounts;
+ }
+
+ public void addAccount(long sav) throws SQLException {
+ Connection con = getDataSourceA().getConnection();
+ PreparedStatement pstmt = con.prepareStatement(
+ "INSERT INTO ACCOUNTS (SAVINGS) VALUES (?)");
+ try {
+ pstmt.setLong(1,sav);
+ pstmt.executeUpdate();
+ } finally {
+ pstmt.close();
+ con.close();
+ }
+ }
+
+
+ private static class Account {
+ long id;
+ long savings;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/BaseServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java Wed Aug 18 03:43:09 2010
@@ -0,0 +1,161 @@
+/**
+ * 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.sample.servlet;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+import javax.annotation.Resource;
+import javax.transaction.UserTransaction;
+
+/**
+ * Servlet implementation class DoTransfer
+ */
+public class DoTransfer extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ //@Resource(lookup="java:app/SHAcc")
+ //DataSource ds_SH;
+
+ //@Resource(lookup="java:app/SHAcc")
+ //DataSource ds_BJ;
+
+ public DoTransfer() {
+ super();
+
+ }
+
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ int amount = new Integer(request.getParameter("amount")).intValue();
+ int isFaildFlag = new Integer(request.getParameter("flag")).intValue();
+ boolean failFlag = ( isFaildFlag == 1 )? true :false;
+ String output = new String();
+
+ UserTransaction tx = null;
+ DataSource ds = null;
+ Connection conn_SH = null;
+ Connection conn_BJ = null;
+ Statement stmt = null;
+ String sql =null;
+ ResultSet rs = null;
+
+ try{
+ Context initContext = new InitialContext();
+
+ tx = (UserTransaction)initContext.lookup("java:comp/UserTransaction");
+
+ // Start a transaction
+ tx.begin();
+
+ //System.out.println("tx begin!");
+
+ // First, add to SH
+ ds = (javax.sql.DataSource) initContext.lookup("java:app/SHAcc");
+ System.out.println("in DoTransfer, get java:app/SHAcc sucess!");
+ //conn_SH = ds_SH.getConnection();
+ conn_SH = ds.getConnection();
+ conn_SH.setAutoCommit(false);
+ stmt = conn_SH.createStatement();
+ sql = "UPDATE ACCOUNTS set SAVINGS = SAVINGS+"+amount;
+ stmt.executeUpdate(sql);
+ //System.out.println("execute SQL 1 sucess!");
+
+ if(failFlag)
+ {throw new Exception("fail shoud happen!");}
+
+ // Second, del in BJ
+ ds = (javax.sql.DataSource) initContext.lookup("java:app/BJAcc");
+ //System.out.println("in DoTransfer, get java:app/BJAcc sucess!");
+ //conn_BJ = ds_BJ.getConnection();
+ conn_BJ = ds.getConnection();
+ conn_BJ.setAutoCommit(false);
+ stmt = conn_BJ.createStatement();
+ rs = stmt.executeQuery("SELECT * FROM ACCOUNTS");
+ int saving_BJ = 0;
+ while (rs.next()) {
+ saving_BJ = rs.getInt("SAVINGS");
+ if (saving_BJ < amount){
+ // throw a exception if no enough money left
+ throw new Exception("No enough money left in BJ Account!");
+ }
+ }
+
+ sql = "UPDATE ACCOUNTS set SAVINGS = SAVINGS-"+amount;
+ stmt.executeUpdate(sql);
+
+ // commit all the operations
+ tx.commit();
+
+
+ }
+ catch(Exception e){
+ if(tx!=null){
+ try{
+ // rollback the operations
+ tx.rollback();
+ //System.out.println("catch: roll back success.");
+ output += "catch: roll back success.";
+ }catch(Exception e1){
+ //System.out.println("catch: roll back fail.");
+ output += "catch: roll back fail.";
+ }
+ }
+ System.out.println("catch: " + e.getClass() + "; " + e.getMessage()+"");
+ }
+ finally{
+ if(conn_SH!=null){
+ try{
+ conn_SH.close();
+ //System.out.println("finally: close conn_SH success.");
+ output += "finally: close conn_SH success.";
+ }catch(Exception e1){
+ //System.out.println("finally: close conn_SH fail.");
+ output += "finally: close conn_SH fail.";
+ }
+ }
+ if(conn_BJ!=null){
+ try{
+ conn_BJ.close();
+ //System.out.println("finally: close conn_BJ success.");
+ output += "finally: close conn_BJ success.";
+ }catch(Exception e1){
+ //System.out.println("finally: close conn_BJ fail.");
+ output += "finally: close conn_BJ success.";
+ }
+ }
+ request.setAttribute("output",output);
+ //response.sendRedirect("AccountList.jsp");
+ getServletContext().getRequestDispatcher("/display.jsp").forward(request,response);
+ }
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DoTransfer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java Wed Aug 18 03:43:09 2010
@@ -0,0 +1,49 @@
+/**
+ * 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.sample.servlet;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.annotation.sql.DataSourceDefinitions;
+import javax.sql.DataSource;
+
+@DataSourceDefinition(name="java:app/SHAcc",
+ className="org.apache.derby.jdbc.ClientXADataSource",
+ url="jdbc:derby://localhost:1527/SHAcc",
+ user="system",
+ databaseName="SHAcc",
+ transactional=true,
+ maxPoolSize=10,
+ properties = {"createDatabase = create"})
+
+public class SHAcc extends BaseServlet {
+
+ @Resource(lookup="java:app/SHAcc")
+ DataSource dataSource;
+
+ @Override
+ DataSource getDataSourceA() {
+ return dataSource;
+ }
+
+ @Override
+ DataSource getDataSourceB() {
+ return dataSource;
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/java/org/apache/geronimo/sample/servlet/SHAcc.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug 18 03:43:09 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>
\ No newline at end of file
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml Wed Aug 18 03:43:09 2010
@@ -0,0 +1,58 @@
+<?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">
+ <servlet>
+ <display-name>SHAcc</display-name>
+ <servlet-name>SHAcc</servlet-name>
+ <servlet-class>org.apache.geronimo.sample.servlet.SHAcc</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SHAcc</servlet-name>
+ <url-pattern>/SHAcc</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <display-name>BJAcc</display-name>
+ <servlet-name>BJAcc</servlet-name>
+ <servlet-class>org.apache.geronimo.sample.servlet.BJAcc</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>BJAcc</servlet-name>
+ <url-pattern>/BJAcc</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <display-name>DoTransfer</display-name>
+ <servlet-name>DoTransfer</servlet-name>
+ <servlet-class>org.apache.geronimo.sample.servlet.DoTransfer</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>DoTransfer</servlet-name>
+ <url-pattern>/DoTransfer</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+
+</web-app>
\ No newline at end of file
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp Wed Aug 18 03:43:09 2010
@@ -0,0 +1,149 @@
+<!--
+ 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.
+-->
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<%@ page import="javax.sql.*"%>
+<%@ page import="java.sql.*"%>
+<%@ page import="javax.naming.*"%>
+<%@ page import="javax.annotation.Resource"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>JTA Testpage</title>
+</head>
+<body>
+<br/>
+
+<br/>
+<%
+Context initContext = new InitialContext();
+//Context envContext = (Context)initContext.lookup("java:comp/env");
+DataSource ds =null;
+Connection conn = null;
+Statement stmt = null;
+ResultSet rs = null;
+
+String id;
+String sav;
+%>
+
+<table border="0" width="600">
+<tr>
+ <!--////////// BJ DB info ///////////-->
+ <td width="300">
+ The Account at BJ:
+ <table border="1">
+ <tr>
+ <th>Account ID</th>
+ <th>Saving</th>
+ </tr>
+
+<%
+ ds = (javax.sql.DataSource)initContext.lookup("java:app/BJAcc");
+ //System.out.println("In desplay.jsp,sucess get java:app/BJAcc");
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("SELECT ID, SAVINGS FROM ACCOUNTS");
+
+ while (rs.next()) {
+ id = Long.valueOf(rs.getLong(1)).toString();
+ sav = Long.valueOf(rs.getLong(2)).toString();
+
+%>
+ <tr>
+ <td><%=id%></td>
+ <td id="bj"><%=sav%></td>
+ </tr>
+<%
+ }
+ rs.close();
+ conn.close();
+%>
+ </table>
+ </td>
+
+ <!--////////// SH DB info ///////////-->
+ <td width="300">
+ The Account at SH:
+ <table border="1">
+ <tr>
+ <th>Account ID</th>
+ <th>Saving</th>
+ </tr>
+
+<%
+
+ ds = (javax.sql.DataSource)initContext.lookup("java:app/SHAcc");
+ //System.out.println("In desplay.jsp,sucess get java:app/SHAcc");
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("SELECT ID, SAVINGS FROM ACCOUNTS");
+
+ while (rs.next()) {
+ id = Long.valueOf(rs.getLong(1)).toString();
+ sav = Long.valueOf(rs.getLong(2)).toString();
+
+
+%>
+ <tr>
+ <td><%=id%></td>
+ <td id="sh"><%=sav%></td>
+ </tr>
+
+<%
+ }
+ rs.close();
+ conn.close();
+
+ String output = String.valueOf(request.getAttribute("output"));
+ //System.out.println("in jsp,output is "+output);
+ output = output.equals("null") ? " ":output;
+ //System.out.println("in jsp,output is "+output);
+ request.setAttribute("output",null);
+ request.removeAttribute("output");
+
+%>
+
+ </table>
+ </td>
+</tr>
+</table>
+
+<br/>
+<form name="accForm" method="post" action="DoTransfer">
+ <b>Transfer Money from BJ to SH:</b>
+<br/>$<input type="text" name="amount" size="10" />
+
+<br/>
+<b>Want to invoke transaction failing?</b>
+<br/> <input type="text" name="flag" size="10" />
+<br/>(Input 0 for Transaction SUCESS, 1 for FAIL)
+<br/>
+<br/>
+<input type="submit" value="Submit" />
+<br/>
+<br/>
+</form>
+<b>Result:</b>
+<br/>
+<%=output%>
+
+
+</body>
+</html>
\ No newline at end of file
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/display.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp Wed Aug 18 03:43:09 2010
@@ -0,0 +1,23 @@
+<!--
+ 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.
+-->
+<ul>
+<a href="BJAcc">BJAcc</a>
+<br/>
+<a href="SHAcc">SHAcc</a>
+<br/>
+<a href="display.jsp">TestJTA</a>
+</ul>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java Wed Aug 18 03:43:09 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.testsuite.javaee6.tests;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import java.util.regex.Pattern;
+
+public class jtaTest extends SeleniumTestSupport {
+ @Test
+ public void testDerbyTxSucessCommit() throws Exception {
+ selenium.open("/jta1.1-test/");
+ selenium.click("link=BJAcc");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=Return");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=SHAcc");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=Return");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=TestJTA");
+ selenium.waitForPageToLoad("30000");
+ //test if transfer from BJ to SH sucess
+ selenium.type("amount", "1");
+ selenium.type("flag", "0");
+ selenium.click("//input[@value='Submit']");
+ selenium.waitForPageToLoad("30000");
+ Assert.assertEquals("199", selenium.getText("//*[@id=\"bj\"]"));
+ Assert.assertEquals("201", selenium.getText("//*[@id=\"sh\"]"));
+ //test if the DoTransfer Servlet can invoked again
+ selenium.type("amount", "1");
+ selenium.type("flag", "0");
+ selenium.click("//input[@value='Submit']");
+ selenium.waitForPageToLoad("30000");
+ Assert.assertEquals("198", selenium.getText("//*[@id=\"bj\"]"));
+ Assert.assertEquals("202", selenium.getText("//*[@id=\"sh\"]"));
+ }
+
+ @Test
+ public void testDerbyTxRollback() throws Exception {
+ selenium.open("/jta1.1-test/");
+ selenium.click("link=BJAcc");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=Return");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=SHAcc");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=Return");
+ selenium.waitForPageToLoad("30000");
+ selenium.click("link=TestJTA");
+ selenium.waitForPageToLoad("30000");
+ //test if transaction fail can occured
+ selenium.type("amount", "1");
+ selenium.type("flag", "1");//input 1 for transaction rollback
+ selenium.click("//input[@value='Submit']");
+ selenium.waitForPageToLoad("30000");
+ Assert.assertEquals("200", selenium.getText("//*[@id=\"bj\"]"));
+ Assert.assertEquals("200", selenium.getText("//*[@id=\"sh\"]"));
+ //test if the DoTransfer Servlet can invoked again and do transaction.commit()
+ selenium.type("amount", "10");
+ selenium.type("flag", "0");
+ selenium.click("//input[@value='Submit']");
+ selenium.waitForPageToLoad("30000");
+ Assert.assertEquals("190", selenium.getText("//*[@id=\"bj\"]"));
+ Assert.assertEquals("210", selenium.getText("//*[@id=\"sh\"]"));
+ }
+}
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/tests/jtaTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml?rev=986560&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml Wed Aug 18 03:43:09 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.1Lite">
+ <packages>
+ <package name="org.apache.geronimo.testsuite.javaee6.tests"/>
+ </packages>
+ </test>
+</suite>
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/jta1.1-test/src/test/resources/testng.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=986560&r1=986559&r2=986560&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Wed Aug 18 03:43:09 2010
@@ -64,6 +64,7 @@
<module>interceptors1.1-test</module>
-->
<module>commonannotation1.1-test</module>
+ <module>jta1.1-test</module>
</modules>
</project>