litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

Browse source 
Changes for multi view support. See commit message.
This commit is contained in:
tworrall 2013-02-11 16:18:58 -05:00
commit 3b50b82f2e
1 changed files with 6 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

215
productMods/WEB-INF/web.xml
View file

@ -125,8 +125,8 @@
<filter-mapping> <filter-mapping>
<filter-name>VitroRequestPrep</filter-name> <filter-name>VitroRequestPrep</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
<dispatcher>request</dispatcher> <dispatcher>REQUEST</dispatcher>
<dispatcher>forward</dispatcher> <dispatcher>FORWARD</dispatcher>
</filter-mapping> </filter-mapping>
<filter> <filter>
@ -136,7 +136,7 @@
<filter-mapping> <filter-mapping>
<filter-name>PageRoutingFilter</filter-name> <filter-name>PageRoutingFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
<dispatcher>request</dispatcher> <dispatcher>REQUEST</dispatcher>
</filter-mapping> </filter-mapping>
<!-- Spring setup **************************************************** --> <!-- Spring setup **************************************************** -->
@ -167,24 +167,8 @@
--> -->
<!-- Servlets ********************************************************** --> <!-- Servlets ********************************************************** -->
<servlet>
<!--adding only trimSpaces param to defaults to clean up html output--> <!--
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<init-param>
<param-name>fork</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xpoweredBy</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>trimSpaces</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>3</load-on-startup>
</servlet><!--
<servlet> <servlet>
<servlet-name>ProcessRdfForm</servlet-name> <servlet-name>ProcessRdfForm</servlet-name>
@ -241,15 +225,6 @@
<url-pattern>/RecomputeInferences</url-pattern> <url-pattern>/RecomputeInferences</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>SDBSetupController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SDBSetupController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SDBSetupController</servlet-name>
<url-pattern>/sdbsetup</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>DeletePropertyController</servlet-name> <servlet-name>DeletePropertyController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class>
@ -325,12 +300,6 @@
</servlet-mapping> </servlet-mapping>
--> -->
<servlet>
<servlet-name>fetch</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.QueryServlet</servlet-class>
<!--load-on-startup>2</load-on-startup-->
</servlet>
<servlet> <servlet>
<servlet-name>AboutController</servlet-name> <servlet-name>AboutController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class>
@ -398,24 +367,6 @@
<url-pattern>/uploadImages</url-pattern> <url-pattern>/uploadImages</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>FlagUpdateController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FlagUpdateController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FlagUpdateController</servlet-name>
<url-pattern>/flagUpdate</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>SitemapIndexController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SitemapIndexController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SitemapIndexController</servlet-name>
<url-pattern>/sitemap.xml</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>RDFUploadFormController</servlet-name> <servlet-name>RDFUploadFormController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController</servlet-class>
@ -471,24 +422,6 @@
<url-pattern>/jenaXmlFileUpload/*</url-pattern> <url-pattern>/jenaXmlFileUpload/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>OwlImportController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.owl.OwlImportController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>OwlImportController</servlet-name>
<url-pattern>/owl</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>OwlImportServlet</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.owl.ProtegeOwlImportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>OwlImportServlet</servlet-name>
<url-pattern>/importOwl</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>JenaAdminServlet</servlet-name> <servlet-name>JenaAdminServlet</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions</servlet-class>
@ -588,16 +521,6 @@
<url-pattern>/datapropEdit</url-pattern> <url-pattern>/datapropEdit</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>KeywordEditController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.KeywordEditController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>KeywordEditController</servlet-name>
<url-pattern>/keywordEdit</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>OntologyEditController</servlet-name> <servlet-name>OntologyEditController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController</servlet-class>
@ -787,24 +710,6 @@
<url-pattern>/admin/wait</url-pattern> <url-pattern>/admin/wait</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>StatementChangeListingController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>StatementChangeListingController</servlet-name>
<url-pattern>/statementHistory</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>WriteOutChangesController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.WriteOutChangesController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>WriteOutChangesController</servlet-name>
<url-pattern>/writeOutChanges</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>ListVClassWebappsController</servlet-name> <servlet-name>ListVClassWebappsController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
@ -1004,15 +909,6 @@
<url-pattern>/edit/reorder</url-pattern> <url-pattern>/edit/reorder</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>AdminController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.AdminController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AdminController</servlet-name>
<url-pattern>/adminCon</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>TermsOfUseController</servlet-name> <servlet-name>TermsOfUseController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TermsOfUseController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TermsOfUseController</servlet-class>
@ -1041,15 +937,6 @@
<url-pattern>/dataservice</url-pattern> <url-pattern>/dataservice</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>UMLSTerminology</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.UMLSTerminologyAnnotation</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>UMLSTerminology</servlet-name>
<url-pattern>/UMLSTermsRetrieval</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>ConceptSearchService</servlet-name> <servlet-name>ConceptSearchService</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ConceptSearchServlet</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ConceptSearchServlet</servlet-class>
@ -1059,15 +946,6 @@
<url-pattern>/conceptSearchService</url-pattern> <url-pattern>/conceptSearchService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>ProcessTerminologyAnnotation</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ProcessTerminologyController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ProcessTerminologyAnnotation</servlet-name>
<url-pattern>/edit/processTerminologyAnnotation</url-pattern>
</servlet-mapping>
<!-- Google Refine servlets begins --> <!-- Google Refine servlets begins -->
<servlet> <servlet>
@ -1223,32 +1101,6 @@
<url-pattern>/browse</url-pattern> <url-pattern>/browse</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>pubsbyorg</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.PubsByDepartmentServlet</servlet-class>
<init-param>
<param-name>workspaceDir</param-name>
<param-value>/usr/local/services/vivo/logs</param-value>
</init-param>
<!--load-on-startup>2</load-on-startup-->
</servlet>
<servlet>
<servlet-name>coauthors</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.CoAuthorServlet</servlet-class>
<init-param>
<param-name>workspaceDir</param-name>
<param-value>/usr/local/services/vivo/logs</param-value>
</init-param>
<!--load-on-startup>2</load-on-startup-->
</servlet>
<servlet>
<servlet-name>generic_create</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBCreate</servlet-class>
<!--load-on-startup>2</load-on-startup-->
</servlet>
<servlet> <servlet>
<servlet-name>serveFiles</servlet-name> <servlet-name>serveFiles</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.filestorage.serving.FileServingServlet</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.filestorage.serving.FileServingServlet</servlet-class>
@ -1258,21 +1110,6 @@
<url-pattern>/file/*</url-pattern> <url-pattern>/file/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>generic_editprep</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBEditPrep</servlet-class>
</servlet>
<servlet>
<servlet-name>generic_update</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBUpdate</servlet-class>
</servlet>
<servlet>
<servlet-name>generic_delete</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBDelete</servlet-class>
</servlet>
<servlet> <servlet>
<servlet-name>SparqlQuery</servlet-name> <servlet-name>SparqlQuery</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet</servlet-class>
@ -1283,20 +1120,6 @@
<url-pattern>/admin/sparqlquery</url-pattern> <url-pattern>/admin/sparqlquery</url-pattern>
</servlet-mapping> </servlet-mapping>
<!--
<servlet>
<servlet-name>VisualizationController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>VisualizationController</servlet-name>
<url-pattern>/visualization</url-pattern>
</servlet-mapping>
-->
<servlet> <servlet>
<servlet-name>StandardVisualizationController</servlet-name> <servlet-name>StandardVisualizationController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController</servlet-class>
@ -1423,10 +1246,6 @@
<!-- ============================== servlet-mappings ======================== --> <!-- ============================== servlet-mappings ======================== -->
<servlet-mapping>
<servlet-name>fetch</servlet-name>
<url-pattern>/fetch</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>mailusers</servlet-name> <servlet-name>mailusers</servlet-name>
<url-pattern>/mailusers</url-pattern> <url-pattern>/mailusers</url-pattern>
@ -1478,30 +1297,6 @@
<servlet-name>logout</servlet-name> <servlet-name>logout</servlet-name>
<url-pattern>/logout</url-pattern> <url-pattern>/logout</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>pubsbyorg</servlet-name>
<url-pattern>/pubsbyorg</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>coauthors</servlet-name>
<url-pattern>/coauthors</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>generic_create</servlet-name>
<url-pattern>/generic_create</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>generic_editprep</servlet-name>
<url-pattern>/generic_editprep</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>generic_update</servlet-name>
<url-pattern>/generic_update</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>generic_delete</servlet-name>
<url-pattern>/generic_delete</url-pattern>
</servlet-mapping>
<!-- ==================== sparql query builder ==================== --> <!-- ==================== sparql query builder ==================== -->