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

Merge revisions 4706 4715 4724 4726 4731 4733 4734 4735 4739 to the trunk. For bjl23 and bdc34. Also web.xml from 4719, but not EntityController.java, which causes SVN to barf.

Browse source
This commit is contained in:
jeb228 2010-04-13 19:51:58 +00:00
parent 10bf357d5e
commit b88ed19ed0
6 changed files with 292 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/config/web.xml
View file

@ -1044,6 +1044,10 @@
<servlet-name>entity</servlet-name>
<url-pattern>/individual/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>entity</servlet-name>
<url-pattern>/display/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>updateEntityFlags</servlet-name>
<url-pattern>/updateEntityFlags</url-pattern>