[gatein-commits] gatein SVN: r750 - in components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl: xml and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2009-11-22 18:43:40 -0500 (Sun, 22 Nov 2009)
New Revision: 750

Modified:
   components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/AbstractProducerConfigurationService.java
   components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java
   components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/SimpleXMLProducerConfigurationService.java
Log:
- Renamed AbstractProducerConfigurationService.loadConfiguration to reloadConfiguration as it needs to be the entry point and delegate actual
  loading to subclasses via loadConfiguration abstract method.

Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/AbstractProducerConfigurationService.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/AbstractProducerConfigurationService.java	2009-11-22 22:46:54 UTC (rev 749)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/AbstractProducerConfigurationService.java	2009-11-22 23:43:40 UTC (rev 750)
@@ -46,7 +46,7 @@
       return configuration;
    }
 
-   public void loadConfiguration() throws Exception
+   public void reloadConfiguration() throws Exception
    {
       // save listeners if we already have a configuration
       List<ProducerConfigurationChangeListener> listeners = null;
@@ -65,7 +65,7 @@
       }
 
       // reload
-      reloadConfiguration();
+      loadConfiguration();
 
       // restore listeners
       if (listeners != null)
@@ -94,4 +94,6 @@
          }
       }
    }
+
+   protected abstract void loadConfiguration() throws Exception;
 }

Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java	2009-11-22 22:46:54 UTC (rev 749)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java	2009-11-22 23:43:40 UTC (rev 750)
@@ -110,7 +110,7 @@
       reloadConfiguration();
    }
 
-   public void reloadConfiguration() throws Exception
+   public void loadConfiguration() throws Exception
    {
       URL configURL = getConfigLocationURL();
 

Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/SimpleXMLProducerConfigurationService.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/SimpleXMLProducerConfigurationService.java	2009-11-22 22:46:54 UTC (rev 749)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/SimpleXMLProducerConfigurationService.java	2009-11-22 23:43:40 UTC (rev 750)
@@ -52,7 +52,7 @@
       this.inputStream = inputStream;
    }
 
-   public void reloadConfiguration() throws Exception
+   public void loadConfiguration() throws Exception
    {
       Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
       ObjectModelFactory factory = new ProducerConfigurationFactory();