Skip to content

Commit

Permalink
Got fcrepo-jms further towards passing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajs6f
ajs6f committed Feb 8, 2013
1 parent 21ae48d commit 9333f76
Show file tree
Hide file tree
Showing 15 changed files with 439 additions and 348 deletions.
4 changes: 2 additions & 2 deletions ...n/java/org/fcrepo/indexer/DublinCore.java → ...java/org/fcrepo/generator/DublinCore.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer;
package org.fcrepo.generator;

import static javax.ws.rs.core.MediaType.TEXT_XML;
import static javax.ws.rs.core.Response.ok;
Expand All @@ -17,7 +17,7 @@
import javax.ws.rs.core.Response;

import org.fcrepo.AbstractResource;
import org.fcrepo.indexer.dublincore.AbstractIndexer;
import org.fcrepo.generator.dublincore.AbstractIndexer;

@Path("/objects/{pid}")
public class DublinCore extends AbstractResource {
Expand Down
2 changes: 1 addition & 1 deletion ...o/indexer/dublincore/AbstractIndexer.java → ...generator/dublincore/AbstractIndexer.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer.dublincore;
package org.fcrepo.generator.dublincore;


import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...er/dublincore/IndexFromJcrProperties.java → ...or/dublincore/IndexFromJcrProperties.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer.dublincore;
package org.fcrepo.generator.dublincore;

import javax.jcr.*;
import java.io.ByteArrayInputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...er/dublincore/IndexFromWellKnownPath.java → ...or/dublincore/IndexFromWellKnownPath.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer.dublincore;
package org.fcrepo.generator.dublincore;

import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
Expand Down
2 changes: 1 addition & 1 deletion .../indexer/dublincore/WorstCaseIndexer.java → ...enerator/dublincore/WorstCaseIndexer.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer.dublincore;
package org.fcrepo.generator.dublincore;

import javax.jcr.Node;
import java.io.ByteArrayInputStream;
Expand Down
23 changes: 23 additions & 0 deletions fcrepo-dc/src/main/resources/META-INF/spring/generator.xml
View file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">


<context:annotation-config/>



<util:list value-type="org.fcrepo.generator.dublincore.AbstractIndexer">
<bean class="org.fcrepo.generator.dublincore.IndexFromWellKnownPath">
<property name="wellKnownPath" value="DC"/>
</bean>
<bean class="org.fcrepo.generator.dublincore.IndexFromJcrProperties"/>
</util:list>

</beans>
32 changes: 0 additions & 32 deletions fcrepo-dc/src/main/resources/META-INF/spring/indexer.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...va/org/fcrepo/indexer/DublinCoreTest.java → .../org/fcrepo/generator/DublinCoreTest.java
View file
@@ -1,4 +1,4 @@
package org.fcrepo.indexer;
package org.fcrepo.generator;

import static java.util.regex.Pattern.DOTALL;
import static java.util.regex.Pattern.compile;
Expand Down
100 changes: 54 additions & 46 deletions fcrepo-jms/pom.xml
View file
@@ -1,50 +1,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>fcrepo-jms</artifactId>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>fcrepo-jms</artifactId>

<dependencies>
<dependencies>

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
</dependencies>
</project>
26 changes: 26 additions & 0 deletions fcrepo-jms/src/main/resources/META-INF/spring/jms.xml
View file
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">

<!-- Context that suports JMS publication-->

<context:annotation-config/>

<!-- publishes events from the internal bus to JMS, in Atom format -->
<bean class="org.fcrepo.observer.JMSTopicAtomPublisher"/>

<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
depends-on="jmsBroker">
<property name="brokerURL" value="vm://localhost?create=false"/>
</bean>

<bean name="jmsBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
<property name="config" value="classpath:/META-INF/spring/activemq.xml"/>
<property name="start" value="true"/>
</bean>

</beans>
3 changes: 2 additions & 1 deletion fcrepo-jms/src/test/java/org/fcrepo/modeshape/observer/AtomJMSTest.java
View file
Expand Up @@ -33,7 +33,8 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({ "/spring-test/eventing.xml", "/spring-test/repo.xml" })
@ContextConfiguration({ "/spring-test/jms.xml",
"/META-INF/spring-test/master.xml" })
public class AtomJMSTest implements MessageListener {

@Inject
Expand Down
22 changes: 22 additions & 0 deletions fcrepo-jms/src/test/resources/logback.xml
View file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE configuration>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%p %d{HH:mm:ss.SSS} \(%c{0}\) %m%n</pattern>
</encoder>
</appender>

<logger name="org.fcrepo" additivity="false" level="DEBUG">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.modeshape" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.springframework" additivity="false" level="DEBUG">
<appender-ref ref="STDOUT"/>
</logger>
<root additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</configuration>
26 changes: 26 additions & 0 deletions fcrepo-jms/src/test/resources/spring-test/jms.xml
View file
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">

<!-- Context that suports JMS publication-->

<context:annotation-config/>

<!-- publishes events from the internal bus to JMS, in Atom format -->
<bean class="org.fcrepo.observer.JMSTopicAtomPublisher"/>

<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
depends-on="jmsBroker">
<property name="brokerURL" value="vm://localhost?create=false"/>
</bean>

<bean name="jmsBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
<property name="config" value="classpath:/spring/activemq.xml"/>
<property name="start" value="true"/>
</bean>

</beans>

0 comments on commit 9333f76

Please sign in to comment.