Merge pull request #22 from IMSGlobal/cleanup_deps

Cleanup deps

Author: pfgray

pom.xml

@@ -69,6 +69,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -91,11 +92,6 @@
             <version>1.9.3</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>net.oauth.core</groupId>
             <artifactId>oauth-provider</artifactId>
@@ -144,11 +140,6 @@
             <version>1.7.4</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.2</version>
-        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>

src/main/java/org/imsglobal/lti2/LTI2Servlet.java

@@ -25,15 +25,15 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.ObjectWriter;
@@ -80,7 +80,7 @@
 public class LTI2Servlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
-	private static Log M_log = LogFactory.getLog(LTI2Servlet.class);
+	private static Logger M_log = Logger.getLogger(LTI2Servlet.class.getName());
 
 	protected ServiceOffered LTI2ResultItem = null;
 	protected ServiceOffered LTI2LtiLinkSettings = null;
@@ -125,7 +125,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		} catch (Exception e) {
 			String ipAddress = request.getRemoteAddr();
 			String uri = request.getRequestURI();
-			M_log.warn("General LTI2 Failure URI="+uri+" IP=" + ipAddress);
+			M_log.log(Level.WARNING, "General LTI2 Failure URI="+uri+" IP=" + ipAddress);
 			e.printStackTrace();
 			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); 
 			doErrorJSON(request, response, null, "General failure", e);
@@ -179,7 +179,7 @@ protected void doRequest(HttpServletRequest request, HttpServletResponse respons
 		}
 
 		response.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED); 
-		M_log.warn("Unknown request="+uri);
+		M_log.log(Level.WARNING, "Unknown request="+uri);
 		doErrorJSON(request, response, null, "Unknown request="+uri, null);
 	}
 
@@ -440,7 +440,7 @@ public void registerToolProviderProfile(HttpServletRequest request,HttpServletRe
 		response.setContentType(StandardServices.TOOLPROXY_ID_FORMAT);
 		response.setStatus(HttpServletResponse.SC_CREATED);
 		String jsonText = JSONValue.toJSONString(jsonResponse);
-		M_log.debug(jsonText);
+		M_log.log(Level.FINE, jsonText);
 		PrintWriter out = response.getWriter();
 		out.println(jsonText);
 	}
@@ -477,7 +477,7 @@ public void handleResultRequest(HttpServletRequest request,HttpServletResponse r
 			response.setContentType(StandardServices.RESULT_FORMAT);
 			response.setStatus(HttpServletResponse.SC_OK);
 			String jsonText = JSONValue.toJSONString(jsonResponse);
-			M_log.debug(jsonText);
+			M_log.log(Level.FINE, jsonText);
 			PrintWriter out = response.getWriter();
 			out.println(jsonText);
 			return;
@@ -624,7 +624,7 @@ public void doErrorJSON(HttpServletRequest request,HttpServletResponse response,
 		throws java.io.IOException 
 	{
 		if (e != null) {
-			M_log.error(e.getLocalizedMessage(), e);
+			M_log.log(Level.WARNING, e.getLocalizedMessage(), e);
 		}
         M_log.info(message);
 		String output = IMSJSONRequest.doErrorJSON(request, response, json, message, e);