Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
I have no idea why this is a merge. My develop branch is behind and I want to push changes to git, and this form is what I got.
This commit is contained in:
tworrall
commit
1f66e0eca4
8 changed files with 905 additions and 256 deletions
|
|
@ -122,8 +122,8 @@
|
|||
<filter-mapping>
|
||||
<filter-name>VitroRequestPrep</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>request</dispatcher>
|
||||
<dispatcher>forward</dispatcher>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
<dispatcher>FORWARD</dispatcher>
|
||||
</filter-mapping>
|
||||
|
||||
<filter>
|
||||
|
|
@ -133,7 +133,7 @@
|
|||
<filter-mapping>
|
||||
<filter-name>PageRoutingFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>request</dispatcher>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
</filter-mapping>
|
||||
|
||||
<!-- Spring setup **************************************************** -->
|
||||
|
|
@ -164,25 +164,6 @@
|
|||
|
||||
-->
|
||||
<!-- 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-name>IndexController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.IndexController</servlet-class>
|
||||
|
|
@ -201,15 +182,6 @@
|
|||
<url-pattern>/RecomputeInferences</url-pattern>
|
||||
</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-name>MenuManagementEdit</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.MenuManagementEdit</servlet-class>
|
||||
|
|
@ -228,24 +200,6 @@
|
|||
<url-pattern>/ajax/sparqlQuery</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<!-- This is the new navigation controller. It is not ready for the 1.1 release
|
||||
see http://issues.library.cornell.edu/browse/NIHVIVO-597
|
||||
<servlet>
|
||||
<servlet-name>NavigationController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.NavigationController</servlet-class>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>NavigationController</servlet-name>
|
||||
<url-pattern>/nav/*</url-pattern>
|
||||
</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-name>AboutController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class>
|
||||
|
|
@ -389,15 +343,6 @@
|
|||
<url-pattern>/editRequestAJAX</url-pattern>
|
||||
</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>RDFUploadFormController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController</servlet-class>
|
||||
|
|
@ -452,24 +397,6 @@
|
|||
<url-pattern>/jenaXmlFileUpload/*</url-pattern>
|
||||
</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-name>JenaAdminServlet</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions</servlet-class>
|
||||
|
|
@ -569,16 +496,6 @@
|
|||
<url-pattern>/datapropEdit</url-pattern>
|
||||
</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-name>OntologyEditController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController</servlet-class>
|
||||
|
|
@ -777,24 +694,6 @@
|
|||
<url-pattern>/admin/wait</url-pattern>
|
||||
</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-name>ListVClassWebappsController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
|
||||
|
|
@ -957,15 +856,6 @@
|
|||
<url-pattern>/edit/reorder</url-pattern>
|
||||
</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-name>TermsOfUseController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TermsOfUseController</servlet-class>
|
||||
|
|
@ -1105,32 +995,6 @@
|
|||
<url-pattern>/browse</url-pattern>
|
||||
</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-name>serveFiles</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.filestorage.serving.FileServingServlet</servlet-class>
|
||||
|
|
@ -1140,21 +1004,6 @@
|
|||
<url-pattern>/file/*</url-pattern>
|
||||
</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-name>SparqlQuery</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet</servlet-class>
|
||||
|
|
@ -1165,16 +1014,6 @@
|
|||
<url-pattern>/admin/sparqlquery</url-pattern>
|
||||
</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-name>primitiveRdfEdit</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveRdfEdit</servlet-class>
|
||||
|
|
@ -1194,10 +1033,6 @@
|
|||
</servlet-mapping>
|
||||
|
||||
<!-- ============================== servlet-mappings ======================== -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>fetch</servlet-name>
|
||||
<url-pattern>/fetch</url-pattern>
|
||||
</servlet-mapping>
|
||||
<servlet-mapping>
|
||||
<servlet-name>mailusers</servlet-name>
|
||||
<url-pattern>/mailusers</url-pattern>
|
||||
|
|
@ -1256,22 +1091,6 @@
|
|||
<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 ==================== -->
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue