Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to last versions of quartz and ehcache 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1158469 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-08-16 23:03:30 +00:00
parent fb8ff53c01
commit 9357da09d3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
View File

@ -180,7 +180,7 @@ public class MetadataUpdaterConsumer
public void processFile( String path )
throws ConsumerException
{
// Ignore paths like .indexer etc
// Ignore paths like .index etc
if ( !path.startsWith( "." ) )
{
try

10
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -113,10 +113,10 @@ public class ArchivaIndexingTaskExecutor
&& indexingTask.isExecuteOnEntireRepo() )
{
// TODO update or not !!
// do the full scan
// olamy currently do the full scan
try
{
nexusIndexer.scan( context );
nexusIndexer.scan( context, null, false );
}
catch ( IOException e )
{
@ -188,11 +188,8 @@ public class ArchivaIndexingTaskExecutor
FlatSearchRequest flatSearchRequest = new FlatSearchRequest( q, context );
FlatSearchResponse flatSearchResponse = nexusIndexer.searchFlat( flatSearchRequest );
if ( flatSearchResponse.getResults().isEmpty() )
//if ( d.totalHits == 0 )
{
log.debug( "Adding artifact '{}' to index..", ac.getArtifactInfo() );
//indexerEngine.index( context, ac );
//context.getIndexWriter().commit();
nexusIndexer.addArtifactToIndex( ac, context );
}
else
@ -244,14 +241,17 @@ public class ArchivaIndexingTaskExecutor
{
try
{
context.optimize();
File managedRepository = new File( repository.getLocation() );
final File indexLocation = new File( managedRepository, ".index" );
IndexPackingRequest request = new IndexPackingRequest( context, indexLocation );
indexPacker.packIndex( request );
log.debug( "Index file packaged at '{}'.", indexLocation.getPath() );
}
catch ( IOException e )
{

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
View File

@ -185,7 +185,7 @@ public class ArtifactIndexingTask
}
context = indexer.addIndexingContext( repository.getId(), repository.getId(), managedRepository, indexDirectory,
managedRepository.toURI().toURL().toString(),
managedRepository.toURI().toURL().toExternalForm(),
indexDirectory.toURI().toURL().toString(), indexCreators );
context.setSearchable( repository.isScanned() );

4
pom.xml
View File

@ -660,7 +660,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
@ -1140,7 +1140,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.4.2</version>
<version>2.4.3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>