Changeset 25717 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2012-05-30T15:34:25+12:00 (12 years ago)

Author:

sjm84

Message:

Added a BaseGreenstoneServlet servlet that the other servlets now inherit from so that we can be sure that GlobalProperties is properly initialised. There is also some reformatting and import cleaning

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -1 +1 @@
 package org.greenstone.gsdl3;
 
-import org.greenstone.gsdl3.comms.*;
-import org.greenstone.gsdl3.core.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.action.PageAction;
+import org.greenstone.gsdl3.comms.Communicator;
+import org.greenstone.gsdl3.comms.SOAPCommunicator;
+import org.greenstone.gsdl3.core.DefaultReceptionist;
+import org.greenstone.gsdl3.core.MessageRouter;
+import org.greenstone.gsdl3.core.Receptionist;
 import org.greenstone.gsdl3.service.Authentication;
-import org.greenstone.gsdl3.util.*;
-import org.greenstone.gsdl3.action.PageAction; // used to get the default action
+import org.greenstone.gsdl3.util.GSConstants;
+import org.greenstone.gsdl3.util.GSParams;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import java.io.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import java.util.Enumeration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.lang.reflect.Type;
-import java.util.Hashtable;
-import org.apache.log4j.*;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-
-// Apache Commons
-import org.apache.commons.lang3.*;
 
 /**
@@ -45 +58 @@
  * @see Receptionist
  */
-public class LibraryServlet extends HttpServlet
+public class LibraryServlet extends BaseGreenstoneServlet
 {
-
     /** the receptionist to send messages to */
     protected Receptionist recept = null;
@@ -110 +122 @@
 
         String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
-        String gsdl3_home = config.getInitParameter(GSConstants.GSDL3_HOME);
         String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);