1 files changed, 31 insertions, 27 deletions
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
index 6164154..135d652 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.server.service;
 
 import java.io.IOException;
@@ -37,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-import at.gv.egovernment.moa.spss.server.init.*;
+import at.gv.egovernment.moa.spss.server.init.SystemInitializer;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moaspss.logging.LogMsg;
 import at.gv.egovernment.moaspss.logging.Logger;
@@ -46,36 +45,38 @@ import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
 /**
  * A servlet to initialize and update the MOA configuration.
- * 
+ *
  * @author Fatemeh Philippi
  * @author Patrick Peck
  * @version $Id$
  */
 public class ConfigurationServlet extends HttpServlet {
   /**
-	 * 
-	 */
-	private static final long serialVersionUID = 8372961105222028696L;
-/** The document type of the HTML to generate. */
+   * 
+   */
+  private static final long serialVersionUID = 8372961105222028696L;
+  /** The document type of the HTML to generate. */
   private static final String DOC_TYPE =
-    "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
+      "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
 
   /**
-   * Handle a HTTP GET request, used to indicated that the MOA
-   * configuration needs to be updated (reloaded).
-   * 
-   * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
+   * Handle a HTTP GET request, used to indicated that the MOA configuration needs
+   * to be updated (reloaded).
+   *
+   * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest,
+   *      HttpServletResponse)
    */
+  @Override
   @SuppressWarnings({ "rawtypes", "unchecked" })
   public void doGet(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
+      throws ServletException, IOException {
 
-    MessageProvider msg = MessageProvider.getInstance();
+    final MessageProvider msg = MessageProvider.getInstance();
     PrintWriter out;
 
     // set up a logging context for logging the reconfiguration
     LoggingContextManager.getInstance().setLoggingContext(
-      new LoggingContext("configuration update"));
+        new LoggingContext("configuration update"));
 
     response.setContentType("text/html");
     out = response.getWriter();
@@ -84,8 +85,8 @@ public class ConfigurationServlet extends HttpServlet {
     out.println("<body bgcolor=\"#FFFFFF\">");
     try {
       // reconfigure the system
-      ConfigurationProvider config = ConfigurationProvider.reload();
-      IaikConfigurator iaikConfigurator = new IaikConfigurator();
+      final ConfigurationProvider config = ConfigurationProvider.reload();
+      final IaikConfigurator iaikConfigurator = new IaikConfigurator();
 
       iaikConfigurator.configure(config);
 
@@ -95,12 +96,12 @@ public class ConfigurationServlet extends HttpServlet {
 
       if (!config.getWarnings().isEmpty()) {
         // print the warnings
-        List allWarnings = new ArrayList();
+        final List allWarnings = new ArrayList();
         Iterator iter;
-        
+
         allWarnings.addAll(config.getWarnings());
         allWarnings.addAll(iaikConfigurator.getWarnings());
-        
+
         out.println("<p><b>" + msg.getMessage("config.29", null) + "</b></p>");
         for (iter = allWarnings.iterator(); iter.hasNext();) {
           out.println(iter.next() + "<br />");
@@ -108,7 +109,7 @@ public class ConfigurationServlet extends HttpServlet {
         out.println("<p><b>" + msg.getMessage("config.28", null) + "</b></p>");
       }
 
-    } catch (Throwable t) {
+    } catch (final Throwable t) {
       out.println("<p><b>" + msg.getMessage("config.20", null) + "</b></p>");
       out.println("<p><b>" + msg.getMessage("config.28", null) + "</b></p>");
       Logger.warn(new LogMsg(msg.getMessage("config.20", null)), t);
@@ -117,30 +118,33 @@ public class ConfigurationServlet extends HttpServlet {
 
     out.flush();
     out.close();
-    
+
     // tear down the logging context
     LoggingContextManager.getInstance().setLoggingContext(null);
   }
 
   /**
    * Do the same as <code>doGet</code>.
-   * 
-   * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
+   *
+   * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest,
+   *      HttpServletResponse)
    */
+  @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
+      throws ServletException, IOException {
     doGet(request, response);
   }
 
   /**
    * Perform some initial initialization tasks for the MOA web services
    * application.
-   * 
+   *
    * Does an initial load of the MOA configuration to test if a working web
    * service can be provided.
-   * 
+   *
    * @see javax.servlet.GenericServlet#init()
    */
+  @Override
   public void init() throws ServletException {
     SystemInitializer.init();
   }