[Treebase-guts] SF.net SVN: treebase:[500] trunk/treebase-web/src/main/webapp/WEB-INF/ treebase-servlet.xml

[<rv...@us...>]

Revision: 500
          http://treebase.svn.sourceforge.net/treebase/?rev=500&view=rev
Author:   rvos
Date:     2010-02-15 13:32:51 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Expanded bean configuration for downloaders: these need access to the submissionService to check whether a download can be permitted because the requester is a submitter (as opposed to a reviewer). This is needed to address issue 2949853

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2010-02-15 13:30:56 UTC (rev 499)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2010-02-15 13:32:51 UTC (rev 500)
@@ -109,7 +109,8 @@
 	<bean id="downloadAStudyController" class="org.cipres.treebase.web.controllers.DownloadAStudyController">
 		<property name="studyService"><ref bean="studyService"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
-		<property name="rdfaService"><ref bean="rdfaService"></ref></property>
+		<property name="rdfaService"><ref bean="rdfaService"></ref></property>
+		<property name="submissionService"><ref bean="submissionService"></ref></property>
 	</bean>	
 	
 	<!-- Download A Tree -->	
@@ -117,7 +118,8 @@
 		<property name="studyService"><ref bean="studyService"></ref></property>
 		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
-		<property name="rdfaService"><ref bean="rdfaService"></ref></property>		
+		<property name="rdfaService"><ref bean="rdfaService"></ref></property>	
+		<property name="submissionService"><ref bean="submissionService"></ref></property>	
 	</bean>
 	
 	<bean id="downloadATreeBlockController" class="org.cipres.treebase.web.controllers.DownloadATreeBlockController">
@@ -125,7 +127,8 @@
 		<property name="phyloTreeHome"><ref bean="phyloTreeHome"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
 		<property name="rdfaService"><ref bean="rdfaService"></ref></property>	
-		<property name="submissionHome"><ref bean="submissionHome"></ref></property>			
+		<property name="submissionHome"><ref bean="submissionHome"></ref></property>	
+		<property name="submissionService"><ref bean="submissionService"></ref></property>		
 	</bean>
 	
 	<!-- Download A Matrix -->	
@@ -133,7 +136,8 @@
 		<property name="matrixService"><ref bean="matrixService"></ref></property>
 		<property name="studyService"><ref bean="studyService"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
-		<property name="rdfaService"><ref bean="rdfaService"></ref></property>				
+		<property name="rdfaService"><ref bean="rdfaService"></ref></property>	
+		<property name="submissionService"><ref bean="submissionService"></ref></property>			
 	</bean>
 	
 	<!-- Download A NexusFile -->	
@@ -142,7 +146,8 @@
 		<property name="studyService"><ref bean="studyService"></ref></property>
 		<property name="matrixService"><ref bean="matrixService"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
-		<property name="rdfaService"><ref bean="rdfaService"></ref></property>				
+		<property name="rdfaService"><ref bean="rdfaService"></ref></property>	
+		<property name="submissionService"><ref bean="submissionService"></ref></property>			
 	</bean>
 	
 	<!-- Download An AnalysisStep's input and output as a NexusFile -->	
@@ -152,14 +157,16 @@
 		<property name="analysisStepService"><ref bean="analysisStepService"></ref></property>
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
 		<property name="rdfaService"><ref bean="rdfaService"></ref></property>	
-		<property name="studyService"><ref bean="studyService"></ref></property>			
+		<property name="studyService"><ref bean="studyService"></ref></property>		
+		<property name="submissionService"><ref bean="submissionService"></ref></property>	
 	</bean>	
 	
 	<!-- Download A NexusFile -->	
 	<bean id="downloadANexusRCTFileController" class="org.cipres.treebase.web.controllers.DownloadANexusRCTFileController">		
 		<property name="studyService"><ref bean="studyService"></ref></property>	
 		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
-		<property name="rdfaService"><ref bean="rdfaService"></ref></property>				
+		<property name="rdfaService"><ref bean="rdfaService"></ref></property>
+		<property name="submissionService"><ref bean="submissionService"></ref></property>				
 	</bean>
 	
 	<!-- View Taxa -->	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.