Commit graph

6515 commits

Author SHA1 Message Date
Graham Triggs
aa3b011479 Update JSTL dependencies 2016-03-28 15:39:58 +01:00
grahamtriggs
4f9fe39ca3 Merge pull request #34 from OpenVIVO/develop
Suppress dependency that causes OpenJDK problem
2016-03-25 14:35:35 +00:00
Graham Triggs
df7c74206a [VIVO-1236] Remove dependency from compile that causes problems with OpenJDK 2016-03-25 14:34:38 +00:00
Graham Triggs
acf54541a5 [VIVO-1234] Use alternative colour space that should work better with OpenJDK 2016-03-11 15:15:47 +00:00
grahamtriggs
bae17b4293 Merge pull request #33 from OpenVIVO/develop
VIVO-1234 JaiImageProcessor alpha channel problem
2016-03-10 23:28:47 +00:00
Graham Triggs
bbad114f85 [VIVO-1234] Use alternative method to change the colour space of an image and remove the alpha channel 2016-03-10 23:20:35 +00:00
Graham Triggs
c7ca626121 Updated Freemarker 2016-03-07 21:20:35 +00:00
Paul Friedman
bc6eda75b1 Use posix extensions for maven-assembly-plugin
After encountering the following error when attempting to build the application with maven

  [ERROR] Failed to execute goal org.apache.maven.plugins:maven-assembly-plugin:2.5.5:single (default) on project vitro-home: Execution default of goal org.apache.maven.plugins:maven-assembly-plugin:2.5.5:single failed: group id '1162086330' is too big ( > 2097151 ). Use STAR or POSIX extensions to overcome this limit -> [Help 1]

set the tarLongFileMode option to posix as it says in the error message and in the FAQ

  https://maven.apache.org/plugins/maven-assembly-plugin/faq.html#tarFileModes
2016-02-16 13:01:14 -06:00
Benjamin Gross
7c42bb3c9f [VIVO-1229] fix siteName and title variable mixup 2016-02-16 10:08:23 -07:00
brianjlowe
97658ad25f Merge remote-tracking branch 'upstream/develop' into writePerformance 2016-02-11 17:49:23 +02:00
brianjlowe
e4a8c4f102 move unit test to new location 2016-02-11 16:38:17 +02:00
brianjlowe
724d8df369 Merge branch 'writePerformance-1.8' into writePerformance 2016-02-11 16:30:19 +02:00
Graham Triggs
9ff3dd5e11 [VIVO-1226] bug fix for search help back link 2016-01-21 15:55:49 +00:00
Ariel D. Moya Sequeira
950aecf7ab Adds UTF-8 charset to emails 2016-01-20 15:51:10 +00:00
Ariel D. Moya Sequeira
8660ed91eb Adds UTF-8 charset to emails 2016-01-20 15:51:09 +00:00
Ariel D. Moya Sequeira
9a2cc3a9cc Adds UTF-8 charset to emails 2016-01-20 15:51:08 +00:00
Ariel D. Moya Sequeira
074d9f98cf Adds UTF-8 charset to emails 2016-01-20 15:51:07 +00:00
grahamtriggs
3fb5f80119 Merge pull request #27 from lawlesst/fix/yasqe-js
Move yasqe js to required location.
2016-01-07 14:02:23 +00:00
Ted Lawless
11d8a91469 Move yasqe js to required location. 2016-01-06 14:20:43 -05:00
brianjlowe
64cfc4a370 improvements to RDFServiceGraph triple batching 2015-12-20 18:44:11 +02:00
brianjlowe
6e3a256596 fix to allow for batch handling of more complex SPARQL updates 2015-12-19 18:43:16 +02:00
Graham Triggs
f3fb439c15 Change DWR dependency to an unreleased version, due to session errors 2015-12-17 19:34:17 +00:00
Graham Triggs
661b1e7c88 Add JSP dependencies 2015-12-17 16:22:18 +00:00
brianjlowe
de9d40694f moving IndividualURIQueue to its new mavenized home 2015-12-14 20:00:30 +02:00
brianjlowe
5d33da415d remove obsolete files 2015-12-14 17:26:53 +02:00
brianjlowe
01281d2034 Merge branch 'develop' into writePerformance
Conflicts:
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ABoxJenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/ListeningGraph.java
2015-12-14 17:19:32 +02:00
brianjlowe
ce1ec1158f remove obsolete code 2015-12-13 14:09:56 +02:00
brianjlowe
ace972dd73 minor fixes 2015-12-12 23:27:36 +02:00
brianjlowe
17fab2894c misc. cleanup / minor fixes 2015-12-12 22:58:06 +02:00
brianjlowe
e85e8a4e22 remove obsolete import 2015-12-12 22:04:45 +02:00
brianjlowe
539bffd6bf change to listener interface to simplify things and avoid sharing the reasoner's individual queue between concurrent writing threads 2015-12-12 21:51:50 +02:00
brianjlowe
295ddbfad1 add/remove ABox portion of mixed RDF through RDFService 2015-12-11 20:37:56 +02:00
brianjlowe
d13fdf8124 bulk graph clear from ingest tools 2015-12-11 19:02:10 +02:00
brianjlowe
5ae16cf9e5 clean up / remove unneeded methods in SimpleReasoner 2015-12-11 17:35:03 +02:00
Michael Conlon
14b1027943 correct links 2015-12-11 09:48:00 -05:00
brianjlowe
f0992605ce passes sameAs unit tests 2015-12-10 18:34:54 +02:00
brianjlowe
a4649a7751 log level change 2015-12-09 22:10:00 +02:00
brianjlowe
6e99b1c707 reverting a small rearrangement of VClassGroupCache to avoid changing the unit test 2015-12-09 22:08:00 +02:00
brianjlowe
1a1606d6ff 5x speedup for add RDF via GUI; 25x speedup for SPARQL API writes. sameAs still needs fixing; will flunk tests. 2015-12-09 21:54:30 +02:00
Graham Triggs
f817ef7be2 Merge branch 'lawlesst-feature/yasqe' into develop 2015-12-02 15:05:54 +00:00
Graham Triggs
8b1919e69b Merge branch 'feature/yasqe' of https://github.com/lawlesst/Vitro into lawlesst-feature/yasqe 2015-12-02 15:05:00 +00:00
Graham Triggs
635f6a5257 Merge branch 'gneissone-browse-columns' into develop 2015-12-02 14:09:06 +00:00
Graham Triggs
a3b238f870 Merge branch 'browse-columns' of https://github.com/gneissone/Vitro into gneissone-browse-columns 2015-12-02 14:08:16 +00:00
grahamtriggs
b4206faf1d Merge pull request #26 from vivo-project/maven-migration
Maven migration
2015-12-02 13:33:01 +00:00
Benjamin Gross
7c9cadd981 tweak index page initHeight and don't add (cont'd) text if there aren't any more classes to show 2015-12-01 17:21:52 -07:00
Graham Triggs
af77804dfe Move unnecessary files out of home directory 2015-11-25 13:58:02 +00:00
brianjlowe
dcfd95ca9d First rough steps at replacing SimpleReasoner's incremental mode with selective recomputing, for major improvement to RDF uploading speed. A few unit tests related to retraction with sameAs aren't passing yet. 2015-11-23 20:47:40 +02:00
Graham Triggs
307787b316 Move dependencies into a pom project so that they can be referenced in projects that "shade" the vitro-api 2015-11-21 16:48:35 +00:00
Graham Triggs
679aa855de Dependency fixes 2015-11-21 10:13:33 +00:00
Graham Triggs
f5b0494e3c Maven (second draft) 2015-11-20 21:21:11 +00:00