[jboss-svn-commits] JBL Code SVN: r29695 - in labs/jbosstm/trunk/ArjunaJTS/jts: classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 20 10:50:08 EDT 2009
Author: jhalliday
Date: 2009-10-20 10:50:07 -0400 (Tue, 20 Oct 2009)
New Revision: 29695
Removed:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Defaults.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/BeanPopulatorTest.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBean.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBeanMBean.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java
Log:
Updated config properties handling. JBTM-628
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -898,10 +898,4 @@
* @message com.arjuna.ats.internal.jts.orbspecific.tfitimeout {0} - invalid
* default transaction timeout {1}. Caught exception: {2}
*/
-
- static
- {
- TxControl.setDefaultTimeout(jtsPropertyManager.getJTSEnvironmentBean().getDefaultTimeout());
- }
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -207,10 +207,12 @@
* to start the recovery daemon. In general we don't want people
* doing that kind of thing, but it makes development testing a
* lot easier.
+ *
+ * Note: this relies directly on system property lookup, since we don't
+ * want to expose the setting via the public EnvironmentBean config.
*/
+ String env = System.getProperty("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.noDaemon");
- String env = jtsPropertyManager.getPropertyManager().getProperty("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.noDaemon");
-
if (env != null)
{
if (env.equals("YES"))
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -46,8 +46,6 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.objectstore.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.orbportability.*;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.jts.logging.jtsLogger;
@@ -58,7 +56,6 @@
import org.omg.CORBA.OBJECT_NOT_EXIST;
import org.omg.CORBA.TRANSIENT;
-import java.util.Hashtable;
/**
@@ -99,7 +96,6 @@
public RecoveredServerTransaction ( Uid actionUid )
{
this(actionUid, "");
- _assumed_not_exist = jtsPropertyManager.getJTSEnvironmentBean().getAssumedObjectNotExist();
}
/**
@@ -113,8 +109,6 @@
{
super(actionUid);
- _assumed_not_exist = jtsPropertyManager.getJTSEnvironmentBean().getAssumedObjectNotExist();
-
if (jtsLogger.loggerI18N.isDebugEnabled())
{
jtsLogger.loggerI18N.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
@@ -339,36 +333,11 @@
}
}
- // orbix seems to count unreachable as transient. Over infinite time, all
- // addresses are valid
- catch (TRANSIENT ex_trans)
+ catch (TRANSIENT ex_trans)
{
- //Check here the orb used - If Orbix execute what is below.
- if (ORBInfo.getOrbEnumValue() == ORBType.ORBIX2000)
- {
- // the original application has (probably) died
- if (!assumed_not_exist.containsKey(get_uid()))
- assumed_not_exist.put(get_uid(), new Integer(_assumed_not_exist));
-
- Integer n = (Integer)assumed_not_exist.get(get_uid());
- not_exist_count = n.intValue();
-
- not_exist_count--;
-
- if (not_exist_count == 0)
- {
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoverdServerTransaction_10", new Object[] {get_uid()});
- theStatus = org.omg.CosTransactions.Status.StatusRolledBack;
- assumed_not_exist.remove(get_uid());
- }
- else
- {
- theStatus = org.omg.CosTransactions.Status.StatusUnknown;
- // check if the value can be changed rather remove then put in
- assumed_not_exist.remove(get_uid());
- assumed_not_exist.put(get_uid(), new Integer(not_exist_count));
- }
- }
+ // orbix seems to count unreachable as transient, but we no longer support orbix
+ jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoverdServerTransaction_10", new Object[] {get_uid()});
+ theStatus = org.omg.CosTransactions.Status.StatusRolledBack;
}
// What here what should be done for Orbix2000
catch (OBJECT_NOT_EXIST ex)
@@ -523,14 +492,5 @@
private boolean _reportHeuristics = false;
private int _recoveryStatus = RecoveryStatus.NEW;
- private int _assumed_not_exist = 10;
-
private org.omg.CosTransactions.Status _txStatus;
-
- static Hashtable assumed_not_exist;
-
- static {
- assumed_not_exist = new Hashtable();
- }
-
}
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts;
-
-import java.util.Hashtable;
-
-import com.arjuna.ats.jts.common.Configuration;
-
-/**
- * Module specific implementation of the information object.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 2.0.
- */
-
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
- moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
- moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
- moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
- moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
- moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -59,26 +59,14 @@
* @return the name of the module properties file to use.
*/
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
- /**
- * Set the name of the properties file.
- */
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
/**
* Get a build time property.
* @param name The name of the build time property.
* @return The build time property value.
*/
- public static String getBuildTimeProperty(final String name)
+ private static String getBuildTimeProperty(final String name)
{
if (PROPS == null)
{
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Defaults.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Defaults.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Defaults.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001, 2002,
- *
- * Hewlett-Packard Arjuna Labs,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK
- *
- * $Id: Defaults.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts.common;
-
-/**
- * Some default values for the OTS.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Defaults.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Defaults
-{
-
- /**
- * Does the receiving transactional object always need to be invoked within
- * the context of a transaction?
- */
-
- public static boolean needTransactionContext = false;
-
- /**
- * Do we always propagate the transaction hierarchy regardless of
- * whether or not the receiving object is derived from
- * CosTransactions::TransactionalObject?
- */
-
- public static boolean alwaysPropagateContext = false;
-
-}
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001, 2002,
- *
- * Hewlett-Packard Arjuna Labs,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts.common;
-
-/**
- * The various property values that may be specified at runtime to
- * change the configuration and behaviour of the system.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- * @deprecated use JTSEnvironmentBean instead
- */
- at Deprecated
-public class Environment
-{
-
- public static final String PROPERTIES_FILE = "com.arjuna.ats.jts.common.propertiesFile";
- public static final String TRANSACTION_MANAGER = "com.arjuna.ats.jts.transactionManager";
- public static final String NEED_TRAN_CONTEXT = "com.arjuna.ats.jts.needTranContext";
- public static final String ALWAYS_PROPAGATE_CONTEXT = "com.arjuna.ats.jts.alwaysPropagateContext";
- public static final String INTERPOSITION = "com.arjuna.ats.jts.interposition";
- public static final String CHECKED_TRANSACTIONS = "com.arjuna.ats.jts.checkedTransactions";
- public static final String SUPPORT_SUBTRANSACTIONS = "com.arjuna.ats.jts.supportSubtransactions";
- public static final String SUPPORT_ROLLBACK_SYNC = "com.arjuna.ats.jts.supportRollbackSync";
- public static final String SUPPORT_INTERPOSED_SYNCHRONIZATION = "com.arjuna.ats.jts.supportInterposedSynchronization";
- public static final String DEFAULT_TIMEOUT = "com.arjuna.ats.jts.defaultTimeout"; // deprecated
- public static final String PROPAGATE_TERMINATOR = "com.arjuna.ats.jts.propagateTerminator";
- public static final String CONTEXT_PROP_MODE = "com.arjuna.ats.jts.contextPropMode";
- public static final String RECOVERY_MANAGER_ORB_PORT = "com.arjuna.ats.jts.recoveryManagerPort";
- public static final String RECOVERY_MANAGER_ADDRESS = "com.arjuna.ats.jts.recoveryManagerAddress";
- public static final String OTS_1_0_TIMEOUT_PROPAGATION = "com.arjuna.ats.jts.ots_1_0.timeoutPropagation";
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBean.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBean.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -33,9 +33,6 @@
@PropertyPrefix(prefix = "com.arjuna.ats.jts.")
public class JTSEnvironmentBean implements JTSEnvironmentBeanMBean
{
- @FullPropertyName(name= "com.arjuna.ats.jts.common.propertiesFile")
- private volatile String propertiesFile = "";
-
private volatile boolean transactionManager = false;
private volatile boolean needTranContext = false;
private volatile boolean alwaysPropagateContext = false;
@@ -44,7 +41,6 @@
private volatile boolean supportSubtransactions = true;
private volatile boolean supportRollbackSync = true;
private volatile boolean supportInterposedSynchronization = false;
- private volatile int defaultTimeout = 60; // deprecated
private volatile boolean propagateTerminator = false;
private volatile String contextPropMode = null;
private volatile int recoveryManagerPort = 4711;
@@ -59,34 +55,8 @@
@FullPropertyName(name = "com.arjuna.ats.jts.recovery.commitTransactionRetryLimit")
private volatile int commitedTransactionRetryLimit = 3;
- @FullPropertyName(name = "com.arjuna.ats.jts.recovery.assumedObjectNotExist")
- private volatile int assumedObjectNotExist = 10;
-
/**
- * Returns the name of the properties file.
- *
- * Default: ""
- * Equivalent deprecated property: com.arjuna.ats.jts.common.propertiesFile
- *
- * @return the name of the properties file
- */
- public String getPropertiesFile()
- {
- return propertiesFile;
- }
-
- /**
- * Sets the name of the properties file.
- *
- * @param propertiesFile the name of the properties file.
- */
- public void setPropertiesFile(String propertiesFile)
- {
- this.propertiesFile = propertiesFile;
- }
-
- /**
* Returns if an extenal transaction manager process should be used.
*
* Default: false
@@ -273,31 +243,6 @@
}
/**
- * Returns the default interval after which a transaction may be considered for timeout, in seconds.
- * Note: depending on the reaper mode and workload, transactions may not be timed out immediately.
- *
- * Default: 60
- * Equivalent deprecated property: com.arjuna.ats.jts.defaultTimeout
- *
- * @deprecated use the Coordinator one instead.
- * @return the default transaction lifetime, in seconds.
- */
- public int getDefaultTimeout()
- {
- return defaultTimeout;
- }
-
- /**
- * Sets the default lifetime after which a transaction may be considered for timeout, in seconds.
- *
- * @param defaultTimeout the default transaction lifetime, in seconds.
- */
- public void setDefaultTimeout(int defaultTimeout)
- {
- this.defaultTimeout = defaultTimeout;
- }
-
- /**
* Returns if a reference to the terminator should be included in the propagation context.
*
* Default: false
@@ -470,28 +415,4 @@
{
this.commitedTransactionRetryLimit = commitedTransactionRetryLimit;
}
-
- /**
- * Returns the number of transient errors to allow before assuming an unreachable object is permanently gone.
- *
- * Default: 10
- * Equivalent deprecated property: com.arjuna.ats.jts.recovery.assumedObjectNotExist
- *
- * @deprecated I apply to Orbix only - remove me.
- * @return the nubmer of transient errors to allow.
- */
- public int getAssumedObjectNotExist()
- {
- return assumedObjectNotExist;
- }
-
- /**
- * Sets the number of transient errors to allow before assuming an object is permanently unreachable.
- *
- * @param assumedObjectNotExist the number of attempts to allow.
- */
- public void setAssumedObjectNotExist(int assumedObjectNotExist)
- {
- this.assumedObjectNotExist = assumedObjectNotExist;
- }
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBeanMBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBeanMBean.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/JTSEnvironmentBeanMBean.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -27,10 +27,6 @@
*/
public interface JTSEnvironmentBeanMBean
{
- String getPropertiesFile();
-
- void setPropertiesFile(String propertiesFile);
-
boolean isTransactionManager();
void setTransactionManager(boolean transactionManager);
@@ -63,10 +59,6 @@
void setSupportInterposedSynchronization(boolean supportInterposedSynchronization);
- int getDefaultTimeout();
-
- void setDefaultTimeout(int defaultTimeout);
-
boolean isPropagateTerminator();
void setPropagateTerminator(boolean propagateTerminator);
@@ -94,8 +86,4 @@
int getCommitedTransactionRetryLimit();
void setCommitedTransactionRetryLimit(int commitedTransactionRetryLimit);
-
- int getAssumedObjectNotExist();
-
- void setAssumedObjectNotExist(int assumedObjectNotExist);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -43,16 +43,6 @@
public class jtsPropertyManager
{
- /**
- * @deprecated use JTSEnvironmentBean instead
- * @return
- */
- @Deprecated
- public static PropertyManager getPropertyManager()
- {
- return PropertyManagerFactory.getPropertyManagerForModule("jts", Environment.PROPERTIES_FILE);
- }
-
public static JTSEnvironmentBean getJTSEnvironmentBean()
{
return BeanPopulator.getSingletonInstance(JTSEnvironmentBean.class);
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/BeanPopulatorTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/BeanPopulatorTest.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/BeanPopulatorTest.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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) 2009,
- * @author JBoss, a division of Red Hat.
- */
-package com.hp.mwtests.ts.jts;
-
-import com.arjuna.common.tests.simple.DummyProperties;
-import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import com.arjuna.ats.jts.common.JTSEnvironmentBean;
-import com.arjuna.ats.jts.common.Environment;
-
-import java.util.Set;
-import java.util.HashSet;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- * Check behaviour of the BeanPopulator util which copies old PropertyManager values into new EnvironmentBeans.
- *
- * @author Jonathan Halliday (jonathan.halliday at redhat.com)
- */
-public class BeanPopulatorTest
-{
- @Test
- public void testJTSPropertiesPopulation() throws Exception {
-
- // check that all the Environment properties are looked for
- // by the set of beans which wrap them and conversely that no undefined
- // properties are looked for. i.e. that the Environment and Beans are in sync
-
- DummyProperties testProperties = new DummyProperties();
-
- BeanPopulator.configureFromProperties(new JTSEnvironmentBean(), testProperties);
-
- Set<String> expectedKeys = new HashSet<String>();
- expectedKeys.addAll( DummyProperties.extractKeys(Environment.class));
-
- assertTrue( testProperties.usedKeys.containsAll(expectedKeys) );
- }
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java 2009-10-20 14:09:05 UTC (rev 29694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java 2009-10-20 14:50:07 UTC (rev 29695)
@@ -38,6 +38,7 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -61,7 +62,7 @@
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
- int sleepTime = jtsPropertyManager.getJTSEnvironmentBean().getDefaultTimeout();
+ int sleepTime = arjPropertyManager.getCoordinatorEnvironmentBean().getDefaultTimeout();
System.out.println("Thread "+Thread.currentThread()+" starting transaction.");
More information about the jboss-svn-commits
mailing list