[jboss-svn-commits] JBL Code SVN: r34888 - labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2010-08-25 11:32:23 -0400 (Wed, 25 Aug 2010)
New Revision: 34888

Added:
   labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertiesFactory.java
Modified:
   labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertyManager.java
Log:
modified properties file lookup to use same process as JBossTS property manager

Added: labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertiesFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertiesFactory.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertiesFactory.java	2010-08-25 15:32:23 UTC (rev 34888)
@@ -0,0 +1,75 @@
+package org.jboss.jbossts.xts.environment;
+
+import com.arjuna.common.util.propertyservice.PropertiesFactory;
+
+import java.util.Properties;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: adinn
+ * Date: Aug 25, 2010
+ * Time: 2:45:21 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class XTSPropertiesFactory
+{
+    private static volatile Properties defaultProperties = null;
+
+    /**
+     * Returns the systems default properties, as read from the configuration file.
+     * @return the configuration Properties
+     */
+    public static Properties getDefaultProperties() {
+        if(defaultProperties == null) {
+            initDefaultProperties("org.jboss.jbossts.xts.propertiesFile");
+        }
+
+        return defaultProperties;
+    }
+
+    /**
+     * Returns the systems default properties, as read from the configuration file.
+     * @return the configuration Properties
+     */
+    public static synchronized void setDefaultProperties(Properties properties) {
+        if(defaultProperties == null) {
+            defaultProperties = properties;
+        }
+    }
+
+    private static synchronized void initDefaultProperties(String fileNamePropertyKey)
+    {
+        if(defaultProperties != null) {
+            return;
+        }
+
+        // This is where the properties loading takes place. The algorithm is as follows:
+
+        // If the specified fileNamePropertyKey exists as a key is the system properties, take the value of that property as
+        // the location of the module's properties file. This allows file location to be overriden easily.
+        String propertyFileName = System.getProperty(fileNamePropertyKey);
+
+        // If the system property is not set, try to load the build time properties. Build time properties
+        // are not the module properties! These are optional and so loading may fail. That's not considered an error.
+        // If the properties file name is defined by the build time properties, use that.
+        // (In JBossTS it mostly does exist - the build scripts put build time properties into the .jars manifest file.)
+        if (propertyFileName == null) {
+            propertyFileName = "xts-properties.xml";
+        }
+
+        // use the TS properties factory but supply the XTS property file name
+        // we also need to set the context class loader in case we try to load
+        // the fiel as a resource. this makes sure the resource load is performed
+        // relative to the XTS deployment
+
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+        try {
+            ClassLoader xtsLoader = XTSPropertiesFactory.class.getClassLoader();
+            Thread.currentThread().setContextClassLoader(xtsLoader);
+            defaultProperties = PropertiesFactory.getPropertiesFromFile(propertyFileName);
+        } finally {
+            Thread.currentThread().setContextClassLoader(loader);
+        }
+    }
+}

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertyManager.java	2010-08-25 13:21:23 UTC (rev 34887)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/XTSPropertyManager.java	2010-08-25 15:32:23 UTC (rev 34888)
@@ -54,24 +54,10 @@
     static Properties xtsProperties;
 
     static {
-        InputStream is = null;
         try {
-            is = XTSPropertyManager.class.getClassLoader().getResourceAsStream("xts-properties.xml");
-            Properties properties = new Properties();
-            properties.loadFromXML(is);
-            xtsProperties = mergeSystemProperties(properties);
+            xtsProperties = XTSPropertiesFactory.getDefaultProperties();
         } catch (Exception e) {
-            // ok, so we have no property file!
-            // just rely on system properties
-            xtsProperties = System.getProperties();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
+            xtsProperties = new Properties(System.getProperties());
         }
     }
 }