Author: olamy
Date: Mon Mar 12 22:25:42 2012
New Revision: 1299906
URL: http://svn.apache.org/viewvc?rev=1299906&view=rev
Log:
cleanup commented code
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java?rev=1299906&r1=1299905&r2=1299906&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RepositoryScannerStatistics.java
Mon Mar 12 22:25:42 2012
@@ -33,8 +33,6 @@ public class RepositoryScannerStatistics
{
private ManagedRepository managedRepository;
- //private RepositoryScanStatistics repositoryScanStatistics;
-
private List<ConsumerScanningStatistics> 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<String, Long> getConsumerCounts()
- {
- return consumerCounts;
- }
-
- public void setConsumerCounts( Map<String, Long> consumerCounts )
- {
- this.consumerCounts = consumerCounts;
- }
-
- public Map<String, Long> getConsumerTimings()
- {
- return consumerTimings;
- }
-
- public void setConsumerTimings( Map<String, Long> consumerTimings )
- {
- this.consumerTimings = consumerTimings;
- } */
-
public List<ConsumerScanningStatistics> getConsumerScanningStatistics()
{
return consumerScanningStatistics;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.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/DefaultManagedRepositoriesService.java?rev=1299906&r1=1299905&r2=1299906&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
Mon Mar 12 22:25:42 2012
@@ -184,7 +184,10 @@ public class DefaultManagedRepositoriesS
}
finally
{
- repositorySession.close();
+ if ( repositorySession != null )
+ {
+ repositorySession.close();
+ }
}
return null;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.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/DefaultSystemStatusService.java?rev=1299906&r1=1299905&r2=1299906&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
Mon Mar 12 22:25:42 2012
@@ -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<String, Long>( instance.getConsumerCounts() ) );
- //repositoryScannerStatistics.setConsumerTimings(
- // new HashMap<String, Long>( instance.getConsumerTimings() ) );
repositoryScannerStatistics.setNewFileCount(
instance.getStats().getNewFileCount() );
repositoryScannerStatistics.setTotalFileCount(
instance.getStats().getTotalFileCount() );
repositoryScannerStatistics.setConsumerScanningStatistics(
mapConsumerScanningStatistics( instance ) );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1299906&r1=1299905&r2=1299906&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Mon Mar 12 22:25:42 2012
@@ -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,"locati
on":"/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}));
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html?rev=1299906&r1=1299905&r2=1299906&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Mon Mar 12 22:25:42 2012
@@ -420,12 +420,13 @@
{{if repositoryScannerStatisticsList.length == 0}}
<p>No scans in progress.</p>
{{else}}
- <table>
+ <table class="table table-condensed">
<thead>
<tr>
<th>Repository</th>
<th>Files processed</th>
<th>New files</th>
+ <th>Stats</th>
</tr>
</thead>
<tbody>
@@ -434,6 +435,30 @@
<td>${repositoryScannerStatistics.managedRepository.name()}</td>
<td>${repositoryScannerStatistics.totalFileCount}</td>
<td>${repositoryScannerStatistics.newFileCount}</td>
+ <td>
+ <blockquote>
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Total</th>
+ <th>Average</th>
+ <th>Invocations</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{each(j,consumerScanningStatistics)
repositoryScannerStatistics.consumerScanningStatisticsList}}
+ <tr>
+ <td>${consumerScanningStatistics.consumerKey}</td>
+ <td>${consumerScanningStatistics.count}</td>
+ <td></td>
+ <td>${consumerScanningStatistics.time}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ </blockquote>
+ </td>
</tr>
{{/each}}
</tbody>
