Commit graph

562 commits

Author SHA1 Message Date
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
Jim Blake
7b849ace9b VIVO-731 Create ContentTypeUtil with tests 2014-04-09 17:01:10 -04:00
Jim Blake
b63e4134ac VIVO-731 Create a thorough unit test for SparqlQueryServlet 2014-04-07 14:23:22 -04:00
j2blake
09dd8da784 Merge branch 'maint-rel-1.6' into develop 2014-03-25 15:44:59 -04:00
j2blake
0bc3f211bb VIVO-682 Modify some auth code to work better with faux properties. 2014-03-25 15:44:10 -04:00
j2blake
50e55b62ef Merge branch 'maint-rel-1.6' into develop 2014-03-10 18:15:16 -04:00
j2blake
fdeee35bb4 VIVO-692 Restrict LOD by Publish level, not by Display level
Create a new annotation for properties and classes, HiddenFromPublishBelowRoleLevelAnnot.
Provide the means to initialize these annotations, edit them, and display them in the verbose property display.
Create a Permission and some requested actions so the policies can decide which statements must be filtered out, based on the user's role.
Add unit tests and improve acceptance tests
2014-03-10 18:14:02 -04:00
j2blake
416f142526 Merge branch 'maint-rel-1.6' into develop 2014-01-09 18:25:32 -05:00
j2blake
0280cda8e3 VIVO-662 Remove duplicate rows from the SPARQL query results.
Two rows are considered to be duplicates if they have the same authorshipURI or the same authorURI.
2014-01-09 17:33:25 -05:00
j2blake
245763e9e7 Make DeveloperSettings a singleton, and other improvements.
By making it a singleton, we do need an explicit Setup operation. However, it means that we can refer to the settings in client code that doesn’t have access to a request or to the ServletContext.

Other refactorings to simplify the logic or make it more scalable.
2014-01-04 14:22:29 -05:00
j2blake
d08c3f61ff VIVO-618 Revise SearchService to parse uploaded files correctly and to respond properly to authentication errors. 2013-12-05 16:36:26 -05:00
brianjlowe
d2792db057 VIVO-614 faster model reconciliation in ABoxRecomputer 2013-12-04 16:32:01 -05:00
j2blake
70298026ea Reduce warning messages in unit tests.
We get a warning on any attempt to use anything that may be affected by DeveloperSettings, because DeveloperSetting tries to use ConfigurationProperties to find its properties file. We could avoid this by requiring the use of a ConfigurationPropertiesStub, but it seems to make more sense to routinely create a DeveloperSettingsStub on each ServletContextStub.
2013-11-25 12:31:51 -05:00
j2blake
b6da0052ce VIVO-548 Make unit tests independent of file separator characters.
By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\”. This time for sure.
2013-11-20 10:17:27 -05:00
j2blake
025f2dd8ec VIVO-548 Make unit tests independent of file separator characters.
By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\”
2013-11-19 15:50:44 -05:00
j2blake
cd0cb50798 VIVO-533 When loading properties files, mimic the language filtering of the RDFService. 2013-11-19 15:25:43 -05:00
j2blake
818962d0a6 VIVO-533 When loading templates, mimic the language filtering of the RDFService. 2013-11-18 17:13:09 -05:00
j2blake
0fce9f6a7b VIVO-541 First cut at the developer panel. 2013-11-17 11:52:18 -05:00
j2blake
5d19e746e1 VIVO-469 run the URL Finders from an RDFService, not an OntModel 2013-11-11 09:41:46 -05:00
j2blake
b012acd968 Ignore this test - it may fail on a slow machine. 2013-11-07 14:49:12 -05:00
j2blake
bc0cf6be63 VIVO-483 Obsolete VIVO URIs in Vitro search code.
Break out the mechanism for building a list of Additional URI Finder instances. Override that in VIVO. Move AdditionalURIsForContextNodes to VIVO. References to obsolete URIs are in comments.
2013-11-06 13:07:08 -05:00
j2blake
2f78e09765 VIVO-452 Revise SparqlQueryDataGetter to use RDFService if possible. 2013-11-04 15:02:15 -05:00
brianjlowe
754c8004ae Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
2013-10-31 10:45:51 -04:00
brianjlowe
e1b7638202 various performance tweaks 2013-10-31 10:43:25 -04:00
j2blake
2026a40943 VIVO-268 Restore data values to DataProperty RequestedAction classes. 2013-10-26 18:02:29 -04:00
j2blake
2bf1498c0b Remove special characters from the test.
We are testing URL encoding and decoding, but the special characters can be expressed as Unicode (e.g., \u9999), so the file does not need to be stored as UTF-8 or equivalent.
2013-10-08 16:23:58 -04:00
j2blake
7cccf19e45 VIVO-297 Use /display form of URLs on pages, not /individual form.
Individuals that don't belong to the default namespace still use the /individual form.
2013-10-08 16:22:21 -04:00
brianjlowe
32be076e29 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-08 09:41:02 -04:00
brianjlowe
5293824fa2 work on VIVO-303 picklist sorting and display 2013-10-08 09:40:57 -04:00
tworrall
6ba8de8a9d fixed additional uris for context node tests 2013-10-07 15:48:22 -04:00
j2blake
c77a9786d1 VIVO-295 Fix the unit test.
I broke it by supporting application/json
2013-10-04 16:03:00 -04:00
hudajkhan
c58215a249 fixing test so changes to process method handled 2013-09-24 15:50:49 -04:00
brianjlowe
90512bdc1c Merge remote-tracking branch 'origin/develop' into dev-isf
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
2013-09-23 16:19:05 -04:00
hudajkhan
d5c1cc49c6 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-09-16 14:08:34 -04:00
hudajkhan
8fa8702462 updates to include method that checks whether uri exists or not 2013-09-16 14:07:52 -04:00
brianjlowe
73d54999d4 VIVO-151 remedies missing inverse property inference deletions 2013-09-13 15:01:57 -04:00
j2blake
48c8c5924a VIVO-293 Create language strings for search error messages. 2013-09-13 14:46:15 -04:00
brianjlowe
2d3295fa2b Merge commit 'afa5e8697aae74217538d4a1d65043e82d5b57f9' into dev-isf 2013-09-10 09:08:14 -04:00