svn commit: r911362 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: Axis2SynapseController.java config/SynapseConfiguration.java config/xml/MultiXMLConfigurationBuilder.java

[hiranya]

Author: hiranya
Date: Thu Feb 18 12:21:56 2010
New Revision: 911362

URL: http://svn.apache.org/viewvc?rev=911362&view=rev
Log:
Deprecating the SynapseCOnfiguration#setProperties method and introducing a new 
setProperty method to set one property at a time. With this proeprties can be 
set without overwriting all the exising properties at once.


Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=911362&r1=911361&r2=911362&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 Thu Feb 18 12:21:56 2010
@@ -385,7 +385,12 @@
             synapseConfiguration = 
SynapseConfigurationBuilder.getDefaultConfiguration();
         }
 
-        
synapseConfiguration.setProperties(SynapsePropertiesLoader.loadSynapseProperties());
+        Properties properties = 
SynapsePropertiesLoader.loadSynapseProperties();
+        if (properties != null) {
+            for (String key : properties.stringPropertyNames()) {
+                synapseConfiguration.setProperty(key, 
properties.getProperty(key));
+            }
+        }
 
         // Set the Axis2 ConfigurationContext to the SynapseConfiguration
         
synapseConfiguration.setAxisConfiguration(configurationContext.getAxisConfiguration());

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=911362&r1=911361&r2=911362&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 Thu Feb 18 12:21:56 2010
@@ -849,9 +849,21 @@
     }
 
     /**
+     * Sets the specified property to the Synapse configuration
+     *
+     * @param key Name of the property
+     * @param value Value of the property to be set
+     */
+    public void setProperty(String key, String value) {
+        properties.setProperty(key, value);
+    }
+
+    /**
      * Sets the properties to configure the Synapse enviornment.
      *
      * @param properties - Properties which needs to be set
+     *
+     * @deprecated
      */
     public void setProperties(Properties properties) {
         this.properties = properties;

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=911362&r1=911361&r2=911362&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
 Thu Feb 18 12:21:56 2010
@@ -147,7 +147,7 @@
             try {
                 OMElement document = parseFile(registryDef);
                 SynapseXMLConfigurationFactory.defineRegistry(synapseConfig, 
document);
-                
synapseConfig.getProperties().setProperty(SEPARATE_REGISTRY_DEFINITION,
+                synapseConfig.setProperty(SEPARATE_REGISTRY_DEFINITION,
                         String.valueOf(Boolean.TRUE));
             } catch (FileNotFoundException ignored) {}
         }