explicitly load spring configuration. wire in the legacy atom seriali…

…zation
fcrepo4-archive · Jun 11, 2013 · a28ac73 · a28ac73
1 parent 40d9405
commit a28ac73
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,10 @@
       <artifactId>fcrepo-webhooks</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.sun.jersey.contribs</groupId>
       <artifactId>jersey-spring</artifactId>
@@ -136,6 +140,10 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.fcrepo.fixity</groupId>
       <artifactId>fcrepo-fixity-corrupter</artifactId>

diff --git a/src/main/resources/spring/atom_jms.xml b/src/main/resources/spring/atom_jms.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+
+  <import resource="classpath:/spring/jms.xml"/>
+
+  <!-- translates events from the internal bus to JMS, in Atom format -->
+  <bean class="org.fcrepo.messaging.legacy.LegacyMethodEventFactory" />
+
+</beans>
diff --git a/src/main/resources/spring/master.xml b/src/main/resources/spring/master.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+  <!-- Master context for the test application. -->
+
+  <import resource="classpath:/spring/eventing.xml"/>
+  <import resource="classpath:/spring/generator.xml"/>
+  <import resource="classpath:/spring/repo.xml"/>
+  <import resource="classpath:/spring/rest.xml"/>
+  <import resource="classpath:/spring/transactions.xml"/>
+  <import resource="classpath:/spring/atom_jms.xml"/>
+  <import resource="classpath:/spring/optional_modules.xml"/>
+  <import resource="classpath:/spring/metrics_reporting.xml"/>
+  <import resource="classpath:/spring/policy_driven_storage.xml"/>
+
+</beans>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
 
   <context-param>
     <param-name>contextConfigLocation</param-name>
-    <param-value>WEB-INF/classes/spring/*.xml</param-value>
+    <param-value>WEB-INF/classes/spring/master.xml</param-value>
   </context-param>
 
   <listener>