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

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

Revision: 85
          http://treebase.svn.sourceforge.net/treebase/?rev=85&view=rev
Author:   rvos
Date:     2009-06-23 11:14:09 +0000 (Tue, 23 Jun 2009)

Log Message:
-----------
Changed configuration for download controllers, which need a nexmlService so they can serialize to nexml in addition to nexus.

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	2009-06-23 11:12:31 UTC (rev 84)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2009-06-23 11:14:09 UTC (rev 85)
@@ -101,29 +101,39 @@
 		<property name="formView"><value>readyState</value></property>
 		<property name="submissionService"><ref bean="submissionService"></ref></property>
 		<property name="studyService"><ref bean="studyService"></ref></property>
-	</bean>
+	</bean>
+	
+	<!-- Download A Study -->	
+	<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>
+	</bean>	
 	
 	<!-- Download A Tree -->	
 	<bean id="downloadATreeController" class="org.cipres.treebase.web.controllers.DownloadATreeController">
 		<property name="studyService"><ref bean="studyService"></ref></property>
-		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
+		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
+		<property name="nexmlService"><ref bean="nexmlService"></ref></property>
 	</bean>
 	
 	<bean id="downloadATreeBlockController" class="org.cipres.treebase.web.controllers.DownloadATreeBlockController">
-		<property name="phyloTreeHome"><ref bean="phyloTreeHome"></ref></property>
+		<property name="phyloTreeHome"><ref bean="phyloTreeHome"></ref></property>
+		<property name="nexmlService"><ref bean="nexmlService"></ref></property>		
 	</bean>
 	
 	<!-- Download A Matrix -->	
 	<bean id="downloadAMatrixController" class="org.cipres.treebase.web.controllers.DownloadAMatrixController">
 		<property name="matrixService"><ref bean="matrixService"></ref></property>
-		<property name="studyService"><ref bean="studyService"></ref></property>
+		<property name="studyService"><ref bean="studyService"></ref></property>
+		<property name="nexmlService"><ref bean="nexmlService"></ref></property>		
 	</bean>
 	
 	<!-- Download A NexusFile -->	
 	<bean id="downloadANexusFileController" class="org.cipres.treebase.web.controllers.DownloadANexusFileController">
 		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
 		<property name="studyService"><ref bean="studyService"></ref></property>
-		<property name="matrixService"><ref bean="matrixService"></ref></property>
+		<property name="matrixService"><ref bean="matrixService"></ref></property>
+		<property name="nexmlService"><ref bean="nexmlService"></ref></property>		
 	</bean>
 	
 	<!-- Download An AnalysisStep's input and output as a NexusFile -->	
@@ -131,11 +141,13 @@
 		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
 		<property name="matrixService"><ref bean="matrixService"></ref></property>
 		<property name="analysisStepService"><ref bean="analysisStepService"></ref></property>
+		<property name="nexmlService"><ref bean="nexmlService"></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="studyService"><ref bean="studyService"></ref></property>	
+		<property name="nexmlService"><ref bean="nexmlService"></ref></property>		
 	</bean>
 	
 	<!-- View Taxa -->	
@@ -910,6 +922,7 @@
 			    <prop key="/search/study/rowSegments.html">searchSummaryController</prop>
 				<prop key="/search/matrixRowList.html">listMatrixRowController</prop>
 				<prop key="/search/taxonList.html">listTaxaSearchController</prop>
+				<prop key="/search/downloadAStudy.html">downloadAStudyController</prop>				
 				<prop key="/search/downloadATree.html">downloadATreeController</prop>
 				<prop key="/search/downloadATreeBlock.html">downloadATreeBlockController</prop>
 				<prop key="/search/downloadAMatrix.html">downloadAMatrixController</prop>


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