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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
index f4dd2c9f400a8e735ea7831191e78ea7ddbfb320..2244f72e333cd94eae875eba370923bea3a237ad 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -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

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index 175c2243c9d25d191b9d284a7ac3cfe62a528d23..19a66eb06039bc64d72605c3c0b78155d6a7b16d 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -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 )
         {

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
index 353386972b16dc3afe424ca9ed25047d0a16dfae..688d465f9a97701c418ad1ddbd0a7e0624ed1682 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
@@ -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() );

diff --git a/pom.xml b/pom.xml
index 262928e483d549fed4ac0a4d634b340f2a6e0a44..340ba9d24bc9ad81230dafbea36788aa5853d824 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>