Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[201] trunk/oai-pmh_data_provider/data_provider_web/ src/main/webapp/WEB-INF
|
From: <yo...@us...> - 2009-10-20 14:34:58
|
Revision: 201
http://treebase.svn.sourceforge.net/treebase/?rev=201&view=rev
Author: youjun
Date: 2009-10-20 14:34:49 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/dwr.xml
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/menu-config.xml
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/mvs/
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/sitemesh.xml
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/xfire-servlet.xml
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/dwr.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/dwr.xml 2009-10-19 20:30:19 UTC (rev 200)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/dwr.xml 2009-10-20 14:34:49 UTC (rev 201)
@@ -1,12 +0,0 @@
-<!DOCTYPE dwr PUBLIC
- "-//GetAhead Limited//DTD Direct Web Remoting 1.0//EN"
- "http://www.getahead.ltd.uk/dwr/dwr10.dtd">
-<dwr>
- <allow>
- <!--create creator="spring" javascript="UserManager">
- <param name="beanName" value="userManager"/>
- <include method="getUsers"/>
- </create>
- <convert converter="bean" match="org.appfuse.model.User"/-->
- </allow>
-</dwr>
\ No newline at end of file
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/menu-config.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/menu-config.xml 2009-10-19 20:30:19 UTC (rev 200)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/menu-config.xml 2009-10-20 14:34:49 UTC (rev 201)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MenuConfig>
- <Displayers>
- <Displayer name="ListMenu" type="net.sf.navigator.displayer.ListMenuDisplayer"/>
- <Displayer name="SimpleMenu"
- type="net.sf.navigator.displayer.SimpleMenuDisplayer"/>
-
- </Displayers>
- <Menus>
- <!-- ==================== Administrator Menus =========================== -->
- <Menu name="StudyManagementMenu" title="Study Management" description="Study Management" roles="Admin,Associate Editor">
- <Item name="UserManagement" title="For a User" page="/admin/userManagement.html"/>
- <Item name="ReadyStudies" title="studies.ready.state" page="/admin/readyStateStudies.html"/>
- <Item name="SearchBySubmissionId" title="search.by.submission.id" page="/admin/searchBySubmissionID.html"/>
- <Item name="SelectStudies" title="select.studies" page="/admin/selectStudies.html"/>
- </Menu>
- <Menu name="UserManagementMenu" title="User Management" description="User Management" roles="Admin,Associate Editor">
- <Item name="SelectUsers" title="Select Users" page="/admin/adminSelectUsers.html"/>
- <Item name="UpdateUserInfo" title="Update User Info" page="/admin/adminUpdatingUserInfo.html"/>
- <Item name="DeleteUser" title="Delete User" page="/admin/adminDeletingUserStepOne.html"/>
- <Item name="MergeUsers" title="Merge Users" page="/admin/adminMergingUsers.html"/>
- <Item name="SelectPersons" title="Select Persons" page="/admin/adminSelectPersons.html"/>
- <Item name="MergePersons" title="Merge Persons" page="/admin/adminMergingPersons.html"/>
- </Menu>
-
- <!-- ==================== User Menu =========================== -->
- <Menu name="SubmissionHome" title="nav.submission.home" description="SubmissionHome" page="/user/summary.html" roles="Admin,User"/>
- <Menu name="SubmissionNotes" title="nav.submission.notes" description="SubmissionNotes" page="/user/studyForm.html" roles="Admin,User"/>
- <Menu name="SubmissionCitation" title="nav.submission.citation" description="SubmissionCitation" page="/user/citationForm.html" roles="Admin,User"/>
- <Menu name="SubmissionAuthors" title="nav.submission.authors" description="SubmissionAuthors" page="/user/authorSearchForm.html" roles="Admin,User"/>
- <Menu name="SubmissionUploadFile" title="nav.submission.upload" description="SubmissionUploadFile" page="/user/uploadFile.html" roles="Admin,User"/>
- <Menu name="SubmissionNexusFiles" title="nav.submission.files" description="SubmissionNexusFiles" page="/user/nexusFiles.html" roles="Admin,User"/>
- <Menu name="SubmissionTaxa" title="nav.submission.taxa" description="SubmissionTaxa" page="/user/taxaList.html" roles="Admin,User"/>
- <Menu name="SubmissionMatrices" title="nav.submission.matrices" description="SubmissionMatrices" page="/user/matrixList.html" roles="Admin,User"/>
- <Menu name="SubmissionTrees" title="nav.submission.trees" description="SubmissionTrees" page="/user/treeBlockList.html" roles="Admin,User"/>
- <Menu name="SubmissionAnalyses" title="nav.submission.analyses" description="SubmissionAnalyses" page="/user/analyses.html" roles="Admin,User"/>
- <Menu name="SubmissionSubmissions" title="nav.submission.submissions" description="SubmissionSubmissions" page="/user/submissionList.html" roles="Admin,User"/>
-
- <!-- ==================== Submission metadata =========================== -->
- <Menu name="AboutSubmission" title="nav.submission.about" description="About the submission">
- <Item name="Summary" title="nav.summary" description="Summary Section" page="/user/summary.html"/>
- <Item name="SubmissionInfo" title="nav.submission.info" description="Submission Name" page="/user/studyForm.html"/>
- <Item name="Citation" title="nav.citation" description="Citation Menu" roles="Admin,User">
- <Item name="Publication" title="nav.citation.publication" page="/user/citationForm.html"/>
- <Item name="Authors" title="nav.citation.authors" page="/user/authorSearchForm.html"/>
- </Item>
- </Menu>
-
- <!-- ==================== Raw Data =========================== -->
- <Menu name="RawData" title="nav.rawdata" description="Raw Data Menu" roles="Admin,User">
- <Item name="UploadFile" title="nav.uploadfile" description="Upload File" page="/user/uploadFile.html"/>
- <Item name="NexusFiles" title="nav.nexusfiles" description="Nexus Files Section" page="/user/nexusFiles.html"/>
- </Menu>
- <!-- ==================== PhyloData Sections =========================== -->
- <Menu name="ProcessedData" title="nav.processed" description="Processed Data Menu" roles="Admin,User">
- <Item name="Taxa" title="nav.taxa" description="Taxa Section" page="/user/taxaList.html"/>
- <Item name="Matrices" title="nav.matrix" description="Data Matrices" page="/user/matrixList.html"/>
- <Item name="Trees" title="nav.trees" description="Trees Section" page="/user/treeBlockList.html"/>
- </Menu>
- <!-- ==================== Analysis Menu =========================== -->
- <Menu name="Analyses" title="nav.analyses" description="Analyses Section" page="/user/analysisDisplay.html"/>
-
- <!-- ==================== Searching =========================== -->
- <Menu name="Searches" title="search.menu.title" >
- <Item name="SearchStudies" title="search.menu.studies" description="Search for studies" page="/search/studySearch.html?action=discard"/>
- <Item name="SearchTrees" title="search.menu.trees" description="Search for trees" page="/search/treeSearch.html?action=discard"/>
- <Item name="SearchMatrices" title="search.menu.matrices" description="Search for matrices" page="/search/matrixSearch.html?action=discard"/>
- </Menu>
-
- <Menu name="Study" title="search.study.menu.title" >
- <Item name="StudySummary" title="search.study.menu.summary" description="View study citation and summary" page="/search/studySearch.html${1+1}"/>
- <Item name="StudyAnalyses" title="search.study.menu.analyses" description="View study's analyses" page="/search/treeSearch.html"/>
- <Item name="StudyMatrices" title="search.study.menu.matrices" description="View study's matrices" page="/search/matrixSearch.html"/>
- <Item name="StudyTrees" title="search.study.menu.trees" description="View study's trees" page="/search/matrixSearch.html"/>
- <Item name="StudyTaxa" title="search.study.menu.taxa" description="View study's taxa" page="/search/matrixSearch.html"/>
- </Menu>
-
- </Menus>
-</MenuConfig>
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/sitemesh.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/sitemesh.xml 2009-10-19 20:30:19 UTC (rev 200)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/sitemesh.xml 2009-10-20 14:34:49 UTC (rev 201)
@@ -1,17 +0,0 @@
-<sitemesh>
- <property name="decorators-file" value="/WEB-INF/decorators.xml" />
- <excludes file="${decorators-file}" />
-
- <page-parsers>
- <parser content-type="text/html"
- class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
- <parser content-type="text/html;charset=ISO-8859-1"
- class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
- </page-parsers>
-
- <decorator-mappers>
- <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
- <param name="config" value="${decorators-file}" />
- </mapper>
- </decorator-mappers>
-</sitemesh>
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml 2009-10-19 20:30:19 UTC (rev 200)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml 2009-10-20 14:34:49 UTC (rev 201)
@@ -30,84 +30,15 @@
<!-- ========================================================== -->
- <!-- List of Filters -->
- <!-- ========================================================== -->
- <filter>
- <filter-name>sitemesh</filter-name>
- <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
- </filter>
- <filter>
- <filter-name>securityFilter</filter-name>
- <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
- <init-param>
- <param-name>targetClass</param-name>
- <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>hibernateFilter</filter-name>
- <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
- <init-param>
- <param-name>singleSession</param-name>
- <param-value>true</param-value>
- </init-param>
- </filter>
-
- <filter>
- <filter-name>ResponseOverrideFilter</filter-name>
- <filter-class>org.displaytag.filter.ResponseOverrideFilter</filter-class>
- </filter>
-
-
-
-
- <!-- ========================================================== -->
- <!-- Mappings for Filters defined aboved -->
- <!-- ========================================================== -->
- <filter-mapping>
- <filter-name>securityFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- </filter-mapping>
- <filter-mapping>
- <filter-name>hibernateFilter</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>ResponseOverrideFilter</filter-name>
- <url-pattern>*.jsp</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResponseOverrideFilter</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
-
-
- <!-- ========================================================== -->
<!-- Name of our servlet processed by Spring's front controller -->
<!-- DispatcherServlet -->
<!-- ========================================================== -->
<servlet>
- <servlet-name>treebase</servlet-name>
+ <servlet-name>TOPServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- ========================================================== -->
- <!-- Processed by XFireSpringServlet -->
- <!-- ========================================================== -->
- <!--servlet>
- <servlet-name>XFireServlet</servlet-name>
- <servlet-class>
- org.codehaus.xfire.spring.XFireSpringServlet
- </servlet-class>
- </servlet-->
<!-- ========================================================== -->
<!-- Processed by CXFServlet -->
@@ -125,27 +56,9 @@
<!-- url pattern that will be processed by DispatcherServlet -->
<!-- ========================================================== -->
<servlet-mapping>
- <servlet-name>treebase</servlet-name>
- <url-pattern>*.html</url-pattern>
+ <servlet-name>TOPServlet</servlet-name>
+ <url-pattern>/top/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>treebase</servlet-name>
- <url-pattern>/phylows/*</url-pattern>
- </servlet-mapping>
-
- <!-- ========================================================== -->
- <!-- url pattern that will be processed by XFireSpringServlet -->
- <!-- ========================================================== -->
-
- <!--servlet-mapping>
- <servlet-name>XFireServlet</servlet-name>
- <url-pattern>/servlet/XFireServlet/*</url-pattern>
- </servlet-mapping-->
-
- <!--servlet-mapping>
- <servlet-name>XFireServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping-->
<!-- ========================================================== -->
<!-- url pattern that will be processed by CXFServlet -->
@@ -155,27 +68,7 @@
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
- <!-- ========================================================== -->
- <!-- DWR Sruff -->
- <!-- ========================================================== -->
- <servlet>
- <servlet-name>dwr</servlet-name>
- <servlet-class>org.directwebremoting.spring.DwrSpringServlet</servlet-class>
- <init-param>
- <param-name>allowGetForSafariButMakeForgeryEasier</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>dwr</servlet-name>
- <url-pattern>/dwr/*</url-pattern>
- </servlet-mapping>
<!-- ========================================================== -->
<!-- define some default pages -->
@@ -183,6 +76,7 @@
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+
<!-- ========================================================== -->
<!-- Error Pages -->
<!-- ========================================================== -->
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/xfire-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/xfire-servlet.xml 2009-10-19 20:30:19 UTC (rev 200)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/xfire-servlet.xml 2009-10-20 14:34:49 UTC (rev 201)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans default-autowire="no"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.directwebremoting.org/schema/spring-dwr
- http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd">
-
-
- <!-- ========================================================== -->
- <!-- LIST OF DWR beans/methods -->
- <!-- ========================================================== -->
-
- <import resource="classpath:org/codehaus/xfire/spring/xfire.xml"/>
-
-
- <bean id="searchStudiesByKeyword"
- class="org.cipres.treebase.web.webservices.StudyServiceByKeywordImp">
- <property name="studyService"><ref bean="studyService"></ref></property>
- </bean>
-
- <bean id="webAnnotations"
- class="org.codehaus.xfire.annotations.jsr181.Jsr181WebAnnotations"/>
- <bean id="handlerMapping"
- class="org.codehaus.xfire.spring.remoting.Jsr181HandlerMapping">
- <property name="typeMappingRegistry">
- <ref bean="xfire.typeMappingRegistry"/>
- </property>
- <property name="xfire">
- <ref bean="xfire"/>
- </property>
- <property name="webAnnotations">
- <ref bean="webAnnotations"/>
- </property>
- </bean>
-
- <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
- <property name="urlMap">
- <map>
- <entry key="/">
- <ref bean="handlerMapping"/>
- </entry>
- </map>
- </property>
- </bean>
-
-
-
-</beans>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
