Author: olamy
Date: Tue Aug 16 23:03:30 2011
New Revision: 1158469
URL: http://svn.apache.org/viewvc?rev=1158469&view=rev
Log:
upgrade to last versions of quartz and ehcache
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1158469&r1=1158468&r2=1158469&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
Tue Aug 16 23:03:30 2011
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1158469&r1=1158468&r2=1158469&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Tue Aug 16 23:03:30 2011
@@ -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 )
{
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java?rev=1158469&r1=1158468&r2=1158469&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
Tue Aug 16 23:03:30 2011
@@ -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() );
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1158469&r1=1158468&r2=1158469&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Aug 16 23:03:30 2011
@@ -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>
