Commit graph

2963 commits

Author SHA1 Message Date
brianjlowe
d2177ab3ce Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-06-20 12:45:14 -04:00
brianjlowe
54f43f56d3 ongoing work on VIVO-60 application ontology support for property/class combinations 2013-06-20 12:43:53 -04:00
j2blake
951e7af9b0 No longer used 2013-06-20 12:18:03 -04:00
j2blake
d977c4d52d Remove unused import statements. 2013-06-20 11:59:27 -04:00
j2blake
a42b4cbe25 VIVO-126 Default WADF on the request must include language filter.
In this case, the application metadata model was not filtered.
2013-06-18 14:32:12 -04:00
j2blake
4ee600a0d4 VIVO-80 Default WADF on the request must include language filter.
In this case, the display model was not filtered.
2013-06-18 11:32:48 -04:00
j2blake
5de5a322a2 VIVO-139 Use the I18n framework wherever DisplayMessage is loaded. 2013-06-14 12:47:37 -04:00
j2blake
aa7c8024d0 VIVO-125 Improvements to I18n
Do not clear the cache more than once per request. Improve the hooks for unit tests.
2013-06-14 12:41:33 -04:00
brianjlowe
b26922242a work on VIVO-60 application ontology code for class/property combination configuration 2013-06-12 16:57:37 -04:00
tworrall
f3acf5afe6 VIVO-65. for property groups, edit form was incorrect 2013-06-11 13:35:19 -04:00
j2blake
57c962e82a VIVO-82 FileServingServlet must use an existing WADF.
Request-specific WebappDaoFactory objects are not initialized on image requests.
2013-06-07 16:22:33 -04:00
j2blake
69ab12c4bc VIVO-82 Remove the vestiges of VitroRequestPrep
Unused imports prevented the compiling of JSPs
2013-06-07 15:43:22 -04:00
j2blake
b86a34b611 VIVO-73 Check for null Set from ServletContext.getResourcePaths() 2013-06-06 18:09:13 -04:00
j2blake
91277a1715 VIVO-120 VitroRequest.getFullWebappDaoFactory() is poorly named.
In fact, it returns a reference to the unfilteredWebappDaoFactory, and this was changed (broken) by the work on VIVO-82.
2013-06-06 17:33:02 -04:00
j2blake
ed95df1637 VIVO-82 Merge the filters that set up VitroRequest models
VitroRequestPrep and WebappDaoFactorySDBPrep merge to RequestModelsPrep. WebappDaoFactorySparqlPrep goes away.
2013-06-06 17:28:45 -04:00
j2blake
a19227188b VIVO-120 improve the error messages from OperationUtils.cloneBean()
Add unit tests for the method and restructure the logic so a failure to create the clone is treated as seriously as a failure to load it with values. Previously  a failure to create resulted in a null return (with a log message) while a failure to load resulted in an exception (with a log message).
2013-06-05 15:37:05 -04:00
j2blake
9ec06f224e Trivial changes 2013-06-04 14:21:21 -04:00
j2blake
140fd0eb8b VIVO-117 Turn off HTTP caching unless explicitly enabled in runtime.properties. 2013-06-03 15:44:17 -04:00
Stephen V. Williams
16412889b2 merged i18n changes in searchPageResults into feature/search-download changes for downloading results and adding counts to facets 2013-05-31 15:02:13 -06:00
j2blake
5bf80c3e14 VIVO-118 Make getDataPropertyByURI() an unfiltered operation.
This method is used to determine whether a given property is a data property or not. If the user is restricted from displaying this property, then the filtered answer is NO. But that is really inappropriate. The real questions are whether the user can see the values of this property, and whether the user can add or modify values of this property -- not whether the user can see or modify the property itself.
2013-05-31 12:40:15 -04:00
j2blake
9a6f300993 VIVO-118 Clean up DataPropertyDaoFiltering
Remove unused imports, add @Override tags as appropriate. Remove unused methods (don't override the interface, not called). Separate filtering methods from non-filtering methods. Cosmetic formatting.
2013-05-31 12:32:32 -04:00
j2blake
20e6db75cd Remove unused imports. 2013-05-28 15:39:33 -04:00
j2blake
c9e666048e VIVO-92 Remove OntModelSelector.getTBoxModel(String ontologyURI)
This variant of getTBoxModel() is never called in the code, and it not implemented correctly in any of the implementations of OntModelSelector. Lose it.
2013-05-28 15:39:07 -04:00
j2blake
ee6141adc2 Clean up JenaAdminActions to remove compiler warnings.
Remove commented code and unused methods. Add generics to Iterators or use for-each loops to avoid iterators entirely.
2013-05-28 15:35:51 -04:00
j2blake
77d7f1e184 VIVO-82 Remove unused actions in JenaAdminActions
No code in the application calls ctx.setAttribute("jenaPersistentOntModel").

The action "isIsomorphic" will do nothing if ctx.getAttribute("jenaPersistentOntModel") is null.
The action "removeUntypedResources" will throw an exception if ctx.getAttribute("jenaPersistentOntModel") is null.
Remove them.
2013-05-28 15:30:56 -04:00
brianjlowe
7760fdf6af work on VIVO-60 application ontology for property/class combinations 2013-05-22 16:28:11 -04:00
brianjlowe
d65d4109fa Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-22 15:03:54 -04:00
j2blake
4928940849 VIVO-82 Use ModelAccess to store and get WebappDaoFactory references. 2013-05-21 17:46:20 -04:00
j2blake
c086a595e1 VIVO-82 Tweak the uses of ModelAccess to keep backward compatibility.
Even if it appears to the untrained eye that the models are being misused.
2013-05-21 17:46:19 -04:00
brianjlowe
067deb48d5 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 16:19:07 -04:00
tworrall
8e26a768b5 some i18n cleanup 2013-05-21 10:55:24 -04:00
brianjlowe
6464dc9eeb Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 10:23:12 -04:00
j2blake
dbcc75dc20 Fix so widgets can invoke I18N method. 2013-05-20 13:31:25 -04:00
brianjlowe
707d40e25c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-20 10:03:35 -04:00
j2blake
9a7a385b87 VIVO-82 Use ModelAccess to access the DisplayTBox and the DisplayDisplay 2013-05-17 17:58:14 -04:00
j2blake
864c93432f VIVO-82 Use ModelAccess to get the OntModelSelectors
Since the OntModelSelectors are facades over the OntModels stored in ModelAccess, remove any attempts to set the OntModelSelectors.
2013-05-17 17:25:13 -04:00
j2blake
1d8da55fdb VIVO-82 Use ModelAccess to get or set the InferenceOntModel
a.k.a the Inferred Full model
2013-05-17 15:05:24 -04:00
brianjlowe
eebb205723 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-17 15:03:57 -04:00
brianjlowe
0b2896acc2 application ontology work 2013-05-17 15:03:36 -04:00
j2blake
9b7f6c92e6 VIVO-82 Use ModelAccess to get or set the BaseOntModel
a.k.a the Base Full model, or AssertionsModel
2013-05-17 13:19:46 -04:00
j2blake
4e4384bd3e VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 12:28:48 -04:00
j2blake
0a15a6df7d VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 11:41:47 -04:00
j2blake
1c95d4e4a9 VIVO-82 Use ModelAccess to get or set the UserAccounts model 2013-05-16 18:11:13 -04:00
j2blake
4764751905 VIVO-82 Use ModelAccess to get or set the Display Model 2013-05-16 18:05:50 -04:00
j2blake
416e98f5ab VIVO-82 Split WebappDaoSetup into ContentModelSetup and ModelMaker setup. 2013-05-16 16:42:57 -04:00
j2blake
0e34b459e5 VIVO-82 Refactoring WebappDaoSetup to clarify the model setup. 2013-05-16 14:04:04 -04:00
Stephen V. Williams
32395cbac2 Fixed controller for CSV output, added button and coorsponding js and png 2013-05-15 14:53:31 -06:00
Stephen V. Williams
96bed7ce03 first pass at creating a csv download option. TODO icons on page, debug failing load 2013-05-14 14:40:17 -06:00
j2blake
6123f41d95 VIVO-87 First attempt at a caching filter.
Appears to work with Firefox cache and Chrome cache, except for language-dependent stuff.

Is that because it isn't configured correctly, or is it because Firefox and Chrome aren't attempting to keep more than one version of a page in their caches? Even if they do see a "Vary: Accept-Language" header?
2013-05-14 16:37:29 -04:00
brianjlowe
ddf101d6ae adding license tag to ApplicationConfigurationOntologyUtils.java 2013-05-14 16:14:32 -04:00