# HG changeset patch # User Ingo Weinzierl # Date 1299056765 0 # Node ID 82809c5992e195f4445e12db1d9e923049118299 # Parent 147610c43863a7fcbf68371cff1870d4a852f454 Added a resource '/create-user' to create new users. artifacts/trunk@1355 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 147610c43863 -r 82809c5992e1 ChangeLog --- a/ChangeLog Wed Mar 02 07:36:00 2011 +0000 +++ b/ChangeLog Wed Mar 02 09:06:05 2011 +0000 @@ -1,3 +1,19 @@ +2011-03-02 Ingo Weinzierl + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java: + Added a new method getArtifactDatabase() that retrieves the artifact + database which is used in all subclasses of this resource. + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateUserResource.java: + Use getArtifactDatabase() to retrieve the artifact database. + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java: + New. A resource that is used to create new users. The information about + the user need to be included in the POST data of the request. + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java: + Added the CreateUserResource. + 2011-03-02 Ingo Weinzierl * artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultUserFactory.java, diff -r 147610c43863 -r 82809c5992e1 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Wed Mar 02 07:36:00 2011 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Wed Mar 02 09:06:05 2011 +0000 @@ -11,6 +11,7 @@ import de.intevation.artifactdatabase.DefaultCallMeta; import de.intevation.artifactdatabase.DefaultPreferredLocale; +import de.intevation.artifacts.ArtifactDatabase; import de.intevation.artifacts.CallMeta; import de.intevation.artifacts.PreferredLocale; @@ -146,5 +147,16 @@ return new DefaultCallMeta(languages); } + + + /** + * Returns the artifact database stored in the context of the REST + * application. + * + * @return the artifact database. + */ + protected ArtifactDatabase getArtifactDatabase() { + return (ArtifactDatabase) getContext().getAttributes().get("database"); + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 147610c43863 -r 82809c5992e1 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Wed Mar 02 07:36:00 2011 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Wed Mar 02 09:06:05 2011 +0000 @@ -95,8 +95,7 @@ logger.debug("Create artifact with factory '" + factory + "'"); } - ArtifactDatabase db = (ArtifactDatabase)getContext() - .getAttributes().get("database"); + ArtifactDatabase db = getArtifactDatabase(); try { return new DomRepresentation( diff -r 147610c43863 -r 82809c5992e1 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateUserResource.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateUserResource.java Wed Mar 02 09:06:05 2011 +0000 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2011 by Intevation GmbH + * + * This program is free software under the LGPL (>=v2.1) + * Read the file LGPL.txt coming with the software for details + * or visit http://www.gnu.org/licenses/ if it does not exist. + */ +package de.intevation.artifactdatabase.rest; + +import java.io.IOException; + +import org.apache.log4j.Logger; + +import org.restlet.Response; +import org.restlet.data.MediaType; +import org.restlet.data.Status; +import org.restlet.ext.xml.DomRepresentation; +import org.restlet.representation.EmptyRepresentation; +import org.restlet.representation.Representation; +import org.restlet.resource.ResourceException; + +import org.w3c.dom.Document; + +import de.intevation.artifacts.ArtifactDatabase; +import de.intevation.artifacts.ArtifactDatabaseException; + + +/** + * Resource to create a new users within the artifact database. + * + * @author Ingo Weinzierl + */ +public class CreateUserResource +extends BaseResource +{ + /** The logger used in this class.*/ + private static Logger logger = Logger.getLogger(CreateUserResource.class); + + /** The URL part for this resource.*/ + public static final String PATH = "/create-user"; + + + @Override + protected Representation innerPost(Representation requestRepr) + throws ResourceException + { + Document input = null; + + try { + DomRepresentation in = new DomRepresentation(requestRepr); + in.setNamespaceAware(true); + input = in.getDocument(); + } + catch (IOException ioe) { + logger.error(ioe.getLocalizedMessage(), ioe); + + Response response = getResponse(); + response.setStatus(Status.CLIENT_ERROR_BAD_REQUEST, ioe); + return new EmptyRepresentation(); + } + + logger.debug("Create user"); + + ArtifactDatabase db = getArtifactDatabase(); + + try { + return new DomRepresentation( + MediaType.APPLICATION_XML, + db.createUser(input, getCallMeta())); + } + catch (ArtifactDatabaseException adbe) { + Response response = getResponse(); + response.setStatus( + Status.CLIENT_ERROR_UNPROCESSABLE_ENTITY, adbe.getMessage()); + return new EmptyRepresentation(); + } + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 147610c43863 -r 82809c5992e1 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java Wed Mar 02 07:36:00 2011 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java Wed Mar 02 09:06:05 2011 +0000 @@ -73,6 +73,7 @@ router.attach(ArtifactOutResource.PATH, ArtifactOutResource.class); router.attach(ExportResource.PATH, ExportResource.class); router.attach(ImportResource.PATH, ImportResource.class); + router.attach(CreateUserResource.PATH, CreateUserResource.class); return router; }