Changeset 18:aafa3884b2c4 in AnnotationManagerN4J


Ignore:
Timestamp:
Sep 5, 2012, 4:05:54 PM (13 years ago)
Author:
casties
Branch:
default
Message:

new AnnotationStore? restlet for HTML-UI.
reorganisation of classes.

Files:
6 added
2 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • pom.xml

    r17 r18  
    44        <groupId>de.mpiwg.itgroup.annotations</groupId>
    55        <artifactId>AnnotationManagerN4J</artifactId>
    6         <version>0.2.0-SNAPSHOT</version>
     6        <version>0.2.1-SNAPSHOT</version>
    77        <properties>
    88                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

  • src/main/java/de/mpiwg/itgroup/annotations/Actor.java

    r16 r18  
    55
    66import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
    7 import de.mpiwg.itgroup.annotations.old.NS;
    87
    98/**

  • src/main/java/de/mpiwg/itgroup/annotations/NS.java

    r10 r18  
    1 package de.mpiwg.itgroup.annotations.old;
     1package de.mpiwg.itgroup.annotations;
    22
    33public class NS {

  • src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

    r16 r18  
    7272        Node person = getNodeIndex(NodeTypes.PERSON).get("uri", userUri).getSingle();
    7373        return person;
     74    }
     75
     76    /**
     77     * Returns List of Groups.
     78     *
     79     * @param person
     80     * @return
     81     */
     82    public List<Group> getGroups(String uriQuery) {
     83        ArrayList<Group> groups = new ArrayList<Group>();
     84        Index<Node> idx = getNodeIndex(NodeTypes.GROUP);
     85        if (uriQuery == null) uriQuery = "*";
     86        IndexHits<Node> groupNodes = idx.get("uri", uriQuery);
     87        for (Node groupNode : groupNodes) {
     88            Actor group = createActorFromNode(groupNode);
     89            groups.add((Group) group);
     90        }
     91        return groups;
    7492    }
    7593

  • src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorInfo.java

    r2 r18  
    33import java.io.InputStream;
    44
    5 import org.apache.log4j.Logger;
    6 import org.restlet.data.Form;
    75import org.restlet.data.MediaType;
    86import org.restlet.representation.InputRepresentation;
    97import org.restlet.representation.Representation;
    108import org.restlet.resource.Get;
    11 import org.restlet.resource.Options;
    129import org.restlet.resource.ServerResource;
    13 
    14 
    15 
    1610
    1711
    1812public class AnnotatorInfo extends ServerResource {
    1913
    20 private Logger logger = Logger.getRootLogger();
    21        
    22         /**
    23          * Erlaubt cross scripting bei Aufruf aus Javascript
    24          * @param entity
    25          */
    26         @Options
    27         public void doOptions(Representation entity) {
    28             Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
    29             if (responseHeaders == null) {
    30                 responseHeaders = new Form();
    31                 getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
    32             }
    33             responseHeaders.add("Access-Control-Allow-Origin", "*");
    34             responseHeaders.add("Access-Control-Allow-Methods", "POST,OPTIONS,GET");
    35             responseHeaders.add("Access-Control-Allow-Headers", "Content-Type");
    36             responseHeaders.add("Access-Control-Allow-Credentials", "false");
    37             responseHeaders.add("Access-Control-Max-Age", "60");
    38         }
    39 
    40 
    41        
    4214        @Get("html")
    4315        public Representation getHTML(){

  • src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

    r16 r18  
    3838import de.mpiwg.itgroup.annotations.Actor;
    3939import de.mpiwg.itgroup.annotations.Annotation;
     40import de.mpiwg.itgroup.annotations.NS;
    4041import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
    4142import de.mpiwg.itgroup.annotations.Group;
    4243import de.mpiwg.itgroup.annotations.Person;
    4344import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
    44 import de.mpiwg.itgroup.annotations.old.NS;
    4545
    4646/**
    … …  
    6565                    .get("org.restlet.ext.servlet.ServletContext");
    6666            logger.debug("Getting AnnotationStore from Context");
    67             store = (AnnotationStore) sc.getAttribute(RestServer.ANNSTORE_KEY);
     67            store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
    6868        }
    6969        return store;
    … …  
    149149        String consumerKey = token.getParamAsPrimitive("consumerKey").getAsString();
    150150        // get stored consumer secret for key
    151         RestServer restServer = (RestServer) getApplication();
     151        BaseRestlet restServer = (BaseRestlet) getApplication();
    152152        String consumerSecret = restServer.getConsumerSecret(consumerKey);
    153153        logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);
    … …  
    208208                String userName = creator.getName();
    209209                if (userName == null) {
    210                     RestServer restServer = (RestServer) getApplication();
     210                    BaseRestlet restServer = (BaseRestlet) getApplication();
    211211                    userName = restServer.getFullNameFromLdap(userId);
    212212                }
    … …  
    500500        // try to get full name
    501501        if (creator.getName() == null && username != null) {
    502             RestServer restServer = (RestServer) getApplication();
     502            BaseRestlet restServer = (BaseRestlet) getApplication();
    503503            String fullName = restServer.getFullNameFromLdap(username);
    504504            creator.setName(fullName);

  • src/main/webapp/WEB-INF/web.xml

    r3 r18  
    55xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    66http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    7     <display-name>AnnotationManager-Restlet</display-name>
    8     <!-- Application classname -->
    9     <context-param>
    10         <param-name>org.restlet.application</param-name>
    11         <param-value>de.mpiwg.itgroup.annotations.restlet.RestServer</param-value>
    12     </context-param>
    13     <!-- Restletadapter -->
    14     <servlet>
    15         <servlet-name>RestletServlet</servlet-name>
    16         <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
    17     </servlet>
    18     <!-- Catchallrequests -->
    19     <servlet-mapping>
    20         <servlet-name>RestletServlet</servlet-name>
    21         <!-- <url-pattern>/annotator/*</url-pattern> -->
    22         <url-pattern>/*</url-pattern>
    23     </servlet-mapping>
     7        <display-name>AnnotationManager-Restlet</display-name>
     8        <!-- Restletadapter -->
     9        <servlet>
     10                <servlet-name>AnnotatorRestlet</servlet-name>
     11                <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
     12                <!-- Application classname -->
     13                <init-param>
     14                        <param-name>org.restlet.application</param-name>
     15                        <param-value>de.mpiwg.itgroup.annotations.restlet.AnnotatorRestlet</param-value>
     16                </init-param>
     17        <!-- Load this servlet at server startup time -->
     18        <load-on-startup>1</load-on-startup>
     19        </servlet>
     20        <!-- Restletadapter -->
     21        <servlet>
     22                <servlet-name>AnnotationStoreRestlet</servlet-name>
     23                <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
     24                <!-- Application classname -->
     25                <init-param>
     26                        <param-name>org.restlet.application</param-name>
     27                        <param-value>de.mpiwg.itgroup.annotations.restlet.AnnotationStoreRestlet</param-value>
     28                </init-param>
     29        <!-- Load this servlet at server startup time -->
     30        <load-on-startup>
     31            10
     32        </load-on-startup>
     33        </servlet>
     34        <!-- Catchallrequests -->
     35        <servlet-mapping>
     36                <servlet-name>AnnotatorRestlet</servlet-name>
     37                <url-pattern>/annotator/*</url-pattern>
     38                <!-- <url-pattern>/*</url-pattern> -->
     39        </servlet-mapping>
     40        <servlet-mapping>
     41                <servlet-name>AnnotationStoreRestlet</servlet-name>
     42                <url-pattern>/annotations/*</url-pattern>
     43                <!-- <url-pattern>/*</url-pattern> -->
     44        </servlet-mapping>
    2445</web-app>
Note: See TracChangeset for help on using the changeset viewer.