annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java @ 57:4efb21cf0ce0

new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
author casties
date Tue, 20 Nov 2012 17:56:35 +0100
parents 64aa756c60cc
children f5c0e6df7e88
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
1 package de.mpiwg.itgroup.annotations.restlet;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
2
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
3 import java.io.File;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
4 import java.io.FileInputStream;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
5 import java.io.FileNotFoundException;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
6 import java.io.IOException;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
7 import java.io.InputStream;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
8 import java.util.Hashtable;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
9 import java.util.Properties;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
10
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
11 import javax.naming.NamingEnumeration;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
12 import javax.naming.NamingException;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
13 import javax.naming.directory.Attribute;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
14 import javax.naming.directory.DirContext;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
15 import javax.naming.directory.InitialDirContext;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
16 import javax.naming.directory.SearchControls;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
17 import javax.naming.directory.SearchResult;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
18 import javax.servlet.ServletContext;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
19
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
20 import org.apache.log4j.BasicConfigurator;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
21 import org.apache.log4j.Logger;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
22 import org.neo4j.graphdb.GraphDatabaseService;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
23 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
24 import org.neo4j.kernel.AbstractGraphDatabase;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
25 import org.neo4j.server.WrappingNeoServerBootstrapper;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
26 import org.restlet.Application;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
27 import org.restlet.Context;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
28
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
29 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
30
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
31 public abstract class BaseRestlet extends Application {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
32
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
33 public static Logger logger = Logger.getLogger(BaseRestlet.class);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
34
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
35 /**
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
36 * Properties holding consumer keys and secrets.
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
37 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
38 protected Properties consumerKeys;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
39 public String CONSUMER_KEYS_PATH = "WEB-INF/consumerkeys.property";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
40 public static final String CONSUMERKEYS_KEY = "annotationmanager.consumerkeys";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
41
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
42 /**
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
43 * Properties holding server config.
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
44 */
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
45 protected Properties serverConfig;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
46 public String CONFIG_PROPS_PATH = "WEB-INF/serverconfig.property";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
47 public static final String SERVERCONFIG_KEY = "annotationmanager.serverconfig";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
48
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
49 /**
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
50 * database instance;
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
51 */
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
52 protected GraphDatabaseService graphDb;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
53 public static final String GRAPHDB_KEY = "annotationmanager.graphdb";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
54 public static final String GRAPHDB_PATH_KEY = "annotationmanager.graphdb.path";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
55 public String graphdbPath = "WEB-INF/neo4j-annotation-db";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
56
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
57 /**
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
58 * database interface server instance.
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
59 */
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
60 protected WrappingNeoServerBootstrapper srv;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
61 public static final String GRAPHDBSRV_KEY = "annotationmanager.graphdb.srv";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
62
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
63 /**
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
64 * annotation store instance.
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
65 */
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
66 protected AnnotationStore store;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
67 public static final String ANNSTORE_KEY = "annotationmanager.store";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
68
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
69 /**
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
70 * LDAP server URI (for looking up full user names).
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
71 */
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
72 protected String ldapServerUrl;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
73 public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
74
50
64aa756c60cc annotations ui can show and delete annotations now.
casties
parents: 22
diff changeset
75 public static final String ADMIN_USER_KEY = "annotationmanager.admin.user";
64aa756c60cc annotations ui can show and delete annotations now.
casties
parents: 22
diff changeset
76 public static final String ADMIN_PASSWORD_KEY = "annotationmanager.admin.password";
64aa756c60cc annotations ui can show and delete annotations now.
casties
parents: 22
diff changeset
77
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
78 /**
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
79 * run in authorization mode i.e. with tokens.
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
80 */
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
81 protected boolean authorizationMode = false;
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
82 public static final String AUTHORIZATION_MODE_KEY = "annotationmanager.authorization";
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
83
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
84 /**
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
85 * constructor
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
86 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
87 * @param context
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
88 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
89 public BaseRestlet(Context context) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
90 super(context);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
91 configure();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
92 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
93
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
94 /**
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
95 * Configures the restlet.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
96 * Reads serverConfig, consumerKeys and graphDb config from config files and starts graphDb.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
97 * Uses config from webapp context if already initialized.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
98 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
99 protected void configure() {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
100 ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
101 .get("org.restlet.ext.servlet.ServletContext");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
102 if (sc != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
103 if (sc.getAttribute("annotationserver.log4j.configured") == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
104 // TODO: is this the right place to run the log4j configurator?
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
105 BasicConfigurator.configure();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
106 sc.setAttribute("annotationserver.log4j.configured", "done");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
107 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
108 logger.info(getVersion() + " starting...");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
109
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
110 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
111 * read config from webapp
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
112 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
113 serverConfig = (Properties) sc.getAttribute(SERVERCONFIG_KEY);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
114 if (serverConfig == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
115 serverConfig = new Properties();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
116 InputStream ps = getResourceAsStream(sc, CONFIG_PROPS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
117 if (ps != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
118 logger.debug("loading config from " + CONFIG_PROPS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
119 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
120 serverConfig.load(ps);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
121 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
122 * read serverconfig options
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
123 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
124 graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
125 ldapServerUrl = serverConfig.getProperty(LDAP_SERVER_KEY, null);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
126 } catch (IOException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
127 logger.warn("Error loading server config: ", e);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
128 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
129 logger.debug("config: " + serverConfig);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
130 } else {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
131 logger.error("Unable to get resource " + CONFIG_PROPS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
132 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
133 // store config
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
134 sc.setAttribute(SERVERCONFIG_KEY, serverConfig);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
135 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
136 // look for database service in context
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
137 graphDb = (GraphDatabaseService) sc.getAttribute(GRAPHDB_KEY);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
138 if (graphDb == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
139 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
140 * open database
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
141 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
142 String dbFn = getResourcePath(sc, graphdbPath);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
143 if (dbFn != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
144 logger.debug("opening DB " + dbFn);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
145 graphDb = new GraphDatabaseFactory().newEmbeddedDatabase(dbFn);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
146 registerShutdownHook(graphDb);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
147 // store in context
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
148 sc.setAttribute(GRAPHDB_KEY, graphDb);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
149 // AnnotationStore
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
150 store = new AnnotationStore(graphDb);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
151 sc.setAttribute(ANNSTORE_KEY, store);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
152 // admin server
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
153 srv = new WrappingNeoServerBootstrapper((AbstractGraphDatabase) graphDb);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
154 logger.debug("Starting DB admin server...");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
155 // store in context
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
156 sc.setAttribute(GRAPHDBSRV_KEY, srv);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
157 srv.start();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
158 } else {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
159 logger.error("Unable to get resource " + dbFn);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
160 }
22
b1fb0d117877 adding and listing groups via html works now.
casties
parents: 19
diff changeset
161 } else {
b1fb0d117877 adding and listing groups via html works now.
casties
parents: 19
diff changeset
162 // get existing AnnotationStore
b1fb0d117877 adding and listing groups via html works now.
casties
parents: 19
diff changeset
163 store = (AnnotationStore) sc.getAttribute(ANNSTORE_KEY);
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
164 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
165 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
166 * read consumerKeys from webapp
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
167 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
168 consumerKeys = (Properties) sc.getAttribute(CONSUMERKEYS_KEY);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
169 if (consumerKeys == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
170 consumerKeys = new Properties();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
171 InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
172 if (ps != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
173 logger.debug("loading consumer keys from " + CONSUMER_KEYS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
174 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
175 consumerKeys.load(ps);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
176 } catch (IOException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
177 // TODO Auto-generated catch block
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
178 e.printStackTrace();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
179 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
180 logger.debug("consumer keys: " + consumerKeys);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
181 } else {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
182 logger.error("Unable to get resource " + CONSUMER_KEYS_PATH);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
183 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
184 // store config
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
185 sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
186 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
187 } else {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
188 logger.error("Unable to get ServletContext!");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
189 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
190 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
191
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
192 public abstract String getVersion();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
193
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
194 /**
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
195 * @return the authorizationMode
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
196 */
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
197 public boolean isAuthorizationMode() {
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
198 return authorizationMode;
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
199 }
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
200
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 50
diff changeset
201 /**
19
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
202 * @return the store
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
203 */
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
204 public AnnotationStore getAnnotationStore() {
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
205 return store;
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
206 }
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
207
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
208 /**
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
209 * returns consumer secret for consumer key. returns null if consumer key
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
210 * doesn't exist.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
211 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
212 * @param consumerKey
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
213 * @return
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
214 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
215 public String getConsumerSecret(String consumerKey) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
216 return consumerKeys.getProperty(consumerKey);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
217 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
218
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
219 /**
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
220 * Hole den vollen Benutzernamen aus dem LDAP
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
221 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
222 * @param creator
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
223 * @return
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
224 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
225 public String getFullNameFromLdap(String creator) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
226 String retString = creator; // falls nichts gefunden wird einfach den
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
227 // creator zurueckgeben
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
228 if (ldapServerUrl == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
229 return retString;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
230 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
231 Hashtable<String, String> env = new Hashtable<String, String>();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
232 String sp = "com.sun.jndi.ldap.LdapCtxFactory";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
233 env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, sp);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
234 env.put(javax.naming.Context.PROVIDER_URL, ldapServerUrl);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
235
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
236 DirContext dctx;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
237 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
238 dctx = new InitialDirContext(env);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
239 } catch (NamingException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
240 logger.error("Error in getFullNameFromLDAP!", e);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
241 return retString;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
242 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
243
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
244 String base = "ou=people";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
245
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
246 SearchControls sc = new SearchControls();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
247 String[] attributeFilter = { "cn", "mail" };
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
248 sc.setReturningAttributes(attributeFilter);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
249 sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
250
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
251 String filter = "(uid=" + creator + ")";
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
252
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
253 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
254 NamingEnumeration<SearchResult> results = dctx.search(base, filter, sc);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
255 while (results.hasMore()) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
256 SearchResult sr = (SearchResult) results.next();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
257 javax.naming.directory.Attributes attrs = sr.getAttributes();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
258
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
259 Attribute attr = attrs.get("cn");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
260 retString = (String) attr.get();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
261 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
262 } catch (NamingException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
263 logger.error("Error in getFullNameFromLDAP!", e);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
264 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
265
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
266 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
267 dctx.close();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
268 } catch (NamingException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
269 logger.error("Error in getFullNameFromLDAP!", e);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
270 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
271 return retString;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
272 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
273
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
274 /**
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
275 * returns resource from path (in webapp) as InputStream.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
276 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
277 * @param sc
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
278 * @param path
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
279 * @return
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
280 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
281 protected InputStream getResourceAsStream(ServletContext sc, String path) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
282 InputStream ps = sc.getResourceAsStream(path);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
283 if (ps == null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
284 // try as file
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
285 File pf = new File(sc.getRealPath(path));
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
286 if (pf != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
287 logger.debug("trying file for: " + pf);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
288 try {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
289 ps = new FileInputStream(pf);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
290 } catch (FileNotFoundException e) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
291 logger.error(e);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
292 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
293 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
294 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
295 return ps;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
296 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
297
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
298 /**
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
299 * get a real file name for a web app file pathname.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
300 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
301 * If filename starts with "/" its treated as absolute else the path is
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
302 * appended to the base directory of the web-app.
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
303 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
304 * @param filename
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
305 * @param sc
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
306 * @return
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
307 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
308 public static String getResourcePath(ServletContext sc, String filename) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
309 File f = new File(filename);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
310 // is the filename absolute?
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
311 if (!f.isAbsolute()) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
312 // relative path -> use getRealPath to resolve in webapp
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
313 filename = sc.getRealPath(filename);
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
314 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
315 return filename;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
316 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
317
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
318 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
319 * (non-Javadoc)
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
320 *
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
321 * @see org.restlet.Application#stop()
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
322 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
323 @Override
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
324 public synchronized void stop() throws Exception {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
325 /*
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
326 * trying to clean up databases, not sure if this is the right way...
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
327 */
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
328 if (srv != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
329 logger.debug("Stopping DB admin server...");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
330 srv.stop();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
331 srv = null;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
332 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
333 if (graphDb != null) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
334 logger.debug("Stopping DB...");
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
335 graphDb.shutdown();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
336 graphDb = null;
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
337 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
338 super.stop();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
339 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
340
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
341 private static void registerShutdownHook(final GraphDatabaseService graphDb) {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
342 // Registers a shutdown hook for the Neo4j instance so that it
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
343 // shuts down nicely when the VM exits (even if you "Ctrl-C" the
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
344 // running example before it's completed)
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
345 Runtime.getRuntime().addShutdownHook(new Thread() {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
346 @Override
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
347 public void run() {
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
348 graphDb.shutdown();
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
349 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
350 });
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
351 }
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
352
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents:
diff changeset
353 }