Commit graph

5796 commits

Author SHA1 Message Date
Jim Blake
73b76a6e90 VIVO-933 Read PropertyConfig.n3 into an existing model, just once. 2014-12-11 15:51:59 -05:00
Jim Blake
d48d6f63ec Merge branch 'develop' into feature/fauxEditing 2014-12-10 17:41:37 -05:00
Jim Blake
481d3fc1d8 VIVO-695 VIVO-699 Refactor and optimize the PropertyRestrictionBean
Formerly the PropertyRestrictionPolicyHelper.
2014-12-10 17:39:06 -05:00
hudajkhan
05fe47e50a needed access to rdfservice in nyccsc 2014-12-10 12:36:37 -05:00
Tim Worrall
da9e244c18 Merge branch 'feature/fauxEditing' of https://github.com/vivo-project/Vitro into feature/fauxEditing 2014-12-09 13:16:57 -05:00
Tim Worrall
ee8300dccc No Jira issue. Faux property listing was not displaying all cases of a property where the labels were the same but the domains were different. 2014-12-09 13:16:20 -05:00
Jim Blake
5a54fa171b VIVO-825 do not allow access to APIs if the account is not in a valid state.
Before testing the password, test that the account is well-formed: first name, last name, email.
After testing the password, check to see whether a password change is required.
2014-12-09 12:26:49 -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
d1b07bcffc VIVO-766 This comparator is invalid under Java 8.
Because subclass/superclass is only a partial ordering, this breaks the contract for Comparator,
and throws an IllegalArgumentException under Java 8. In particular, for classes sub, super and other,
we have sub=other, sub<super, which should imply other<super, but instead other=super.

As far as I can determine, this sort is never used anyway, so there should be no impact in removing it.
PropertyInstanceDaoJena sorts these results again before using them, as does GroupedPropertyList.
2014-12-08 15:31:10 -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
Tim Worrall
b8cb95d252 VIVO-922: updates for new faux listing functionality. New controller, template and js file, updated web.xml and site admin page, and updates to the all.properties 2014-12-05 16:57:09 -05:00
Tim Worrall
4da345d843 Merge branch 'feature/fauxEditing' of https://github.com/vivo-project/Vitro into feature/fauxEditing 2014-11-20 10:58:04 -05:00
Tim Worrall
6e212e2889 VIVO-724: minor clean up of verbose property display. 2014-11-20 10:57:46 -05:00
Jim Blake
e79ace9d55 VIVO-774 Show correct property name
Also, pre-populate the custom entry generator if the base property has one.
2014-11-19 17:03:13 -05:00
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
0f2949a36c VIVO-875 2014-11-13 17:37:02 -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