Commit graph

3963 commits

Author SHA1 Message Date
hudajkhan
ad0ae3c09a updates for semantic services, temporarily commenting out concept semantic type which is still in progress 2013-08-12 13:09:04 -04:00
hudajkhan
a728d53c22 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-12 11:22:34 -04:00
brianjlowe
ed71f74e10 continued work on ISF conversion and data migration 2013-08-09 16:24:08 -04:00
j2blake
1c9f9f5f1a VIVO-246 Re-implement the FreemarkerConfiguration
The Configuration must contain mutable information like the theme directory and the TemplateLoader. It must also be request-specific so it can have the correct Locale for language support. But we should only have one instance, so there is only one TemplateCache (alternatively, one TemplateCache per theme).

Previously, this was addressed by intercepting the Template processing and adding the request-based info to the Environment. However, this interception code needed to appear each time a Template was processed. This was sometimes overlooked, and at best introduced a bunch of duplicated code.

Instead, I extended the freemarker Configuration class to include a ThreadLocal that holds request-specific information.
2013-08-08 13:23:40 -04:00
hudajkhan
0f64658c5e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-08 12:25:31 -04:00
hudajkhan
2ea474b6ef External vocabulary service and integration of Agrovoc with work beginning for applying concept semantic type to UMLS concepts. 2013-08-07 16:08:11 -04:00
tworrall
6950aab59c fixed a typo 2013-08-07 15:02:42 -04:00
brianjlowe
a8f1bfcf15 working on converting position editing to ISF 2013-08-07 13:47:17 -04:00
brianjlowe
c162d3d84b position form updates for ISF 2013-08-06 16:55:15 -04:00
brianjlowe
afedf991f2 in-process conversion of position rendering to ISF 2013-08-06 16:23:44 -04:00
brianjlowe
f30917d357 Merge remote-tracking branch 'origin/develop' into dev-isf 2013-08-06 11:06:35 -04:00
brianjlowe
cd3ae0d0ad publication form updates for ISF 2013-08-06 10:35:13 -04:00
brianjlowe
4598aae578 work in progress on data migration and related changes for ISF properties 2013-08-05 16:46:25 -04:00
tworrall
be11fc589f VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before 2013-08-05 14:57:59 -04:00
j2blake
9fda9d2922 VIVO-235 Improve build instructions.
Tell the user what to expect when they run "ant all", and how to distinguish success from failure.
2013-08-01 17:18:17 -04:00
brianjlowe
5fad9b85fa initial example file of application configuration for property/class combination 2013-07-24 17:04:30 -04:00
brianjlowe
087e33f137 person subtypes for 1.6 2013-07-24 16:38:45 -04:00
brianjlowe
1fafc58def ISF owl files 2013-07-24 15:03:13 -04:00
tworrall
f2ce218a87 VIVO-105: English and Spanish versions of the about page 2013-07-22 16:19:40 -04:00
tworrall
a2ce7abf73 VIVO-216 made the controllers threadsafe (thanks for the example, Jim) 2013-07-22 13:25:34 -04:00
j2blake
ea2ab8cd3b VIVO-137 Move the i18nChecker utility to utilities/languageSupport 2013-07-19 16:28:03 -04:00
j2blake
2155394810 VIVO-137 improve i18nChecker
Recognize sets of language-dependent template files. Only report warnings if they use i18n()
Reduce the number of false positives
Speed things up.
2013-07-19 16:26:33 -04:00
j2blake
b6401de8aa VIVO-216 Remove instance variables to make the servlet thread-safe. 2013-07-18 16:16:05 -04:00
j2blake
d667f63632 VIVO-212 Rename WADF access methods on VitroRequest
Use the term Unfiltered instead of Full, for consistency with other places in Vitro.
2013-07-18 13:29:24 -04:00
tworrall
b1fc49bc05 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-07-17 15:51:12 -04:00
tworrall
9d5636d01c moving some i18n() strings from vivo (wilma theme) to vitro 2013-07-17 15:50:37 -04:00
j2blake
113f7ba94b Remove reference to N3EditFormController, which was removed in 0e26d45a31 2013-07-17 15:47:58 -04:00
j2blake
e9c25cd207 Remove extraneous closing brace 2013-07-17 13:23:28 -04:00
j2blake
1d16f165dc VIVO-213 smoke test to check JVM temp directory
If it isn't set, if it isn't a directory, if we can't access it, if we can't create a temp file, complain.
2013-07-17 13:01:33 -04:00
Brian Caruso
b155bd7aa3 Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-07-16 14:41:06 -04:00
Brian Caruso
b7c80189f0 Adding SearchService to web.xml VIVO-98 2013-07-16 14:40:12 -04:00
tworrall
002cdb7a51 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-07-16 10:04:59 -04:00
tworrall
a067f193a3 fixed div element reference 2013-07-16 10:04:33 -04:00
Brian Caruso
7dd2e6c549 Changing install.html to suggest proxy instead of mod_jk VIVO-5 2013-07-10 11:22:21 -04:00
tworrall
57c694abee add links to wiki pages for two runtime properties; fixed an incorrect href attribute 2013-07-09 09:38:30 -04:00
tworrall
0395f474a4 VIVO-30: removing list view config doc as it now appears in the Duraspace VIVO wiki 2013-07-05 11:42:03 -04:00
tworrall
7bbc249047 some home page map cleanup, standardization 2013-07-03 14:00:56 -04:00
Jim Blake
cb757d82da Merge pull request #5 from vivo-project/feature/search-download
Added a new field email to IndividualSearchResults and a modification of...
2013-06-28 12:16:01 -07:00
tworrall
c3bdcb6676 minor change, renamed a variable 2013-06-28 10:15:32 -04:00
tworrall
04b3bb864f removing some unused image files 2013-06-25 15:53:04 -04:00
tworrall
93e2b107bf fixed an i18n string 2013-06-25 13:56:17 -04:00
tworrall
d9de65e4c8 only show the view active grants link on academic department pages if the department has any active grants 2013-06-25 11:07:16 -04:00
tworrall
883cbea941 VIVO-105 along with additions to the upgrade doc 2013-06-24 15:48:19 -04:00
j2blake
0bb0c1d323 VIVO-18 Rename Log4J properties file 2013-06-21 15:39:27 -04:00
j2blake
c5acf46316 VIVO-125 Create more "Google Spanish" labels
Add more labels by changing the filter in the label_stripper/label_inserter scripts. Improve the structure of the scripts to use an external filter.
2013-06-21 14:58:28 -04:00
j2blake
b758f374ad VIVO-140 Modify client code to get language-aware extract from VClassGroupCache 2013-06-21 14:54:05 -04:00
tworrall
7a9d46e130 significant changes for VIVO-131. See Jira comment for more details 2013-06-20 16:02:10 -04:00
tworrall
42e88d91b8 fixed variable reference 2013-06-19 16:48:33 -04:00
tworrall
c4790afac4 updated install and upgrade docs to include info on new runtime properties 2013-06-17 10:44:31 -04:00
tworrall
c50ed11b15 modified the display string for display_more_ellipsis 2013-06-14 16:40:58 -04:00