# HG changeset patch # User Sascha L. Teichmann # Date 1264161388 0 # Node ID d1b8c91b4506b49c29d5d26b4db1eb06b8cb079b # Parent b01e47317a7872ad14dcef5c25a6f425049943f4 Added url '/service/{service}' to REST server to offer the actual service over HTTP. artifacts/trunk@601 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r b01e47317a78 -r d1b8c91b4506 ChangeLog --- a/ChangeLog Fri Jan 22 11:40:26 2010 +0000 +++ b/ChangeLog Fri Jan 22 11:56:28 2010 +0000 @@ -1,3 +1,12 @@ +2010-01-22 Sascha L. Teichmann + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ServiceResource.java: + New REST wrapper to call the service. Bound under '/service/{service}' + where '{service}' is the name of the service as announced by '/services'. + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java: + Register new resource to web server. + 2010-01-22 Sascha L. Teichmann * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ServicesResource.java: diff -r b01e47317a78 -r d1b8c91b4506 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java Fri Jan 22 11:40:26 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/RestApp.java Fri Jan 22 11:56:28 2010 +0000 @@ -36,6 +36,7 @@ Router router = new Router(context); router.attach(ServicesResource.PATH, ServicesResource.class); + router.attach(ServiceResource.PATH, ServiceResource.class); router.attach(FactoriesResource.PATH, FactoriesResource.class); router.attach(CreateResource.PATH, CreateResource.class); router.attach(ArtifactResource.PATH, ArtifactResource.class); diff -r b01e47317a78 -r d1b8c91b4506 artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ServiceResource.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ServiceResource.java Fri Jan 22 11:56:28 2010 +0000 @@ -0,0 +1,70 @@ +package de.intevation.artifactdatabase.rest; + +import org.restlet.representation.Representation; +import org.restlet.representation.EmptyRepresentation; + +import org.restlet.ext.xml.DomRepresentation; + +import de.intevation.artifacts.ArtifactDatabase; +import de.intevation.artifacts.ArtifactDatabaseException; + +import org.restlet.data.Request; +import org.restlet.data.Response; +import org.restlet.data.Status; +import org.restlet.data.MediaType; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; + +import java.io.IOException; + +/** + * @author Sascha L. Teichmann (sascha.teichmann@intevation) + */ +public class ServiceResource +extends BaseResource +{ + private static Logger logger = Logger.getLogger(ServiceResource.class); + + public static final String PATH = "/service/{service}"; + + public static final String NO_SUCH_ACTION_MESSAGE = "no such service"; + + protected Representation innerPost(Representation requestRepr) { + + Document inputDocument = null; + try { + DomRepresentation input = new DomRepresentation(requestRepr); + input.setNamespaceAware(true); + inputDocument = input.getDocument(); + } + catch (IOException ioe) { + logger.error(ioe.getMessage()); + Response response = getResponse(); + response.setStatus(Status.CLIENT_ERROR_BAD_REQUEST, ioe); + return new EmptyRepresentation(); + } + + Request request = getRequest(); + + String service = (String)request.getAttributes().get("service"); + + ArtifactDatabase db = (ArtifactDatabase)getContext() + .getAttributes().get("database"); + + try { + return new DomRepresentation( + MediaType.APPLICATION_XML, + db.process(service, inputDocument, getCallMeta())); + } + catch (ArtifactDatabaseException adbe) { + logger.warn(adbe.getLocalizedMessage(), adbe); + Response response = getResponse(); + response.setStatus( + Status.CLIENT_ERROR_BAD_REQUEST, adbe.getMessage()); + return new EmptyRepresentation(); + } + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :