Mercurial > hg > AnnotationManagerN4J
diff src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 75:25eb2e1df106
change logging to java.util.logging.
author | casties |
---|---|
date | Fri, 21 Mar 2014 13:32:41 +0100 |
parents | 4b8c909cabf3 |
children | 4e2dc67997a0 |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Fri Mar 21 13:32:41 2014 +0100 @@ -34,6 +34,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -45,7 +46,6 @@ import net.oauth.jsontoken.crypto.Verifier; import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -73,7 +73,7 @@ */ public abstract class AnnotatorResourceImpl extends ServerResource { - protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class); + protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.toString()); private AnnotationStore store; @@ -115,7 +115,7 @@ */ @Options public void doOptions(Representation entity) { - logger.debug("AnnotatorResourceImpl doOptions!"); + logger.fine("AnnotatorResourceImpl doOptions!"); setCorsHeaders(); } @@ -182,11 +182,11 @@ // get stored consumer secret for key BaseRestlet restServer = (BaseRestlet) getApplication(); String consumerSecret = restServer.getConsumerSecret(consumerKey); - logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret); + logger.fine("requested consumer key=" + consumerKey + " secret=" + consumerSecret); if (consumerSecret == null) { return null; } - // logger.debug(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm())); + // logger.fine(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm())); try { List<Verifier> verifiers = new ArrayList<Verifier>(); // we only do HS256 yet @@ -204,7 +204,7 @@ e.printStackTrace(); } // must be ok then - logger.debug("auth OK! user=" + userId); + logger.fine("auth OK! user=" + userId); return userId; } @@ -335,7 +335,7 @@ jo.put("id", annotId); return jo; } catch (JSONException e) { - logger.error("Unable to create AnnotatorJSON!", e); + logger.severe("Unable to create AnnotatorJSON! "+e); } return null; } @@ -367,7 +367,7 @@ } } } catch (JSONException e) { - logger.error("Unable to transform to ranges!", e); + logger.severe("Unable to transform to ranges! "+e); } return ja; } @@ -403,7 +403,7 @@ } } } catch (JSONException e) { - logger.error("Unable to transform to shapes!", e); + logger.severe("Unable to transform to shapes! "+e); } return ja; } @@ -423,7 +423,7 @@ String height = geom.getString("height"); fragment = String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height); } else { - logger.error("Unable to parse this shape: " + shape); + logger.severe("Unable to parse this shape: " + shape); } return fragment; }