litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6253 commits 9 branches 0 tags 258 MiB
Commit graph

3628 commits

Author SHA1 Message Date
j2blake
1c475a5661 VIVO-248 Tweak some issues with file paths and Application Model init. 2013-08-21 15:08:48 -04:00
Brian Caruso
7a431478cb Adding authorization to SparqlUpdate, changing name of SparqlUpdateTestDataGetter to SparqlUpdate. Adding AND to Actions 2013-08-21 13:01:13 -04:00
brianjlowe
72314df521 workaround for property editing nontermination 2013-08-21 12:58:42 -04:00
j2blake
f2312a4067 VIVO-248 Move more RDF files into the home directory 
Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader.
 2013-08-21 11:27:29 -04:00
j2blake
290333a21e VIVO-248 Move more RDF files into the home directory 
Files for initializing the TBOX, ABOX, ApplicationMetadata and UserAccounts models.
 2013-08-20 17:13:48 -04:00
j2blake
2c5ce8c5ce VIVO-248 Move filegraph RDF files into the home directory 2013-08-20 15:25:57 -04:00
Brian Caruso
63da01ed7b Adding RequiresActions interface 2013-08-20 11:42:08 -04:00
Brian Caruso
3bb968a72a removing some PageDataGetter objects. They are replaced by DataGetter objects 2013-08-20 11:41:04 -04:00
Brian Caruso
34af3c202a Adding email password method to PolicyHelper. Adding getClientAddr to VitroRequest 2013-08-20 11:40:23 -04:00
Brian Caruso
e6a7ad34d3 merging develop to issue-vivo-101-sparqlupdate 2013-08-19 16:21:16 -04:00
brianjlowe
dffc40dd3b continued work on ISF conversion and data migration 2013-08-09 16:23:01 -04:00
j2blake
3f061da006 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:22:16 -04:00
brianjlowe
cbdbe629d1 work on converting editing to be ISF compatible 2013-08-07 13:48:37 -04:00
brianjlowe
887cc94e8d updating pullProperty() to pull property/class combos 2013-08-06 16:22:58 -04:00
brianjlowe
a270043063 Merge remote-tracking branch 'origin/develop' into dev-isf 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java
 2013-08-06 11:05:54 -04:00
brianjlowe
dd80f542ea work on application ontology support for property/class configuration 2013-08-06 10:34:33 -04:00
j2blake
969569c385 VIVO-246 Continue cleanup 2013-08-05 17:10:55 -04:00
j2blake
7083d8acc4 VIVO-246 Set up the Freemarker directives in only one place. 2013-08-05 16:54:49 -04:00
brianjlowe
d8d704064e work in progress on data migration and related changes to support ISF 2013-08-05 16:48:23 -04:00
j2blake
9a0ec5a76e VIVO-96 Recognize language support within editing framework. 
Instead of adding the same kluge in another location (and passing the necessary info through six layers of framework), modify the FreemarkerConfiguration to directly hold request info. Storing it in a ThreadLocal means that each thread sees its own request info, without confusion. There is still only one instance of FreemarkerConfiguration, so the template cache is shared as before.
 2013-08-05 16:15:37 -04:00
tworrall
36a7b57fad Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-08-05 15:12:45 -04:00
tworrall
37142c0231 VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before 2013-08-05 15:12:24 -04:00
Brian Caruso
f5161e14b7 Removing PageDataGetters and its related servlets and tests. VIVO-218 2013-08-05 12:41:15 -04:00
Brian Caruso
d802b95f9c removing white space from very long line 2013-08-02 11:30:33 -04:00
j2blake
56b963d8bc VIVO-235 Reduce "deprecation" messages in the build 
The benefit of making these instances deprecated is very small. The annoyance of having deprecation messages in the build is very real.
 2013-08-01 16:04:42 -04:00
j2blake
914bb18278 VIVO-64 Modify UpdateKnowledgeBase so it doesn't require an empty directory. 
It will create any directories that it needs. It will also store them in [vitro.home]/upgrade/knowledgeBase instead of [webapps]/vivo/WEB-INF/ontologies/upgrade
 2013-07-31 16:30:40 -04:00
Brian Caruso
6a3e6f4f5b Merge branch 'develop' into issue-vivo-101-sparqlupdate 2013-07-31 13:53:39 -04:00
j2blake
50a6be56a2 VIVO-39 Deprecate the SimplePermission instances that we would like to see go away. 2013-07-29 14:30:49 -04:00
j2blake
578bc95b63 Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2013-07-25 11:55:03 -04:00
j2blake
9f1b9f6beb Add license tag line. Remove unused imports. VIVO-222 2013-07-25 11:51:45 -04:00
Brian Caruso
b9d1b5d48f Remvoing unused Solr fileds ALLTEXT_PHONETIC, PHI, ADJACENT_NODES, modType, JCLASS, 
Adding field mostSpecificTypesURIs for VIVO-221
 2013-07-25 11:38:40 -04:00
Brian Caruso
5b0f8919b7 Fixing broken FileUploadServletRequest VIVO-222 2013-07-24 17:14:32 -04:00
Brian Caruso
efb879ce1e Removing classLocalNameLowerCase from solr schema.xml VIVO-161 2013-07-22 15:44:22 -04:00
j2blake
73fd47dd55 VIVO-212 The "unfiltered" WebappDaoFactory must be built from language-aware models, even if no policy filtering is applied. 2013-07-22 12:31:56 -04:00
Brian Caruso
463453111d Adding proof of concept SPARQL update VIVO-101 2013-07-19 13:49:02 -04:00
j2blake
fcbe59dcf6 Use the WADF from the request, not from the context. 
It will never be null.
 2013-07-18 16:18:49 -04:00
Brian Caruso
54f79f2ea7 Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
Brian Caruso
dfce1429b1 Merge branch 'issue-vivo-191' into develop 2013-07-18 14:35:05 -04:00
Brian Caruso
c1a6c0b228 Removing unused properties VIVO-191 2013-07-18 14:32:45 -04:00
j2blake
4f6679be58 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:22:45 -04:00
j2blake
c3a0568114 VIVO-212 Add unfiltered WADFs to ModelAccess 
Create two new FactoryIDs: UNFILTERED_BASE and UNFILTERED_UNION
Modify VitroRequest so the unfiltered WADF is no longer stored in an attribute on the request.
Initialize them in the context - same as the BASE and UNION
Initialize them in the request - same as the BASE, but UNION will be filtered.
 2013-07-18 12:37:20 -04:00
Brian Caruso
7620e43209 Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-07-17 15:03:38 -04:00
Brian Caruso
38e6146390 Fixing RDF edit on session experation. VIVO-186 2013-07-17 15:03:28 -04:00
j2blake
8f336b3505 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:08 -04:00
Brian Caruso
e3b57fd0b6 Improved the option sorting code in IndividualTypeRetryController VIVO-154 2013-07-17 11:52:42 -04:00
Brian Caruso
8d78ba0373 Change to comments in VClassGroupCache 2013-07-16 17:27:14 -04:00
Brian Caruso
fb28ce2d6d Adding checks for exceptions to solr index building. 2013-07-16 16:15:26 -04:00
Brian Caruso
268a786214 Adding check for null to IndividualFiltering to avoid problems from jena parse errors 2013-07-16 16:14:45 -04:00
Brian Caruso
fb46e64725 Adding login via email/password parameters 2013-07-16 12:28:24 -04:00
Brian Caruso
7905b80df4 Adding initial search web service for updating uris. VIVO-98 2013-07-15 14:14:15 -04:00