Skip to content
This repository has been archived by the owner on Jan 3, 2019. It is now read-only.

Commit

Permalink
Update test wiring to enable integration tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Woods committed Aug 19, 2013
1 parent 40e6bdd commit b858b8a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
14 changes: 9 additions & 5 deletions pom.xml
View file
Expand Up @@ -6,12 +6,11 @@

<groupId>fcrepo-jms-indexer-pluggable</groupId>
<artifactId>fcrepo-jms-indexer-pluggable</artifactId>
<version>4.0-SNAPSHOT</version>

<parent>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo</artifactId>
<version>4.0-SNAPSHOT</version>
<version>4.0.0-alpha-2-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -150,19 +149,24 @@
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-legacy-api</artifactId>
<version>4.0-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>4.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-jms</artifactId>
<version>4.0-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/spring-test/eventing.xml
View file
Expand Up @@ -12,10 +12,10 @@
<context:annotation-config/>

<!-- listener that moves JCR Events to the Fedora internal event bus -->
<bean class="org.fcrepo.observer.SimpleObserver"/>
<bean class="org.fcrepo.kernel.observer.SimpleObserver"/>

<!-- used by bean above to filter which events get put on the bus -->
<bean name="fedoraEventFilter" class="org.fcrepo.observer.DefaultFilter"/>
<bean name="fedoraEventFilter" class="org.fcrepo.kernel.observer.DefaultFilter"/>

<!-- Fedora's lightweight internal event bus. Currently memory-resident.-->
<bean name="fedoraInternalEventBus" class="com.google.common.eventbus.EventBus"/>
Expand Down
8 changes: 1 addition & 7 deletions src/test/resources/spring-test/indexer.xml
View file
Expand Up @@ -20,12 +20,6 @@
<constructor-arg value="fedora" />
</bean>

<!-- fcrepo 4 repository to retrieve metadata from -->
<bean class="org.fcrepo.indexer.RepositoryProfile">
<property name="repositoryURL" value="http://localhost:${test.port:8080}/res
t" />
</bean>

<!-- sparql-update indexer -->
<!--
<bean id="sparqlUpdate" class="org.fcrepo.indexer.sparql.SparqlUpdateIndexer">
Expand All @@ -41,7 +35,7 @@ t" />
</bean>

<!-- Message Driven POJO (MDP) that manages individual indexers -->
<bean id="indexerGroup" class="org.fcrepo.indexer.solr.IndexerGroup">
<bean id="indexerGroup" class="org.fcrepo.indexer.IndexerGroup">
<property name="repositoryURL" value="http://localhost:${test.port:8080}/rest" />
<property name="indexers">
<set>
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/spring-test/jms.xml
View file
Expand Up @@ -11,10 +11,10 @@
<context:annotation-config/>

<!-- publishes events from the internal bus to JMS -->
<bean class="org.fcrepo.observer.JMSTopicPublisher"/>
<bean class="org.fcrepo.jms.observer.JMSTopicPublisher"/>

<!-- translates events from the internal bus to JMS, in Atom format -->
<bean class="org.fcrepo.messaging.legacy.LegacyMethodEventFactory" />
<bean class="org.fcrepo.jms.legacy.LegacyMethodEventFactory" />


<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
Expand Down
13 changes: 4 additions & 9 deletions src/test/resources/spring-test/repo.xml
View file
Expand Up @@ -10,16 +10,11 @@

<context:annotation-config/>

<bean name="modeshapeRepofactory" class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean">
<property name="repositoryConfiguration"
value="${fcrepo.modeshape.configuration:config/test_repository.json}"/>
</bean>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.springframework.core.io.ClassPathResource">
<qualifier type="ModeShapeRepositoryConfiguration"/>
<constructor-arg type="String" value="config/test_repository.json"/>
</bean>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.DatastreamService"/>

</beans>

0 comments on commit b858b8a

Please sign in to comment.