From f425272a22407892ab38a8f1e53b4b84b5160d7c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 12 Mar 2012 22:25:42 +0000 Subject: [PATCH] cleanup commented code git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299906 13f79535-47bb-0310-9956-ffa450edef68 --- .../model/RepositoryScannerStatistics.java | 33 ------------------- .../DefaultManagedRepositoriesService.java | 5 ++- .../services/DefaultSystemStatusService.java | 4 --- .../main/webapp/js/archiva/general-admin.js | 6 ++-- .../js/archiva/templates/general-admin.html | 27 ++++++++++++++- 5 files changed, 33 insertions(+), 42 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java index d7e149e6f..b6143ac94 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java @@ -33,8 +33,6 @@ public class RepositoryScannerStatistics { private ManagedRepository managedRepository; - //private RepositoryScanStatistics repositoryScanStatistics; - private List consumerScanningStatistics; private long totalFileCount = 0; @@ -56,37 +54,6 @@ public class RepositoryScannerStatistics this.managedRepository = managedRepository; } - /* - public RepositoryScanStatistics getRepositoryScanStatistics() - { - return repositoryScanStatistics; - } - - public void setRepositoryScanStatistics( RepositoryScanStatistics repositoryScanStatistics ) - { - this.repositoryScanStatistics = repositoryScanStatistics; - }*/ - - /*public Map getConsumerCounts() - { - return consumerCounts; - } - - public void setConsumerCounts( Map consumerCounts ) - { - this.consumerCounts = consumerCounts; - } - - public Map getConsumerTimings() - { - return consumerTimings; - } - - public void setConsumerTimings( Map consumerTimings ) - { - this.consumerTimings = consumerTimings; - } */ - public List getConsumerScanningStatistics() { return consumerScanningStatistics; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index e3a9460d8..dfac5b2a8 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -184,7 +184,10 @@ public class DefaultManagedRepositoriesService } finally { - repositorySession.close(); + if ( repositorySession != null ) + { + repositorySession.close(); + } } return null; } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java index acc77e4d8..a8cca6993 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java @@ -174,10 +174,6 @@ public class DefaultSystemStatusService RepositoryScannerStatistics repositoryScannerStatistics = new RepositoryScannerStatistics(); repositoryScannerStatisticsList.add( repositoryScannerStatistics ); repositoryScannerStatistics.setManagedRepository( instance.getRepository() ); - //repositoryScannerStatistics.setRepositoryScanStatistics( instance.getStatistics() ); - //repositoryScannerStatistics.setConsumerCounts( new HashMap( instance.getConsumerCounts() ) ); - //repositoryScannerStatistics.setConsumerTimings( - // new HashMap( instance.getConsumerTimings() ) ); repositoryScannerStatistics.setNewFileCount( instance.getStats().getNewFileCount() ); repositoryScannerStatistics.setTotalFileCount( instance.getStats().getTotalFileCount() ); repositoryScannerStatistics.setConsumerScanningStatistics( mapConsumerScanningStatistics( instance ) ); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index c53ee3f55..9eea30622 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -642,11 +642,11 @@ $(function() { data.newFileCount,data.consumerScanningStatistics); } - RepositoryScannerStatistics=function(managedRepository,totalFileCount,newFileCount,consumerScanningStatistics){ + RepositoryScannerStatistics=function(managedRepository,totalFileCount,newFileCount,consumerScanningStatisticsList){ //private ManagedRepository managedRepository; this.managedRepository=managedRepository - this.consumerScanningStatistics= consumerScanningStatistics; + this.consumerScanningStatisticsList= consumerScanningStatisticsList; //private long totalFileCount = 0; this.totalFileCount=totalFileCount; @@ -691,7 +691,7 @@ $(function() { } }); - var dataStr='[{"managedRepository":{"id":"snapshots","name":"Archiva Managed Snapshot Repository","layout":"default","indexDirectory":null,"location":"/Users/olamy/dev/tests/archiva-appserver-base-test/data/repositories/snapshots","snapshots":true,"releases":false,"blockRedeployments":false,"cronExpression":"0 0,30 * * * ?","stagingRepository":null,"scanned":true,"daysOlder":30,"retentionCount":2,"deleteReleasedSnapshots":false,"stageRepoNeeded":false,"resetStats":false},"consumerCounts":{"create-missing-checksums":114,"duplicate-artifacts":12,"metadata-updater":114,"index-content":197,"create-archiva-metadata":113},"consumerTimings":{"create-missing-checksums":86,"duplicate-artifacts":929,"metadata-updater":263,"index-content":13,"create-archiva-metadata":11088},"totalFileCount":592,"newFileCount":592},{"managedRepository":{"id":"internal","name":"the Archiva Managed Internal Repository","layout":"default","indexDirectory":null,"location":"/Users/olamy/dev/tests/archiva-appserver-base-test/data/repositories/internal","snapshots":false,"releases":true,"blockRedeployments":true,"cronExpression":"0 */5 * * * ?","stagingRepository":null,"scanned":true,"daysOlder":30,"retentionCount":2,"deleteReleasedSnapshots":false,"stageRepoNeeded":false,"resetStats":false},"consumerCounts":{"create-missing-checksums":28,"duplicate-artifacts":28,"metadata-updater":28,"index-content":52,"create-archiva-metadata":28},"consumerTimings":{"create-missing-checksums":71,"duplicate-artifacts":4151,"metadata-updater":2645,"index-content":1,"create-archiva-metadata":3971},"totalFileCount":157,"newFileCount":157}]'; + var dataStr='[{"managedRepository":{"id":"snapshots","name":"Archiva Managed Snapshot Repository","layout":"default","indexDirectory":null,"location":"/Users/olamy/dev/tests/archiva-appserver-base-test/data/repositories/snapshots","snapshots":true,"releases":false,"blockRedeployments":false,"cronExpression":"0 0,30 * * * ?","stagingRepository":null,"scanned":true,"daysOlder":30,"retentionCount":2,"deleteReleasedSnapshots":false,"stageRepoNeeded":false,"resetStats":false},"consumerScanningStatistics":[{"consumerKey":"create-missing-checksums","count":83,"time":137},{"consumerKey":"metadata-updater","count":83,"time":192},{"consumerKey":"duplicate-artifacts","count":10,"time":2788},{"consumerKey":"index-content","count":134,"time":10},{"consumerKey":"create-archiva-metadata","count":82,"time":9399}],"totalFileCount":403,"newFileCount":403},{"managedRepository":{"id":"internal","name":"the Archiva Managed Internal Repository","layout":"default","indexDirectory":null,"location":"/Users/olamy/dev/tests/archiva-appserver-base-test/data/repositories/internal","snapshots":false,"releases":true,"blockRedeployments":true,"cronExpression":"0 */5 * * * ?","stagingRepository":null,"scanned":true,"daysOlder":30,"retentionCount":2,"deleteReleasedSnapshots":false,"stageRepoNeeded":false,"resetStats":false},"consumerScanningStatistics":[{"consumerKey":"create-missing-checksums","count":12,"time":2206},{"consumerKey":"metadata-updater","count":12,"time":1261},{"consumerKey":"duplicate-artifacts","count":12,"time":3461},{"consumerKey":"index-content","count":19,"time":0},{"consumerKey":"create-archiva-metadata","count":11,"time":3615}],"totalFileCount":58,"newFileCount":58}]'; var data= mapRepositoryScannerStatisticsList( $.parseJSON(dataStr)); $.log("size:"+data.length); mainContent.find("#status_scanning" ).html($("#status_scanning_tmpl").tmpl({repositoryScannerStatisticsList:data})); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html index a0a6edcc7..833b157d8 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html @@ -420,12 +420,13 @@ {{if repositoryScannerStatisticsList.length == 0}}

No scans in progress.

{{else}} - +
+ @@ -434,6 +435,30 @@ + {{/each}} -- 2.39.5
Repository Files processed New filesStats
${repositoryScannerStatistics.managedRepository.name()} ${repositoryScannerStatistics.totalFileCount} ${repositoryScannerStatistics.newFileCount} +
+ + + + + + + + + + + {{each(j,consumerScanningStatistics) repositoryScannerStatistics.consumerScanningStatisticsList}} + + + + + + + {{/each}} + +
NameTotalAverageInvocations
${consumerScanningStatistics.consumerKey}${consumerScanningStatistics.count}${consumerScanningStatistics.time}
+
+