Menu
▾
▴
treebase-guts
|
From: <rv...@us...> - 2009-06-23 12:04:14
|
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.
|
|
From: <rv...@us...> - 2009-06-25 02:45:00
|
Revision: 109
http://treebase.svn.sourceforge.net/treebase/?rev=109&view=rev
Author: rvos
Date: 2009-06-25 02:44:58 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Added configuration for NeXML/RDFa->RDF/XML serialization
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-25 02:43:44 UTC (rev 108)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2009-06-25 02:44:58 UTC (rev 109)
@@ -15,6 +15,8 @@
<bean id="processUserController" class="org.cipres.treebase.web.controllers.ProcessUserController"/>
+ <bean id="anyObjectAsRDFController" class="org.cipres.treebase.web.controllers.AnyObjectAsRDFController"/>
+
<bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController">
<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
@@ -107,25 +109,29 @@
<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>
</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="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></ref></property>
</bean>
<bean id="downloadATreeBlockController" class="org.cipres.treebase.web.controllers.DownloadATreeBlockController">
<property name="phyloTreeHome"><ref bean="phyloTreeHome"></ref></property>
- <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></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="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></ref></property>
</bean>
<!-- Download A NexusFile -->
@@ -133,7 +139,8 @@
<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="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></ref></property>
</bean>
<!-- Download An AnalysisStep's input and output as a NexusFile -->
@@ -141,13 +148,15 @@
<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>
+ <property name="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></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="nexmlService"><ref bean="nexmlService"></ref></property>
+ <property name="rdfaService"><ref bean="rdfaService"></ref></property>
</bean>
<!-- View Taxa -->
@@ -920,6 +929,7 @@
<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/matrixRowList.html">listMatrixRowController</prop>
<prop key="/search/taxonList.html">listTaxaSearchController</prop>
<prop key="/search/downloadAStudy.html">downloadAStudyController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-06-28 10:33:47
|
Revision: 149
http://treebase.svn.sourceforge.net/treebase/?rev=149&view=rev
Author: rvos
Date: 2009-06-28 10:33:46 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
s/PhyloWS/phylows/g
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-28 10:32:54 UTC (rev 148)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2009-06-28 10:33:46 UTC (rev 149)
@@ -841,7 +841,7 @@
<property name="alwaysUseFullPath" value="true"/>
<property name="mappings">
<props>
- <prop key="/PhyloWS/**">phyloWSController</prop>
+ <prop key="/phylows/**">phyloWSController</prop>
<prop key="/home.html">filenameController</prop>
<prop key="/login.html">filenameController</prop>
<prop key="/user/viewXML.html">filenameController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-07-02 21:18:20
|
Revision: 169
http://treebase.svn.sourceforge.net/treebase/?rev=169&view=rev
Author: rvos
Date: 2009-07-02 21:18:18 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
Added configuration for searchResultsAsRDFController
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-07-02 21:15:21 UTC (rev 168)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2009-07-02 21:18:18 UTC (rev 169)
@@ -16,7 +16,7 @@
<bean id="processUserController" class="org.cipres.treebase.web.controllers.ProcessUserController"/>
<bean id="anyObjectAsRDFController" class="org.cipres.treebase.web.controllers.AnyObjectAsRDFController"/>
-
+ <bean id="searchResultsAsRDFController" class="org.cipres.treebase.web.controllers.SearchResultsAsRDFController"/>
<bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController">
<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
@@ -930,6 +930,7 @@
<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/searchResultsAsRDF.html">searchResultsAsRDFController</prop>
<prop key="/search/matrixRowList.html">listMatrixRowController</prop>
<prop key="/search/taxonList.html">listTaxaSearchController</prop>
<prop key="/search/downloadAStudy.html">downloadAStudyController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-19 18:10:41
|
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.
|
|
From: <rv...@us...> - 2010-02-15 13:32:57
|
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.
|
|
From: <rv...@us...> - 2010-03-12 23:19:35
|
Revision: 556
http://treebase.svn.sourceforge.net/treebase/?rev=556&view=rev
Author: rvos
Date: 2010-03-12 23:19:29 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
Changed extension for *AsRDF* jsps to .rdf
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-03-12 23:18:17 UTC (rev 555)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-03-12 23:19:29 UTC (rev 556)
@@ -950,9 +950,9 @@
<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.rdf">anyObjectAsRDFController</prop>
- <prop key="/search/searchResultsAsRDF.html">searchResultsAsRDFController</prop>
+ <prop key="/search/searchResultsAsRDF.rdf">searchResultsAsRDFController</prop>
<prop key="/search/matrixRowList.html">listMatrixRowController</prop>
<prop key="/search/taxonList.html">listTaxaSearchController</prop>
<prop key="/search/downloadAStudy.html">downloadAStudyController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-03-16 17:02:10
|
Revision: 610
http://treebase.svn.sourceforge.net/treebase/?rev=610&view=rev
Author: rvos
Date: 2010-03-16 17:02:04 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
Added studyService field initialization for the "anyObjectAsRDFController" bean.
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-03-16 17:00:50 UTC (rev 609)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-03-16 17:02:04 UTC (rev 610)
@@ -15,7 +15,9 @@
<bean id="processUserController" class="org.cipres.treebase.web.controllers.ProcessUserController"/>
- <bean id="anyObjectAsRDFController" class="org.cipres.treebase.web.controllers.AnyObjectAsRDFController"/>
+ <bean id="anyObjectAsRDFController" class="org.cipres.treebase.web.controllers.AnyObjectAsRDFController">
+ <property name="studyService"><ref bean="studyService"></ref></property>
+ </bean>
<bean id="searchResultsAsRDFController" class="org.cipres.treebase.web.controllers.SearchResultsAsRDFController"/>
<bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-04-05 14:37:28
|
Revision: 675
http://treebase.svn.sourceforge.net/treebase/?rev=675&view=rev
Author: youjun
Date: 2010-04-05 14:37:21 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
viewresolver confliction
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-04-03 17:43:07 UTC (rev 674)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-04-05 14:37:21 UTC (rev 675)
@@ -860,7 +860,7 @@
<!-- ========================================================== -->
<!-- Spring View Resolvers for JSPs and .vm files -->
<!-- ========================================================== -->
-
+ <!--
<bean id="vmViewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
<property name="order" value="1"></property>
<property name="suffix">
@@ -873,14 +873,14 @@
<value>true</value>
</property>
</bean>
-
+ -->
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="requestContextAttribute" value="rc"/>
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
<property name="prefix" value="/WEB-INF/pages/"/>
<property name="suffix" value=".jsp"/>
</bean>
-
+
<!-- ========================================================== -->
<!-- URL MAPPING -->
<!-- ========================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2011-04-25 21:54:35
|
Revision: 802
http://treebase.svn.sourceforge.net/treebase/?rev=802&view=rev
Author: rvos
Date: 2011-04-25 21:54:29 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
Removed abstract bean from servlet configuration.
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 2011-04-25 21:46:23 UTC (rev 801)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-25 21:54:29 UTC (rev 802)
@@ -40,9 +40,6 @@
<bean id="nexusFilesController" class="org.cipres.treebase.web.controllers.NexusFilesController">
<property name="studyService"><ref bean="studyService"></ref></property>
- </bean>
-
- <bean id="phyloWSController" class="org.cipres.treebase.web.controllers.PhyloWSController">
</bean>
<bean id="phyloWSStudyController" class="org.cipres.treebase.web.controllers.PhyloWSStudyController">
@@ -915,8 +912,7 @@
<property name="alwaysUseFullPath" value="true"/>
<property name="mappings">
<props>
- <prop key="/top/**">OAIPMHController</prop>
- <prop key="/phylows/**">phyloWSController</prop>
+ <prop key="/top/**">OAIPMHController</prop>
<prop key="/phylows/study/**">phyloWSStudyController</prop>
<prop key="/phylows/taxon/**">phyloWSTaxonController</prop>
<prop key="/phylows/tree/**">phyloWSTreeController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2011-04-29 00:19:32
|
Revision: 818
http://treebase.svn.sourceforge.net/treebase/?rev=818&view=rev
Author: rvos
Date: 2011-04-29 00:19:26 +0000 (Fri, 29 Apr 2011)
Log Message:
-----------
Reverting
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 2011-04-29 00:04:44 UTC (rev 817)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-29 00:19:26 UTC (rev 818)
@@ -743,10 +743,10 @@
<property name="searchService"><ref bean="searchService"></ref></property>
</bean>
- <bean id="mainSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.MainSearchController">
+ <!-- bean id="mainSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.MainSearchController">
<property name="formView"><value>search/mainSearch</value></property>
<property name="successView"><value>search/mainSearch</value></property>
- </bean>
+ </bean-->
<bean id="studySearchController" parent="searchController" class="org.cipres.treebase.web.controllers.StudySearchController">
<property name="formView"><value>search/studySearch</value></property>
@@ -1009,7 +1009,7 @@
<prop key="/search/treeTopSearch.html">treeTopSearchController</prop>
<prop key="/search/matrixSearch.html">matrixSearchController</prop>
<prop key="/search/taxonSearch.html">taxonSearchController</prop>
- <prop key="/search/mainSearch.html">mainSearchController</prop>
+ <!-- prop key="/search/mainSearch.html">mainSearchController</prop-->
<!-- SEARCH RESULTS SECTION -->
<prop key="/search/study/summary.html">searchSummaryController</prop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hs...@us...> - 2011-07-19 21:21:09
|
Revision: 932
http://treebase.svn.sourceforge.net/treebase/?rev=932&view=rev
Author: hshyket
Date: 2011-07-19 21:21:03 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Adding identify reference so that the StudySearch controller can use the class
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 2011-07-19 19:37:41 UTC (rev 931)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-07-19 21:21:03 UTC (rev 932)
@@ -759,7 +759,8 @@
<bean id="studySearchController" parent="searchController" class="org.cipres.treebase.web.controllers.StudySearchController">
<property name="formView"><value>search/studySearch</value></property>
- <property name="successView"><value>search/studySearch</value></property>
+ <property name="successView"><value>search/studySearch</value></property>
+ <property name="identify"><ref bean="top.identify"></ref></property>
</bean>
<bean id="treeSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.TreeSearchController">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X