Commit graph

5742 commits

Author SHA1 Message Date
Jim Blake
3b4e2bc012 VIVO-782 Create PropertyDao.FullPropertyKey class.
Replaces Pair<String,Pair<String, String>> when building maps of Properties and FauxProperties.
2014-10-27 14:20:22 -04:00
hudajkhan
4a2321db41 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2014-10-24 12:37:57 -04:00
hudajkhan
456f8beb41 VIVO 888, and just a change to an if statement in the menumanagement file 2014-10-24 12:37:43 -04:00
Jim Blake
af0bac74a2 Remove deprecation warnings in JUnit tests. 2014-10-24 10:59:33 -04:00
Jim Blake
73b200aac1 Create ConfigurationBeansLoader.
Also dependent classes and unit tests.
2014-10-24 10:29:59 -04:00
Jim Blake
645bc92d99 A bit of syntactic sugar for critical sections. 2014-10-24 10:28:43 -04:00
Jim Blake
a4d4d761bc Update JUnit and add Hamcrest matchers.
Allows better testing of expected exceptions in unit tests.
2014-10-24 10:27:53 -04:00
Tim Worrall
ea98c15092 VIVO-217: modified template to handle situations where the associatedPage variable is null 2014-10-22 15:18:14 -04:00
Jim Blake
3f8286756a Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2014-10-17 10:56:08 -04:00
Jim Blake
dfd4a310ba Unit test for NameFields search document modifier. 2014-10-17 10:55:03 -04:00
Jim Blake
a6ce4374dc Unit test for NameFields search document modifier. 2014-10-17 10:52:53 -04:00
Jim Blake
7a12354430 VIVO-873 Improve unit tests of DocumentModifier classes
Add copy constructors, equals(), and hashCode() to BaseSearchInputDocument and BaseSearchInputField
2014-10-17 10:52:11 -04:00
Jim Blake
3ccb10dc83 VIVO-873 Simplify and document the DocumentModifier interface.
allUris parameter on modifyDocument() was not documented and not used.
There is no logical reason for modifyDocument to throw a SkipIndividualException.
2014-10-16 12:30:50 -04:00
Jim Blake
3877ba1c3e Better name for SearchEngineWrapper 2014-10-13 15:38:54 -04:00
Jim Blake
78c8f102f8 Continue to reduce the Model Madness!
Add OntModelCache to the top of the stack of RDF data structures.
Add DataStructuresProvider to the bottom of the stack.
Redesign ModelAccess method signatures.
Create the ShowSources page.
Remove RequestModelsPrep, except for setting the Collator.
Reduce the complexity of ContentModelsSetup and ConfigurationModelsSetup.

VIVO-225 VIVO-819 VIVO-820 VIVO-821 VIVO-823 VIVO-832
2014-10-10 10:07:56 -04:00
Tim Worrall
c9362db3c1 modifying previous commit so that the orcid code works correctly 2014-10-08 15:57:27 -04:00
Jim Blake
573a5e6cc6 Add a developer setting that will suppress automated search index updates. 2014-10-02 16:22:02 -04:00
Jim Blake
39e7a818c2 VIVO-864 add logging statements 2014-09-26 15:37:42 -04:00
Tim Worrall
18c3f769ee fixed issue where display was incorrect when a user was not logged in 2014-09-22 16:12:01 -04:00
Tim Worrall
8516955979 VIVO-201: removed some css redundancies 2014-09-22 12:58:52 -04:00
Jim Blake
b89dba1982 VIVO-862 add a filter to prevent Clickjacking. 2014-09-17 12:56:03 -04:00
Jim Blake
fc227d9fcd VIVO-861 Guard against Cross-Site Scripting attacks in the page title and in the body classes. 2014-09-16 13:26:03 -04:00
Jim Blake
2b9a3a5a01 Enhanced toString() methods for Models, OntModels, Datasets, Graphs, RDFService 2014-08-29 17:43:30 -04:00
hudajkhan
f1c9ac23de updating object property statement template model to enable all data to be retrieved 2014-08-27 15:46:09 -04:00
Jim Blake
7f220abf6f VIVO-225 Use URI Strings to fetch models, not enums. 2014-08-19 15:07:25 -04:00
Tim Worrall
80733cdcfe updated class to use i18n strings defined in all.properties rather than hard-coded strings in the class 2014-08-19 14:47:10 -04:00
Jim Blake
6e5bbaeef8 VIVO-848 Move the FileStorage system behind an interface
Add it to the Application framework, and do some cleanup.
2014-08-14 16:54:29 -04:00
Jim Blake
c751ecdc6d VIVO-848 move the image processing code behind an interface 2014-08-14 15:00:05 -04:00
Jim Blake
c1bb928096 Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2014-08-13 15:23:27 -04:00
Jim Blake
a9cb42162c VIVO-843 "every time" sub-models were being lost.
The problem comes when you wrap an OntModel around a Model. Sub-models are added to the OntModel, so unless you keep the same OntModel, those sub-models get lost.

This is a kluge, rather than a fix.
2014-08-13 15:22:39 -04:00
Tim Worrall
4849dd07ad VIVO-698: corrected a layout issue 2014-08-13 13:11:29 -04:00
Tim Worrall
27c62c26cc VIVO-532: modified display of language selectors 2014-08-13 12:17:05 -04:00
Jim Blake
d9fc640da6 Merge pull request #6 from lawlesst/develop
Change link to documentation for StartupManager.
2014-07-31 13:56:15 -04:00
Ted Lawless
6b72b39729 Change link to documentation for StartupManager. 2014-07-31 12:20:08 -04:00
hudajkhan
0ce10b32e6 enabling model change preprocessors to be associated with application and not just edit configuration objects 2014-07-30 14:31:49 -04:00
Jim Blake
2baa2c33e0 VIVO-823 Improve the TDB implementation of RDFService
Use a single dataset for long-term and short-term use. Get read and write locks for all access to the dataset.
Create a "VitroConnection.DataSource.tdbDirectory" property that will force and configure TDB for content models.
2014-07-28 11:54:12 -04:00
Jim Blake
0e5ee7226b Correct typo in unregisterListener(). 2014-07-28 11:06:24 -04:00
Jim Blake
4da0e35182 A more robust SDB - TDB converter: works on models as large as 6M triples. 2014-07-22 17:26:47 -04:00
Jim Blake
06be40e699 First cut at the SDB - TDB converter: fails on large models (>2M triples) 2014-07-21 17:37:02 -04:00
Jim Blake
89416efa77 VIVO-823 Close all short-term RDF Services.
Brian Lowe points out that I was creating an additional RDFService and not closing it.
Also, the configuration RDFService wasn't being closed. It wasn't causing a problem because there
is no database connection associated with it, but still it was a potential for problem.
2014-07-21 11:22:59 -04:00
Jim Blake
e1bc897154 VIVO-823 Adjust these classes to use the new ModelMakers, as much as possible.
There are commented Kluges in RequestModelsPrep and ModelAccess, where things still are not as clean as they should be.
2014-07-18 17:19:52 -04:00
Jim Blake
b4395fcb31 VIVO-823 Big changes to RDFServiceModelMaker
The "Metadata Model" goes away. A ListCachingModelMaker will provide similar functionality,
although empty models will not persist across a restart.
The BlankNodeFiltering gets pushed into the BlankNodeFilteringModelMaker, a decorator.
2014-07-18 17:18:15 -04:00
Jim Blake
58148630ad VIVO-823 Replace RDFServiceSetup with RDFSetup
This introduces the RDFSource as a wrapper around an RDFServiceFactory and 2 ModelMakerFactorys.
This introduces ModelMakerUtils as a way to get the ModelMakers for context or for request.
Create implementations of RDFSource for SDB, TDB, and SPARQL.
The SDB implementation absorbs JenaPersistentDataSourceSetup and part of ConfigurationPropertiesSmokeTests,
which aren't needed unless we use SDB.

This is probably broken, without the subsequent changes.
2014-07-18 17:15:24 -04:00
Jim Blake
63ed82cef9 VIVO-823 Create some tests for the VitroModelFactory
Make changes as determined by the tests, to BulkUpdatingOntModel as well.
Add debug statements to ModelSynchronizer.
2014-07-18 17:04:58 -04:00
Jim Blake
04f763109e VIVO-823 Create several ModelMaker decorators, with tests 2014-07-18 17:02:21 -04:00
Jim Blake
553bd417f7 VIVO-730 SparqlUpdatePage is no longer used. 2014-07-18 16:54:20 -04:00
Jim Blake
8115aebc1f Fix this warning message. 2014-07-18 10:51:31 -04:00
Jim Blake
1343a762e8 Add license tag. 2014-07-17 11:17:42 -04:00
hudajkhan
72fbcedcba updates for returning array of most specific types and incorporating that check in removeConceptSubclasses in the client-side code VIVO-826 2014-07-10 12:37:16 -04:00
Jim Blake
8591894262 GuardAgainstUnmigratedRDB should behave well if the database driver is not found. 2014-07-10 10:30:09 -04:00