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/09 23:35:56 UTC
svn commit: r1299081 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Author: olamy
Date: Fri Mar 9 22:35:55 2012
New Revision: 1299081
URL: http://svn.apache.org/viewvc?rev=1299081&view=rev
Log:
ensure we remove scannerInstance from the queue in a finally block, minor javascript cleanup
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java?rev=1299081&r1=1299080&r2=1299081&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java Fri Mar 9 22:35:55 2012
@@ -21,11 +21,11 @@ package org.apache.archiva.repository.sc
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.consumers.RepositoryContentConsumer;
+import org.apache.commons.collections.CollectionUtils;
import org.codehaus.plexus.util.DirectoryWalker;
import org.springframework.stereotype.Service;
@@ -130,17 +130,23 @@ public class DefaultRepositoryScanner
inProgressScans.add( scannerInstance );
- dirWalker.addDirectoryWalkListener( scannerInstance );
-
- // Execute scan.
- dirWalker.scan();
+ RepositoryScanStatistics stats;
+ try
+ {
+ dirWalker.addDirectoryWalkListener( scannerInstance );
- RepositoryScanStatistics stats = scannerInstance.getStatistics();
+ // Execute scan.
+ dirWalker.scan();
- stats.setKnownConsumers( gatherIds( knownContentConsumers ) );
- stats.setInvalidConsumers( gatherIds( invalidContentConsumers ) );
+ stats = scannerInstance.getStatistics();
- inProgressScans.remove( scannerInstance );
+ stats.setKnownConsumers( gatherIds( knownContentConsumers ) );
+ stats.setInvalidConsumers( gatherIds( invalidContentConsumers ) );
+ }
+ finally
+ {
+ inProgressScans.remove( scannerInstance );
+ }
return stats;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1299081&r1=1299080&r2=1299081&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Fri Mar 9 22:35:55 2012
@@ -289,7 +289,7 @@ customShowError=function(selector, valid
$(selector).find("span.help-inline").remove();
for ( var i = 0; errorList[i]; i++ ) {
var error = errorList[i];
- var field = $(selector).find("#"+error.element.id);// $.isFunction(selector)? selector.find(fieldSelector ).get(0):$(selector).find(selector);
+ var field = $(selector).find("#"+error.element.id);
field.parents( "div.control-group" ).addClass( "error" );
field.parent().append( "<span class=\"help-inline\">" + error.message + "</span>" );
}
@@ -314,10 +314,9 @@ appendTemplateUrl=function(){
Entry=function(key,value){
var self=this;
this.key=ko.observable(key);
- //this.key.subscribe(function(newValue){self.modified(true)});
this.value=ko.observable(value);
- //this.value.subscribe(function(newValue){self.modified(true)});
}
+
/**
* map {"strings":["snapshots","internal"]} to an array
* @param data
@@ -345,7 +344,10 @@ unifyArray=function(strArray,sorted){
return sorted?res.sort():res;
}
-// utils
+//------------------------------------
+// utils javascript string extensions
+//------------------------------------
+
String.prototype.endsWith = function(str) {
return (this.match(str+"$")==str)
}
@@ -358,7 +360,10 @@ String.prototype.substringBeforeLast = f
return this.substring(0,this.lastIndexOf(str));
}
+//-----------------------------------------
// extends jquery tmpl to support var def
+//-----------------------------------------
+
$.extend($.tmpl.tag, {
"var": {
open: "var $1;"