You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/07/02 18:23:14 UTC
svn commit: r1356320 [2/2] - in /incubator/stanbol/trunk/ontologymanager:
ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/
ontonet/src/main/java/org/apache/st...
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1356320&r1=1356319&r2=1356320&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Mon Jul 2 16:23:12 2012
@@ -16,6 +16,11 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
+import static javax.ws.rs.HttpMethod.DELETE;
+import static javax.ws.rs.HttpMethod.GET;
+import static javax.ws.rs.HttpMethod.OPTIONS;
+import static javax.ws.rs.HttpMethod.POST;
+import static javax.ws.rs.HttpMethod.PUT;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
@@ -186,7 +191,7 @@ public class SessionResource extends Bas
} catch (SessionLimitException e) {
throw new WebApplicationException(e, FORBIDDEN);
}
- ResponseBuilder rb = Response.ok();
+ ResponseBuilder rb = Response.created(uriInfo.getRequestUri());
addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -213,6 +218,26 @@ public class SessionResource extends Bas
return rb.build();
}
+ /*
+ * Needed for freemarker
+ */
+ public Set<OntologyScope> getAppendableScopes() {
+ Set<OntologyScope> notAppended = new HashSet<OntologyScope>();
+ for (OntologyScope sc : onMgr.getRegisteredScopes())
+ if (!session.getAttachedScopes().contains(sc.getID())) notAppended.add(sc);
+ return notAppended;
+ }
+
+ /*
+ * Needed for freemarker
+ */
+ public Set<OntologyScope> getAppendedScopes() {
+ Set<OntologyScope> appended = new HashSet<OntologyScope>();
+ for (OntologyScope sc : onMgr.getRegisteredScopes())
+ if (session.getAttachedScopes().contains(sc.getID())) appended.add(sc);
+ return appended;
+ }
+
@GET
@Produces(TEXT_HTML)
public Response getHtmlInfo(@Context HttpHeaders headers) {
@@ -238,30 +263,18 @@ public class SessionResource extends Bas
return session;
}
- /*
- * Needed for freemarker
- */
- public Set<OntologyScope> getAppendableScopes() {
- Set<OntologyScope> notAppended = new HashSet<OntologyScope>();
- for (OntologyScope sc : onMgr.getRegisteredScopes())
- if (!session.getAttachedScopes().contains(sc.getID())) notAppended.add(sc);
- return notAppended;
- }
-
- /*
- * Needed for freemarker
- */
- public Set<OntologyScope> getAppendedScopes() {
- Set<OntologyScope> appended = new HashSet<OntologyScope>();
- for (OntologyScope sc : onMgr.getRegisteredScopes())
- if (session.getAttachedScopes().contains(sc.getID())) appended.add(sc);
- return appended;
+ @OPTIONS
+ public Response handleCorsPreflight(@Context HttpHeaders headers) {
+ ResponseBuilder rb = Response.ok();
+ enableCORS(servletContext, rb, headers, GET, POST, PUT, DELETE, OPTIONS);
+ return rb.build();
}
@OPTIONS
- public Response handleCorsPreflight(@Context HttpHeaders headers) {
+ @Path("/{ontologyId:.+}")
+ public Response handleCorsPreflightOntology(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+ enableCORS(servletContext, rb, headers, GET, DELETE, OPTIONS);
return rb.build();
}