[jboss-svn-commits] JBL Code SVN: r29857 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore and 18 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 28 13:10:16 EDT 2009
Author: jhalliday
Date: 2009-10-28 13:10:15 -0400 (Wed, 28 Oct 2009)
New Revision: 29857
Removed:
labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyServiceImple.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/TransactionMonitor.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/StaticInventory.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/nameservice/JNS.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/lockstore/LockStore.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/jdbcPropertyManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/jtaPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyManagerFactory.java
labs/jbosstm/trunk/common/tests/com/arjuna/common/tests/simple/PropertiesTest.java
Log:
Cleanup PropertyManager usage as a prelude to its demise. JBTM-628
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -20,12 +20,8 @@
*/
package com.arjuna.ats.arjuna.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* Property manager wrapper for the recovery system.
*
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-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStore.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -32,10 +32,8 @@
package com.arjuna.ats.arjuna.objectstore;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.gandiva.*;
import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
-import com.arjuna.ats.arjuna.gandiva.nameservice.NameService;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.ArjunaNames;
import com.arjuna.ats.internal.arjuna.Implementations;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -40,8 +40,6 @@
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
/**
*
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/TransactionMonitor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/TransactionMonitor.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/TransactionMonitor.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,13 +31,10 @@
package com.arjuna.ats.arjuna.tools;
-import com.arjuna.ats.arjuna.ArjunaNames;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.internal.arjuna.common.UidHelper;
import java.io.PrintWriter;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/Utility.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.logging.tsLogger;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -285,68 +284,6 @@
}
/**
- * Lookup and valid a port number.
- *
- * @param intProperty
- * property name of an integer valued property
- * @param defValue
- * a value to return if intProperty is invalid. If a null value
- * is used and intProperty is invalid then
- * @see com.arjuna.ats.arjuna.exceptions.FatalError is thrown
- * @param warnMsgKey
- * message key to report a warning if property values is invalid
- * @param minValue
- * minimum value for the integer propertry
- * @param maxValue
- * maximum value for the integer propertry
- * @return the integer value of property or the default value if the
- * property does not represent an integer
- *
- * @deprecated properties should come from environment beans now
- */
- @Deprecated
- public static Integer lookupBoundedIntegerProperty (PropertyManager pm,
- String intProperty, Integer defValue, String warnMsgKey,
- int minValue, int maxValue)
- {
- String intStr = pm.getProperty(intProperty);
-
- // if the propery is not found or empty just return the default
- if (intStr == null || intStr.length() == 0)
- {
- return defValue;
- }
-
- try
- {
- int i = Integer.parseInt(intStr);
-
- if (i < minValue || i > maxValue)
- {
- // the value is an invalid number
- if (warnMsgKey != null
- && tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- tsLogger.arjLoggerI18N.warn(warnMsgKey, new Object[]
- { intStr });
- }
- }
- else
- {
- return i;
- }
- }
- catch (Exception ex)
- {
- // the value is not a number
- if (warnMsgKey != null && tsLogger.arjLoggerI18N.isWarnEnabled())
- tsLogger.arjLoggerI18N.warn(warnMsgKey, ex);
- }
-
- return defValue;
- }
-
- /**
* @return the process id. This had better be unique between processes on
* the same machine. If not we're in trouble!
* @since JTS 2.1.
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/StaticInventory.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/StaticInventory.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/inventory/StaticInventory.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -35,12 +35,10 @@
import com.arjuna.ats.arjuna.ArjunaNames;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.gandiva.inventory.*;
import com.arjuna.ats.arjuna.gandiva.*;
import com.arjuna.ats.internal.arjuna.Implementations;
import java.io.PrintStream;
-import java.util.*;
/**
* The StaticInventory required each implementation type to be registered
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/nameservice/JNS.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/nameservice/JNS.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/gandiva/nameservice/JNS.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -34,7 +34,6 @@
import com.arjuna.ats.arjuna.ArjunaNames;
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.arjuna.gandiva.ObjectName;
import com.arjuna.ats.arjuna.gandiva.nameservice.*;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -33,8 +33,6 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.ArjunaNames;
-import com.arjuna.ats.arjuna.coordinator.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.gandiva.ClassName;
@@ -52,7 +50,6 @@
import com.arjuna.ats.internal.arjuna.common.UidHelper;
import java.io.IOException;
-import java.io.FileNotFoundException;
import java.lang.NumberFormatException;
/*
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,12 +31,8 @@
package com.arjuna.ats.txoj.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* Property manager wrapper for the TXOJ module.
*
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/lockstore/LockStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/lockstore/LockStore.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/lockstore/LockStore.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,11 +31,9 @@
package com.arjuna.ats.txoj.lockstore;
-import com.arjuna.ats.txoj.TxOJNames;
import com.arjuna.ats.arjuna.ObjectModel;
import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.txoj.common.*;
import com.arjuna.ats.internal.txoj.Implementations;
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/BasicXARecovery.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -32,13 +32,11 @@
package com.arjuna.ats.internal.jdbc.recovery;
import com.arjuna.ats.jdbc.TransactionalDriver;
-import com.arjuna.ats.jdbc.common.jdbcPropertyManager;
import com.arjuna.ats.jdbc.logging.jdbcLogger;
import com.arjuna.ats.jta.recovery.XAResourceRecovery;
import com.arjuna.common.util.logging.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import java.sql.*;
@@ -46,7 +44,6 @@
import java.util.*;
import java.lang.NumberFormatException;
-import com.arjuna.common.internal.util.propertyservice.plugins.io.XMLFilePlugin;
/**
* This class implements the XAResourceRecovery interface for XAResources. The
@@ -161,9 +158,7 @@
try
{
- PropertyManager propertyManager = PropertyManagerFactory.getPropertyManagerForFile(fileName, false);
-
- props = propertyManager.getProperties();
+ props = PropertyManagerFactory.getPropertiesFromFile(fileName);
}
catch (Exception e)
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -38,11 +38,8 @@
import javax.sql.*;
import javax.transaction.xa.*;
import com.arjuna.common.util.logging.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
-import com.arjuna.common.internal.util.propertyservice.plugins.io.XMLFilePlugin;
import com.arjuna.ats.arjuna.logging.FacilityCode;
-import com.arjuna.ats.jdbc.common.*;
import com.arjuna.ats.jdbc.logging.jdbcLogger;
import com.arjuna.ats.jta.recovery.XAResourceRecovery;
@@ -99,10 +96,8 @@
try
{
- PropertyManager propertyManager = PropertyManagerFactory.getPropertyManagerForFile(parameter, false);
+ _props = PropertyManagerFactory.getPropertiesFromFile(parameter);
- _props = propertyManager.getProperties();
-
_dbName = _props.getProperty(DATABASE_JNDI_NAME);
_user = _props.getProperty(USER_NAME);
_password = _props.getProperty(PASSWORD);
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/jdbcPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/jdbcPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/jdbcPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -30,8 +30,6 @@
*/
package com.arjuna.ats.jdbc.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
import java.util.concurrent.atomic.AtomicBoolean;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/jtaPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/jtaPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/jtaPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -30,16 +30,11 @@
*/
package com.arjuna.ats.jta.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* Property manager wrapper for the JTA module.
*/
-
public class jtaPropertyManager
{
public static JTAEnvironmentBean getJTAEnvironmentBean()
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/contact/FactoryContactItem.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,16 +31,12 @@
package com.arjuna.ats.internal.jts.recovery.contact;
-import com.arjuna.ats.jts.logging.*;
-
import java.util.Date;
-import java.text.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.objectstore.*;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.utils.*;
import com.arjuna.ats.arjuna.exceptions.*;
import com.arjuna.ArjunaOTS.*;
@@ -48,14 +44,8 @@
import com.arjuna.ats.arjuna.logging.FacilityCode;
import com.arjuna.common.util.logging.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.orbportability.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.ats.internal.jts.recovery.RecoveryORBManager;
-
/**
* Create a persistent entry in the ActionStore to allow the RecoveryManager to
* know which ArjunaFactory is in which JVM.
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -40,11 +40,7 @@
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.common.util.propertyservice.PropertyManager;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.utils.*;
import com.arjuna.ats.jts.logging.jtsLogger;
import com.arjuna.ats.arjuna.logging.FacilityCode;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/TransactionCacheItem.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -36,11 +36,6 @@
import com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.ServerTransaction;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.objectstore.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.*;
-import com.arjuna.common.util.propertyservice.PropertyManager;
import org.omg.CosTransactions.*;
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-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,16 +31,11 @@
package com.arjuna.ats.jts.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* Property manager wrapper for the JTS module.
*/
-
public class jtsPropertyManager
{
public static JTSEnvironmentBean getJTSEnvironmentBean()
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -31,12 +31,8 @@
package com.arjuna.orbportability.common;
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* Property manager wrapper for the ORB Portability module.
*
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -20,6 +20,8 @@
*/
package com.arjuna.common.internal.util.logging;
+import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
+
/**
* This class is used to control properties values for CLF.
*
@@ -32,13 +34,6 @@
*
* @author Malik SAHEB
*/
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
-import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
public class commonPropertyManager
{
public static LoggingEnvironmentBean getLoggingEnvironmentBean()
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyManagerFactory.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyManagerFactory.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyManagerFactory.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -76,7 +76,11 @@
return createPropertyManagerForModule(moduleName, fileNamePropertyKey);
}
- public static PropertyManager getPropertyManagerForFile(String propertyFileName, boolean withCaching)
+ public static Properties getPropertiesFromFile(String propertiesFileName) {
+ return getPropertyManagerForFile(propertiesFileName, false).getProperties();
+ }
+
+ private static PropertyManager getPropertyManagerForFile(String propertyFileName, boolean withCaching)
{
String filepath = null;
try
Deleted: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyServiceImple.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyServiceImple.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/propertyservice/PropertyServiceImple.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -1,109 +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,
-*
-* Arjuna Solutions Limited,
-* Newcastle upon Tyne,
-* Tyne and Wear,
-* UK.
-*
-* $Id: PropertyServiceImple.java 2342 2006-03-30 13:06:17Z $
-*/
-
-package com.arjuna.common.util.propertyservice;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.SecurityException;
-
-/**
- * The PropertyServiceImple class provides a uniform interface to
- * accessing and manipulating Java properties.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: PropertyServiceImple.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 2.1.2.
- */
-
-public interface PropertyServiceImple
-{
-
- /**
- * Add the specified property file to the list of registered
- * property files.
- */
-
- public void addPropertiesFile (String fileName);
-
- /**
- * Remove the specified property file from the list of registered
- * property files. If the file was not added, then the
- * FileNotFoundException will be thrown.
- */
-
- public void removePropertiesFile (String fileName) throws FileNotFoundException;
-
- /**
- * Read in the properties file, if present.
- *
- */
- public void loadProperties () throws SecurityException, IOException;
-
- /**
- * Saves the altered properties back to the properties files
- * from which they came.
- *
- * @throws SecurityException
- * @throws IOException
- */
- public void saveProperties() throws SecurityException, IOException;
-
- /**
- * Set the property name to have the specified value.
- * If flush is true then we put the property value into the System
- * so that a call to System.getProperty will succeed. Otherwise we
- * cache it as a "volatile" value.
- * If <code>warn</code> is <code>true</code> then issue a warning
- * message if an existing property value is changed.
- */
-
- public void setProperty (String name, String property, boolean flush, boolean warn);
-
- /**
- * Return the value associated with the property name. If the name
- * does not exist then the specified default value will be returned.
- */
-
- public String getProperty (String name, String defaultValue);
-
- /**
- * Remove the property.
- */
-
- public String removeProperty (String name, boolean flush);
-
- /**
- * Locate property file
- */
- public String locateFile (String propertyName) throws FileNotFoundException;
-
-}
Modified: labs/jbosstm/trunk/common/tests/com/arjuna/common/tests/simple/PropertiesTest.java
===================================================================
--- labs/jbosstm/trunk/common/tests/com/arjuna/common/tests/simple/PropertiesTest.java 2009-10-28 17:07:00 UTC (rev 29856)
+++ labs/jbosstm/trunk/common/tests/com/arjuna/common/tests/simple/PropertiesTest.java 2009-10-28 17:10:15 UTC (rev 29857)
@@ -22,7 +22,6 @@
import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
-import com.arjuna.common.internal.util.propertyservice.plugins.io.XMLFilePlugin;
import java.util.Properties;
import java.util.Enumeration;
More information about the jboss-svn-commits
mailing list