Mercurial > hg > AnnotationManagerN4J
changeset 75:25eb2e1df106
change logging to java.util.logging.
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Fri Mar 21 13:32:41 2014 +0100 @@ -32,8 +32,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -61,7 +61,7 @@ */ public class AnnotationStore { - protected static Logger logger = Logger.getLogger(AnnotationStore.class); + protected static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.neo4j.AnnotationStore"); protected GraphDatabaseService graphDb; @@ -319,7 +319,7 @@ Actor group = createActorFromNode(groupNode); // make sure we're getting a group if (!(group instanceof Group)) { - logger.error("target of MEMBER_OF is not GROUP! rel=" + rel); + logger.severe("target of MEMBER_OF is not GROUP! rel=" + rel); continue; } groups.add((Group) group); @@ -369,7 +369,7 @@ Actor member = createActorFromNode(memberNode); // make sure we're getting a group if (!(member instanceof Person)) { - logger.error("source of MEMBER_OF is not PERSON! rel=" + rel); + logger.severe("source of MEMBER_OF is not PERSON! rel=" + rel); continue; } members.add((Person) member); @@ -484,7 +484,7 @@ // this shouldn't happen deleteNode(actorNode); } else { - logger.error("deleteActor: unable to delete: Node still has relations."); + logger.severe("deleteActor: unable to delete: Node still has relations."); } tx.success(); } @@ -532,7 +532,7 @@ } } if (annot.getTarget() == null) { - logger.warn("annotation " + annotNode + " has no target node!"); + logger.warning("annotation " + annotNode + " has no target node!"); } // get fragment from attribute annot.setTargetFragment((String) annotNode.getProperty("targetFragment", null)); @@ -549,7 +549,7 @@ Actor creator = createActorFromNode(creatorNode); annot.setCreator(creator); } else { - logger.warn("annotation " + annotNode + " has no creator node!"); + logger.warning("annotation " + annotNode + " has no creator node!"); } /* * get creation date @@ -832,7 +832,7 @@ if (!annotNode.hasRelationship()) { deleteNode(annotNode); } else { - logger.error("deleteById: unable to delete: Node still has relations."); + logger.severe("deleteById: unable to delete: Node still has relations."); } } tx.success(); @@ -860,7 +860,7 @@ Annotation annot = createAnnotationFromNode(ann); annotations.add(annot); } else { - logger.error("ANNOTATES relation does not start with ANNOTATION: " + ann); + logger.severe("ANNOTATES relation does not start with ANNOTATION: " + ann); } } tx.success(); @@ -879,7 +879,7 @@ Annotation annot = createAnnotationFromNode(ann); annotations.add(annot); } else { - logger.error("CREATED relation does not end with ANNOTATION: " + ann); + logger.severe("CREATED relation does not end with ANNOTATION: " + ann); } } tx.success(); @@ -1083,14 +1083,14 @@ protected void deleteNode(Node node) { try (Transaction tx = graphDb.beginTx()) { if (node.hasRelationship()) { - logger.error("deleteNode: unable to delete: Node still has relations."); + logger.severe("deleteNode: unable to delete: Node still has relations."); } else { String ts = (String) node.getProperty("TYPE", null); try { NodeTypes type = NodeTypes.valueOf(ts); getNodeIndex(type).remove(node); } catch (Exception e) { - logger.error("deleteNode: unable to get TYPE of node: " + node); + logger.severe("deleteNode: unable to get TYPE of node: " + node); } node.delete(); } @@ -1161,7 +1161,7 @@ Node an = rel.getStartNode(); Node rn = rel.getEndNode(); if (rn.getProperty("TYPE", "").equals("RESOURCE")) { - logger.error("getAnnotationsByResource got ANNOTATES != RESOURCE"); + logger.severe("getAnnotationsByResource got ANNOTATES != RESOURCE"); } ret.add(createAnnotationFromNode(an)); }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java Fri Mar 21 13:32:41 2014 +0100 @@ -70,7 +70,7 @@ */ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorAnnotations doGetJSON!"); + logger.fine("AnnotatorAnnotations doGetJSON!"); setCorsHeaders(); // id from URI /annotations/{id} String id = null; @@ -83,12 +83,12 @@ // this shouldn't happen } id = decodeJsonId(jsonId); - logger.debug("annotation-id=" + id); + logger.fine("annotation-id=" + id); } // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); if (id == null) { // no id -- send all annotations @@ -167,13 +167,13 @@ */ @Post("json") public Representation doPostJson(Representation entity) { - logger.debug("AnnotatorAnnotations doPostJSON!"); + logger.fine("AnnotatorAnnotations doPostJSON!"); // set headers setCorsHeaders(); // do authentication TODO: who's allowed to create? Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); if (authUser == null) { setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!"); return null; @@ -222,16 +222,16 @@ */ @Put("json") public Representation doPutJSON(Representation entity) { - logger.debug("AnnotatorAnnotations doPutJSON!"); + logger.fine("AnnotatorAnnotations doPutJSON!"); setCorsHeaders(); // id from URI /annotations/{id} String jsonId = (String) getRequest().getAttributes().get("id"); String id = decodeJsonId(jsonId); - logger.debug("annotation-id=" + id); + logger.fine("annotation-id=" + id); // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); Annotation annot = null; AnnotationStore store = getAnnotationStore(); @@ -268,10 +268,10 @@ JsonRepresentation retRep = new JsonRepresentation(jo); return retRep; } catch (JSONException e) { - logger.error("Error in doPutJSON", e); + logger.severe("Error in doPutJSON: "+e); setStatus(Status.CLIENT_ERROR_BAD_REQUEST); } catch (IOException e) { - logger.error("Error in doPutJSON", e); + logger.severe("Error in doPutJSON: "+e); setStatus(Status.SERVER_ERROR_INTERNAL, "Other Error"); } return null; @@ -285,16 +285,16 @@ */ @Delete("json") public Representation doDeleteJSON(Representation entity) { - logger.debug("AnnotatorAnnotations doDeleteJSON!"); + logger.fine("AnnotatorAnnotations doDeleteJSON!"); setCorsHeaders(); // id from URI /annotations/{id} String jsonId = (String) getRequest().getAttributes().get("id"); String id = decodeJsonId(jsonId); - logger.debug("annotation-id=" + id); + logger.fine("annotation-id=" + id); // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); AnnotationStore store = getAnnotationStore(); Annotation annot = store.getAnnotationById(id); if (annot != null) {
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByResources.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByResources.java Fri Mar 21 13:32:41 2014 +0100 @@ -55,12 +55,12 @@ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorAnnotatonsByResource doGetJSON!"); + logger.fine("AnnotatorAnnotatonsByResource doGetJSON!"); setCorsHeaders(); // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); String id = null; String jsonId = (String) getRequest().getAttributes().get("id"); @@ -73,7 +73,7 @@ } id = decodeJsonId(jsonId); // String id = jsonId; - logger.debug("ressource-id=" + id); + logger.fine("ressource-id=" + id); } Form form = getRequest().getResourceRef().getQueryAsForm();
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByTags.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByTags.java Fri Mar 21 13:32:41 2014 +0100 @@ -54,12 +54,12 @@ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorAnnotatonsBytag doGetJSON!"); + logger.fine("AnnotatorAnnotatonsBytag doGetJSON!"); setCorsHeaders(); // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); String id = (String) getRequest().getAttributes().get("id"); // URL decode @@ -68,7 +68,7 @@ } catch (UnsupportedEncodingException e) { // this shouldn't happen } - logger.debug("annotation-id=" + id); + logger.fine("annotation-id=" + id); Form form = getRequest().getResourceRef().getQueryAsForm(); String sortBy = form.getFirstValue("sortBy");
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorGroups.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorGroups.java Fri Mar 21 13:32:41 2014 +0100 @@ -64,7 +64,7 @@ */ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorGroups doGetJSON!"); + logger.fine("AnnotatorGroups doGetJSON!"); setCorsHeaders(); Form form = getRequest().getResourceRef().getQueryAsForm(); String user = form.getFirstValue("user"); @@ -98,8 +98,8 @@ setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error"); return null; } - logger.debug("sending:"); - logger.debug(result); + logger.fine("sending:"); + logger.fine(result.toString()); return new JsonRepresentation(result); }
--- 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; }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResources.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResources.java Fri Mar 21 13:32:41 2014 +0100 @@ -61,7 +61,7 @@ */ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorResources doGetJSON!"); + logger.fine("AnnotatorResources doGetJSON!"); setCorsHeaders(); String jsonId = (String) getRequest().getAttributes().get("id"); @@ -75,7 +75,7 @@ } String uri = decodeJsonId(jsonId); - logger.debug("resources-id=" + uri); + logger.fine("resources-id=" + uri); if (uri == null) { return getAllResources(); @@ -122,8 +122,8 @@ setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error"); return null; } - logger.debug("sending:"); - logger.debug(result); + logger.fine("sending:"); + logger.fine(result.toString()); return new JsonRepresentation(result); }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java Fri Mar 21 13:32:41 2014 +0100 @@ -25,7 +25,6 @@ * #L% */ -import org.apache.log4j.Logger; import org.restlet.Restlet; import org.restlet.routing.Router; @@ -37,8 +36,6 @@ public final String version = "AnnotationManagerN4J/Annotator 0.3.2"; - public static Logger logger = Logger.getLogger(AnnotatorRestlet.class); - /* * (non-Javadoc) *
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java Fri Mar 21 13:32:41 2014 +0100 @@ -64,11 +64,11 @@ */ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorSearch doGetJSON!"); + logger.fine("AnnotatorSearch doGetJSON!"); setCorsHeaders(); // do authentication Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); - logger.debug("request authenticated=" + authUser); + logger.fine("request authenticated=" + authUser); Form form = getRequest().getResourceRef().getQueryAsForm(); String uri = form.getFirstValue("uri"); @@ -79,7 +79,7 @@ // do search ArrayList<JSONObject> results = new ArrayList<JSONObject>(); - logger.debug(String.format("searching for uri=%s user=%s", uri, user)); + logger.fine(String.format("searching for uri=%s user=%s", uri, user)); AnnotationStore store = getAnnotationStore(); List<Annotation> annots = store.searchAnnotationByUriUser(uri, user); for (Annotation annot : annots) { @@ -119,8 +119,8 @@ return null; } - logger.debug("sending:"); - logger.debug(result); + logger.fine("sending:"); + logger.fine(result.toString()); return new JsonRepresentation(result); }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorTags.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorTags.java Fri Mar 21 13:32:41 2014 +0100 @@ -63,13 +63,13 @@ */ @Get("json") public Representation doGetJSON(Representation entity) { - logger.debug("AnnotatorGroups doGetJSON!"); + logger.fine("AnnotatorGroups doGetJSON!"); setCorsHeaders(); String jsonId = (String) getRequest().getAttributes().get("id"); // String id = decodeJsonId(jsonId); String id = jsonId; - logger.debug("annotation-id=" + id); + logger.fine("annotation-id=" + id); if (id == null) { return getAllTags(); @@ -125,8 +125,8 @@ setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error"); return null; } - logger.debug("sending:"); - logger.debug(result); + logger.fine("sending:"); + logger.fine(result.toString()); return new JsonRepresentation(result); }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Fri Mar 21 13:32:41 2014 +0100 @@ -31,6 +31,7 @@ import java.util.Hashtable; import java.util.Properties; import java.util.concurrent.ConcurrentMap; +import java.util.logging.Logger; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -41,8 +42,6 @@ import javax.naming.directory.SearchResult; import javax.servlet.ServletContext; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Logger; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseFactory; @@ -56,7 +55,7 @@ public abstract class BaseRestlet extends Application { - public static Logger logger = Logger.getLogger(BaseRestlet.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.BaseRestlet"); /** * Properties holding consumer keys and secrets. @@ -147,11 +146,7 @@ ConcurrentMap<String, Object> attrs = context.getAttributes(); ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext"); if (sc != null) { - if (sc.getAttribute("annotationserver.log4j.configured") == null) { - // TODO: is this the right place to run the log4j configurator? - BasicConfigurator.configure(); - sc.setAttribute("annotationserver.log4j.configured", "done"); - } + logger = context.getLogger(); logger.info(getVersion() + " starting..."); /* @@ -162,7 +157,7 @@ serverConfig = new Properties(); InputStream ps = getResourceAsStream(sc, CONFIG_PROPS_PATH); if (ps != null) { - logger.debug("loading config from " + CONFIG_PROPS_PATH); + logger.fine("loading config from " + CONFIG_PROPS_PATH); try { serverConfig.load(ps); /* @@ -186,11 +181,11 @@ AnnotationStore.ANNOTATION_URI_PREFIX = serverConfig.getProperty(ANNOTATIONS_URI_KEY); } } catch (IOException e) { - logger.warn("Error loading server config: ", e); + logger.warning("Error loading server config: "+e.toString()); } - logger.debug("config: " + serverConfig); + logger.fine("config: " + serverConfig); } else { - logger.error("Unable to get resource " + CONFIG_PROPS_PATH); + logger.severe("Unable to get resource " + CONFIG_PROPS_PATH); } // store config sc.setAttribute(SERVERCONFIG_KEY, serverConfig); @@ -203,7 +198,7 @@ */ String dbFn = getResourcePath(sc, graphdbPath); if (dbFn != null) { - logger.debug("opening DB " + dbFn); + logger.fine("opening DB " + dbFn); GraphDatabaseBuilder graphDbBuilder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(dbFn); graphDbBuilder.setConfig(GraphDatabaseSettings.allow_store_upgrade, "true"); graphDb = graphDbBuilder.newGraphDatabase(); @@ -215,12 +210,12 @@ sc.setAttribute(ANNSTORE_KEY, store); // admin server srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb); - logger.debug("Starting DB admin server..."); + logger.fine("Starting DB admin server..."); // store in context sc.setAttribute(GRAPHDBSRV_KEY, srv); srv.start(); } else { - logger.error("Unable to get resource " + dbFn); + logger.severe("Unable to get resource " + dbFn); } } else { // get existing AnnotationStore @@ -234,22 +229,22 @@ consumerKeys = new Properties(); InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH); if (ps != null) { - logger.debug("loading consumer keys from " + CONSUMER_KEYS_PATH); + logger.fine("loading consumer keys from " + CONSUMER_KEYS_PATH); try { consumerKeys.load(ps); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } - logger.debug("consumer keys: " + consumerKeys); + logger.fine("consumer keys: " + consumerKeys); } else { - logger.error("Unable to get resource " + CONSUMER_KEYS_PATH); + logger.severe("Unable to get resource " + CONSUMER_KEYS_PATH); } // store config sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys); } } else { - logger.error("Unable to get ServletContext!"); + logger.severe("Unable to get ServletContext!"); } } @@ -301,7 +296,7 @@ try { dctx = new InitialDirContext(env); } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP! "+e); return retString; } @@ -324,13 +319,13 @@ retString = (String) attr.get(); } } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP!"+e); } try { dctx.close(); } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP!"+e); } return retString; } @@ -362,11 +357,11 @@ // try as file File pf = new File(sc.getRealPath(webPath)); if (pf.canRead()) { - logger.debug("trying file for: " + pf); + logger.fine("trying file for: " + pf); try { ps = new FileInputStream(pf); } catch (FileNotFoundException e) { - logger.error(e); + logger.severe(e.toString()); } } else { // use class loader @@ -408,12 +403,12 @@ * trying to clean up databases, not sure if this is the right way... */ if (srv != null) { - logger.debug("Stopping DB admin server..."); + logger.info("Stopping DB admin server..."); srv.stop(); srv = null; } if (graphDb != null) { - logger.debug("Stopping DB..."); + logger.info("Stopping DB..."); graphDb.shutdown(); graphDb = null; }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -27,8 +27,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.Form; import org.restlet.data.MediaType; import org.restlet.data.Reference; @@ -53,7 +53,7 @@ */ public class AnnotationResource extends ServerResource { - public static Logger logger = Logger.getLogger(AnnotationResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationResource"); protected AnnotationStore store; @@ -66,7 +66,7 @@ super.doInit(); // id from URI /annotations/persons/{id} requestId = (String) getRequest().getAttributes().get("id"); - logger.debug("annoation-id=" + requestId); + logger.fine("annoation-id=" + requestId); // get store instance if (store == null) { store = ((BaseRestlet) getApplication()).getAnnotationStore(); @@ -148,7 +148,7 @@ */ @Put public Representation doPut(Representation entity) { - logger.debug("AnnotationResource.doPut!"); + logger.fine("AnnotationResource.doPut!"); if (annotation == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST); @@ -185,7 +185,7 @@ */ @Delete public Representation doDelete(Representation entity) { - logger.debug("AnnotationResource.doDelete!"); + logger.fine("AnnotationResource.doDelete!"); if (annotation == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -26,8 +26,8 @@ */ import java.util.List; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.MediaType; import org.restlet.data.Reference; import org.restlet.representation.Representation; @@ -48,7 +48,7 @@ */ public class AnnotationsResource extends ServerResource { - public static Logger logger = Logger.getLogger(AnnotationsResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationsResource"); private AnnotationStore store;
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java Fri Mar 21 13:32:41 2014 +0100 @@ -25,7 +25,8 @@ * #L% */ -import org.apache.log4j.Logger; +import java.util.logging.Logger; + import org.restlet.Restlet; import org.restlet.data.ChallengeScheme; import org.restlet.routing.Router; @@ -42,7 +43,7 @@ public final String version = "AnnotationManagerN4J/AnnotationsUI 0.3"; - public static Logger logger = Logger.getLogger(AnnotationsUiRestlet.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationsUiRestlet"); /* * (non-Javadoc) @@ -79,7 +80,7 @@ if (user != null && pw != null) { verifier.getLocalSecrets().put(user, pw.toCharArray()); } else { - logger.error("Admin user and password missing in serverconfig!"); + logger.severe("Admin user and password missing in serverconfig!"); } // Create a Guard ChallengeAuthenticator guard = new ChallengeAuthenticator(getContext(), ChallengeScheme.HTTP_BASIC, "Tutorial");
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupMembersResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupMembersResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -95,7 +95,7 @@ */ @Post public Representation doPost(Representation entity) { - logger.debug("GroupMembersResource doPost!"); + logger.fine("GroupMembersResource doPost!"); // TODO: do authentication Form form = new Form(entity); String addMemberId = form.getFirstValue("add_member"); @@ -107,14 +107,14 @@ return null; } if (addMemberId != null) { - logger.debug("adding member: "+addMemberId); + logger.fine("adding member: "+addMemberId); Person member = new Person(addMemberId); store.addGroupMember(group, member); } else if (delMemberId != null) { if (delMemberId.startsWith("delete:")) { delMemberId = delMemberId.substring(7); } - logger.debug("deleting member: "+delMemberId); + logger.fine("deleting member: "+delMemberId); Person member = new Person(delMemberId); store.deleteGroupMember(group, member); }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -27,8 +27,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.Form; import org.restlet.data.MediaType; import org.restlet.data.Reference; @@ -53,7 +53,7 @@ */ public class GroupResource extends ServerResource { - public static Logger logger = Logger.getLogger(GroupResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.GroupResource"); protected AnnotationStore store; @@ -66,7 +66,7 @@ super.doInit(); // id from URI /annotations/groups/{id} requestId = (String) getRequest().getAttributes().get("id"); - logger.debug("group-id=" + requestId); + logger.fine("group-id=" + requestId); // get store instance if (store == null) { store = ((BaseRestlet) getApplication()).getAnnotationStore(); @@ -144,7 +144,7 @@ */ @Put public Representation doPut(Representation entity) { - logger.debug("GroupResource.doPut!"); + logger.fine("GroupResource.doPut!"); if (group == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST); @@ -177,7 +177,7 @@ */ @Delete public Representation doDelete(Representation entity) { - logger.debug("GroupResource.doDelete!"); + logger.fine("GroupResource.doDelete!"); if (group == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupsResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupsResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -26,8 +26,8 @@ */ import java.util.List; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.Form; import org.restlet.data.MediaType; import org.restlet.data.Reference; @@ -52,7 +52,7 @@ */ public class GroupsResource extends ServerResource { - public static Logger logger = Logger.getLogger(GroupsResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.GroupsResource"); private AnnotationStore store; @@ -115,7 +115,7 @@ */ @Post public Representation doPost(Representation entity) { - logger.debug("AnnotationsUiGroups doPost!"); + logger.fine("AnnotationsUiGroups doPost!"); // TODO: do authentication Form form = new Form(entity); String id = form.getFirstValue("id");
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -27,8 +27,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.Form; import org.restlet.data.MediaType; import org.restlet.data.Reference; @@ -53,7 +53,7 @@ */ public class PersonResource extends ServerResource { - public static Logger logger = Logger.getLogger(PersonResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.PersonResource"); protected AnnotationStore store; @@ -66,7 +66,7 @@ super.doInit(); // id from URI /annotations/persons/{id} requestId = (String) getRequest().getAttributes().get("id"); - logger.debug("person-id=" + requestId); + logger.fine("person-id=" + requestId); // get store instance if (store == null) { store = ((BaseRestlet) getApplication()).getAnnotationStore(); @@ -142,7 +142,7 @@ */ @Put public Representation doPut(Representation entity) { - logger.debug("PersonResource.doPut!"); + logger.fine("PersonResource.doPut!"); if (person == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST); @@ -175,7 +175,7 @@ */ @Delete public Representation doDelete(Representation entity) { - logger.debug("PersonResource.doDelete!"); + logger.fine("PersonResource.doDelete!"); if (person == null) { // invalid id setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java Fri Mar 21 13:32:41 2014 +0100 @@ -26,8 +26,8 @@ */ import java.util.List; +import java.util.logging.Logger; -import org.apache.log4j.Logger; import org.restlet.data.Form; import org.restlet.data.MediaType; import org.restlet.data.Reference; @@ -52,7 +52,7 @@ */ public class PersonsResource extends ServerResource { - public static Logger logger = Logger.getLogger(PersonsResource.class); + public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.PersonsResource"); private AnnotationStore store; @@ -114,7 +114,7 @@ */ @Post public Representation doPost(Representation entity) { - logger.debug("PersonsResource doPost!"); + logger.fine("PersonsResource doPost!"); // TODO: do authentication Form form = new Form(entity); String id = form.getFirstValue("id");