use a Archiva* name

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1201812 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
new file mode 100644 (file)
index 0000000..94ff51b
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
@@ -0,0 +1,80 @@
+package org.apache.archiva.rest.services;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4-M2
+ */
+@XmlRootElement( name = "archivaRestError" )
+public class ArchivaRestError
+{
+    
+    private int httpErrorCode;
+    
+    private String errorKey;
+    
+    private String errorMessage;
+    
+    public ArchivaRestError()
+    {
+        // no op
+    }
+    
+    public ArchivaRestError( ArchivaRestServiceException e )
+    {
+        httpErrorCode = e.getHttpErrorCode();
+        errorKey = e.getErrorKey();
+        errorMessage = e.getMessage();
+    }
+
+    public int getHttpErrorCode()
+    {
+        return httpErrorCode;
+    }
+
+    public void setHttpErrorCode( int httpErrorCode )
+    {
+        this.httpErrorCode = httpErrorCode;
+    }
+
+    public String getErrorKey()
+    {
+        return errorKey;
+    }
+
+    public void setErrorKey( String errorKey )
+    {
+        this.errorKey = errorKey;
+    }
+
+    public String getErrorMessage()
+    {
+        return errorMessage;
+    }
+
+    public void setErrorMessage( String errorMessage )
+    {
+        this.errorMessage = errorMessage;
+    }
+}

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java
deleted file mode 100644 (file)
index e93c5b7..0000000
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.apache.archiva.rest.services;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author Olivier Lamy
- * @since 1.4-M2
- */
-@XmlRootElement( name = "restError" )
-public class RestError
-{
-    
-    private int httpErrorCode;
-    
-    private String errorKey;
-    
-    private String errorMessage;
-    
-    public RestError()
-    {
-        // no op
-    }
-    
-    public RestError( ArchivaRestServiceException e)
-    {
-        httpErrorCode = e.getHttpErrorCode();
-        errorKey = e.getErrorKey();
-        errorMessage = e.getMessage();
-    }
-
-    public int getHttpErrorCode()
-    {
-        return httpErrorCode;
-    }
-
-    public void setHttpErrorCode( int httpErrorCode )
-    {
-        this.httpErrorCode = httpErrorCode;
-    }
-
-    public String getErrorKey()
-    {
-        return errorKey;
-    }
-
-    public void setErrorKey( String errorKey )
-    {
-        this.errorKey = errorKey;
-    }
-
-    public String getErrorMessage()
-    {
-        return errorMessage;
-    }
-
-    public void setErrorMessage( String errorMessage )
-    {
-        this.errorMessage = errorMessage;
-    }
-}

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java
index 4f3500ab3dc9543b01dd2a8bb9398048bb560a46..04e4ced1911abc5eb1aecf5e0f8def2a0220b1d8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java
@@ -19,10 +19,9 @@ package org.apache.archiva.rest.services.interceptors;
  */
 
 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 ArchivaRestServiceExceptionMapper
 {
     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();
     }