Author: olamy
Date: Wed Feb 6 21:22:04 2013
New Revision: 1443220
URL: http://svn.apache.org/viewvc?rev=1443220&view=rev
Log:
remove duplicate code with using exposed method
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java?rev=1443220&r1=1443219&r2=1443220&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
Wed Feb 6 21:22:04 2013
@@ -60,7 +60,7 @@ import java.util.Set;
/**
* RepositorySearch implementation which uses the Maven Indexer for searching.
*/
-@Service ("repositorySearch#maven")
+@Service("repositorySearch#maven")
public class MavenRepositorySearch
implements RepositorySearch
{
@@ -338,37 +338,8 @@ public class MavenRepositorySearch
if ( repoConfig != null )
{
- String indexDir = repoConfig.getIndexDirectory();
- File indexDirectory = null;
- if ( indexDir != null && !"".equals( indexDir ) )
- {
- indexDirectory = new File(
repoConfig.getIndexDirectory() );
- if ( !indexDirectory.isAbsolute() )
- {
- indexDirectory = new File(
repoConfig.getLocation(), repoConfig.getIndexDirectory() );
- }
- }
- else
- {
- indexDirectory = new File( repoConfig.getLocation(),
".indexer" );
- }
-
- IndexingContext context =
indexer.getIndexingContexts().get( repoConfig.getId() );
- if ( context != null )
- {
- // alreday here so no need to record it again
- log.debug( "index with id {} already exists skip
adding it", repoConfig.getId() );
- // set searchable flag
- context.setSearchable( repoConfig.isScanned() );
- indexingContextIds.add( context.getId() );
- indexingContextIds.addAll(
getRemoteIndexingContextIds( repo ) );
- continue;
- }
- context = indexer.addIndexingContext( repoConfig.getId(),
repoConfig.getId(),
- new File(
repoConfig.getLocation() ), indexDirectory, null,
- null,
getAllIndexCreators() );
- context.setSearchable( repoConfig.isScanned() );
+ IndexingContext context =
managedRepositoryAdmin.createIndexContext( repoConfig );
if ( context.isSearchable() )
{
indexingContextIds.addAll(
getRemoteIndexingContextIds( repo ) );
@@ -382,23 +353,23 @@ public class MavenRepositorySearch
}
else
{
- log.warn( "Repository '" + repo + "' not found in
configuration." );
+ log.warn( "Repository '{}' not found in configuration.",
repo );
}
}
catch ( UnsupportedExistingLuceneIndexException e )
{
- log.warn( "Error accessing index of repository '" + repo + "'
: " + e.getMessage() );
+ log.warn( "Error accessing index of repository '{}' : {}",
repo, e.getMessage() );
continue;
}
catch ( IOException e )
{
- log.warn( "IO error occured while accessing index of
repository '" + repo + "' : " + e.getMessage() );
+ log.warn( "IO error occured while accessing index of
repository '{}' : {}", repo, e.getMessage() );
continue;
}
catch ( RepositoryAdminException e )
{
- log.warn( "RepositoryAdminException occured while accessing
index of repository '" + repo + "' : "
- + e.getMessage() );
+ log.warn( "RepositoryAdminException occured while accessing
index of repository '{}' : {}", repo,
+ e.getMessage() );
continue;
}
}
