Changeset 2643

Timestamp:

03/01/13 11:26:19 (11 years ago)

Author:

oschonef

Message:

• add compatibility shim for legacy init parameter

File:

• SRUServer/trunk/src/main/java/eu/clarin/sru/server/utils/SRUServerServlet.java (modified) (6 diffs)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/utils/SRUServerServlet.java

@@ -89 +89 @@
     private static final String LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM =
             "sruServerConfigLocation";
-
     /**
      * Servlet initialization parameter name for the class that implements the
@@ -96 +95 @@
     public static final String SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM =
             "eu.clarin.sru.server.utils.sruServerSearchEngineClass";
+    /**
+     * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
+     */
+    @Deprecated
+    private static final String LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM =
+            "sruServerSerachEngineClass";
     /**
      * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
@@ -102 +107 @@
     private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM =
             "sruServerSearchEngineClass";
-
     /**
      * Default value for the location of the SRU server configuration.
@@ -128 +132 @@
                 cfg.getInitParameter(SRU_SERVER_CONFIG_LOCATION_PARAM);
         if (sruServerConfigLocation == null) {
-            sruServerConfigLocation = cfg.getInitParameter(LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM);
+            sruServerConfigLocation = cfg.getInitParameter(
+                    LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM);
             if (sruServerConfigLocation != null) {
                 logger.warn("init parameter '" +
@@ -154 +159 @@
         }
 
+        /* get search engine class name from servelet init parameters */
         String sruServerSearchEngineClass =
                 cfg.getInitParameter(SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
+
+        /* legacy compatibility (first try) */
         if (sruServerSearchEngineClass == null) {
-            sruServerSearchEngineClass = cfg.getInitParameter(LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
+            sruServerSearchEngineClass = cfg.getInitParameter(
+                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
             if (sruServerSearchEngineClass != null) {
                 logger.warn("init parameter '" +
@@ -163 +172 @@
                         "' is deprecated, please use init parameter '" +
                         SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
-            } else {
-                throw new ServletException("init parameter '" +
-                        SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM +
-                        "' not defined in servlet configuration");
-            }
+            }
+        }
+
+        /* legacy compatibility (second try) */
+        if (sruServerSearchEngineClass == null) {
+            sruServerSearchEngineClass = cfg.getInitParameter(
+                    LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM);
+            if (sruServerSearchEngineClass != null) {
+                logger.warn("init parameter '" +
+                        LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM +
+                        "' is deprecated, please use init parameter '" +
+                        SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
+            }
+        }
+
+        /* if still nothing, give up */
+        if (sruServerSearchEngineClass == null) {
+            throw new ServletException("init parameter '" +
+                    SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM +
+                    "' not defined in servlet configuration");
         }