[jboss-svn-commits] JBL Code SVN: r29690 - in labs/jbosstm/trunk: ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 20 08:56:58 EDT 2009
Author: jhalliday
Date: 2009-10-20 08:56:56 -0400 (Tue, 20 Oct 2009)
New Revision: 29690
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.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/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/internal/util/propertyservice/BeanPopulator.java
Log:
Update per-module property managers to use a global rather than per-module config. JBTM-628
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-10-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -56,16 +56,16 @@
public static CoreEnvironmentBean getCoreEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(CoreEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(CoreEnvironmentBean.class);
}
public static CoordinatorEnvironmentBean getCoordinatorEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(CoordinatorEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(CoordinatorEnvironmentBean.class);
}
public static ObjectStoreEnvironmentBean getObjectStoreEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(ObjectStoreEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(ObjectStoreEnvironmentBean.class);
}
}
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-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/recoveryPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -32,18 +32,8 @@
*/
public class recoveryPropertyManager
{
- /**
- * @deprecated use RecoveryEnvironmentBean instead
- * @return
- */
- @Deprecated
- public static PropertyManager getPropertyManager()
- {
- return PropertyManagerFactory.getPropertyManagerForModule("arjuna", Environment.PROPERTIES_FILE);
- }
-
public static RecoveryEnvironmentBean getRecoveryEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(RecoveryEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(RecoveryEnvironmentBean.class);
}
}
\ No newline at end of file
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-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/jdbcPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -53,6 +53,6 @@
public static JDBCEnvironmentBean getJDBCEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(JDBCEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(JDBCEnvironmentBean.class);
}
}
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-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/jtaPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -42,18 +42,8 @@
public class jtaPropertyManager
{
- /**
- * @deprecated use JTAEnvironmentBean instead
- * @return
- */
- @Deprecated
- public static PropertyManager getPropertyManager()
- {
- return PropertyManagerFactory.getPropertyManagerForModule("jta", Environment.PROPERTIES_FILE);
- }
-
public static JTAEnvironmentBean getJTAEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(JTAEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(JTAEnvironmentBean.class);
}
}
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 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -55,6 +55,6 @@
public static JTSEnvironmentBean getJTSEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(JTSEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(JTSEnvironmentBean.class);
}
}
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-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -51,6 +51,6 @@
public static OrbPortabilityEnvironmentBean getOrbPortabilityEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(OrbPortabilityEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(OrbPortabilityEnvironmentBean.class);
}
}
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-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -41,23 +41,13 @@
public class commonPropertyManager
{
- /**
- * @deprecated use LoggingEnvironmentBean instead
- * @return
- */
- @Deprecated
- public static PropertyManager getPropertyManager()
- {
- return PropertyManagerFactory.getPropertyManagerForModule("common", "com.arjuna.common.util.logging.propertiesFile");
- }
-
public static LoggingEnvironmentBean getLoggingEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(LoggingEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(LoggingEnvironmentBean.class);
}
public static DefaultLogEnvironmentBean getDefaultLogEnvironmentBean()
{
- return BeanPopulator.getSingletonInstance(DefaultLogEnvironmentBean.class, getPropertyManager());
+ return BeanPopulator.getSingletonInstance(DefaultLogEnvironmentBean.class);
}
}
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java 2009-10-20 12:48:04 UTC (rev 29689)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java 2009-10-20 12:56:56 UTC (rev 29690)
@@ -27,6 +27,7 @@
import java.util.concurrent.ConcurrentMap;
import com.arjuna.common.util.propertyservice.PropertyManager;
+import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
/**
* Utility class that configures *EnvironmentBean objects using a PropertyManager, which is usually
@@ -38,7 +39,7 @@
{
private static final ConcurrentMap<Class, Object> singletonBeanInstances = new ConcurrentHashMap<Class, Object>();
- public static <T> T getSingletonInstance(Class<T> beanClass, PropertyManager propertyManager) throws RuntimeException {
+ public static <T> T getSingletonInstance(Class<T> beanClass) throws RuntimeException {
// we don't mind sometimes instantiating the bean multiple times,
// as long as the duplicates never escape into the outside world.
@@ -46,6 +47,8 @@
T bean = null;
try {
bean = beanClass.newInstance();
+ // TODO: pick and document new standard for global config file name property. For now use arjunacore value.
+ PropertyManager propertyManager = PropertyManagerFactory.getPropertyManagerForModule("common", "com.arjuna.ats.arjuna.common.propertiesFile");
configureFromProperties(bean, propertyManager.getProperties());
} catch (Exception e) {
throw new RuntimeException(e);
More information about the jboss-svn-commits
mailing list