switch from jersey 1.x to resteasy

2025-11-17 02:31:14 +01:00 · 2017-06-27 20:16:05 +02:00
parent 3f27dd8cca
commit e826b833cc
48 changed files with 622 additions and 877 deletions
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/TemplateEngineViewable.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/TemplateEngineViewable.java
@@ -42,65 +42,50 @@ import sonia.scm.template.TemplateEngineFactory;

 //~--- JDK imports ------------------------------------------------------------

-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.spi.template.ViewProcessor;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;

 import javax.ws.rs.ext.Provider;
+import sonia.scm.template.Viewable;

 /**
 *
 * @author Sebastian Sdorra
 */
@Provider
-public class TemplateEngineViewable implements ViewProcessor<String>
+public class TemplateEngineViewable implements MessageBodyWriter<Viewable>
 {
+  
+  private final TemplateEngineFactory templateEngineFactory;

-  /**
-   * Constructs ...
-   *
-   *
-   * @param templateEngineFactory
-   */
  @Inject
  public TemplateEngineViewable(TemplateEngineFactory templateEngineFactory)
  {
    this.templateEngineFactory = templateEngineFactory;
  }

-  //~--- methods --------------------------------------------------------------

-  /**
-   * Method description
-   *
-   *
-   * @param name
-   *
-   * @return
-   */
  @Override
-  public String resolve(String name)
-  {
-    return name;
+  public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+    return type.isAssignableFrom(Viewable.class);
  }

-  /**
-   * Method description
-   *
-   *
-   * @param path
-   * @param viewable
-   * @param out
-   *
-   * @throws IOException
-   */
  @Override
-  public void writeTo(String path, Viewable viewable, OutputStream out)
-    throws IOException
-  {
+  public long getSize(Viewable viewable, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+    return -1;
+  }
+
+  @Override
+  public void writeTo(Viewable viewable, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+    String path = viewable.getPath();
+    
    TemplateEngine engine = templateEngineFactory.getEngineByExtension(path);

    if (engine == null)
@@ -115,14 +100,9 @@ public class TemplateEngineViewable implements ViewProcessor<String>
      throw new IOException("could not find template for ".concat(path));
    }

-    PrintWriter writer = new PrintWriter(out);
+    PrintWriter writer = new PrintWriter(entityStream);

-    template.execute(writer, viewable.getModel());
+    template.execute(writer, viewable.getContext());
    writer.flush();
  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private TemplateEngineFactory templateEngineFactory;
 }
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.api.core.PackagesResourceConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class UriExtensionsConfig extends PackagesResourceConfig
-{
-
-  /** Field description */
-  public static final String EXTENSION_JSON = "json";
-
-  /** Field description */
-  public static final String EXTENSION_XML = "xml";
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   */
-  public UriExtensionsConfig()
-  {
-    super();
-  }
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param props
-   */
-  public UriExtensionsConfig(Map<String, Object> props)
-  {
-    super(props);
-  }
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param paths
-   */
-  public UriExtensionsConfig(String[] paths)
-  {
-    super(paths);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  public Map<String, MediaType> getMediaTypeMappings()
-  {
-    if (mediaTypeMap == null)
-    {
-      mediaTypeMap = new HashMap<String, MediaType>();
-      mediaTypeMap.put(EXTENSION_JSON, MediaType.APPLICATION_JSON_TYPE);
-      mediaTypeMap.put(EXTENSION_XML, MediaType.APPLICATION_XML_TYPE);
-    }
-
-    return mediaTypeMap;
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private Map<String, MediaType> mediaTypeMap;
-}
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractPermissionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractPermissionResource.java
@@ -133,7 +133,7 @@ public abstract class AbstractPermissionResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response add(@Context UriInfo uriInfo, Permission permission)
  {
    AssignedPermission ap = transformPermission(permission);
@@ -185,7 +185,7 @@ public abstract class AbstractPermissionResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response update(@PathParam("id") String id, Permission permission)
  {
    StoredAssignedPermission sap = getPermission(id);
@@ -213,7 +213,7 @@ public abstract class AbstractPermissionResource
    @ResponseCode(code = 404, condition = "not found, no permission with the specified id available"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Permission get(@PathParam("id") String id)
  {
    StoredAssignedPermission sap = getPermission(id);
@@ -231,7 +231,7 @@ public abstract class AbstractPermissionResource
    @ResponseCode(code = 204, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public List<Permission> getAll()
  {
    return getPermissions(getPredicate());
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
@@ -118,7 +118,7 @@ public class ChangePasswordResource
    @ResponseCode(code = 400, condition = "bad request, the old password is not correct"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response changePassword(@FormParam("old-password") String oldPassword,
    @FormParam("new-password") String newPassword)
    throws UserException, IOException
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
@@ -89,7 +89,7 @@ public class ConfigurationResource
   * @return
   */
  @GET
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getConfiguration()
  {
    Response response = null;
@@ -118,7 +118,7 @@ public class ConfigurationResource
   * @return
   */
  @POST
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response setConfig(@Context UriInfo uriInfo,
    ScmConfiguration newConfig)
  {
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
@@ -119,7 +119,7 @@ public class GroupResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response create(@Context UriInfo uriInfo, Group group)
  {
@@ -164,7 +164,7 @@ public class GroupResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response update(@Context UriInfo uriInfo,
    @PathParam("id") String name, Group group)
@@ -191,7 +191,7 @@ public class GroupResource
    @ResponseCode(code = 404, condition = "not found, no group with the specified id/name available"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response get(@Context Request request, @PathParam("id") String id)
  {
@@ -221,7 +221,7 @@ public class GroupResource
   * @return
   */
  @GET
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @TypeHint(Group[].class)
  @StatusCodes({
    @ResponseCode(code = 200, condition = "success"),
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
@@ -52,7 +52,6 @@ import sonia.scm.plugin.PluginInformationComparator;

 //~--- JDK imports ------------------------------------------------------------

-import com.sun.jersey.multipart.FormDataParam;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
@@ -66,6 +65,7 @@ import java.util.Iterator;
 import java.util.List;

 import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -124,9 +124,9 @@ public class PluginResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @Consumes(MediaType.MULTIPART_FORM_DATA)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response install(
-    @FormDataParam("package") InputStream uploadedInputStream)
+    /*@FormParam("package")*/ InputStream uploadedInputStream)
    throws IOException
  {
    Response response = null;
@@ -194,7 +194,7 @@ public class PluginResource
  @Consumes(MediaType.MULTIPART_FORM_DATA)
  @Produces(MediaType.TEXT_HTML)
  public Response installFromUI(
-    @FormDataParam("package") InputStream uploadedInputStream)
+    /*@FormParam("package")*/ InputStream uploadedInputStream)
    throws IOException
  {
    return install(uploadedInputStream);
@@ -257,7 +257,7 @@ public class PluginResource
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Collection<PluginInformation> getAll()
  {
    return pluginManager.getAll();
@@ -274,7 +274,7 @@ public class PluginResource
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Collection<PluginInformation> getAvailable()
  {
    return pluginManager.getAvailable();
@@ -291,7 +291,7 @@ public class PluginResource
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Collection<PluginInformation> getAvailableUpdates()
  {
    return pluginManager.getAvailableUpdates();
@@ -325,7 +325,7 @@ public class PluginResource
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Collection<PluginInformation> getOverview()
  {
    //J-
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -69,8 +69,6 @@ import static com.google.common.base.Preconditions.*;

 //~--- JDK imports ------------------------------------------------------------

-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.multipart.FormDataParam;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
@@ -89,6 +87,7 @@ import java.util.Set;

 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -111,7 +110,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 *
 * @author Sebastian Sdorra
 */
-@Path("import/repositories")
+// @Path("import/repositories")
 public class RepositoryImportResource
 {

@@ -170,8 +169,8 @@ public class RepositoryImportResource
  @TypeHint(TypeHint.NO_CONTENT.class)
  @Consumes(MediaType.MULTIPART_FORM_DATA)
  public Response importFromBundle(@Context UriInfo uriInfo,
-    @PathParam("type") String type, @FormDataParam("name") String name,
-    @FormDataParam("bundle") InputStream inputStream, @QueryParam("compressed")
+    @PathParam("type") String type, @FormParam("name") String name,
+    @FormParam("bundle") InputStream inputStream, @QueryParam("compressed")
  @DefaultValue("false") boolean compressed)
  {
    Repository repository = doImportFromBundle(type, name, inputStream,
@@ -211,8 +210,8 @@ public class RepositoryImportResource
  @Consumes(MediaType.MULTIPART_FORM_DATA)
  @Produces(MediaType.TEXT_HTML)
  public Response importFromBundleUI(@PathParam("type") String type,
-    @FormDataParam("name") String name,
-    @FormDataParam("bundle") InputStream inputStream, @QueryParam("compressed")
+    @FormParam("name") String name,
+    @FormParam("bundle") InputStream inputStream, @QueryParam("compressed")
  @DefaultValue("false") boolean compressed)
  {
    Response response;
@@ -260,7 +259,7 @@ public class RepositoryImportResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response importFromUrl(@Context UriInfo uriInfo,
    @PathParam("type") String type, UrlImportRequest request)
  {
@@ -320,7 +319,7 @@ public class RepositoryImportResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Repository[].class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response importRepositories(@PathParam("type") String type)
  {
    SecurityUtils.getSubject().checkRole(Role.ADMIN);
@@ -352,7 +351,7 @@ public class RepositoryImportResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Repository[].class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response importRepositories()
  {
    SecurityUtils.getSubject().checkRole(Role.ADMIN);
@@ -394,7 +393,7 @@ public class RepositoryImportResource
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(ImportResult.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response importRepositoriesFromDirectory(
    @PathParam("type") String type)
  {
@@ -435,7 +434,7 @@ public class RepositoryImportResource
          .warn(
            "import feature is not supported by repository handler for type "
              .concat(type), ex);
-        response = Response.status(Status.BAD_REQUEST).build();
+        response = Response.status(Response.Status.BAD_REQUEST).build();
      }
      catch (IOException ex)
      {
@@ -451,7 +450,7 @@ public class RepositoryImportResource
    else
    {
      logger.warn("could not find reposiotry handler for type {}", type);
-      response = Response.status(Status.BAD_REQUEST).build();
+      response = Response.status(Response.Status.BAD_REQUEST).build();
    }

    return response;
@@ -475,7 +474,7 @@ public class RepositoryImportResource
    ),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getImportableTypes()
  {
    SecurityUtils.getSubject().checkRole(Role.ADMIN);
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -166,7 +166,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response create(@Context UriInfo uriInfo, Repository repository)
  {
@@ -296,7 +296,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response update(@Context UriInfo uriInfo, @PathParam("id") String id, Repository repository)
  {
@@ -315,7 +315,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
   */
  @GET
  @Path("{id}")
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @StatusCodes({
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 404, condition = "not found, no repository with the specified id available"),
@@ -340,7 +340,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
   * @return all repositories
   */
  @GET
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @StatusCodes({
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
@@ -377,7 +377,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(BlameResult.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getBlame(@PathParam("id") String id,
    @QueryParam("revision") String revision, @QueryParam("path") String path)
    throws RepositoryException, IOException
@@ -449,7 +449,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Branches.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getBranches(@PathParam("id") String id)
    throws RepositoryException, IOException
  {
@@ -511,7 +511,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(BrowserResult.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  //J-
  public Response getBrowserResult(
    @PathParam("id") String id,
@@ -591,7 +591,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Repository.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getByTypeAndName(@PathParam("type") String type,
    @PathParam("name") String name)
  {
@@ -632,7 +632,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Changeset.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getChangeset(@PathParam("id") String id,
    @PathParam("revision") String revision)
    throws IOException, RepositoryException
@@ -708,7 +708,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(ChangesetPagingResult.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  //J-
  public Response getChangesets(
    @PathParam("id") String id,
@@ -948,7 +948,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(Tags.class)
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public Response getTags(@PathParam("id") String id)
    throws RepositoryException, IOException
  {
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
@@ -50,8 +50,6 @@ import sonia.scm.util.HttpUtil;

 //~--- JDK imports ------------------------------------------------------------

-import com.sun.jersey.api.view.Viewable;
-
 import java.io.IOException;

 import java.util.Collection;
@@ -67,6 +65,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import sonia.scm.template.Viewable;

 /**
 *
@@ -76,17 +75,13 @@ import javax.ws.rs.core.MediaType;
 public class RepositoryRootResource
 {

-  /** Field description */
-  public static final String TEMPLATE = "/templates/repository-root.mustache";
-
-  //~--- constructors ---------------------------------------------------------
+  private static final String TEMPLATE = "/templates/repository-root.mustache";

+  private final RepositoryManager repositoryManager;
+  
  /**
   * Constructs ...
-   *
-   *
-   *
-   * @param templateHandler
+   * 
   * @param repositoryManager
   */
  @Inject
@@ -330,10 +325,4 @@ public class RepositoryRootResource
    /** Field description */
    private UrlProvider urlProvider;
  }
-
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private RepositoryManager repositoryManager;
 }
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java
@@ -154,7 +154,7 @@ public class SearchResource implements UserListener, GroupListener
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public SearchResults searchGroups(@QueryParam("query") String queryString)
  {
    return groupSearchHandler.search(queryString,
@@ -189,7 +189,7 @@ public class SearchResource implements UserListener, GroupListener
    @ResponseCode(code = 200, condition = "success"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  public SearchResults searchUsers(@QueryParam("query") String queryString)
  {
    return userSearchHandler.search(queryString,
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
@@ -125,7 +125,7 @@ public class UserResource extends AbstractManagerResource<User, UserException>
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response create(@Context UriInfo uriInfo, User user)
  {
@@ -170,7 +170,7 @@ public class UserResource extends AbstractManagerResource<User, UserException>
    @ResponseCode(code = 500, condition = "internal server error")
  })
  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response update(@Context UriInfo uriInfo,
    @PathParam("id") String name, User user)
@@ -197,7 +197,7 @@ public class UserResource extends AbstractManagerResource<User, UserException>
    @ResponseCode(code = 404, condition = "not found, no group with the specified id/name available"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response get(@Context Request request, @PathParam("id") String id)
  {
@@ -233,7 +233,7 @@ public class UserResource extends AbstractManagerResource<User, UserException>
    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
    @ResponseCode(code = 500, condition = "internal server error")
  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
  @Override
  public Response getAll(@Context Request request, @DefaultValue("0")
  @QueryParam("start") int start, @DefaultValue("-1")