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/10 00:44:11 UTC
svn commit: r1299102 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/
archiva-web/archiva-rest/archiva-rest-api/
archiva-web/archiva-rest/archiva-rest-api/src/main/java/or...
Author: olamy
Date: Fri Mar 9 23:44:11 2012
New Revision: 1299102
URL: http://svn.apache.org/viewvc?rev=1299102&view=rev
Log:
add REST method to really scan repositories
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java Fri Mar 9 23:44:11 2012
@@ -19,18 +19,21 @@ package org.apache.archiva.repository.sc
* under the License.
*/
+import org.apache.archiva.admin.model.beans.ManagedRepository;
+import org.apache.commons.collections.CollectionUtils;
+
+import javax.xml.bind.annotation.XmlRootElement;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.commons.collections.CollectionUtils;
-
/**
* RepositoryScanStatistics - extension to the RepositoryContentStatistics model.
*
* @version $Id$
*/
+@XmlRootElement( name = "repositoryScanStatistics" )
public class RepositoryScanStatistics
{
private transient List<String> knownConsumers;
@@ -38,7 +41,7 @@ public class RepositoryScanStatistics
private transient List<String> invalidConsumers;
private transient long startTimestamp;
-
+
private SimpleDateFormat df = new SimpleDateFormat();
/**
@@ -49,7 +52,7 @@ public class RepositoryScanStatistics
/**
* Field whenGathered
*/
- private java.util.Date whenGathered;
+ private Date whenGathered;
/**
* Field duration
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java Fri Mar 9 23:44:11 2012
@@ -22,6 +22,7 @@ package org.apache.archiva.repository.sc
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
+import org.springframework.scheduling.annotation.Async;
import java.util.List;
import java.util.Set;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml Fri Mar 9 23:44:11 2012
@@ -51,6 +51,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-scanner</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.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/RepositoriesService.java?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java Fri Mar 9 23:44:11 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.rest.api.serv
* under the License.
*/
+import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.rest.api.model.Artifact;
import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
import org.apache.archiva.security.common.ArchivaRoleConstants;
@@ -45,11 +46,26 @@ public interface RepositoriesService
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_RUN_INDEXER )
+ /**
+ * index repository
+ */
Boolean scanRepository( @QueryParam( "repositoryId" ) String repositoryId,
@QueryParam( "fullScan" ) boolean fullScan )
throws ArchivaRestServiceException;
+ @Path( "scanRepositoryDirectories/{repositoryId}" )
+ @GET
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
+ @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_RUN_INDEXER )
+ /**
+ * scan directories
+ * @since 1.4-M3
+ */
+ RepositoryScanStatistics scanRepositoryDirectories( @PathParam( "repositoryId" ) String repositoryId )
+ throws ArchivaRestServiceException;
+
+
@Path( "alreadyScanning/{repositoryId}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Fri Mar 9 23:44:11 2012
@@ -74,6 +74,10 @@
<artifactId>archiva-repository-layer</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-scanner</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.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/DefaultRepositoriesService.java?rev=1299102&r1=1299101&r2=1299102&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java Fri Mar 9 23:44:11 2012
@@ -51,6 +51,9 @@ import org.apache.archiva.repository.met
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.RepositoryMetadataReader;
import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
+import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
+import org.apache.archiva.repository.scanner.RepositoryScanner;
+import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.archiva.rest.api.model.Artifact;
import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
@@ -146,6 +149,9 @@ public class DefaultRepositoriesService
@Inject
protected List<RepositoryListener> listeners = new ArrayList<RepositoryListener>();
+ @Inject
+ private RepositoryScanner repoScanner;
+
private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
public Boolean scanRepository( String repositoryId, boolean fullScan )
@@ -735,19 +741,19 @@ public class DefaultRepositoriesService
}
catch ( RepositoryException e )
{
- throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 400 );
+ throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500 );
}
catch ( MetadataResolutionException e )
{
- throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 400 );
+ throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500 );
}
catch ( MetadataRepositoryException e )
{
- throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 400 );
+ throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500 );
}
catch ( RepositoryAdminException e )
{
- throw new ArchivaRestServiceException( "RepositoryAdmin exception: " + e.getMessage(), 400 );
+ throw new ArchivaRestServiceException( "RepositoryAdmin exception: " + e.getMessage(), 500 );
}
finally
@@ -757,6 +763,25 @@ public class DefaultRepositoriesService
return Boolean.TRUE;
}
+ public RepositoryScanStatistics scanRepositoryDirectories( String repositoryId )
+ throws ArchivaRestServiceException
+ {
+ long sinceWhen = RepositoryScanner.FRESH_SCAN;
+ try
+ {
+ return repoScanner.scan( getManagedRepositoryAdmin().getManagedRepository( repositoryId ), sinceWhen );
+ }
+ catch ( RepositoryScannerException e )
+ {
+ log.error( e.getMessage(), e );
+ throw new ArchivaRestServiceException( "RepositoryScannerException exception: " + e.getMessage(), 500 );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ log.error( e.getMessage(), e );
+ throw new ArchivaRestServiceException( "RepositoryScannerException exception: " + e.getMessage(), 500 );
+ }
+ }
/**
* Update artifact level metadata. Creates one if metadata does not exist after artifact deletion.