Author: olamy
Date: Mon Mar 12 16:41:57 2012
New Revision: 1299734
URL: http://svn.apache.org/viewvc?rev=1299734&view=rev
Log:
more human readable format for the last scan date
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.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-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.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/ArchivaRepositoryStatistics.java?rev=1299734&r1=1299733&r2=1299734&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
Mon Mar 12 16:41:57 2012
@@ -48,6 +48,8 @@ public class ArchivaRepositoryStatistics
private long duration;
+ private String lastScanDate;
+
public ArchivaRepositoryStatistics()
{
// no op
@@ -143,6 +145,16 @@ public class ArchivaRepositoryStatistics
return duration;
}
+ public String getLastScanDate()
+ {
+ return lastScanDate;
+ }
+
+ public void setLastScanDate( String lastScanDate )
+ {
+ this.lastScanDate = lastScanDate;
+ }
+
@Override
public String toString()
{
@@ -156,6 +168,8 @@ public class ArchivaRepositoryStatistics
sb.append( ", totalGroupCount=" ).append( totalGroupCount );
sb.append( ", totalProjectCount=" ).append( totalProjectCount );
sb.append( ", newFileCount=" ).append( newFileCount );
+ sb.append( ", duration=" ).append( duration );
+ sb.append( ", lastScanDate='" ).append( lastScanDate ).append( '\'' );
sb.append( '}' );
return sb.toString();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.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/services/ManagedRepositoriesService.java?rev=1299734&r1=1299733&r2=1299734&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java
Mon Mar 12 16:41:57 2012
@@ -91,19 +91,20 @@ public interface ManagedRepositoriesServ
Boolean fileLocationExists( @QueryParam( "fileLocation" ) String
fileLocation )
throws ArchivaRestServiceException;
- @Path( "getManagedRepositoryStatistics/{repositoryId}" )
+ @Path( "getManagedRepositoryStatistics/{repositoryId}/{lang}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
/**
* @since 1.4-M3
*/
- ArchivaRepositoryStatistics getManagedRepositoryStatistics( @PathParam(
"repositoryId" ) String repositoryId )
+ ArchivaRepositoryStatistics getManagedRepositoryStatistics( @PathParam(
"repositoryId" ) String repositoryId,
+ @PathParam(
"lang" ) String lang )
throws ArchivaRestServiceException;
@Path( "getPomSnippet/{repositoryId}" )
@GET
- @Produces( { MediaType.TEXT_PLAIN} )
+ @Produces( { MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
/**
* return a pom snippet to use this repository with entities escaped (< > )
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=1299734&r1=1299733&r2=1299734&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 16:41:57 2012
@@ -23,11 +23,9 @@ import org.apache.archiva.admin.model.Re
import org.apache.archiva.admin.model.RepositoryCommonValidator;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
import
org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.rest.api.model.ArchivaRepositoryStatistics;
@@ -38,10 +36,11 @@ import org.apache.commons.lang.StringUti
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import javax.inject.Named;
import java.io.File;
+import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
/**
* @author Olivier Lamy
@@ -153,10 +152,11 @@ public class DefaultManagedRepositoriesS
return new File( location ).exists();
}
- public ArchivaRepositoryStatistics getManagedRepositoryStatistics( String
repositoryId )
+ public ArchivaRepositoryStatistics getManagedRepositoryStatistics( String
repositoryId, String lang )
throws ArchivaRestServiceException
{
RepositorySession repositorySession =
repositorySessionFactory.createSession();
+ SimpleDateFormat sdf = new SimpleDateFormat( "EEE, d MMM yyyy HH:mm:ss
Z", new Locale( lang ) );
try
{
MetadataRepository metadataRepository =
repositorySession.getRepository();
@@ -176,6 +176,8 @@ public class DefaultManagedRepositoriesS
new BeanReplicator().replicateBean( stats,
ArchivaRepositoryStatistics.class );
archivaRepositoryStatistics.setDuration(
archivaRepositoryStatistics.getScanEndTime().getTime()
-
archivaRepositoryStatistics.getScanStartTime().getTime() );
+ archivaRepositoryStatistics.setLastScanDate(
+ sdf.format( archivaRepositoryStatistics.getScanEndTime() )
);
return archivaRepositoryStatistics;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1299734&r1=1299733&r2=1299734&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Mon Mar 12 16:41:57 2012
@@ -106,6 +106,10 @@ $(function() {
displaySystemStatus();
return;
}
+ if (screen=='repositories-management'&&
hasKarma('archiva-manage-configuration')){
+ displayRepositoriesGrid();
+ return;
+ }
}
// by default display search screen
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1299734&r1=1299733&r2=1299734&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Mon Mar 12 16:41:57 2012
@@ -109,7 +109,7 @@ $(function() {
}
ArchivaRepositoryStatistics=function(scanEndTime,scanStartTime,totalArtifactCount,totalArtifactFileSize,totalFileCount,
-
totalGroupCount,totalProjectCount,newFileCount,duration,managedRepository){
+
totalGroupCount,totalProjectCount,newFileCount,duration,managedRepository,lastScanDate){
//private Date scanEndTime;
this.scanEndTime = ko.observable(scanEndTime);
@@ -137,6 +137,8 @@ $(function() {
this.duration = ko.observable(duration);
this.managedRepository = managedRepository;
+
+ this.lastScanDate=ko.observable(lastScanDate);
}
mapManagedRepositories=function(data){
@@ -162,7 +164,7 @@ $(function() {
}
return new
ArchivaRepositoryStatistics(data.scanEndTime,data.scanStartTime,data.totalArtifactCount,data.totalArtifactFileSize,
data.totalFileCount,data.totalGroupCount,data.totalProjectCount,data.newFileCount,
-
data.duration,data.managedRepository)
+
data.duration,data.managedRepository,data.lastScanDate)
}
ManagedRepositoryViewModel=function(managedRepository, update,
managedRepositoriesViewModel){
@@ -421,6 +423,7 @@ $(function() {
}
var curRepo=managedRepository;
var url =
"restServices/archivaServices/managedRepositoriesService/getManagedRepositoryStatistics/"+managedRepository.id();
+ url+="/"+encodeURIComponent(usedLang());
$.ajax(url,
{
type: "GET",
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1299734&r1=1299733&r2=1299734&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Mon Mar 12 16:41:57 2012
@@ -287,7 +287,7 @@
</script>
<script id="managed-repository-stats-tmpl" type='text/x-jquery-tmpl'>
<div id="managedrepository-stats-${managedRepository.id()}-popover"
style="display:none">
- <div>${$.i18n.prop('managedrepository.stats.endTime')}:
${scanEndTime()}</div>
+ <div>${$.i18n.prop('managedrepository.stats.endTime')}:
${lastScanDate()}</div>
<div>${$.i18n.prop('managedrepository.stats.duration')}:
${duration()}ms</div>
<div>${$.i18n.prop('managedrepository.stats.totalFileCount')}:
${totalFileCount()}</div>
<div>${$.i18n.prop('managedrepository.stats.newFileCount')}:
${newFileCount()}</div>
