[jboss-cvs] JBossAS SVN: r91707 - in branches/JBPAPP_5_0/testsuite/src: resources/crashrecovery/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 28 07:15:44 EDT 2009
Author: istudens at redhat.com
Date: 2009-07-28 07:15:44 -0400 (Tue, 28 Jul 2009)
New Revision: 91707
Removed:
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test01.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test02.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test03.java
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/ejb-jar.xml
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss-beans.xml
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss.xml
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-xa-ds.xml
Log:
removed obsolete resources, JBQA-2176
Deleted: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test01.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test01.java 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test01.java 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- * @author JBoss Inc.
- */
-package org.jboss.test.crashrecovery.ASCrashRecovery01;
-
-import org.jboss.test.crashrecovery.taskdefs.ClientAction;
-import org.jboss.test.crashrecovery.taskdefs.ASTestConfig;
-
-import java.util.Map;
-
-public class Test01 implements ClientAction
-{
- public static void main(String args[])
- {
- System.out.println("Passed");
- }
-
- public boolean execute(ASTestConfig config, Map<String, String> params)
- {
- return true;
- }
-
- public boolean cancel() throws UnsupportedOperationException
- {
- throw new UnsupportedOperationException("TODO");
- }
-}
-
Deleted: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test02.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test02.java 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test02.java 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- * @author JBoss Inc.
- */
-package org.jboss.test.crashrecovery.ASCrashRecovery01;
-
-import org.jboss.test.crashrecovery.taskdefs.ClientAction;
-import org.jboss.test.crashrecovery.taskdefs.ASTestConfig;
-
-
-import java.util.Map;
-
-public class Test02 implements ClientAction
-{
-
- public boolean execute(ASTestConfig config, Map<String, String> params)
- {
- return true;
- }
-
- public boolean cancel() throws UnsupportedOperationException
- {
- return true;
- }
-}
Deleted: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test03.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test03.java 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/Test03.java 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,331 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- * @author JBoss Inc.
- */
-package org.jboss.test.crashrecovery.ASCrashRecovery01;
-
-import org.jboss.test.crashrecovery.taskdefs.ClientAction;
-import org.jboss.test.crashrecovery.recovery.ASFailureSpec;
-import org.jboss.test.crashrecovery.taskdefs.ASTestConfig;
-import org.jboss.test.crashrecovery.taskdefs.TransactionLog;
-import org.jboss.test.crashrecovery.crash.CrashRem;
-import org.jboss.test.crashrecovery.crash.CrashRemHome;
-import org.jboss.remoting.CannotConnectException;
-import org.apache.tools.ant.BuildException;
-
-import java.util.Map;
-import java.io.*;
-
-import javax.rmi.PortableRemoteObject;
-import javax.transaction.*;
-import javax.naming.NamingException;
-
-public class Test03 implements ClientAction
-{
- // the longest time to wait in millis before declaring a test a failed (overridable)
- private static final int MAX_TEST_TIME = 180000;
-
- private ASTestConfig config;
- private boolean isCMT = false;
- private boolean clientTx = false;
- private boolean isDebug = false;
- private boolean expectFailure = false;
- private int maxTestTime = MAX_TEST_TIME;
-
- private String storeDir = null;
- private String storeImple = "HashedActionStore";
- private String storeType = null; //"StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction";
- private TransactionLog store;
- private int existingUids;
-
- private String name = "Test";
- private String serverName = "default";
-
- public boolean execute(ASTestConfig config, Map<String, String> params)
- {
- StringBuilder sb = new StringBuilder();
- ASFailureSpec[] fspecs = null;
-
- this.config = config;
-
- for (Map.Entry<String, String> me : params.entrySet())
- {
- String key = me.getKey().trim();
- String val = me.getValue().trim();
-
- if ("name".equals(key))
- name = val;
- else if ("cmt".equals(key))
- isCMT = val.equalsIgnoreCase("true");
- else if ("debug".equals(key))
- isDebug = val.equalsIgnoreCase("true");
- else if ("serverName".equals(key))
- serverName = val;
- else if ("storeType".equals(key))
- storeType = val;
- else if ("storeDir".equals(key))
- storeDir = val;
- else if ("clientTx".equals(key))
- clientTx = val.equalsIgnoreCase("true");
- else if ("storeImple".equals(key))
- storeImple = val;
- else if ("testTime".equals(key))
- maxTestTime = parseInt(val, "parameter testTime should represent a number of seconds: ");
- else if ("specs".equals(key))
- fspecs = parseSpecs(val, sb);
- else if ("wait".equals(key))
- suspendFor(Integer.parseInt(val));
- }
-
- sb.insert(0, ":\n").insert(0, name).insert(0, "Executing test ");
-
- System.out.println(sb);
-
- ClassLoader loader1 = Thread.currentThread().getContextClassLoader();
- ClassLoader loader2 = this.getClass().getClassLoader();
-
- try
- {
- String serverPath = config.getServerPath(serverName);
-
- // switch class loaders since a custom ant task runs with a different loader from the loader
- // that loader that loaded the class
- Thread.currentThread().setContextClassLoader(loader2);
-
- // get a handle to the transaction logs
- if (storeDir == null)
- storeDir = serverPath + "data/tx-object-store";
- else
- storeDir = serverPath + storeDir;
-
- store = new TransactionLog(storeDir, storeImple);
-
- if (expectFailure)
- {
- // this test may halt the VM so make sure the transaction log is empty
- // before starting the test - then the pass/fail check is simply to
- // test whether or not the log is empty (see recoverUids() below).
- try
- {
- store.clearXids(storeType);
- }
- catch (Exception ignore)
- {
- }
-
- existingUids = getPendingUids();
- }
-
- // run the crash test
- return crashTest(fspecs);
- }
- catch (Exception e)
- {
- if (isDebug)
- e.printStackTrace();
-
- throw new BuildException(e);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(loader1);
- }
- }
-
- public boolean cancel() throws UnsupportedOperationException
- {
- throw new UnsupportedOperationException("TODO");
- }
-
- private ASFailureSpec[] parseSpecs(String specArg, StringBuilder sb)
- {
- ASFailureSpec[] fspecs = config.parseSpecs(specArg);
-
- for (ASFailureSpec spec : fspecs)
- {
- String name = (spec == null ? "INVALID" : spec.getName());
-
- if (spec != null && spec.willTerminateVM())
- expectFailure = true;
-
- sb.append("\t").append(name).append('\n');
- }
-
- return fspecs;
- }
-
- private int parseInt(String intValue, String errorMessage) throws IllegalArgumentException
- {
- try
- {
- return Integer.parseInt(intValue);
- }
- catch (NumberFormatException e)
- {
- System.out.println(errorMessage + e.getMessage());
-
- throw new IllegalArgumentException(e);
- }
- }
-
- // count how many pending transaction branches there are in the transaction log
- private int getPendingUids()
- {
- try
- {
- return store.getIds(storeType).size();
- }
- catch (Exception e)
- {
- e.printStackTrace();
-
- return -1;
- }
- }
-
- private CrashRem lookup(String name) throws Exception
- {
- Object o = config.getNamingContext(serverName).lookup(name);
- CrashRemHome home = (CrashRemHome) PortableRemoteObject.narrow(o, CrashRemHome.class);
-
- return home.create();
- }
-
- private UserTransaction startTx() throws NamingException, SystemException, NotSupportedException
- {
- UserTransaction tx = (UserTransaction) config.getNamingContext(serverName).lookup("UserTransaction");
-
- tx.begin();
-
- return tx;
- }
-
- private boolean crashTest(ASFailureSpec[] sa) throws Exception
- {
- UserTransaction tx = null;
-
- try
- {
- CrashRem cr = lookup(isCMT ? CrashRem.CMT_JNDI_NAME : CrashRem.BMT_JNDI_NAME);
-
- if (clientTx)
- tx = startTx();
-
- String res = cr.testXA(sa);
-
- return "Passed".equalsIgnoreCase(res);
- }
- catch (CannotConnectException e)
- {
- if (expectFailure)
- {
- print("Failure was expected: " + e.getMessage());
-
- return recoverUids();
- }
- else
- {
- System.err.println("XACrashTest:crashTest: Caught " + e);
-
- e.printStackTrace();
- }
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- System.err.println("XACrashTest:crashTest: Caught " + t);
- }
- finally {
- if (clientTx)
- try
- {
- tx.commit();
- }
- catch (Throwable e)
- {
- System.out.println("User tx commit failure: " + e.getMessage());
- }
- }
-
- return false;
- }
-
- /**
- * Wait for any pending transactions to recover by restaring the AS.
- * @return true if all pending branches have been recovered
- * @throws IOException if the server cannot be started
- */
- private boolean recoverUids() throws IOException
- {
- int retryPeriod = 30000;
- int maxWait = maxTestTime;
- int pendingUids;
-
- do
- {
- pendingUids = getPendingUids();
-
- if (pendingUids == -1)
- return false; // object store error
-
- if (pendingUids <= existingUids)
- return true; // all uids recovered
-
- pendingUids -= existingUids;
-
- print("waiting for " + pendingUids + " branches");
-
- // wait for the server to start up the first time through
- if (maxWait == maxTestTime)
- config.startServer(serverName);
-
- suspendFor(retryPeriod);
- maxWait -= retryPeriod;
- } while (maxWait > 0);
-
- // the test failed to recover some uids - clear them out ready for the next test
- try
- {
- store.clearXids(storeType);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- return false;
- }
-
- private void suspendFor(int millis)
- {
- try
- {
- Thread.sleep(millis);
- }
- catch (InterruptedException e)
- {
- System.out.println("Test " + name + " interupted");
- }
- }
-
- static void print(String msg)
- {
- System.out.println(msg);
- }
-}
Deleted: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/ejb-jar.xml 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/ejb-jar.xml 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN' 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
-<ejb-jar>
- <enterprise-beans>
- <session>
- <description>Crash Testing BMT (Remote)</description>
- <ejb-name>CrashBMTRemEJB</ejb-name>
- <home>org.jboss.test.crashrecovery.crash.CrashRemHome</home>
- <remote>org.jboss.test.crashrecovery.crash.CrashRem</remote>
- <local-home>org.jboss.test.crashrecovery.crash.CrashLocalHome</local-home>
- <local>org.jboss.test.crashrecovery.crash.CrashLocal</local>
- <ejb-class>org.jboss.test.crashrecovery.crash.CrashBMTBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
- </session>
-
- <session>
- <description>Crash Testing CMT (Remote)</description>
- <ejb-name>CrashCMTRemEJB</ejb-name>
- <home>org.jboss.test.crashrecovery.crash.CrashRemHome</home>
- <remote>org.jboss.test.crashrecovery.crash.CrashRem</remote>
- <local-home>org.jboss.test.crashrecovery.crash.CrashLocalHome</local-home>
- <local>org.jboss.test.crashrecovery.crash.CrashLocal</local>
- <ejb-class>org.jboss.test.crashrecovery.crash.CrashCMTBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
-<!--
- <message-driven>
- <ejb-name>TextMdb</ejb-name>
- <ejb-class>org.jboss.test.crashrecovery.crash.TextMdb</ejb-class>
- <transaction-type>Bean</transaction-type>
- <message-driven-destination>
- <destination-type>javax.jms.Queue</destination-type>
- </message-driven-destination>
-
- <security-identity>
- <run-as>
- <role-name>guest</role-name>
- </run-as>
- </security-identity>
- </message-driven>
--->
- </enterprise-beans>
-
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>CrashCMTRemEJB</ejb-name>
- <method-name>testXA</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
Deleted: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss-beans.xml 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss-beans.xml 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-<!--
- <bean name="ASTestEJB" class="org.jboss.test.crashrecovery.crash.CrashBMTBean" >
- <depends>jboss.mq:service=DestinationManager</depends>
- <depends>jboss.mq:service=SecurityManager</depends>
- </bean>
--->
-
-</deployment>
Deleted: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss.xml 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/META-INF/jboss.xml 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>CrashBMTRemEJB</ejb-name>
- <jndi-name>org.jboss.test.crashrecovery.crash.CrashBMTRem</jndi-name>
- </session>
-
- <session>
- <ejb-name>CrashCMTRemEJB</ejb-name>
- <jndi-name>org.jboss.test.crashrecovery.crash.CrashCMTRem</jndi-name>
- </session>
-
-<!--
- <message-driven>
- <ejb-name>TextMdb</ejb-name>
- <destination-jndi-name>queue/sndQ</destination-jndi-name>
- </message-driven>
--->
-
- </enterprise-beans>
-</jboss>
Deleted: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-xa-ds.xml 2009-07-28 10:31:39 UTC (rev 91706)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-xa-ds.xml 2009-07-28 11:15:44 UTC (rev 91707)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
-
-<datasources>
- <xa-datasource>
- <jndi-name>XAOracleDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:oci8:@dtfdb5:1521:TSH1</xa-datasource-property>
- <xa-datasource-property name="User">system</xa-datasource-property>
- <xa-datasource-property name="Password">jboss83</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-
- <xa-datasource>
- <jndi-name>XAOracleDS2</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:oci8:@dtfdb7:1521:TSH1</xa-datasource-property>
- <xa-datasource-property name="User">system</xa-datasource-property>
- <xa-datasource-property name="Password">jboss83</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
- <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter"
- name="jboss.jca:service=OracleXAExceptionFormatter">
- <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
- </mbean>
-
-</datasources>
More information about the jboss-cvs-commits
mailing list