[jboss-svn-commits] JBL Code SVN: r29961 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 4 12:26:43 EST 2009
Author: jhalliday
Date: 2009-11-04 12:26:43 -0500 (Wed, 04 Nov 2009)
New Revision: 29961
Removed:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/common/BeanPopulatorTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Environment.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java
labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java
Log:
Remove obsolete Environment classes. JBTM-628
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -1,174 +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) 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.arjuna.common;
-
-/**
- * The various property variables that can be set at
- * runtime to configure the some of the classes within
- * the package.
- *
- * The various values are:
- * <ul>
- * <li> VAR_DIR = com.arjuna.ats.arjuna.common.varDir
- * <li> ACTION_STORE= com.arjuna.ats.arjuna.coordinator.actionStore
- * <li> ASYNC_COMMIT = com.arjuna.ats.arjuna.coordinator.asyncCommit
- * <li> ASYNC_PREPARE = com.arjuna.ats.arjuna.coordinator.asyncPrepare
- * <li> ASYNC_ROLLBACK = com.arjuna.ats.arjuna.coordinator.asyncRollback
- * <li> COMMIT_ONE_PHASE = com.arjuna.ats.arjuna.coordinator.commitOnePhase
- * <li> LOCALOSROOT = com.arjuna.ats.arjuna.objectstore.localOSRoot
- * <li> MAINTAIN_HEURISTICS = com.arjuna.ats.arjuna.coordinator.maintainHeuristics
- * <li> OBJECTSTORE_DIR = com.arjuna.ats.arjuna.objectstore.objectStoreDir
- * <li> OBJECTSTORE_SYNC = com.arjuna.ats.arjuna.objectstore.objectStoreSync
- * <li> OBJECTSTORE_TYPE = com.arjuna.ats.arjuna.objectstore.objectStoreType
- * <li> HASHED_DIRECTORIES = com.arjuna.ats.arjuna.objectstore.hashedDirectories
- * <li> TRANSACTION_LOG = com.arjuna.ats.arjuna.coordinator.transactionLog
- * <li> TRANSACTION_SYNC = com.arjuna.ats.arjuna.objectstore.transactionSync
- * <li> READONLY_OPTIMISATION = com.arjuna.ats.arjuna.coordinator.readonlyOptimisation
- * <li> CLASSIC_PREPARE = com.arjuna.ats.arjuna.coordinator.classicPrepare
- * <li> ENABLE_STATISTICS = com.arjuna.ats.arjuna.coordinator.enableStatistics
- * <li> SHARED_TRANSACTION_LOG = com.arjuna.ats.arjuna.coordinator.sharedTransactionLog
- * <li> START_DISABLED = com.arjuna.ats.arjuna.coordinator.startDisabled
- * <li> JDBC_USER_DB_ACCESS = com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess
- * <li> JDBC_TX_DB_ACCESS = com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess
- * <li> JDBC_POOL_SIZE_INIT = com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial
- * <li> JDBC_POOL_SIZE_MAX = com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum
- * <li> JDBC_POOL_PUT = com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections
- * <li> LICENCE = com.arjuna.ats.arjuna.licence
- * <li> CACHE_STORE_SIZE = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.size
- * <li> CACHE_STORE_SYNC = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.sync
- * <li> CACHE_STORE_REMOVED_ITEMS = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.removedItems
- * <li> CACHE_STORE_SCAN_PERIOD = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.scanPeriod
- * <li> CACHE_STORE_WORK_ITEMS = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.workItems
- * <li> CACHE_STORE_HASH = com.arjuna.ats.internal.arjuna.objectstore.cacheStore.hash
- * <li> PERIODIC_RECOVERY_PERIOD = com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod
- * <li> RECOVERY_BACKOFF_PERIOD = com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod
- * <li> TX_REAPER_MODE = com.arjuna.ats.arjuna.coordinator.txReaperMode
- * <li> TX_REAPER_TIMEOUT = com.arjuna.ats.arjuna.coordinator.txReaperTimeout
- * <li> TX_REAPER_CANCEL_WAIT_PERIOD = com.arjuna.ats.arjuna.coordinator.txReaperCancelWaitPeriod
- * <li> TX_REAPER_CANCEL_FAIL_WAIT_PERIOD = com.arjuna.ats.arjuna.coordinator.txReapercancelFailWaitPeriod
- * <li> TX_REAPER_ZOMBIE_MAX = com.arjuna.ats.arjuna.coordinator.txReaperZombieMax
- * <li> OBJECTSTORE_SHARE = com.arjuna.ats.arjuna.objectstore.share
- * <li> OBJECTSTORE_HIERARCHY_RETRY = com.arjuna.ats.arjuna.objectstore.hierarchyRetry
- * <li> OBJECTSTORE_HIERARCHY_TIMEOUT = com.arjuna.ats.arjuna.objectstore.hierarchyTimeout
- * <li> RECOVERY_MANAGER_PORT = com.arjuna.ats.internal.arjuna.recovery.recoveryPort
- * <li> XA_NODE_IDENTIFIER = com.arjuna.ats.arjuna.xa.nodeIdentifier
- * <li> DEFAULT_TIMEOUT = com.arjuna.ats.arjuna.coordinator.defaultTimeout
- * <li> CHECKEDACTION_FACTORY = com.arjuna.ats.coordinator.checkedActionFactory
- * </ul>
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- * @since 1.0.
- * @deprecated use CoordinatorEnvironentBean, CoreEnvironmentBean, ObjectStoreEnvironmentBean, RecoveryEnvironmentBean instead.
- */
- at Deprecated
-public class Environment
-{
- public static final String PROPERTIES_FILE = "com.arjuna.ats.arjuna.common.propertiesFile";
- public static final String VAR_DIR = "com.arjuna.ats.arjuna.common.varDir";
-
- public static final String ACTION_STORE= "com.arjuna.ats.arjuna.coordinator.actionStore";
- public static final String ASYNC_COMMIT = "com.arjuna.ats.arjuna.coordinator.asyncCommit";
- public static final String ASYNC_PREPARE = "com.arjuna.ats.arjuna.coordinator.asyncPrepare";
- public static final String ASYNC_ROLLBACK = "com.arjuna.ats.arjuna.coordinator.asyncRollback";
- public static final String COMMIT_ONE_PHASE = "com.arjuna.ats.arjuna.coordinator.commitOnePhase";
- public static final String LOCALOSROOT = "com.arjuna.ats.arjuna.objectstore.localOSRoot";
- public static final String MAINTAIN_HEURISTICS = "com.arjuna.ats.arjuna.coordinator.maintainHeuristics";
- public static final String OBJECTSTORE_DIR = "com.arjuna.ats.arjuna.objectstore.objectStoreDir";
- public static final String OBJECTSTORE_SYNC = "com.arjuna.ats.arjuna.objectstore.objectStoreSync";
- public static final String OBJECTSTORE_TYPE = "com.arjuna.ats.arjuna.objectstore.objectStoreType";
- public static final String HASHED_DIRECTORIES = "com.arjuna.ats.arjuna.objectstore.hashedDirectories";
- public static final String TRANSACTION_LOG = "com.arjuna.ats.arjuna.coordinator.transactionLog";
- public static final String TRANSACTION_LOG_SYNC_REMOVAL = "com.arjuna.ats.arjuna.coordinator.transactionLog.synchronousRemoval";
- public static final String TRANSACTION_LOG_SIZE = "com.arjuna.ats.arjuna.coordinator.transactionLog.size";
- public static final String TRANSACTION_LOG_PURGE_TIME = "com.arjuna.ats.arjuna.coordinator.transactionLog.purgeTime";
- @Deprecated public static final String TRANSACTION_LOG_REMOVAL_MARKER = "com.arjuna.ats.arjuna.coordinator.transactionLog.removalMarker";
- public static final String TRANSACTION_LOG_WRITE_OPTIMISATION = "com.arjuna.ats.arjuna.coordinator.transactionLog.writeOptimisation";
- public static final String TRANSACTION_SYNC = "com.arjuna.ats.arjuna.objectstore.transactionSync";
- public static final String READONLY_OPTIMISATION = "com.arjuna.ats.arjuna.coordinator.readonlyOptimisation";
- public static final String CLASSIC_PREPARE = "com.arjuna.ats.arjuna.coordinator.classicPrepare";
- public static final String ENABLE_STATISTICS = "com.arjuna.ats.arjuna.coordinator.enableStatistics";
- public static final String SHARED_TRANSACTION_LOG = "com.arjuna.ats.arjuna.coordinator.sharedTransactionLog";
- public static final String START_DISABLED = "com.arjuna.ats.arjuna.coordinator.startDisabled";
- public static final String JDBC_USER_DB_ACCESS = "com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess";
- public static final String JDBC_TX_DB_ACCESS = "com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess";
- public static final String JDBC_POOL_SIZE_INIT = "com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial";
- public static final String JDBC_POOL_SIZE_MAX = "com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum";
- public static final String JDBC_POOL_PUT = "com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections";
- @Deprecated public static final String LICENCE = "com.arjuna.ats.arjuna.licence";
- public static final String CACHE_STORE_SIZE = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.size";
- public static final String CACHE_STORE_SYNC = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.sync";
- public static final String CACHE_STORE_REMOVED_ITEMS = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.removedItems";
- public static final String CACHE_STORE_SCAN_PERIOD = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.scanPeriod";
- public static final String CACHE_STORE_WORK_ITEMS = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.workItems";
- public static final String CACHE_STORE_HASH = "com.arjuna.ats.internal.arjuna.objectstore.cacheStore.hash";
- public static final String PERIODIC_RECOVERY_PERIOD = "com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" ;
- public static final String RECOVERY_BACKOFF_PERIOD = "com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" ;
- public static final String TX_REAPER_MODE = "com.arjuna.ats.arjuna.coordinator.txReaperMode";
- public static final String TX_REAPER_TIMEOUT = "com.arjuna.ats.arjuna.coordinator.txReaperTimeout";
- public static final String TX_REAPER_CANCEL_WAIT_PERIOD = "com.arjuna.ats.arjuna.coordinator.txReaperCancelWaitPeriod";
- public static final String TX_REAPER_CANCEL_FAIL_WAIT_PERIOD = "com.arjuna.ats.arjuna.coordinator.txReaperCancelFailWaitPeriod";
- public static final String TX_REAPER_ZOMBIE_MAX = "com.arjuna.ats.arjuna.coordinator.txReaperZombieMax";
- public static final String OBJECTSTORE_SHARE = "com.arjuna.ats.arjuna.objectstore.share";
- public static final String OBJECTSTORE_HIERARCHY_RETRY = "com.arjuna.ats.arjuna.objectstore.hierarchyRetry";
- public static final String OBJECTSTORE_HIERARCHY_TIMEOUT = "com.arjuna.ats.arjuna.objectstore.hierarchyTimeout";
- public static final String RECOVERY_MANAGER_LISTENER = "com.arjuna.ats.arjuna.recovery.recoveryListener";
- public static final String RECOVERY_MANAGER_PORT = "com.arjuna.ats.arjuna.recovery.recoveryPort";
- public static final String RECOVERY_MANAGER_ADDRESS = "com.arjuna.ats.arjuna.recovery.recoveryAddress";
- public static final String XA_NODE_IDENTIFIER = "com.arjuna.ats.arjuna.xa.nodeIdentifier";
- public static final String DEFAULT_TIMEOUT = "com.arjuna.ats.arjuna.coordinator.defaultTimeout";
- public static final String TRANSACTION_STATUS_MANAGER_ENABLE = "com.arjuna.ats.arjuna.coordinator.transactionStatusManagerEnable";
- public static final String TRANSACTION_STATUS_MANAGER_PORT = "com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort";
- public static final String TRANSACTION_STATUS_MANAGER_ADDRESS = "com.arjuna.ats.arjuna.recovery.transactionStatusManagerAddress";
- public static final String SOCKET_PROCESS_ID_PORT= "com.arjuna.ats.internal.arjuna.utils.SocketProcessIdPort";
- public static final String SOCKET_PROCESS_ID_MAX_PORTS= "com.arjuna.ats.internal.arjuna.utils.SocketProcessIdMaxPorts";
- public static final String PROCESS_IMPLEMENTATION = "com.arjuna.ats.internal.arjuna.utils.processImplementation";
- public static final String PROCESS_IDENTIFIER = "com.arjuna.ats.internal.arjuna.utils.pid";
- public static final String BEFORECOMPLETION_WHEN_ROLLBACKONLY = "com.arjuna.ats.coordinator.beforeCompletionWhenRollbackOnly";
- public static final String CHECKEDACTION_FACTORY = "com.arjuna.ats.coordinator.checkedActionFactory";
-
- public static final String ALLOW_MULTIPLE_LAST_RESOURCES = "com.arjuna.ats.arjuna.allowMultipleLastResources";
- public static final String DISABLE_MULTIPLE_LAST_RESOURCES_WARNING = "com.arjuna.ats.arjuna.disableMultipleLastResourcesWarning";
-
- /**
- * Constant that holds the name of the environment property
- * for specifying the bind address for transaction services
- *
- */
- @Deprecated public static final String SERVER_BIND_ADDRESS = "jbossts.bind.address";
-
-
- public static final String EXPIRY_SCAN_INTERVAL = "com.arjuna.ats.arjuna.recovery.expiryScanInterval";
- public static final String TRANSACTION_STATUS_MANAGER_EXPIRY_TIME = "com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime";
- public static final String TIMEOUT_RECOVERY_SOCKET = "com.arjuna.ats.internal.arjuna.recovery.listener.timeoutsocket";
-}
-
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -32,7 +32,6 @@
package com.arjuna.ats.arjuna.coordinator;
import com.arjuna.ats.arjuna.logging.tsLogger;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -276,7 +276,7 @@
{
_objectStoreDir = arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir();
if (_objectStoreDir == null || _objectStoreDir.length() == 0)
- throw new ObjectStoreException(Environment.OBJECTSTORE_DIR+" not set.");
+ throw new ObjectStoreException("object store location property not set.");
if (!_objectStoreDir.endsWith(File.separator))
_objectStoreDir = _objectStoreDir + File.separator;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/PeriodicRecovery.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -1045,12 +1045,12 @@
private int _recoveryPeriod = 0;
/**
- * default value for _backoffPeriod if not specified via property {@link com.arjuna.ats.arjuna.common.Environment#RECOVERY_BACKOFF_PERIOD}
+ * default value for _backoffPeriod if not specified via RecoveryEnvironmentBean
*/
public static final int _defaultBackoffPeriod = 10;
/**
- * default value for _recoveryPeriod if not specified via property {@link com.arjuna.ats.arjuna.common.Environment#PERIODIC_RECOVERY_PERIOD}
+ * default value for _recoveryPeriod if not specified via RecoveryEnvironmentBean
*/
public static final int _defaultRecoveryPeriod = 120;
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/common/BeanPopulatorTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/common/BeanPopulatorTest.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/common/BeanPopulatorTest.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -1,67 +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.arjuna.common;
-
-import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import com.arjuna.common.tests.simple.DummyProperties;
-import com.arjuna.ats.arjuna.common.*;
-
-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 testArjunaCorePropertiesPopulation() 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();
-
- testProperties.addConcatenationKeys(RecoveryEnvironmentBean.class);
- testProperties.addConcatenationKeys(CoreEnvironmentBean.class);
-
- BeanPopulator.configureFromProperties(new CoordinatorEnvironmentBean(), testProperties);
- BeanPopulator.configureFromProperties(new RecoveryEnvironmentBean(), testProperties);
- BeanPopulator.configureFromProperties(new CoreEnvironmentBean(), testProperties);
- BeanPopulator.configureFromProperties(new ObjectStoreEnvironmentBean(), testProperties);
-
- Set<String> expectedKeys = new HashSet<String>();
- expectedKeys.addAll( DummyProperties.extractKeys(Environment.class));
-
- System.out.println(testProperties.usedKeys);
-
- System.out.println(expectedKeys);
-
- assertTrue( testProperties.usedKeys.containsAll(expectedKeys) );
-
- }
-}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -31,11 +31,9 @@
* $Id: ObjectStoreTest.java 2342 2006-03-30 13:06:17Z $
*/
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
-import com.arjuna.ats.internal.arjuna.objectstore.LogStore;
import org.junit.Test;
import static org.junit.Assert.*;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/LockManager.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -33,7 +33,6 @@
import com.arjuna.ats.txoj.lockstore.*;
import com.arjuna.ats.txoj.semaphore.*;
-import com.arjuna.ats.txoj.common.Environment;
import com.arjuna.ats.arjuna.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.StateManager;
Deleted: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Environment.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Environment.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -1,52 +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: Environment.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.txoj.common;
-
-/**
- * The various runtime configuration options.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Environment.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- * @deprecated use TxojEnvironmentBean instead
- */
- at Deprecated
-public class Environment
-{
- public static final String PROPERTIES_FILE = "com.arjuna.ats.txoj.common.propertiesFile";
- public static final String LOCKSTORE_DIR = "com.arjuna.ats.txoj.lockstore.lockStoreDir";
- public static final String LOCKSTORE_TYPE = "com.arjuna.ats.txoj.lockstore.lockStoreType";
- public static final String MULTIPLE_LOCKSTORE = "com.arjuna.ats.txoj.lockstore.multipleLockStore";
- public static final String SINGLE_LOCKSTORE = "com.arjuna.ats.txoj.lockstore.singleLockStore";
- public static final String ALLOW_NESTED_LOCKING = "com.arjuna.ats.txoj.lockstore.allowNestedLocking";
-}
-
Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.jta.transaction.Transaction;
/**
Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java 2009-11-04 17:05:42 UTC (rev 29960)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java 2009-11-04 17:26:43 UTC (rev 29961)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.coordinator.RecordList;
import javax.swing.tree.DefaultMutableTreeNode;
More information about the jboss-svn-commits
mailing list