Author: rwesten
Date: Tue Feb 5 13:47:26 2013
New Revision: 1442584
URL: http://svn.apache.org/viewvc?rev=1442584&view=rev
Log:
STANBOL-910: adapted the user manager to refactoring
Modified:
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1442584&r1=1442583&r2=1442584&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Tue Feb 5 13:47:26
2013
@@ -89,6 +89,11 @@
<version>0.11.0</version>
</dependency>
<dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -116,20 +121,10 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
- <version>0.11.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
+ <artifactId>org.apache.stanbol.commons.web.viewable.ldpath</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
- <!-- Jersey, servlet and freemarker -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
<!-- OSGi tax -->
<dependency>
Modified:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java?rev=1442584&r1=1442583&r2=1442584&view=diff
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
(original)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
Tue Feb 5 13:47:26 2013
@@ -23,6 +23,7 @@ import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MediaType;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@@ -31,10 +32,13 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.commons.ldpathtemplate.LdRenderer;
import org.apache.stanbol.commons.usermanagement.resource.UserResource;
+import org.apache.stanbol.commons.web.viewable.RdfViewable;
+import org.apache.stanbol.commons.web.viewable.ldpath.writer.LdViewableWriter;
import org.osgi.framework.BundleContext;
+import freemarker.cache.TemplateLoader;
+
@Component
@Service(Servlet.class)
@Properties({
@@ -47,12 +51,12 @@ public class WebConsolePlugin extends
@Reference
private UserResource userManager;
+
@Reference
- private LdRenderer ldRenderer;
+ private TemplateLoader templateLoader;
- @Reference
- private Serializer serializer;
+ private LdViewableWriter rdfViewableWriter;
public static final String NAME = "User Management";
public static final String LABEL = "usermanagement";
@@ -67,28 +71,35 @@ public class WebConsolePlugin extends
protected void renderContent(HttpServletRequest req,
HttpServletResponse response) throws ServletException,
IOException {
-
- //TODO enhance LDPath template to support rdf:Lists and return
list
- ldRenderer.render(userManager.getUserType(),
-
"html/org/apache/stanbol/commons/usermanagement/webConsole.ftl",
response.getWriter());
+ //create an RdfViewable
+ RdfViewable rdfViewable = new RdfViewable(
+ "org/apache/stanbol/commons/usermanagement/webConsole.ftl",
+ userManager.getUserType());
+ //now use the LdViewableWriter to serialize
+ rdfViewableWriter.writeTo(rdfViewable, RdfViewable.class,
RdfViewable.class,
+ RdfViewable.class.getAnnotations(), MediaType.TEXT_HTML_TYPE,
+ null, response.getOutputStream());
// serializer.serialize(System.out,
userManager.getUserType().getGraph(), SupportedFormat.TURTLE);
-// log me for debug!
+ // log me for debug!
}
@Override
protected String[] getCssReferences() {
- String[] result = new String[1];
- result[0] =
"usermanagement/res/static/user-management/styles/webconsole.css";
+ String[] result = new String[] {
+
"usermanagement/res/static/user-management/styles/webconsole.css"
+ };
return result;
}
-
- public void activateBundle(BundleContext bundleContext) {
+
+ @Override
+ public void activate(BundleContext bundleContext) {
super.activate(bundleContext);
+ rdfViewableWriter = new LdViewableWriter(templateLoader);
}
-
+ @Override
public void deactivate() {
- super.deactivate();
-
+ rdfViewableWriter = null;
+ super.deactivate();
}
/**
Modified:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1442584&r1=1442583&r2=1442584&view=diff
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
(original)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
Tue Feb 5 13:47:26 2013
@@ -21,11 +21,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -44,6 +41,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
@@ -77,13 +75,14 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.rdf.ontologies.PERMISSION;
-import org.apache.stanbol.commons.ldpathtemplate.LdRenderer;
import org.apache.stanbol.commons.security.PasswordUtil;
import org.apache.stanbol.commons.usermanagement.Ontology;
-import org.apache.stanbol.commons.viewable.RdfViewable;
+import org.apache.stanbol.commons.web.viewable.RdfViewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.sun.jersey.multipart.FormDataParam;
+
@Component
@Service(UserResource.class)
@Path("user-management")
@@ -96,8 +95,6 @@ public class UserResource {
private Parser parser;
@Reference
private Serializer serializer;
- @Reference
- private LdRenderer ldRenderer;
@GET
public String index() throws UnsupportedEncodingException {
@@ -109,7 +106,7 @@ public class UserResource {
@GET
@Path("users")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable listUsers() {
return new RdfViewable("listUser.ftl", getUserType(), this.getClass());
}
@@ -140,7 +137,7 @@ public class UserResource {
@GET
@Path("view-user")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable viewUser(@QueryParam("userName") String userName) {
return new RdfViewable("edit.ftl", getUser(userName), this.getClass());
}
@@ -148,7 +145,7 @@ public class UserResource {
@POST
@Path("store-user")
// @Consumes("multipart/form-data")
- @Consumes("application/x-www-form-urlencoded")
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
public Response storeUser(@Context UriInfo uriInfo,
@FormParam("currentLogin") String currentLogin,
@FormParam("newLogin") String newLogin,
@@ -281,11 +278,11 @@ public class UserResource {
*/
@POST
@Path("replace-subgraph")
- @Consumes("multipart/form-data")
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
public void replaceSubGraph(@QueryParam("graph") UriRef graphUri,
- @FormParam("assert") String assertedString,
- @FormParam("revoke") String revokedString,
- @FormParam("format") @DefaultValue("text/turtle") String format) {
+ @FormDataParam("assert") String assertedString,
+ @FormDataParam("revoke") String revokedString,
+ @FormDataParam("format") @DefaultValue("text/turtle") String
format) {
final Graph assertedGraph;
final Graph revokedGraph;
try {
@@ -308,14 +305,14 @@ public class UserResource {
@GET
@Path("roles")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable listRoles() {
return new RdfViewable("listRole.ftl", getRoleType(), this.getClass());
}
@GET
@Path("permissions")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable listPermissions() {
addClassToPermissions();
return new RdfViewable("listPermission.ftl", getPermissionType(),
this.getClass());
@@ -323,7 +320,7 @@ public class UserResource {
@GET
@Path("user/{username}/permissionsCheckboxes")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable permissionsCheckboxes(@PathParam("username") String
userName) { //getUser(userName)
return new RdfViewable("permissionsCheckboxes.ftl", getUser(userName),
this.getClass());
}
@@ -367,7 +364,7 @@ public class UserResource {
@GET
@Path("rolesCheckboxes")
- @Produces("text/html")
+ @Produces(MediaType.TEXT_HTML)
public RdfViewable rolesCheckboxes() {
return new RdfViewable("rolesCheckboxes.ftl", getRoleType(),
this.getClass());
}
@@ -419,7 +416,7 @@ public class UserResource {
* @return HTTP/1.1 204 No Content
*/
@POST
- @Consumes("text/turtle")
+ @Consumes(SupportedFormat.TURTLE)
@Path("add-user")
public Response addUser(String userData) {
@@ -458,7 +455,7 @@ public class UserResource {
* @return HTTP/1.1 204 No Content
*/
@POST
- @Consumes("text/turtle")
+ @Consumes(SupportedFormat.TURTLE)
@Path("delete-user")
public Response deleteUser(String userData) {
@@ -500,7 +497,7 @@ public class UserResource {
// needs refactoring and locks adding
@POST
- @Consumes("text/turtle")
+ @Consumes(SupportedFormat.TURTLE)
@Path("change-user")
public Response changeUser(String userData) {
@@ -572,7 +569,7 @@ public class UserResource {
*/
@GET
@Path("users/{username}")
- @Produces("text/turtle")
+ @Produces(SupportedFormat.TURTLE)
public Response getUserTurtle(@PathParam("username") String userName)
throws UnsupportedEncodingException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -594,7 +591,7 @@ public class UserResource {
*/
@GET
@Path("roles/{username}")
- @Produces("text/turtle")
+ @Produces(SupportedFormat.TURTLE)
public Response getUserRoles(@PathParam("username") String userName)
throws UnsupportedEncodingException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
