Commit graph

549 commits

Author SHA1 Message Date
Jim Blake
481d3fc1d8 VIVO-695 VIVO-699 Refactor and optimize the PropertyRestrictionBean
Formerly the PropertyRestrictionPolicyHelper.
2014-12-10 17:39:06 -05:00
Jim Blake
ec36574041 VIVO-774 fix a unit test that was broken by faux property refactoring. 2014-12-09 11:41:26 -05:00
Jim Blake
875ba66a46 Merge branch 'develop' into feature/fauxEditing 2014-12-08 15:55:32 -05:00
Jim Blake
14d1cdb5bf VIVO-766 Java 8 writes prefixes in a different order.
Probably due to a change in the algorithm for HashMap, or something similar.
This test expected a particular string in response, but Java 7 and Java 8 returned two different, but equivalent, strings.
Modify it so it will accept @prefix or xmlns: specifications in any order.
2014-12-08 15:28:21 -05:00
Jim Blake
3b508a6c97 VIVO-766 Java 8 handles no-argument constructors differently.
Claims that a non-static inner class has no no-argument constructors.
2014-12-08 15:25:59 -05:00
Jim Blake
75fff3ee54 Remove call to deprecated JUmitMatchers method. 2014-12-08 11:25:34 -05:00
Jim Blake
4b71c1d6bb VIVO-778 Refactor the connections to the TBox reasoner.
Replace PelletListener with a TBoxReasonerModule in the Application.
   The reasoner will be accessible only through here, not as a context attribute or through the WebappDaoFactory.
Split out the initialization of the TBox reasoner from SimpleReasonerSetup.
Break out the filtering of TBox changes into a ConfiguredReasonerListener.
Refactor the threading logic into a BasicTBoxReasonerDriver.
   Add a factory for creating VitroBackgroundThreads in an Executor.
Isolate the actual reasoner into a TBoxReasoner implementation. In this case, PelletTBoxReasoner.
Combine the consistency flag, error flag, explanation, and running status into one TBoxReasonerStatus object.
2014-12-08 10:54:07 -05:00
Jim Blake
ef6f92539f Merge branch 'develop' into feature/fauxEditing 2014-11-18 11:56:52 -05:00
Jim Blake
1e6b66a12c VIVO-906 Explicitly configure the SearchIndexExcluders and DocumentModifiers. 2014-11-13 17:14:42 -05:00
Jim Blake
ebb31eb081 VIVO-906 Assemble application at runtime.
Create an object to represent VitroHomeDirectory
Instantiate TripleSources, FileStorage, etc, based on the config file.
2014-11-13 17:11:11 -05:00
Jim Blake
d18c9a38ca Stop 'deprecated' messages from JUnit imports. 2014-11-09 16:22:25 -05:00
Jim Blake
2fa9583569 Merge branch 'develop' into feature/fauxEditing
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
2014-11-09 16:14:48 -05:00
Jim Blake
72b86bd4d5 Improve handling of critical sections
Use LockableOntModel, etc., instead of Critical.
2014-11-09 16:05:06 -05:00
Jim Blake
190bf87979 VIVO-774 More functionality: implement deleteFauxProperty() 2014-10-31 18:17:38 -04:00
Jim Blake
681219da72 Merge branch 'develop' into feature/fauxEditing 2014-10-27 14:20:56 -04:00
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
Jim Blake
21df0f53be Starting the skeleton 2014-10-27 12:42:48 -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
a4d4d761bc Update JUnit and add Hamcrest matchers.
Allows better testing of expected exceptions in unit tests.
2014-10-24 10:27:53 -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
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
Jim Blake
7f220abf6f VIVO-225 Use URI Strings to fetch models, not enums. 2014-08-19 15:07:25 -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
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
1343a762e8 Add license tag. 2014-07-17 11:17:42 -04:00
brianjlowe
d65cc2b106 adding some unit tests to JenaIngestUtils 2014-06-27 16:44:14 -04:00
Jim Blake
baf0d59a68 VIVO-799 Add setRdfsLabel() to unit test class. 2014-06-18 17:41:38 -04:00
Jim Blake
4809fcb37e VIVO-719 Create the first attempt at restore. 2014-06-06 15:27:17 -04:00
Jim Blake
3a2930cdc6 VIVO-773 Update the JENA libraries and adjust to the changes
Replace the JAR files with more current ones.
Add a one-line change to BaseInfGraph (from the Jena source), so it will work with Pellet 2.3.1
Adjust all implementations of Graph to include new methods and remove old ones.
Add annotations and generics to reduce compiler warnings.
Remove all dependencies on RDB, which is no longer supported.
   This requires considerable refactoring of JenaIngestController, RDFUploadController, listModels.jsp
Refactor the ModelMaker uses
   Remove VitroJenaModelMaker,
   Revise VitroInterceptingModelMaker to be configurable for Config or Content models
Add debug logging code to ModelChangeImpl ChangeSetImpl, RDFServiceJena.
Add TDB support: RDFServiceFactoryTDB, RDFServiceTDB
   Refactor RDFServiceJena and RDFServiceSDB so much of the code can be reused by RDFServiceTDB
Accomodate two RDFService instances - one for Configuration models and one for Content models.
   Changes to RDFServiceUtils, RDFServiceSetup
   Configuration models use TDB directory in Vitro home directory
Handle bulk updating:
   Jena has deprecated bulk operations, and their models classes no longer use the bulk updaters
   Create a VitroModelFactory to use instead of the ModelFactory, when bulk updating is required.
   Create adapter classes: BulkUpdatingModel, BulkUpdatingOntModel, AbstractModelDecorator
Make the configuration model setup algorithms uniform
   Combine ApplicationModelSetup and UserModelSetup into ConfigurationModelsSetup
2014-06-01 18:23:21 -04:00
Jim Blake
0b345a6aee VIVO-766 modify test so it will not fail under Java 8. 2014-05-15 10:42:37 -04:00
Jim Blake
d506e5ce25 Merge branch 'develop' into feature/requestedActions 2014-04-28 12:02:43 -04:00
Jim Blake
9a8c378732 VIVO-761 Unit tests and clean-up 2014-04-28 11:59:05 -04:00
Jim Blake
20ba75d1d2 VIVO-761 Clean up some logic, remove some obsolete classes. 2014-04-25 16:08:38 -04:00
Jim Blake
4baad05643 VIVO-761 Use RequestedAction instead of Actions
Modify VitroHttpServlet, similar classes, and all subclasses to use RequestedAction instead of Actions. Modify PolicyHelper also.
2014-04-25 14:39:17 -04:00
hudajkhan
120be1e6b8 Move to solr 4 plus corrections to SparqlQueryExecutorTest with newlines and white space characters 2014-04-25 13:54:42 -04:00
Jim Blake
f3daaaf6d7 VIVO-761 Rework and move RequestedAction
Create AuthorizationRequest, and make RequestedAction a sub-class of it. Move the RequestActionConstants into RequestedAction. Move the class to a different package.
2014-04-24 16:46:42 -04:00
Jim Blake
ad9c08cf28 VIVO-742 Many changes to remove "solr" from the code base.
Comments, template names, Java classes, variables and method names (Java and JavaScript), etc.
2014-04-23 14:20:14 -04:00
Jim Blake
f4e81a7328 VIVO-742 Rename some 'solr' packages. 2014-04-22 18:36:13 -04:00
Jim Blake
bf71c639fb VIVO-742 Many changes to remove "solr" from methods, variables, classes. 2014-04-22 17:58:58 -04:00
Jim Blake
90886c564e VIVO-742 Change client code to use SearchEngine interface.
Removed SolrQueryTest until I can see how to update it. Everything compiles and tests run, but haven't tried running VIVO yet.
2014-04-22 15:18:21 -04:00
Jim Blake
6329343465 VIVO-742 Create the interfaces for Application and SearchEngine
Also some stubs for unit tests.
2014-04-22 15:17:54 -04:00
Jim Blake
de32d53791 VIVO-731 Replace SparqlQueryServlet with SparqlQueryController
SparqlQueryServlet was JSP-based, so delete the JSP also.
SparqlQueryController is Freemarker-based, and is a this shell around the SparqlQueryApiExecutor.
2014-04-14 12:19:48 -04:00
Jim Blake
0c0915ef65 VIVO-731 Create SparqlQueryApiExecutor with tests. 2014-04-13 19:30:23 -04:00