Reduce severity of log for non-OAuth (phone uses non-OAuth)

appengine/.classpath

@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="c2dm"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>

appengine/.settings/com.google.appengine.eclipse.core.prefs

@@ -1,4 +1,4 @@
-#Mon Apr 25 17:13:56 PDT 2011
+#Tue May 10 23:32:51 BST 2011
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-jsr107cache-1.4.3.jar|jdo2-api-2.3-eb.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|datanucleus-jpa-1.1.5.jar|datanucleus-appengine-1.0.8.final.jar|datanucleus-core-1.1.5.jar|appengine-api-labs-1.4.3.jar|appengine-api-1.0-sdk-1.4.3.jar|jsr107cache-1.1.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.5.0.jar|appengine-api-labs-1.5.0.jar|appengine-jsr107cache-1.5.0.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.8.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
 ormEnhancementInclusions=src/**|c2dm/**

appengine/src/com/google/android/chrometophone/server/RequestInfo.java

@@ -28,7 +28,7 @@ import com.google.appengine.repackaged.org.json.JSONObject;
 
 /**
  * Common code and helpers to handle a request and manipulate device info.
- * 
+ *
  */
 public class RequestInfo {
     private static final Logger log =
@@ -37,7 +37,7 @@ public class RequestInfo {
     private static final String LOGIN_REQUIRED_STATUS = "LOGIN_REQUIRED";
 
     public List<DeviceInfo> devices = new ArrayList<DeviceInfo>();
-    
+
     public String userName;
 
     private ServletContext ctx;
@@ -47,21 +47,21 @@ public class RequestInfo {
     // code.
     Map<String, String[]> parameterMap;
     JSONObject jsonParams;
-    
-    
+
+
     public boolean isAuth() {
         return userName != null;
     }
-    
+
     /**
      * Authenticate the user, check headers and pull the registration data.
-     * 
+     *
      * @return null if authentication fails.
-     * @throws IOException 
+     * @throws IOException
      */
-    public static RequestInfo processRequest(HttpServletRequest req, 
+    public static RequestInfo processRequest(HttpServletRequest req,
             HttpServletResponse resp, ServletContext ctx) throws IOException {
-        
+
         // Basic XSRF protection
         if (req.getHeader("X-Same-Domain") == null) {
             resp.setStatus(400);
@@ -69,7 +69,7 @@ public class RequestInfo {
             log.warning("Missing X-Same-Domain");
             return null;
         }
-        
+
         User user = null;
         RequestInfo ri = new RequestInfo();
         ri.ctx= ctx;
@@ -80,7 +80,7 @@ public class RequestInfo {
                 ri.userName = user.getEmail();
             }
         } catch (Throwable t) {
-            log.log(Level.SEVERE, "Oauth error ", t);
+            log.log(Level.INFO, "Non-OAuth request");
             user = null;
         }
 
@@ -92,10 +92,10 @@ public class RequestInfo {
                 ri.userName = user.getEmail();
             }
         }
-        
+
         if ("application/json".equals(req.getContentType())) {
             Reader reader = req.getReader();
-            // where is readFully ? 
+            // where is readFully ?
             char[] tmp = new char[2048];
             StringBuffer body = new StringBuffer();
             while (true) {
@@ -114,7 +114,7 @@ public class RequestInfo {
         } else {
             ri.parameterMap = req.getParameterMap();
         }
-        
+
         ri.deviceRegistrationID = ri.getParameter("devregid");
         if (ri.deviceRegistrationID != null) {
             ri.deviceRegistrationID = ri.deviceRegistrationID.trim();
@@ -122,19 +122,19 @@ public class RequestInfo {
                 ri.deviceRegistrationID = null;
             }
         }
-        
+
         if (ri.userName == null) {
             resp.setStatus(200);
             resp.getWriter().println(LOGIN_REQUIRED_STATUS);
             log.warning("Missing user");
             return null;
         }
-        
+
         if (ctx != null) {
             ri.initDevices(ctx);
         }
-        
-        
+
+
         return ri;
     }
 
@@ -149,17 +149,18 @@ public class RequestInfo {
             return res[0];
         }
     }
- 
+
     /**
      *  Authenticate using the req, fetch devices.
      */
     private RequestInfo() {
     }
 
+    @Override
     public String toString() {
         return userName + " " + devices.size() + " " + jsonParams;
     }
-    
+
     public RequestInfo(String userN, ServletContext ctx) {
         this.userName = userN;
         this.ctx= ctx;
@@ -185,7 +186,7 @@ public class RequestInfo {
                 if (oldKey.toString().indexOf("#") < 0) {
                     log.warning("Removing old-style key " + oldKey.toString());
                     // multiple devices, first is old-style.
-                    devices.remove(0); 
+                    devices.remove(0);
                     pm.deletePersistent(first);
                 }
             }
@@ -193,10 +194,10 @@ public class RequestInfo {
             log.log(Level.WARNING, "Error loading registrations ", e);
         } finally {
             pm.close();
-        }        
-        
+        }
+
     }
-    
+
     // We need to iterate again - can be avoided with a query.
     // delete will fail if the pm is different than the one used to
     // load the object - we must close the object when we're done