Merge pull request #407 from awoods/fcrepo-4.0.0-beta-01-RC

Fix auth.war based on recent spring config changes
fcrepo · Jun 4, 2014 · 1203667 · 1203667
2 parents 0319dd1 + 12d63aa
commit 1203667
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -280,7 +280,6 @@
                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
               </manifest>
             </archive>
-            <packagingExcludes>WEB-INF/classes/spring/auth-repo.xml</packagingExcludes>
         </configuration>
       </plugin>
       <plugin>
@@ -520,6 +519,7 @@
                   <warSourceDirectory>src/main/webapp</warSourceDirectory>
                   <warSourceDirectory>src/auth/webapp</warSourceDirectory>
                   <packagingExcludes>WEB-INF/classes/spring/repo.xml</packagingExcludes>
+                  <packagingExcludes>WEB-INF/classes/spring/master.xml</packagingExcludes>
                 </configuration>
               </execution>
             </executions>

diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-master.xml b/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-master.xml
@@ -0,0 +1,17 @@
+<?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 fcrepo4. -->
+
+    <import resource="classpath:/spring/auth-repo.xml"/>
+    <import resource="classpath:/spring/rest.xml"/>
+    <import resource="${fcrepo.minter.config:classpath:/spring/minter.xml}"/>
+    <import resource="classpath:/spring/eventing.xml"/>
+    <import resource="classpath:/spring/jms.xml"/>
+    <import resource="classpath:/spring/generator.xml"/>
+    <import resource="classpath:/spring/transactions.xml"/>
+
+</beans>
diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-repo.xml b/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-repo.xml
@@ -48,8 +48,9 @@
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-
-
     <!-- For the time being, load annotation config here too -->
     <bean class="org.fcrepo.metrics.MetricsConfig"/>
+
+    <bean id="connectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager" />
+
 </beans>
diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/web.xml b/fcrepo-webapp/src/auth/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/auth-master.xml</param-value>
 	</context-param>
 
 	<listener>