Author: olamy
Date: Thu Nov 3 14:30:36 2011
New Revision: 1197141
URL: http://svn.apache.org/viewvc?rev=1197141&view=rev
Log:
fix tests in archiva-lucene-consumers
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRepositorySessionFactory.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=1197141&r1=1197140&r2=1197141&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
Thu Nov 3 14:30:36 2011
@@ -84,6 +84,22 @@
<artifactId>archiva-repository-admin-default</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-jcr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=1197141&r1=1197140&r2=1197141&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
Thu Nov 3 14:30:36 2011
@@ -46,6 +46,7 @@ import org.springframework.stereotype.Se
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -81,12 +82,13 @@ public class NexusIndexerConsumer
private List<? extends IndexCreator> allIndexCreators;
- @Inject
private ManagedRepositoryAdmin managedRepositoryAdmin;
- public NexusIndexerConsumer( ArchivaTaskScheduler<ArtifactIndexingTask>
scheduler,
- ArchivaConfiguration configuration, FileTypes
filetypes,
- PlexusSisuBridge plexusSisuBridge,
MavenIndexerUtils mavenIndexerUtils )
+ @Inject
+ public NexusIndexerConsumer(
+ @Named( value = "archivaTaskScheduler#indexing" )
ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
+ @Named(value = "archivaConfiguration") ArchivaConfiguration
configuration, FileTypes filetypes, PlexusSisuBridge plexusSisuBridge,
+ MavenIndexerUtils mavenIndexerUtils, ManagedRepositoryAdmin
managedRepositoryAdmin )
throws PlexusSisuBridgeException
{
this.configuration = configuration;
@@ -94,6 +96,7 @@ public class NexusIndexerConsumer
this.scheduler = scheduler;
this.nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
this.allIndexCreators = mavenIndexerUtils.getAllIndexCreators();
+ this.managedRepositoryAdmin = managedRepositoryAdmin;
}
public String getDescription()
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml?rev=1197141&r1=1197140&r2=1197141&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
Thu Nov 3 14:30:36 2011
@@ -27,15 +27,14 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
default-lazy-init="true">
- <bean id="indexerConsumer"
class="org.apache.archiva.consumers.lucene.NexusIndexerConsumer"
lazy-init="true">
- <constructor-arg ref="archivaTaskScheduler#indexing"/>
- <constructor-arg ref="archivaConfiguration"/>
- <constructor-arg ref="fileTypes"/>
- <constructor-arg ref="plexusSisuBridge"/>
- <constructor-arg ref="mavenIndexerUtils"/>
- </bean>
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.archiva.consumers.lucene"/>
- <bean id="logger"
class="org.apache.archiva.common.utils.Slf4JPlexusLogger">
- <constructor-arg
type="java.lang.Class"><value>org.sonatype.nexus.index.DefaultNexusIndexer</value></constructor-arg>
- </bean>
+ <alias name="knownRepositoryContentConsumer#index-content"
alias="indexerConsumer"/>
+
+ <bean id="logger" class="org.apache.archiva.common.utils.Slf4JPlexusLogger">
+ <constructor-arg type="java.lang.Class">
+ <value>org.apache.maven.index.DefaultNexusIndexer</value>
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=1197141&r1=1197140&r2=1197141&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
Thu Nov 3 14:30:36 2011
@@ -21,14 +21,14 @@ package org.apache.archiva.consumers.luc
import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
+import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
import org.apache.commons.io.FileUtils;
-import org.apache.archiva.configuration.ArchivaConfiguration;
-import org.apache.archiva.configuration.FileTypes;
-import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.junit.After;
import org.junit.Before;
@@ -85,7 +85,7 @@ public class NexusIndexerConsumerTest
}
}
- private KnownRepositoryContentConsumer nexusIndexerConsumer;
+ private NexusIndexerConsumer nexusIndexerConsumer;
private ManagedRepository repositoryConfig;
@@ -100,6 +100,9 @@ public class NexusIndexerConsumerTest
@Inject
private MavenIndexerUtils mavenIndexerUtils;
+ @Inject
+ private ManagedRepositoryAdmin managedRepositoryAdmin;
+
@Override
@Before
@@ -115,7 +118,8 @@ public class NexusIndexerConsumerTest
FileTypes filetypes = applicationContext.getBean( FileTypes.class );
nexusIndexerConsumer =
- new NexusIndexerConsumer( scheduler, configuration, filetypes,
plexusSisuBridge, mavenIndexerUtils );
+ new NexusIndexerConsumer( scheduler, configuration, filetypes,
plexusSisuBridge, mavenIndexerUtils,
+ managedRepositoryAdmin );
// initialize to set the file types to be processed
( (NexusIndexerConsumer) nexusIndexerConsumer ).initialize();
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml?rev=1197141&r1=1197140&r2=1197141&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
Thu Nov 3 14:30:36 2011
@@ -59,4 +59,13 @@
<alias name="roleManager#test" alias="roleManager"/>
+ <bean id="jcr-config"
class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig"
factory-method="create">
+ <constructor-arg value="${appserver.base}/conf/repository.xml"/>
+ <constructor-arg value="${appserver.base}/data/jcr"/>
+ </bean>
+
+ <bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown" lazy-init="true">
+ <constructor-arg ref="jcr-config"/>
+ </bean>
+
</beans>
\ No newline at end of file
