You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/31 17:35:32 UTC
svn commit: r1307830 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/
archiva-webapp-js/src/ma...
Author: olamy
Date: Sat Mar 31 15:35:32 2012
New Revision: 1307830
URL: http://svn.apache.org/viewvc?rev=1307830&view=rev
Log:
take of NPE, add rest method to cleanup uploaded files in session
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.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/AbstractRestService.java?rev=1307830&r1=1307829&r2=1307830&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java Sat Mar 31 15:35:32 2012
@@ -147,7 +147,7 @@ public abstract class AbstractRestServic
protected void triggerAuditEvent( String repositoryId, String filePath, String action )
{
- AuditEvent auditEvent = new AuditEvent();
+ AuditEvent auditEvent = new AuditEvent( action, repositoryId );
auditEvent.setAction( action );
auditEvent.setRepositoryId( repositoryId );
auditEvent.setResource( filePath );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java?rev=1307830&r1=1307829&r2=1307830&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java Sat Mar 31 15:35:32 2012
@@ -187,6 +187,17 @@ public class DefaultFileUploadService
return Boolean.FALSE;
}
+ public Boolean clearUploadedFiles()
+ throws ArchivaRestServiceException
+ {
+ List<FileMetadata> fileMetadatas = getSessionFileMetadatas();
+ for ( FileMetadata fileMetadata : fileMetadatas )
+ {
+ deleteFile( fileMetadata.getServerFileName() );
+ }
+ return Boolean.TRUE;
+ }
+
public List<FileMetadata> getSessionFileMetadatas()
throws ArchivaRestServiceException
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java?rev=1307830&r1=1307829&r2=1307830&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java Sat Mar 31 15:35:32 2012
@@ -75,4 +75,12 @@ public interface FileUploadService
@PathParam( "artifactId" ) String artifactId, @QueryParam( "generatePom" ) boolean generatePom )
throws ArchivaRestServiceException;
+
+ @Path( "clearUploadedFiles" )
+ @GET
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD )
+ Boolean clearUploadedFiles()
+ throws ArchivaRestServiceException;
+
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js?rev=1307830&r1=1307829&r2=1307830&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js Sat Mar 31 15:35:32 2012
@@ -38,7 +38,7 @@ define("archiva.artifacts-management",["
this.artifactUploads=[];
saveArtifacts=function(){
-
+ clearUserMessages();
if(!$("#main-content #fileupload" ).valid()){
return;
}
@@ -55,6 +55,10 @@ define("archiva.artifacts-management",["
dataType: 'json',
success: function(data) {
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
}
}
);
@@ -66,46 +70,53 @@ define("archiva.artifacts-management",["
displayUploadArtifact=function(){
var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg());
- mainContent.html($("#file-upload-screen" ).html());
- $.ajax("restServices/archivaServices/browseService/userRepositories", {
+
+
+ $.ajax("restServices/archivaUiServices/fileUploadService/clearUploadedFiles", {
type: "GET",
dataType: 'json',
success: function(data) {
- var artifactUploadViewModel=new ArtifactUploadViewModel(data);
- ko.applyBindings(artifactUploadViewModel,mainContent.find("#file-upload-main" ).get(0));
- var validator = $("#main-content #fileupload" ).validate({
- showErrors: function(validator, errorMap, errorList) {
- customShowError("#main-content #fileupload",validator,errorMap,errorMap);
- }
- });
- $('#fileupload').fileupload({
- add: function (e, data) {
- data.formData = {
- groupId: artifactUploadViewModel.groupId(),
- artifactId: artifactUploadViewModel.artifactId(),
- version: artifactUploadViewModel.version(),
- packaging: artifactUploadViewModel.packaging()
- };
- $.blueimpUI.fileupload.prototype.options.add.call(this, e, data);
- },
- submit: function (e, data) {
- var $this = $(this);
-
- $this.fileupload('send', data);
- artifactUploadViewModel.artifactUploads.push(new ArtifactUpload(data.formData.classifier,data.formData.pomFile));
- return false;
+ mainContent.html($("#file-upload-screen" ).html());
+ $.ajax("restServices/archivaServices/browseService/userRepositories", {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var artifactUploadViewModel=new ArtifactUploadViewModel(data);
+ ko.applyBindings(artifactUploadViewModel,mainContent.find("#file-upload-main" ).get(0));
+ var validator = $("#main-content #fileupload" ).validate({
+ showErrors: function(validator, errorMap, errorList) {
+ customShowError("#main-content #fileupload",validator,errorMap,errorMap);
+ }
+ });
+ $('#fileupload').fileupload({
+ add: function (e, data) {
+ data.formData = {
+ groupId: artifactUploadViewModel.groupId(),
+ artifactId: artifactUploadViewModel.artifactId(),
+ version: artifactUploadViewModel.version(),
+ packaging: artifactUploadViewModel.packaging()
+ };
+ $.blueimpUI.fileupload.prototype.options.add.call(this, e, data);
+ },
+ submit: function (e, data) {
+ var $this = $(this);
+
+ $this.fileupload('send', data);
+ artifactUploadViewModel.artifactUploads.push(new ArtifactUpload(data.formData.classifier,data.formData.pomFile));
+ return false;
+ }
+ }
+ );
+ $('#fileupload').bind('fileuploadsubmit', function (e, data) {
+ var pomFile = data.context.find('#pomFile' ).attr("checked");
+ var classifier = data.context.find('#classifier' ).val();
+ data.formData.pomFile = pomFile;
+ data.formData.classifier = classifier;
+ });
}
- }
- );
- $('#fileupload').bind('fileuploadsubmit', function (e, data) {
- var pomFile = data.context.find('#pomFile' ).attr("checked");
- var classifier = data.context.find('#classifier' ).val();
- data.formData.pomFile = pomFile;
- data.formData.classifier = classifier;
});
- }
+ }
});
-
}
});
\ No newline at end of file