Fix kitchen-sink build

Resolves: https://www.pivotaltracker.com/story/show/61874624
fcrepo4-archive · Dec 6, 2013 · 8bcd421 · 8bcd421
1 parent 5e8b1e7
commit 8bcd421
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,6 @@ ObjectStore/
 bin/
 bin-debug/
 bin-release/
+overlays/
+fcrepo4-data/
+*~
diff --git a/src/main/java/org/fcrepo/webdav/FedoraContentMapper.java b/src/main/java/org/fcrepo/webdav/FedoraContentMapper.java
@@ -245,7 +245,7 @@ public long setContent(Node parentNode, String resourceName,
 
         Datastream ds = new Datastream(parentNode);
         try {
-            ds.setContent(newContent, contentType, null, null);
+            ds.setContent(newContent, contentType, null, null, null);
         } catch (InvalidChecksumException e) {
             throw new RepositoryException(e.getMessage(), e);
         }

diff --git a/src/main/resources/spring/atom_jms.xml b/src/main/resources/spring/atom_jms.xml
@@ -1,11 +1,21 @@
 <?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:p="http://www.springframework.org/schema/p"
+       xmlns:amq="http://activemq.apache.org/schema/core"
        xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+    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
+    http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
+  <context:annotation-config/>
 
-  <import resource="classpath:/spring/jms.xml"/>
+  <!-- publishes events from the internal bus to JMS, in Atom format -->
+  <bean class="org.fcrepo.jms.observer.JMSTopicPublisher"/>
+
+  <amq:connectionFactory id="connectionFactory"
+                         brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false&amp;broker.enableStatistics=false"/>
 
   <!-- translates events from the internal bus to JMS, in Atom format -->
   <bean class="org.fcrepo.jms.legacy.LegacyMethodEventFactory" />