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

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

Revision: 478
          http://treebase.svn.sourceforge.net/treebase/?rev=478&view=rev
Author:   rvos
Date:     2010-01-19 18:10:35 +0000 (Tue, 19 Jan 2010)

Log Message:
-----------
Added bean configuration properties so that all download controllers can reconstruct their focal study for access control verification.

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-01-19 18:07:52 UTC (rev 477)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2010-01-19 18:10:35 UTC (rev 478)
@@ -121,9 +121,11 @@
 	</bean>
 	
 	<bean id="downloadATreeBlockController" class="org.cipres.treebase.web.controllers.DownloadATreeBlockController">
+		<property name="studyService"><ref bean="studyService"></ref></property>
 		<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="rdfaService"><ref bean="rdfaService"></ref></property>	
+		<property name="submissionHome"><ref bean="submissionHome"></ref></property>			
 	</bean>
 	
 	<!-- Download A Matrix -->	
@@ -149,7 +151,8 @@
 		<property name="matrixService"><ref bean="matrixService"></ref></property>
 		<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="rdfaService"><ref bean="rdfaService"></ref></property>	
+		<property name="studyService"><ref bean="studyService"></ref></property>			
 	</bean>	
 	
 	<!-- Download A NexusFile -->	
@@ -572,7 +575,9 @@
 	</bean> 
 	
 	<bean id="searchMapToPhyloWidgetController" class="org.cipres.treebase.web.controllers.SearchMapToPhyloWidgetController"
-	  parent="directMapToPhyloWidgetController">
+	  parent="directMapToPhyloWidgetController">
+	  	<property name="submissionHome"><ref bean="submissionHome"></ref></property>
+	  	<property name="studyService"><ref bean="studyService"></ref></property>	  						  
 		<property name="defaultView"><value>redirect:/test/newPhylowidget.html</value></property>
 	</bean>
 	
@@ -911,14 +916,18 @@
 				<prop key="/searchResult.html">filenameController</prop>
 				<prop key="/searchStudyList.html">listSearchStudyController</prop>
 				<prop key="/searchStudy.html">searchStudyController</prop>
-				<prop key="/study-query.html">updateStudyQueryController</prop>
+				<prop key="/study-query.html">updateStudyQueryController</prop>
+				
+				<!-- SEARCH SECTION -->
 				<prop key="/search/">studySearchController</prop>
 				<prop key="/search/studySearch.html">studySearchController</prop>
 				<prop key="/search/treeSearch.html">treeSearchController</prop>
 				<prop key="/search/treeTopSearch.html">treeTopSearchController</prop>
 				<prop key="/search/matrixSearch.html">matrixSearchController</prop>	
-				<prop key="/search/taxonSearch.html">taxonSearchController</prop>
-			    <prop key="/search/study/summary.html">searchSummaryController</prop>
+				<prop key="/search/taxonSearch.html">taxonSearchController</prop>
+				
+				<!-- SEARCH RESULTS SECTION -->
+			    <prop key="/search/study/summary.html">searchSummaryController</prop>								
 			    <prop key="/search/study/analyses.html">searchSummaryController</prop>
 			    <prop key="/search/study/matrices.html">searchSummaryController</prop>
 			    <prop key="/search/study/trees.html">searchSummaryController</prop>
@@ -929,7 +938,8 @@
 			    <prop key="/search/study/analysis.html">searchSummaryController</prop>
 			    <prop key="/search/study/taxa.html">searchSummaryController</prop>
 			    <prop key="/search/study/rowSegments.html">searchSummaryController</prop>
-			    <prop key="/search/study/anyObjectAsRDF.html">anyObjectAsRDFController</prop>
+			    <prop key="/search/study/anyObjectAsRDF.html">anyObjectAsRDFController</prop>
+			    
 			    <prop key="/search/searchResultsAsRDF.html">searchResultsAsRDFController</prop>
 				<prop key="/search/matrixRowList.html">listMatrixRowController</prop>
 				<prop key="/search/taxonList.html">listTaxaSearchController</prop>
@@ -940,7 +950,8 @@
 				<prop key="/search/downloadAnAnalysisStep.html">downloadAnAnalysisStepController</prop>
 				<prop key="/search/downloadANexusFile.html">downloadANexusFileController</prop>
 				<prop key="/search/downloadANexusRCTFile.html">downloadANexusRCTFileController</prop>
-				       
+				
+				<!-- SUBMISSION SECTION -->
 				<prop key="/user/updateProfile.html">userFormController</prop>
 				<prop key="/user/submissionList.html">listSubmissionController</prop>
 				<prop key="/user/studyForm.html">studyFormController</prop>
@@ -983,6 +994,8 @@
 				
 				<prop key="/user/treeParser.html">treeParserController</prop>
 				<prop key="/user/treeParserResult.html">treeParserResultController</prop>
+				
+				<!-- JSON related bean mappings -->
 				<prop key="/json/submissionIsland.html">submissionToJsonController</prop>			       		
 			</props>
 		</property>


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