Changeset 75:25eb2e1df106 in AnnotationManagerN4J
- Timestamp:
- Mar 21, 2014, 12:32:41 PM (11 years ago)
- Branch:
- default
- Location:
- src/main/java/de/mpiwg/itgroup/annotations
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java
r70 r75 33 33 import java.util.List; 34 34 import java.util.Set; 35 36 import org.apache.log4j.Logger; 35 import java.util.logging.Logger; 36 37 37 import org.neo4j.graphdb.Direction; 38 38 import org.neo4j.graphdb.GraphDatabaseService; … … 62 62 public class AnnotationStore { 63 63 64 protected static Logger logger = Logger.getLogger( AnnotationStore.class);64 protected static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.neo4j.AnnotationStore"); 65 65 66 66 protected GraphDatabaseService graphDb; … … 320 320 // make sure we're getting a group 321 321 if (!(group instanceof Group)) { 322 logger. error("target of MEMBER_OF is not GROUP! rel=" + rel);322 logger.severe("target of MEMBER_OF is not GROUP! rel=" + rel); 323 323 continue; 324 324 } … … 370 370 // make sure we're getting a group 371 371 if (!(member instanceof Person)) { 372 logger. error("source of MEMBER_OF is not PERSON! rel=" + rel);372 logger.severe("source of MEMBER_OF is not PERSON! rel=" + rel); 373 373 continue; 374 374 } … … 485 485 deleteNode(actorNode); 486 486 } else { 487 logger. error("deleteActor: unable to delete: Node still has relations.");487 logger.severe("deleteActor: unable to delete: Node still has relations."); 488 488 } 489 489 tx.success(); … … 533 533 } 534 534 if (annot.getTarget() == null) { 535 logger.warn ("annotation " + annotNode + " has no target node!");535 logger.warning("annotation " + annotNode + " has no target node!"); 536 536 } 537 537 // get fragment from attribute … … 550 550 annot.setCreator(creator); 551 551 } else { 552 logger.warn ("annotation " + annotNode + " has no creator node!");552 logger.warning("annotation " + annotNode + " has no creator node!"); 553 553 } 554 554 /* … … 833 833 deleteNode(annotNode); 834 834 } else { 835 logger. error("deleteById: unable to delete: Node still has relations.");835 logger.severe("deleteById: unable to delete: Node still has relations."); 836 836 } 837 837 } … … 861 861 annotations.add(annot); 862 862 } else { 863 logger. error("ANNOTATES relation does not start with ANNOTATION: " + ann);863 logger.severe("ANNOTATES relation does not start with ANNOTATION: " + ann); 864 864 } 865 865 } … … 880 880 annotations.add(annot); 881 881 } else { 882 logger. error("CREATED relation does not end with ANNOTATION: " + ann);882 logger.severe("CREATED relation does not end with ANNOTATION: " + ann); 883 883 } 884 884 } … … 1084 1084 try (Transaction tx = graphDb.beginTx()) { 1085 1085 if (node.hasRelationship()) { 1086 logger. error("deleteNode: unable to delete: Node still has relations.");1086 logger.severe("deleteNode: unable to delete: Node still has relations."); 1087 1087 } else { 1088 1088 String ts = (String) node.getProperty("TYPE", null); … … 1091 1091 getNodeIndex(type).remove(node); 1092 1092 } catch (Exception e) { 1093 logger. error("deleteNode: unable to get TYPE of node: " + node);1093 logger.severe("deleteNode: unable to get TYPE of node: " + node); 1094 1094 } 1095 1095 node.delete(); … … 1162 1162 Node rn = rel.getEndNode(); 1163 1163 if (rn.getProperty("TYPE", "").equals("RESOURCE")) { 1164 logger. error("getAnnotationsByResource got ANNOTATES != RESOURCE");1164 logger.severe("getAnnotationsByResource got ANNOTATES != RESOURCE"); 1165 1165 } 1166 1166 ret.add(createAnnotationFromNode(an)); -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java
r70 r75 71 71 @Get("json") 72 72 public Representation doGetJSON(Representation entity) { 73 logger. debug("AnnotatorAnnotations doGetJSON!");73 logger.fine("AnnotatorAnnotations doGetJSON!"); 74 74 setCorsHeaders(); 75 75 // id from URI /annotations/{id} … … 84 84 } 85 85 id = decodeJsonId(jsonId); 86 logger. debug("annotation-id=" + id);86 logger.fine("annotation-id=" + id); 87 87 } 88 88 89 89 // do authentication 90 90 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 91 logger. debug("request authenticated=" + authUser);91 logger.fine("request authenticated=" + authUser); 92 92 93 93 if (id == null) { … … 168 168 @Post("json") 169 169 public Representation doPostJson(Representation entity) { 170 logger. debug("AnnotatorAnnotations doPostJSON!");170 logger.fine("AnnotatorAnnotations doPostJSON!"); 171 171 // set headers 172 172 setCorsHeaders(); … … 174 174 // do authentication TODO: who's allowed to create? 175 175 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 176 logger. debug("request authenticated=" + authUser);176 logger.fine("request authenticated=" + authUser); 177 177 if (authUser == null) { 178 178 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!"); … … 223 223 @Put("json") 224 224 public Representation doPutJSON(Representation entity) { 225 logger. debug("AnnotatorAnnotations doPutJSON!");225 logger.fine("AnnotatorAnnotations doPutJSON!"); 226 226 setCorsHeaders(); 227 227 // id from URI /annotations/{id} 228 228 String jsonId = (String) getRequest().getAttributes().get("id"); 229 229 String id = decodeJsonId(jsonId); 230 logger. debug("annotation-id=" + id);230 logger.fine("annotation-id=" + id); 231 231 232 232 // do authentication 233 233 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 234 logger. debug("request authenticated=" + authUser);234 logger.fine("request authenticated=" + authUser); 235 235 236 236 Annotation annot = null; … … 269 269 return retRep; 270 270 } catch (JSONException e) { 271 logger. error("Error in doPutJSON",e);271 logger.severe("Error in doPutJSON: "+e); 272 272 setStatus(Status.CLIENT_ERROR_BAD_REQUEST); 273 273 } catch (IOException e) { 274 logger. error("Error in doPutJSON",e);274 logger.severe("Error in doPutJSON: "+e); 275 275 setStatus(Status.SERVER_ERROR_INTERNAL, "Other Error"); 276 276 } … … 286 286 @Delete("json") 287 287 public Representation doDeleteJSON(Representation entity) { 288 logger. debug("AnnotatorAnnotations doDeleteJSON!");288 logger.fine("AnnotatorAnnotations doDeleteJSON!"); 289 289 setCorsHeaders(); 290 290 // id from URI /annotations/{id} 291 291 String jsonId = (String) getRequest().getAttributes().get("id"); 292 292 String id = decodeJsonId(jsonId); 293 logger. debug("annotation-id=" + id);293 logger.fine("annotation-id=" + id); 294 294 295 295 // do authentication 296 296 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 297 logger. debug("request authenticated=" + authUser);297 logger.fine("request authenticated=" + authUser); 298 298 AnnotationStore store = getAnnotationStore(); 299 299 Annotation annot = store.getAnnotationById(id); -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByResources.java
r70 r75 56 56 @Get("json") 57 57 public Representation doGetJSON(Representation entity) { 58 logger. debug("AnnotatorAnnotatonsByResource doGetJSON!");58 logger.fine("AnnotatorAnnotatonsByResource doGetJSON!"); 59 59 setCorsHeaders(); 60 60 61 61 // do authentication 62 62 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 63 logger. debug("request authenticated=" + authUser);63 logger.fine("request authenticated=" + authUser); 64 64 65 65 String id = null; … … 74 74 id = decodeJsonId(jsonId); 75 75 // String id = jsonId; 76 logger. debug("ressource-id=" + id);76 logger.fine("ressource-id=" + id); 77 77 } 78 78 -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotationsByTags.java
r70 r75 55 55 @Get("json") 56 56 public Representation doGetJSON(Representation entity) { 57 logger. debug("AnnotatorAnnotatonsBytag doGetJSON!");57 logger.fine("AnnotatorAnnotatonsBytag doGetJSON!"); 58 58 setCorsHeaders(); 59 59 60 60 // do authentication 61 61 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 62 logger. debug("request authenticated=" + authUser);62 logger.fine("request authenticated=" + authUser); 63 63 64 64 String id = (String) getRequest().getAttributes().get("id"); … … 69 69 // this shouldn't happen 70 70 } 71 logger. debug("annotation-id=" + id);71 logger.fine("annotation-id=" + id); 72 72 73 73 Form form = getRequest().getResourceRef().getQueryAsForm(); -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorGroups.java
r70 r75 65 65 @Get("json") 66 66 public Representation doGetJSON(Representation entity) { 67 logger. debug("AnnotatorGroups doGetJSON!");67 logger.fine("AnnotatorGroups doGetJSON!"); 68 68 setCorsHeaders(); 69 69 Form form = getRequest().getResourceRef().getQueryAsForm(); … … 99 99 return null; 100 100 } 101 logger. debug("sending:");102 logger. debug(result);101 logger.fine("sending:"); 102 logger.fine(result.toString()); 103 103 return new JsonRepresentation(result); 104 104 -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java
r73 r75 35 35 import java.util.List; 36 36 import java.util.Set; 37 import java.util.logging.Logger; 37 38 import java.util.regex.Matcher; 38 39 import java.util.regex.Pattern; … … 46 47 47 48 import org.apache.commons.codec.binary.Base64; 48 import org.apache.log4j.Logger;49 49 import org.json.JSONArray; 50 50 import org.json.JSONException; … … 74 74 public abstract class AnnotatorResourceImpl extends ServerResource { 75 75 76 protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class );76 protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.toString()); 77 77 78 78 private AnnotationStore store; … … 116 116 @Options 117 117 public void doOptions(Representation entity) { 118 logger. debug("AnnotatorResourceImpl doOptions!");118 logger.fine("AnnotatorResourceImpl doOptions!"); 119 119 setCorsHeaders(); 120 120 } … … 183 183 BaseRestlet restServer = (BaseRestlet) getApplication(); 184 184 String consumerSecret = restServer.getConsumerSecret(consumerKey); 185 logger. debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);185 logger.fine("requested consumer key=" + consumerKey + " secret=" + consumerSecret); 186 186 if (consumerSecret == null) { 187 187 return null; 188 188 } 189 // logger. debug(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm()));189 // logger.fine(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm())); 190 190 try { 191 191 List<Verifier> verifiers = new ArrayList<Verifier>(); … … 205 205 } 206 206 // must be ok then 207 logger. debug("auth OK! user=" + userId);207 logger.fine("auth OK! user=" + userId); 208 208 return userId; 209 209 } … … 336 336 return jo; 337 337 } catch (JSONException e) { 338 logger. error("Unable to create AnnotatorJSON!",e);338 logger.severe("Unable to create AnnotatorJSON! "+e); 339 339 } 340 340 return null; … … 368 368 } 369 369 } catch (JSONException e) { 370 logger. error("Unable to transform to ranges!",e);370 logger.severe("Unable to transform to ranges! "+e); 371 371 } 372 372 return ja; … … 404 404 } 405 405 } catch (JSONException e) { 406 logger. error("Unable to transform to shapes!",e);406 logger.severe("Unable to transform to shapes! "+e); 407 407 } 408 408 return ja; … … 424 424 fragment = String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height); 425 425 } else { 426 logger. error("Unable to parse this shape: " + shape);426 logger.severe("Unable to parse this shape: " + shape); 427 427 } 428 428 return fragment; -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResources.java
r70 r75 62 62 @Get("json") 63 63 public Representation doGetJSON(Representation entity) { 64 logger. debug("AnnotatorResources doGetJSON!");64 logger.fine("AnnotatorResources doGetJSON!"); 65 65 setCorsHeaders(); 66 66 … … 76 76 String uri = decodeJsonId(jsonId); 77 77 78 logger. debug("resources-id=" + uri);78 logger.fine("resources-id=" + uri); 79 79 80 80 if (uri == null) { … … 123 123 return null; 124 124 } 125 logger. debug("sending:");126 logger. debug(result);125 logger.fine("sending:"); 126 logger.fine(result.toString()); 127 127 return new JsonRepresentation(result); 128 128 } -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java
r72 r75 26 26 */ 27 27 28 import org.apache.log4j.Logger;29 28 import org.restlet.Restlet; 30 29 import org.restlet.routing.Router; … … 37 36 38 37 public final String version = "AnnotationManagerN4J/Annotator 0.3.2"; 39 40 public static Logger logger = Logger.getLogger(AnnotatorRestlet.class);41 38 42 39 /* -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java
r70 r75 65 65 @Get("json") 66 66 public Representation doGetJSON(Representation entity) { 67 logger. debug("AnnotatorSearch doGetJSON!");67 logger.fine("AnnotatorSearch doGetJSON!"); 68 68 setCorsHeaders(); 69 69 // do authentication 70 70 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity)); 71 logger. debug("request authenticated=" + authUser);71 logger.fine("request authenticated=" + authUser); 72 72 73 73 Form form = getRequest().getResourceRef().getQueryAsForm(); … … 80 80 // do search 81 81 ArrayList<JSONObject> results = new ArrayList<JSONObject>(); 82 logger. debug(String.format("searching for uri=%s user=%s", uri, user));82 logger.fine(String.format("searching for uri=%s user=%s", uri, user)); 83 83 AnnotationStore store = getAnnotationStore(); 84 84 List<Annotation> annots = store.searchAnnotationByUriUser(uri, user); … … 120 120 } 121 121 122 logger. debug("sending:");123 logger. debug(result);122 logger.fine("sending:"); 123 logger.fine(result.toString()); 124 124 return new JsonRepresentation(result); 125 125 } -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorTags.java
r70 r75 64 64 @Get("json") 65 65 public Representation doGetJSON(Representation entity) { 66 logger. debug("AnnotatorGroups doGetJSON!");66 logger.fine("AnnotatorGroups doGetJSON!"); 67 67 setCorsHeaders(); 68 68 … … 70 70 // String id = decodeJsonId(jsonId); 71 71 String id = jsonId; 72 logger. debug("annotation-id=" + id);72 logger.fine("annotation-id=" + id); 73 73 74 74 if (id == null) { … … 126 126 return null; 127 127 } 128 logger. debug("sending:");129 logger. debug(result);128 logger.fine("sending:"); 129 logger.fine(result.toString()); 130 130 return new JsonRepresentation(result); 131 131 } -
src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java
r74 r75 32 32 import java.util.Properties; 33 33 import java.util.concurrent.ConcurrentMap; 34 import java.util.logging.Logger; 34 35 35 36 import javax.naming.NamingEnumeration; … … 42 43 import javax.servlet.ServletContext; 43 44 44 import org.apache.log4j.BasicConfigurator;45 import org.apache.log4j.Logger;46 45 import org.neo4j.graphdb.GraphDatabaseService; 47 46 import org.neo4j.graphdb.factory.GraphDatabaseBuilder; … … 57 56 public abstract class BaseRestlet extends Application { 58 57 59 public static Logger logger = Logger.getLogger( BaseRestlet.class);58 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.BaseRestlet"); 60 59 61 60 /** … … 148 147 ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext"); 149 148 if (sc != null) { 150 if (sc.getAttribute("annotationserver.log4j.configured") == null) { 151 // TODO: is this the right place to run the log4j configurator? 152 BasicConfigurator.configure(); 153 sc.setAttribute("annotationserver.log4j.configured", "done"); 154 } 149 logger = context.getLogger(); 155 150 logger.info(getVersion() + " starting..."); 156 151 … … 163 158 InputStream ps = getResourceAsStream(sc, CONFIG_PROPS_PATH); 164 159 if (ps != null) { 165 logger. debug("loading config from " + CONFIG_PROPS_PATH);160 logger.fine("loading config from " + CONFIG_PROPS_PATH); 166 161 try { 167 162 serverConfig.load(ps); … … 187 182 } 188 183 } catch (IOException e) { 189 logger.warn ("Error loading server config: ", e);184 logger.warning("Error loading server config: "+e.toString()); 190 185 } 191 logger. debug("config: " + serverConfig);186 logger.fine("config: " + serverConfig); 192 187 } else { 193 logger. error("Unable to get resource " + CONFIG_PROPS_PATH);188 logger.severe("Unable to get resource " + CONFIG_PROPS_PATH); 194 189 } 195 190 // store config … … 204 199 String dbFn = getResourcePath(sc, graphdbPath); 205 200 if (dbFn != null) { 206 logger. debug("opening DB " + dbFn);201 logger.fine("opening DB " + dbFn); 207 202 GraphDatabaseBuilder graphDbBuilder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(dbFn); 208 203 graphDbBuilder.setConfig(GraphDatabaseSettings.allow_store_upgrade, "true"); … … 216 211 // admin server 217 212 srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb); 218 logger. debug("Starting DB admin server...");213 logger.fine("Starting DB admin server..."); 219 214 // store in context 220 215 sc.setAttribute(GRAPHDBSRV_KEY, srv); 221 216 srv.start(); 222 217 } else { 223 logger. error("Unable to get resource " + dbFn);218 logger.severe("Unable to get resource " + dbFn); 224 219 } 225 220 } else { … … 235 230 InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH); 236 231 if (ps != null) { 237 logger. debug("loading consumer keys from " + CONSUMER_KEYS_PATH);232 logger.fine("loading consumer keys from " + CONSUMER_KEYS_PATH); 238 233 try { 239 234 consumerKeys.load(ps); … … 242 237 e.printStackTrace(); 243 238 } 244 logger. debug("consumer keys: " + consumerKeys);239 logger.fine("consumer keys: " + consumerKeys); 245 240 } else { 246 logger. error("Unable to get resource " + CONSUMER_KEYS_PATH);241 logger.severe("Unable to get resource " + CONSUMER_KEYS_PATH); 247 242 } 248 243 // store config … … 250 245 } 251 246 } else { 252 logger. error("Unable to get ServletContext!");247 logger.severe("Unable to get ServletContext!"); 253 248 } 254 249 } … … 302 297 dctx = new InitialDirContext(env); 303 298 } catch (NamingException e) { 304 logger. error("Error in getFullNameFromLDAP!",e);299 logger.warning("Error in getFullNameFromLDAP! "+e); 305 300 return retString; 306 301 } … … 325 320 } 326 321 } catch (NamingException e) { 327 logger. error("Error in getFullNameFromLDAP!",e);322 logger.warning("Error in getFullNameFromLDAP!"+e); 328 323 } 329 324 … … 331 326 dctx.close(); 332 327 } catch (NamingException e) { 333 logger. error("Error in getFullNameFromLDAP!",e);328 logger.warning("Error in getFullNameFromLDAP!"+e); 334 329 } 335 330 return retString; … … 363 358 File pf = new File(sc.getRealPath(webPath)); 364 359 if (pf.canRead()) { 365 logger. debug("trying file for: " + pf);360 logger.fine("trying file for: " + pf); 366 361 try { 367 362 ps = new FileInputStream(pf); 368 363 } catch (FileNotFoundException e) { 369 logger. error(e);364 logger.severe(e.toString()); 370 365 } 371 366 } else { … … 409 404 */ 410 405 if (srv != null) { 411 logger. debug("Stopping DB admin server...");406 logger.info("Stopping DB admin server..."); 412 407 srv.stop(); 413 408 srv = null; 414 409 } 415 410 if (graphDb != null) { 416 logger. debug("Stopping DB...");411 logger.info("Stopping DB..."); 417 412 graphDb.shutdown(); 418 413 graphDb = null; -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationResource.java
r70 r75 28 28 import java.io.UnsupportedEncodingException; 29 29 import java.net.URLDecoder; 30 31 import org.apache.log4j.Logger; 30 import java.util.logging.Logger; 31 32 32 import org.restlet.data.Form; 33 33 import org.restlet.data.MediaType; … … 54 54 public class AnnotationResource extends ServerResource { 55 55 56 public static Logger logger = Logger.getLogger( AnnotationResource.class);56 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationResource"); 57 57 58 58 protected AnnotationStore store; … … 67 67 // id from URI /annotations/persons/{id} 68 68 requestId = (String) getRequest().getAttributes().get("id"); 69 logger. debug("annoation-id=" + requestId);69 logger.fine("annoation-id=" + requestId); 70 70 // get store instance 71 71 if (store == null) { … … 149 149 @Put 150 150 public Representation doPut(Representation entity) { 151 logger. debug("AnnotationResource.doPut!");151 logger.fine("AnnotationResource.doPut!"); 152 152 if (annotation == null) { 153 153 // invalid id … … 186 186 @Delete 187 187 public Representation doDelete(Representation entity) { 188 logger. debug("AnnotationResource.doDelete!");188 logger.fine("AnnotationResource.doDelete!"); 189 189 if (annotation == null) { 190 190 // invalid id -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsResource.java
r70 r75 27 27 28 28 import java.util.List; 29 import java.util.logging.Logger; 29 30 30 import org.apache.log4j.Logger;31 31 import org.restlet.data.MediaType; 32 32 import org.restlet.data.Reference; … … 49 49 public class AnnotationsResource extends ServerResource { 50 50 51 public static Logger logger = Logger.getLogger( AnnotationsResource.class);51 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationsResource"); 52 52 53 53 private AnnotationStore store; -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java
r72 r75 26 26 */ 27 27 28 import org.apache.log4j.Logger; 28 import java.util.logging.Logger; 29 29 30 import org.restlet.Restlet; 30 31 import org.restlet.data.ChallengeScheme; … … 43 44 public final String version = "AnnotationManagerN4J/AnnotationsUI 0.3"; 44 45 45 public static Logger logger = Logger.getLogger( AnnotationsUiRestlet.class);46 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationsUiRestlet"); 46 47 47 48 /* … … 80 81 verifier.getLocalSecrets().put(user, pw.toCharArray()); 81 82 } else { 82 logger. error("Admin user and password missing in serverconfig!");83 logger.severe("Admin user and password missing in serverconfig!"); 83 84 } 84 85 // Create a Guard -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupMembersResource.java
r70 r75 96 96 @Post 97 97 public Representation doPost(Representation entity) { 98 logger. debug("GroupMembersResource doPost!");98 logger.fine("GroupMembersResource doPost!"); 99 99 // TODO: do authentication 100 100 Form form = new Form(entity); … … 108 108 } 109 109 if (addMemberId != null) { 110 logger. debug("adding member: "+addMemberId);110 logger.fine("adding member: "+addMemberId); 111 111 Person member = new Person(addMemberId); 112 112 store.addGroupMember(group, member); … … 115 115 delMemberId = delMemberId.substring(7); 116 116 } 117 logger. debug("deleting member: "+delMemberId);117 logger.fine("deleting member: "+delMemberId); 118 118 Person member = new Person(delMemberId); 119 119 store.deleteGroupMember(group, member); -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupResource.java
r70 r75 28 28 import java.io.UnsupportedEncodingException; 29 29 import java.net.URLDecoder; 30 import java.util.logging.Logger; 30 31 31 import org.apache.log4j.Logger;32 32 import org.restlet.data.Form; 33 33 import org.restlet.data.MediaType; … … 54 54 public class GroupResource extends ServerResource { 55 55 56 public static Logger logger = Logger.getLogger( GroupResource.class);56 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.GroupResource"); 57 57 58 58 protected AnnotationStore store; … … 67 67 // id from URI /annotations/groups/{id} 68 68 requestId = (String) getRequest().getAttributes().get("id"); 69 logger. debug("group-id=" + requestId);69 logger.fine("group-id=" + requestId); 70 70 // get store instance 71 71 if (store == null) { … … 145 145 @Put 146 146 public Representation doPut(Representation entity) { 147 logger. debug("GroupResource.doPut!");147 logger.fine("GroupResource.doPut!"); 148 148 if (group == null) { 149 149 // invalid id … … 178 178 @Delete 179 179 public Representation doDelete(Representation entity) { 180 logger. debug("GroupResource.doDelete!");180 logger.fine("GroupResource.doDelete!"); 181 181 if (group == null) { 182 182 // invalid id -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/GroupsResource.java
r70 r75 27 27 28 28 import java.util.List; 29 import java.util.logging.Logger; 29 30 30 import org.apache.log4j.Logger;31 31 import org.restlet.data.Form; 32 32 import org.restlet.data.MediaType; … … 53 53 public class GroupsResource extends ServerResource { 54 54 55 public static Logger logger = Logger.getLogger( GroupsResource.class);55 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.GroupsResource"); 56 56 57 57 private AnnotationStore store; … … 116 116 @Post 117 117 public Representation doPost(Representation entity) { 118 logger. debug("AnnotationsUiGroups doPost!");118 logger.fine("AnnotationsUiGroups doPost!"); 119 119 // TODO: do authentication 120 120 Form form = new Form(entity); -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonResource.java
r70 r75 28 28 import java.io.UnsupportedEncodingException; 29 29 import java.net.URLDecoder; 30 import java.util.logging.Logger; 30 31 31 import org.apache.log4j.Logger;32 32 import org.restlet.data.Form; 33 33 import org.restlet.data.MediaType; … … 54 54 public class PersonResource extends ServerResource { 55 55 56 public static Logger logger = Logger.getLogger( PersonResource.class);56 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.PersonResource"); 57 57 58 58 protected AnnotationStore store; … … 67 67 // id from URI /annotations/persons/{id} 68 68 requestId = (String) getRequest().getAttributes().get("id"); 69 logger. debug("person-id=" + requestId);69 logger.fine("person-id=" + requestId); 70 70 // get store instance 71 71 if (store == null) { … … 143 143 @Put 144 144 public Representation doPut(Representation entity) { 145 logger. debug("PersonResource.doPut!");145 logger.fine("PersonResource.doPut!"); 146 146 if (person == null) { 147 147 // invalid id … … 176 176 @Delete 177 177 public Representation doDelete(Representation entity) { 178 logger. debug("PersonResource.doDelete!");178 logger.fine("PersonResource.doDelete!"); 179 179 if (person == null) { 180 180 // invalid id -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java
r70 r75 27 27 28 28 import java.util.List; 29 import java.util.logging.Logger; 29 30 30 import org.apache.log4j.Logger;31 31 import org.restlet.data.Form; 32 32 import org.restlet.data.MediaType; … … 53 53 public class PersonsResource extends ServerResource { 54 54 55 public static Logger logger = Logger.getLogger( PersonsResource.class);55 public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.PersonsResource"); 56 56 57 57 private AnnotationStore store; … … 115 115 @Post 116 116 public Representation doPost(Representation entity) { 117 logger. debug("PersonsResource doPost!");117 logger.fine("PersonsResource doPost!"); 118 118 // TODO: do authentication 119 119 Form form = new Form(entity);
Note: See TracChangeset
for help on using the changeset viewer.