Commit graph

6472 commits

Author SHA1 Message Date
Jim Blake
ad9fd830e5 Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 2017-05-15 21:44:21 -04:00
Nate Prewitt
608aa1cf54 Merge pull request #59 from nateprewitt/license_update
[VIVO-1286] License update
2017-05-08 11:12:33 -06:00
Nate Prewitt
9e7d690203
moving license file front and center 2017-05-06 14:41:21 -06:00
Nate Prewitt
000da50219
updating license path 2017-05-06 14:40:28 -06:00
Graham Triggs
23c0ee372d Merge branch 'develop' into feature/theming 2017-04-30 19:27:15 +01:00
Graham Triggs
b2086c9517 Default PlumX to being disabled, as the spacing throws out the article display. 2017-04-30 18:17:53 +01:00
Steve McKay
6db6fabdac [VIVO-1315] Plum print integration (#57) 2017-04-30 13:11:10 +01:00
Jim Blake
d57dad3309 Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 2017-04-25 17:12:24 -04:00
Jim Blake
7991bc3da1 VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME (#56)
* VIVO-1246 improve the ConfigurationBeanLoader:

Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality

* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* VIVO-1246 Move unit tests to the new location.

* VIVO-1246 The documentation was in the wrong place.

* VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME
2017-04-05 09:15:28 -04:00
Jim Blake
c3af31a976 Merge branch 'develop' of https://github.com/j2blake/Vitro into develop
* 'develop' of https://github.com/j2blake/Vitro:
  VIVO-1246 The documentation was in the wrong place.
  VIVO-1246 Move unit tests to the new location.
  VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.
  VIVO-1246 improve the ConfigurationBeanLoader:
2017-03-30 12:48:21 -04:00
Graham Triggs
97adf5bdfc Merge branch 'develop' into feature/theming 2017-03-30 13:22:47 +01:00
Graham Triggs
c93c82c66b Dependency for tools need to be non-transitive (optional) 2017-03-30 13:22:32 +01:00
Graham Triggs
3a5b445571 Merge branch 'develop' into feature/theming 2017-03-30 12:45:53 +01:00
Graham Triggs
ac8f02d006 Update commons collections 2017-03-29 22:16:05 +01:00
Graham Triggs
bafe1b33b3 Revert "Upgrade commons-collections for security fix."
This reverts commit 90bc98a66f.
2017-03-29 22:14:46 +01:00
Graham Triggs
bfa46ef9fe Add Jena tools to home project 2017-03-29 22:14:19 +01:00
Graham Triggs
90bc98a66f Upgrade commons-collections for security fix. 2017-03-29 19:40:46 +01:00
Graham Triggs
b891e8a40b Revert "Use the dataset directly for isomorphism with Jena backend"
This reverts commit f45847842c.
2017-03-19 23:25:30 +00:00
Graham Triggs
f45847842c Use the dataset directly for isomorphism with Jena backend 2017-03-19 22:01:31 +00:00
Jim Blake
472cc3a1a9 Merge branch 'develop' of github.com:j2blake/Vitro into develop
* 'develop' of github.com:j2blake/Vitro:
  VIVO-1246 The documentation was in the wrong place.
  VIVO-1246 Move unit tests to the new location.
  VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.
  VIVO-1246 improve the ConfigurationBeanLoader:

# Conflicts:
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTestBase.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_Cardinality_Test.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java
2017-03-12 20:33:12 -04:00
Graham Triggs
6d44d052f7 Merge branch 'develop' into feature/theming 2017-02-15 19:28:15 +00:00
hudajkhan
1bc1f68548 [VIVO-1316] moving base lookup architecture for vocabulary services to Vitro (#55) 2017-02-10 15:49:28 +00:00
Graham Triggs
ed2b570d37 [VIVO-1313] Swap javax JSON interface to Glassfish parser 2017-02-01 14:46:19 +00:00
Graham Triggs
96b06fc9a5 Add fluent dependency 2017-01-31 21:38:53 +00:00
grahamtriggs
b5da11c2be Faster implementation of TPF for SDB (#54)
* Initial performance improvements to TPF

* Add faster counts for TPF

* Correct end count

* Bug fixes, use hashes for filtering

* Initial LDF SPARQL client

* Handle blank nodes correctly
2017-01-31 21:09:49 +00:00
Graham Triggs
0191ae6dbb Testing Travis trusty (beta) environment 2017-01-26 17:50:37 +00:00
Graham Triggs
1426b005f2 Minor TPF endpoint fixes 2017-01-17 11:40:48 +00:00
Jim Blake
9cd5a1329a VIVO-1248 extend SparqlQueryRunner, and combine with older attempts. (#45)
* Ignore artifacts that Eclipse creates.

* VIVO-1248 Create the utils.sparqlrunner package.

This is a merge of most of the edu.cornell.mannlib.vitro.webapp.utils.sparql package with
edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner

Remove the references to those classes.

* VIVO-1248 extend SparqlQueryRunner, and combine with older attempts.
2017-01-03 13:16:22 -05:00
Jim Blake
a8ec633f71 VIVO-1246 Improve the ConfigurationBeanLoader (#52)
* VIVO-1246 improve the ConfigurationBeanLoader:

Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality

* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* VIVO-1246 Move unit tests to the new location.

* VIVO-1246 The documentation was in the wrong place.
2017-01-03 12:12:11 -05:00
Graham Triggs
fc83c9f48d Remove unneeded calls to JSONObject.quote() 2016-12-29 22:26:08 +00:00
Graham Triggs
91d061f7f2 Add explicit dependency on commons-collections, as it is used directly in Vitro code 2016-12-24 13:48:11 +00:00
Graham Triggs
4c952d01c6 Doesn’t look like we need cxd or cos anymore, so commented out. 2016-12-24 12:49:03 +00:00
Graham Triggs
49c5b561f9 Migrate last dependencies on commons-lang 2.x 2016-12-24 12:27:26 +00:00
Graham Triggs
890d908a6a Allow owlapi to use transitive dependencies 2016-12-24 12:12:43 +00:00
Graham Triggs
88d4cec9cf Move jaxrpc to VIVO 2016-12-24 12:06:48 +00:00
Graham Triggs
be72c0d8b8 Remove COS dependency from JSP 2016-12-24 11:47:36 +00:00
grahamtriggs
68a462b05a [VIVO-1312] Implement Linked Data Fragment Server (#53)
* [VIVO-1312] Linked Data Fragments initial implementation

* [VIVO-1312] Use known ontologies in the prefixes config

* [VIVO-1312] Simplify SPARQL as when restricted to specific values, they don’t need ordering

* [VIVO-1312] Freemarker fixes

* [VIVO-1312] Remove blank nodes

* [VIVO-1312] Add access control header and standard prefixes for TPF

* [VIVO-1312] Render literals in form so that they will work on resubmit

* [VIVO-1312] Minor template update

* [VIVO-1312] Minor template update
2016-12-23 21:55:08 +00:00
Graham Triggs
e9cb3de52e Exclude rio dependencies so that Sesame isn’t included 2016-12-21 18:51:34 +00:00
Graham Triggs
5ccba0e0c4 Update POM to require Java 8 (Jena 3.x does not support earlier versions) 2016-12-21 14:12:27 +00:00
Graham Triggs
d45f70bcc8 Update JFact, OWLAPI and jsonld-java 2016-12-21 12:41:55 +00:00
Graham Triggs
4304d2367f Explode the OWLAPI OSGi distribution to separate JARs so that we don’t bring in the embedded dependencies 2016-12-21 12:16:44 +00:00
Graham Triggs
4e3d373562 Update httpclient to 4.5.2 to resolve a nonsuchmethoderrror 2016-12-21 09:57:51 +00:00
Graham Triggs
c7bbe0a8c3 Remove VIVOWEB Maven repository as Vitro no longer requires dependencies that are not in Maven central 2016-12-20 08:53:36 +00:00
Graham Triggs
45bad8174d Replace old, undistributed CSV parser library with Commons CSV 2016-12-19 22:24:12 +00:00
Graham Triggs
47a18844c4 Remove unused JAI dependencies 2016-12-19 19:09:00 +00:00
Graham Triggs
17b323649d Remove unused Fedora connection 2016-12-19 19:08:13 +00:00
Graham Triggs
28c99c9408 Correct stage 1 migration - remove old JAI processor testers to fix the build 2016-12-19 11:08:57 +00:00
Graham Triggs
e24943aa50 Committed wrong files - removing incomplete image processor testers from image 2016-12-19 11:06:02 +00:00
Graham Triggs
05366f7ebe Help Travis by caching Maven dependencies 2016-12-19 11:02:03 +00:00
Graham Triggs
aaa9ac6989 Migrating image processor testers for the ImageIO implementation - stage 1, remove the old testers from branch so build doesn’t break 2016-12-19 10:59:28 +00:00