From c4efc3cab8bd258dc396ae810acd7f7452ecf921 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 16 May 2012 23:19:15 +0000 Subject: [PATCH] fix compilation failure: my bad! git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1339419 13f79535-47bb-0310-9956-ffa450edef68 --- .../api/DefaultDataValidatorService.java | 6 ++--- .../api/DefaultFileUploadService.java | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java index 5f98c5a19..bbbe0f865 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java @@ -59,7 +59,7 @@ public class DefaultDataValidatorService } catch ( RepositoryAdminException e ) { - throw new ArchivaRestServiceException( e.getMessage() ); + throw new ArchivaRestServiceException( e.getMessage(), e ); } } @@ -72,7 +72,7 @@ public class DefaultDataValidatorService } catch ( RepositoryAdminException e ) { - throw new ArchivaRestServiceException( e.getMessage() ); + throw new ArchivaRestServiceException( e.getMessage(), e ); } } @@ -85,7 +85,7 @@ public class DefaultDataValidatorService } catch ( RepositoryAdminException e ) { - throw new ArchivaRestServiceException( e.getMessage() ); + throw new ArchivaRestServiceException( e.getMessage(), e ); } } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java index 054233231..fb590de9e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java @@ -33,6 +33,7 @@ import org.apache.archiva.maven2.metadata.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.SnapshotVersion; +import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; import org.apache.archiva.repository.RepositoryException; @@ -55,7 +56,6 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; -import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -152,7 +152,7 @@ public class DefaultFileUploadService catch ( IOException e ) { throw new ArchivaRestServiceException( e.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e ); } } @@ -300,17 +300,17 @@ public class DefaultFileUploadService catch ( IOException ie ) { throw new ArchivaRestServiceException( "Error encountered while uploading pom file: " + ie.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), ie ); } catch ( RepositoryException rep ) { throw new ArchivaRestServiceException( "Repository exception: " + rep.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), rep ); } catch ( RepositoryAdminException e ) { throw new ArchivaRestServiceException( "RepositoryAdmin exception: " + e.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e ); } } @@ -385,7 +385,7 @@ public class DefaultFileUploadService { throw new ArchivaRestServiceException( "Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed.", - Response.Status.BAD_REQUEST.getStatusCode() ); + Response.Status.BAD_REQUEST.getStatusCode(), null ); } else { @@ -398,7 +398,7 @@ public class DefaultFileUploadService { throw new ArchivaRestServiceException( "Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed.", - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), ie ); } if ( generatePom ) @@ -425,7 +425,7 @@ public class DefaultFileUploadService { throw new ArchivaRestServiceException( "Error encountered while writing pom file: " + ie.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), ie ); } } @@ -446,17 +446,17 @@ public class DefaultFileUploadService catch ( RepositoryNotFoundException re ) { throw new ArchivaRestServiceException( "Target repository cannot be found: " + re.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), re ); } catch ( RepositoryException rep ) { throw new ArchivaRestServiceException( "Repository exception: " + rep.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), rep ); } catch ( RepositoryAdminException e ) { throw new ArchivaRestServiceException( "RepositoryAdmin exception: " + e.getMessage(), - Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e ); } } -- 2.39.5