svn commit: r1201812 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services: ArchivaRestError.java RestError.java interceptors/ArchivaRestServiceExceptionMapper.java

[ol...@apache.org]

Author: olamy
Date: Mon Nov 14 17:58:54 2011
New Revision: 1201812

URL: http://svn.apache.org/viewvc?rev=1201812&view=rev
Log:
use a Archiva* name

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java   (contents, props changed)
      - copied, changed from r1201601, archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java
Removed:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java

Copied: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java (from r1201601, archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java&r1=1201601&r2=1201812&rev=1201812&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java Mon Nov 14 17:58:54 2011
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlRoot
  * @author Olivier Lamy
  * @since 1.4-M2
  */
-@XmlRootElement( name = "restError" )
-public class RestError
+@XmlRootElement( name = "archivaRestError" )
+public class ArchivaRestError
 {
     
     private int httpErrorCode;
@@ -36,12 +36,12 @@ public class RestError
     
     private String errorMessage;
     
-    public RestError()
+    public ArchivaRestError()
     {
         // no op
     }
     
-    public RestError( ArchivaRestServiceException e)
+    public ArchivaRestError( ArchivaRestServiceException e )
     {
         httpErrorCode = e.getHttpErrorCode();
         errorKey = e.getErrorKey();

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java?rev=1201812&r1=1201811&r2=1201812&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java Mon Nov 14 17:58:54 2011
@@ -19,10 +19,9 @@ package org.apache.archiva.rest.services
  */
 
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
-import org.apache.archiva.rest.services.RestError;
+import org.apache.archiva.rest.services.ArchivaRestError;
 import org.springframework.stereotype.Service;
 
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -38,7 +37,7 @@ public class ArchivaRestServiceException
 {
     public Response toResponse( ArchivaRestServiceException e )
     {
-        RestError restError = new RestError( e );
+        ArchivaRestError restError = new ArchivaRestError( e );
         Response.ResponseBuilder responseBuilder = Response.status( e.getHttpErrorCode() ).entity( restError );
         return responseBuilder.build();
     }