You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/11/29 17:14:04 UTC
svn commit: r1415235 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/
archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/
archiva-web/archiva-webapp-js/src/test...
Author: olamy
Date: Thu Nov 29 16:14:03 2012
New Revision: 1415235
URL: http://svn.apache.org/viewvc?rev=1415235&view=rev
Log:
indexer is now a maven library
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java (contents, props changed)
- copied, changed from r1415205, archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchPaginateTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java (from r1415205, archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.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?p2=archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java&r1=1415205&r2=1415235&rev=1415235&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java Thu Nov 29 16:14:03 2012
@@ -58,10 +58,10 @@ import java.util.Map;
import java.util.Set;
/**
- * RepositorySearch implementation which uses the Nexus Indexer for searching.
+ * RepositorySearch implementation which uses the Maven Indexer for searching.
*/
@Service ("nexusSearch")
-public class NexusRepositorySearch
+public class MavenRepositorySearch
implements RepositorySearch
{
private Logger log = LoggerFactory.getLogger( getClass() );
@@ -74,13 +74,13 @@ public class NexusRepositorySearch
private MavenIndexerUtils mavenIndexerUtils;
- protected NexusRepositorySearch()
+ protected MavenRepositorySearch()
{
// for test purpose
}
@Inject
- public NexusRepositorySearch( PlexusSisuBridge plexusSisuBridge, ManagedRepositoryAdmin managedRepositoryAdmin,
+ public MavenRepositorySearch( PlexusSisuBridge plexusSisuBridge, ManagedRepositoryAdmin managedRepositoryAdmin,
MavenIndexerUtils mavenIndexerUtils, ProxyConnectorAdmin proxyConnectorAdmin )
throws PlexusSisuBridgeException
{
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java?rev=1415235&r1=1415234&r2=1415235&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java Thu Nov 29 16:14:03 2012
@@ -67,7 +67,7 @@ public abstract class AbstractNexusRepos
public static String REPO_RELEASE = "repo-release";
- NexusRepositorySearch search;
+ MavenRepositorySearch search;
ArchivaConfiguration archivaConfig;
@@ -107,7 +107,7 @@ public abstract class AbstractNexusRepos
DefaultProxyConnectorAdmin defaultProxyConnectorAdmin = new DefaultProxyConnectorAdmin();
defaultProxyConnectorAdmin.setArchivaConfiguration( archivaConfig );
- search = new NexusRepositorySearch( plexusSisuBridge, defaultManagedRepositoryAdmin, mavenIndexerUtils,
+ search = new MavenRepositorySearch( plexusSisuBridge, defaultManagedRepositoryAdmin, mavenIndexerUtils,
defaultProxyConnectorAdmin );
nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchPaginateTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchPaginateTest.java?rev=1415235&r1=1415234&r2=1415235&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchPaginateTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchPaginateTest.java Thu Nov 29 16:14:03 2012
@@ -37,7 +37,7 @@ public class NexusRepositorySearchPagina
public void nonPaginatedResult()
throws Exception
{
- NexusRepositorySearch search = new NexusRepositorySearch();
+ MavenRepositorySearch search = new MavenRepositorySearch();
SearchResults searchResults = build( 10, new SearchResultLimits( 0 ) );
@@ -51,7 +51,7 @@ public class NexusRepositorySearchPagina
public void nonPaginatedHugeResult()
throws Exception
{
- NexusRepositorySearch search = new NexusRepositorySearch();
+ MavenRepositorySearch search = new MavenRepositorySearch();
SearchResults origSearchResults = build( 63, new SearchResultLimits( 0 ) );
@@ -71,7 +71,7 @@ public class NexusRepositorySearchPagina
public void paginatedResult()
throws Exception
{
- NexusRepositorySearch search = new NexusRepositorySearch();
+ MavenRepositorySearch search = new MavenRepositorySearch();
SearchResults searchResults = build( 32, new SearchResultLimits( 1 ) );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml?rev=1415235&r1=1415234&r2=1415235&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml Thu Nov 29 16:14:03 2012
@@ -26,7 +26,7 @@
</Console>
</appenders>
<loggers>
- <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch" level="info"/>
+ <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
<logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>