[Carbon-commits] [Carbon] svn commit r92594 - trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin

[hiranya at wso2.com]

Author: hiranya
Date: Tue Apr 26 06:04:05 2011
New Revision: 92594
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=92594

Log:
Minor refactoring

Modified:
   trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin/ConfigAdmin.java

Modified: trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin/ConfigAdmin.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin/ConfigAdmin.java?rev=92594&r1=92593&r2=92594&view=diff
==============================================================================
--- trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin/ConfigAdmin.java	(original)
+++ trunk/carbon/components/synapse-config-admin/org.wso2.carbon.mediation.configadmin/src/main/java/org/wso2/carbon/mediation/configadmin/ConfigAdmin.java	Tue Apr 26 06:04:05 2011
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,10 +81,12 @@
         final Lock lock = getLock();
         try {
             lock.lock();
-            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            // ConfigurationFactoryAndSerializerFider might not have been initialized
+
+            // ConfigurationFactoryAndSerializerFinder might not have been initialized
             // and hence we need to call the getInstance to load the factories and serializers
             ConfigurationFactoryAndSerializerFinder.getInstance();
+
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
             XMLConfigurationSerializer.serializeConfiguration(getSynapseConfiguration(), stream);
             XMLInputFactory factory = XMLInputFactory.newInstance();
             factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event",
@@ -111,7 +113,7 @@
     /**
      * Get the list of configurations available
      *
-     * @return the list is retrived from the registry
+     * @return the list is retrieved from the registry
      * @throws org.apache.axis2.AxisFault if an error occurs
      */
     public ConfigurationInformation[] getConfigurationList() throws AxisFault {
@@ -179,7 +181,7 @@
                     getTaskScheduler();
 
             synchronized (oldConfig) {
-                destroyConfiguration(oldConfig, axisCfg);
+                destroyConfiguration(oldConfig);
             }
 
             SynapseConfiguration newConfig;
@@ -264,7 +266,7 @@
                         getAxisConfig(),
                         getConfigurationManager().getTracker().getCurrentConfigurationName()
                 );
-                reinitializeConfiguration(newConfig, axisCfg, synEnv, repository, taskScheduler);
+                reinitializeConfiguration(newConfig, synEnv, repository, taskScheduler);
                 publishConfiguration(newConfig, synEnv);
             }
 
@@ -294,7 +296,7 @@
      *     
      * @param name name of the configuration to be removed
      * @param description description for the configuration
-     * @return true if the new configuration creation is successfull
+     * @return true if the new configuration creation is successful
      * @throws org.apache.axis2.AxisFault if an error occurs
      */
     public boolean create(String name, String description) throws AxisFault {
@@ -345,12 +347,13 @@
         return false;
     }
 
-    private void destroyConfiguration(SynapseConfiguration oldConfig,
-                                      AxisConfiguration axisCfg) throws Exception {
+    private void destroyConfiguration(SynapseConfiguration oldConfig) throws Exception {
 
         if (log.isTraceEnabled()) {
             log.trace("Stopping Proxy services...");
         }
+
+        AxisConfiguration axisCfg = getAxisConfig();
         for (ProxyService proxyService : oldConfig.getProxyServices()) {
             if (proxyService != null) {
                 try {
@@ -386,7 +389,7 @@
             }
         }
 
-        // destroy the startups
+        // destroy the start ups
         for (Startup stp : oldConfig.getStartups()) {
             if (stp != null) {
                 stp.destroy();
@@ -416,8 +419,7 @@
         }
     }
 
-    private void reinitializeConfiguration(SynapseConfiguration synCfg, AxisConfiguration axisCfg,
-                                           Axis2SynapseEnvironment synEnv,
+    private void reinitializeConfiguration(SynapseConfiguration synCfg, Axis2SynapseEnvironment synEnv,
                                            TaskDescriptionRepository repository,
                                            TaskScheduler taskScheduler) throws AxisFault {
 
@@ -426,6 +428,7 @@
             log.trace("Re-deploying Proxy services...");
         }
 
+        AxisConfiguration axisCfg = getAxisConfig();
         for (ProxyService proxyService : synCfg.getProxyServices()) {
             if (proxyService != null) {
                 proxyService.buildAxisService(synCfg, axisCfg);
@@ -477,13 +480,13 @@
                     .setSynapseConfiguration(synCfg);
 
             // populate the Synapse Configuration
-            ServiceRegistration confiRegistration =
+            ServiceRegistration configRegistration =
                     registrationsService.getSynapseConfigurationServiceRegistration();
             SynapseConfigurationService synCfgSvc = (SynapseConfigurationService)
                     ConfigHolder.getInstance().getBundleContext().getService(
-                            confiRegistration.getReference());
+                            configRegistration.getReference());
             synCfgSvc.setSynapseConfiguration(synCfg);
-            confiRegistration.setProperties(new Properties());
+            configRegistration.setProperties(new Properties());
 
             // populate the Synapse Environment
             ServiceRegistration synEnvSvcRegistration =
@@ -500,7 +503,7 @@
                 trackingSvc.setSynapseConfiguration(synCfg);
             }
         } else {
-            handleException("Couldn't find the OSGI service information about this " +
+            handleException("Couldn't find the OSGi service information about this " +
                     "ESB Configuration");
         }
     }
@@ -520,7 +523,7 @@
                 XMLPrettyPrinter.prettify(new File(config.getPathToConfigFile()));
             }
             catch (IOException e) {
-                // ignore prettyfy errors
+                // ignore prettify errors
             }
             if (log.isTraceEnabled()) {
                 log.trace("Configuration saved to disk");