Changeset 2302 for SRUServer

Timestamp:

10/12/12 13:43:01 (12 years ago)

Author:

oschonef

Message:

• make ServletContext? available to init() method

HEADS UP: the old init() method without ServletContext? is deprecated and will be removed in a future release.

Location:

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

Files:

• SRUSearchEngineBase.java (modified) (3 diffs)
• SRUServerServlet.java (modified) (1 diff)

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

@@ -18 +18 @@
 
 import java.util.Map;
+
+import javax.servlet.ServletContext;
 
 import eu.clarin.sru.server.SRUConfigException;
@@ -82 +84 @@
      * Initialize the search engine.
      * 
+     * @param context
+     *            the {@link ServletContext} for the Servlet
      * @param config
      *            the {@link SRUServerConfig} object for this search engine
@@ -90 +94 @@
      *             an error occurred during initialization of the search engine
      */
+    public void init(ServletContext context, SRUServerConfig config,
+            Map<String, String> params) throws SRUConfigException {
+        init(config, params);
+    }
+
+
+    /**
+     * Initialize the search engine.
+     * 
+     * @param config
+     *            the {@link SRUServerConfig} object for this search engine
+     * @param params
+     *            additional parameters gathered from the Servlet configuration
+     *            and Servlet context.
+     * @throws SRUConfigException
+     *             an error occurred during initialization of the search engine
+     * @deprecated Replaced by {@link #init(ServletContext, SRUServerConfig, Map)}
+     */
+    @Deprecated
     public void init(SRUServerConfig config, Map<String, String> params)
             throws SRUConfigException {

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

@@ -233 +233 @@
          */
         try {
-            searchEngine.init(sruServerConfig, params);
+            searchEngine.init(ctx, sruServerConfig, params);
             sruServer = new SRUServer(sruServerConfig, searchEngine);
         } catch (SRUConfigException e) {