svn commit: r1443259 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java

[olamy]

Author: olamy
Date: Wed Feb  6 22:49:40 2013
New Revision: 1443259

URL: http://svn.apache.org/viewvc?rev=1443259&view=rev
Log:
fix issue when creating repository with relative path index used a wrong 
repository directory

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1443259&r1=1443258&r2=1443259&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 Wed Feb  6 22:49:40 2013
@@ -588,7 +588,7 @@ public class DefaultManagedRepositoryAdm
 
         if ( context != null )
         {
-            log.debug( "skip adding repository indexingContent with id {} as 
already exists", repository.getId() );
+            log.debug( "skip creating repository indexingContent with id {} as 
already exists", repository.getId() );
             return context;
         }
 
@@ -610,10 +610,8 @@ public class DefaultManagedRepositoryAdm
         try
         {
 
-
-
             String indexDir = repository.getIndexDirectory();
-            File managedRepository = new File( repository.getLocation() );
+            //File managedRepository = new File( repository.getLocation() );
 
             File indexDirectory = null;
             if ( StringUtils.isNotBlank( indexDir ) )
@@ -622,14 +620,14 @@ public class DefaultManagedRepositoryAdm
                 // not absolute so create it in repository directory
                 if ( !indexDirectory.isAbsolute() )
                 {
-                    indexDirectory = new File( managedRepository, 
repository.getIndexDirectory() );
+                    indexDirectory = new File( repositoryDirectory, 
repository.getIndexDirectory() );
                     repository.setIndexDirectory( 
indexDirectory.getAbsolutePath() );
                 }
             }
             else
             {
-                indexDirectory = new File( managedRepository, ".indexer" );
-                if ( !managedRepository.isAbsolute() )
+                indexDirectory = new File( repositoryDirectory, ".indexer" );
+                if ( !repositoryDirectory.isAbsolute() )
                 {
                     indexDirectory = new File( repositoryDirectory, ".indexer" 
);
                     repository.setIndexDirectory( 
indexDirectory.getAbsolutePath() );
@@ -645,9 +643,9 @@ public class DefaultManagedRepositoryAdm
 
             if ( context == null )
             {
-                context = indexer.addIndexingContext( repository.getId(), 
repository.getId(), managedRepository,
+                context = indexer.addIndexingContext( repository.getId(), 
repository.getId(), repositoryDirectory,
                                                       indexDirectory,
-                                                      
managedRepository.toURI().toURL().toExternalForm(),
+                                                      
repositoryDirectory.toURI().toURL().toExternalForm(),
                                                       
indexDirectory.toURI().toURL().toString(), indexCreators );
 
                 context.setSearchable( repository.isScanned() );