Changeset 2665

Timestamp:

03/08/13 10:31:21 (11 years ago)

Author:

oschonef

Message:

• re-shuffle legacy init-parameter stuff

File:

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

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

@@ -99 +99 @@
      */
     @Deprecated
-    private static final String LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM =
+    private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1 =
+            "sruServerSerachEngineClass";
+    /**
+     * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
+     */
+    @Deprecated
+    private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2 =
             "eu.clarin.sru.server.utils.sruServerSerachEngineClass";
-    /**
-     * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
-     */
-    @Deprecated
-    private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM =
-            "sruServerSerachEngineClass";
     /**
      * Default value for the location of the SRU server configuration.
@@ -137 +137 @@
                 logger.warn("init parameter '" +
                         LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM +
-                        "' is deprecated, please use init parameter '" +
+                        "' is deprecated, please use init-parameter '" +
                         SRU_SERVER_CONFIG_LOCATION_PARAM + "' instead!");
             } else {
@@ -148 +148 @@
             sruServerConfigFile = ctx.getResource(sruServerConfigLocation);
         } catch (MalformedURLException e) {
-            throw new ServletException("init parameter '" +
+            throw new ServletException("init-parameter '" +
                     SRU_SERVER_CONFIG_LOCATION_PARAM + "' is not a valid URL",
                     e);
         }
         if (sruServerConfigFile == null) {
-            throw new ServletException("init parameter '" +
+            throw new ServletException("init-parameter '" +
                     SRU_SERVER_CONFIG_LOCATION_PARAM +
                     "' points to non-existing resource (" +
@@ -159 +159 @@
         }
 
-        /* get search engine class name from Servlet init parameters */
+        /* get search engine class name from Servlet init-parameters */
         String sruServerSearchEngineClass =
                 cfg.getInitParameter(SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
@@ -166 +166 @@
         if (sruServerSearchEngineClass == null) {
             sruServerSearchEngineClass = cfg.getInitParameter(
-                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
+                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1);
             if (sruServerSearchEngineClass != null) {
-                logger.warn("init parameter '" +
-                        LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM +
-                        "' is deprecated, please use init parameter '" +
+                logger.warn("init-parameter '" +
+                        LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1 +
+                        "' is deprecated, please use init-parameter '" +
                         SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
             }
@@ -178 +178 @@
         if (sruServerSearchEngineClass == null) {
             sruServerSearchEngineClass = cfg.getInitParameter(
-                    LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM);
+                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2);
             if (sruServerSearchEngineClass != null) {
-                logger.warn("init parameter '" +
-                        LEGACY_SRU_SERVER_SERACH_ENGINE_CLASS_PARAM +
-                        "' is deprecated, please use init parameter '" +
+                logger.warn("init-parameter '" +
+                        LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2 +
+                        "' is deprecated, please use init-parameter '" +
                         SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
             }
@@ -189 +189 @@
         /* if still nothing, give up */
         if (sruServerSearchEngineClass == null) {
-            throw new ServletException("init parameter '" +
+            throw new ServletException("init-parameter '" +
                     SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM +
                     "' not defined in servlet configuration");