Author: [email protected]
Date: Tue Oct  4 15:20:57 2011
New Revision: 1429

Log:
AMDATU-410 Removed checks/default on config that is never used

Modified:
   
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/service/ConfigTemplateManagerImpl.java
   
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.config.templates.cfg

Modified: 
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/service/ConfigTemplateManagerImpl.java
==============================================================================
--- 
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/service/ConfigTemplateManagerImpl.java
    (original)
+++ 
trunk/amdatu-core/config-templates/src/main/java/org/amdatu/core/config/templates/service/ConfigTemplateManagerImpl.java
    Tue Oct  4 15:20:57 2011
@@ -275,16 +275,9 @@
 
     @SuppressWarnings("rawtypes")
     public void updated(Dictionary dictionary) throws ConfigurationException {
-        checkAvailability(dictionary, "workdir", "hostname", "port");
+        if (dictionary.get("workdir") == null) {
+            throw new ConfigurationException("Missing configuration key", 
"workdir");
+        }
         m_workDirName = dictionary.get("workdir").toString();
     }
-
-    @SuppressWarnings("rawtypes")
-    private void checkAvailability(Dictionary dictionary, String... 
mandatoryKeys) throws ConfigurationException {
-        for (String mandatoryKey : mandatoryKeys) {
-            if (dictionary.get(mandatoryKey) == null) {
-                throw new ConfigurationException("Missing configuration key", 
mandatoryKey);
-            }
-        }
-    }
 }

Modified: 
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.config.templates.cfg
==============================================================================
--- 
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.config.templates.cfg
 (original)
+++ 
trunk/amdatu-release/src/main/resources/config/org.amdatu.core.config.templates.cfg
 Tue Oct  4 15:20:57 2011
@@ -1,7 +1,3 @@
 # The work directory in which temporary configuration files are stored
 # Note that this directory becomes a subdirectory of /target/work
-workdir=config-template-manager
-
-# Hostname and port number
-hostname=${amdatu.http.hostname}
-port=${amdatu.http.port}
\ No newline at end of file
+workdir=config-template-manager
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to