Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-06-04 15:51:19 +02:00
parent fff682397b abf871fa88
commit 18c5c3ec97
42 changed files with 1689 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/api/rest/RestActionUploadResult.java
View File

@@ -30,18 +30,30 @@
*/
package sonia.scm.api.rest;
//~--- JDK imports ------------------------------------------------------------
import javax.xml.bind.annotation.XmlRootElement;
/**
*
* @author Sebastian Sdorra
*/
@XmlRootElement(name="result")
@XmlRootElement(name = "result")
public class RestActionUploadResult extends RestActionResult
{
/**
* Constructs ...
*
*/
public RestActionUploadResult()
{
this(true);
}
/**
* Constructs ...
*

4
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
View File

@@ -196,7 +196,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
}
catch (Exception ex)
{
logger.error("error during create", ex);
logger.error("error during delete", ex);
response = createErrorResonse(ex);
}
}
@@ -230,7 +230,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
}
catch (ScmSecurityException ex)
{
logger.warn("delete not allowd", ex);
logger.warn("update not allowd", ex);
response = Response.status(Response.Status.FORBIDDEN).build();
}
catch (Exception ex)