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

4951 commits

Author SHA1 Message Date
Jim Blake
474b0abb44 VIVO-774 Fix display of unpopulated properties 
Unpopulated properties with no domain URI were not recognized as faux properties
Use the faux property display name instead of the base property name.
 2014-11-19 15:55:56 -05:00
Jim Blake
dfb9b7517e VIVO-774 When merging property lists, distinguish faux property from its base. 
Merging list of populated properties with all possible properties,
   we don't want to consider two properties equivalent just on the basis of base URI and label (domainPublic)
Why was this previously considered to be a good thing?
 2014-11-19 12:13:19 -05:00
Jim Blake
ef6f92539f Merge branch 'develop' into feature/fauxEditing 2014-11-18 11:56:52 -05:00
Tim Worrall
adf04bd2be VIVO-900: on data property hierarchy, range class should be range data type 2014-11-18 10:56:02 -05:00
Tim Worrall
3cc87ba0c6 VIVO-916: fix menu item title so that it includes the linkText variable 2014-11-18 10:22:13 -05:00
Tim Worrall
9ce4b1e275 some very minor jsp cleanup 2014-11-18 10:10:22 -05:00
Jim Blake
61eb57ca5d VIVO-907 Create the TripleStoreQuirks interface 
Use it to handle the odd behavior that a particular triple store might have.
In this case, the odd behavior is that TDB mangles XMLSchema#nonNegativeInteger to XMLSchema#integer in literal types.
 2014-11-17 13:21:36 -05:00
Jim Blake
546e27c15a VIVO-907 Migrate away from ModelMaker interface. 
Use RDFService instead.
 2014-11-17 13:18:13 -05:00
Jim Blake
3022155988 VIVO-906 fix bug with multiple closures on content RDFService. 
DocumentModifiers were calling close().
 2014-11-14 15:33:05 -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
e3dca6a699 VIVO-906 Create the TripleSource hierarchy. 
SingleSourceDataStructuresProvider becomes TripleSource
DataStructuresProvider becomes CombinedTripleSource
 2014-11-13 17:06:05 -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
e665b48971 Add link to verbose panel, handle VCard oddities. 2014-11-07 10:32:33 -05:00
Jim Blake
1439c2195d tweaks to make the boolean values work. 2014-11-06 13:50:16 -05:00
Jim Blake
daac8c3c4f Populate the new bean from the base property. Handle policy restrictions. 2014-11-06 10:28:40 -05:00
Jim Blake
ec6f166f54 Cleanup. Use the locking model classes. 2014-11-05 12:59:48 -05:00
Jim Blake
852da3ff2a Implement insert and update in FauxPropertyDaoJena 2014-11-05 11:37:52 -05:00
Jim Blake
c8368dbe2d Produce the pick-lists for range and domain. 
Still not submitting the results.
 2014-11-03 15:09:43 -05:00
Jim Blake
f6f12efe6d Repair logging queries from the developer panel. 
the DataStructuresProviders must wrap their RDFServiceFactory in LoggingRDFServiceFactory,
and insure that their RDFService comes from that wrapped factory.
 2014-10-31 18:20:18 -04:00
Jim Blake
190bf87979 VIVO-774 More functionality: implement deleteFauxProperty() 2014-10-31 18:17:38 -04:00
Jim Blake
564130329e Remove previous "improvements". 2014-10-31 16:50:35 -04:00
Jim Blake
0bf6abb197 VIVO-774 clean up the handling of RoleLevel changes. 
Create an interface for the Listener to act on.
If the changed object doesn't implement the interface, log a warning and do nothing, instead of throwing a ClassCastException.
The level values should never be null.
 2014-10-31 12:59:44 -04:00
Jim Blake
f4b3728822 Merge branch 'develop' into feature/fauxEditing 2014-10-30 15:55:16 -04:00
Jim Blake
02ac3944e0 VIVO-774 show list of faux properties on the Property Editing page. 2014-10-30 15:52:23 -04:00
Jim Blake
c7ace22406 VIVO-782 Use PropertyDao.FullPropertyKey class for CustomListViewConfigFileMap 
Replaces Pair<String,Pair<ObjectProperty, String>> when building maps of Properties and FauxProperties.
 2014-10-29 15:32:23 -04:00
Jim Blake
59706a4266 Merge branch 'develop' into feature/fauxEditing 2014-10-29 11:43:05 -04:00
Jim Blake
7069cf8079 VIVO-897 Fix broken display of faux properties. 
Unpopulated faux properties don't display, except to root.
Populated faux properties are not editable, except by root.
GroupedPropertyList was calling vreq.getLanguageNeutralWebappDaoFactory() but expecting it to be policyNeutral as well.
 2014-10-29 11:32:47 -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
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
59ad0c9aa2 Merge branch 'develop' into feature/fauxEditing 2014-10-24 11:00:01 -04:00
Jim Blake
af0bac74a2 Remove deprecation warnings in JUnit tests. 2014-10-24 10:59:33 -04:00
Jim Blake
7c920e81cb Merge branch 'develop' into feature/fauxEditing 2014-10-24 10:34:18 -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