Commit graph

6449 commits

Author SHA1 Message Date
Graham Triggs
3475f90fb4 Update to latest jenatools 2017-08-30 19:56:10 +01:00
Graham Triggs
62c2a0614a Upgrade to latest Jena 3.4.0 2017-08-30 19:51:21 +01:00
Graham Triggs
a132b2421e [VIVO-1294] Allow applications built on Vitro to have application-level messages distinct from themes 2017-08-29 22:56:15 +01:00
Graham Triggs
c409697267 Update to use newer jenatools 2017-08-29 08:19:15 +01:00
Graham Triggs
121eb088d1 [VIVO-1376] Smoke test for SDB that looks for signs that it hasn't been upgraded from Jena 2. 2017-08-27 22:11:18 +01:00
Graham Triggs
47f3f304cb [VIVO-1375] Upgrade to Servlet 3.0 spec 2017-08-25 08:51:10 +01:00
Graham Triggs
787a83e8c3 Make login javascript asynchronous 2017-08-09 14:26:04 +01:00
Graham Triggs
8d64142aba Make project autorelease when deploying to Nexus 2017-08-08 22:01:57 +01:00
Graham Triggs
9645f6dec2 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2017-07-27 17:41:12 +01:00
Graham Triggs
0bfd909348 Update versions for beta 2 release 2017-07-27 17:40:04 +01:00
Mike Conlon
6c12bf66b5 Update license year 2017-07-27 11:27:31 -04:00
Jim Blake
f23d5f5bff Merge branch 'develop' of https://github.com/j2blake/Vitro into develop 2017-07-22 11:34:19 -04:00
Graham Triggs
0adc9bd2ee Improve caching 2017-07-21 18:35:56 +01:00
Graham Triggs
cd0374115e Page speed improvements 2017-07-21 17:55:05 +01:00
Jim Blake
87d479ba49 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2017-07-20 14:26:07 -04:00
Jim Blake
1b3b31ef59 Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 2017-07-20 13:17:55 -04:00
Graham Triggs
67d1e63015 [VIVO-1060] Add DumpRestoreController to web.xml 2017-07-17 15:29:39 +01:00
Graham Triggs
4d381ee058 Update to latest MySQL 5.1 connector 2017-07-13 14:02:11 +01:00
Graham Triggs
0193701401 [VIVO-1322] Add configuration for dependency check 2017-07-12 20:11:59 +01:00
Graham Triggs
7a76405ef3 Reset develop to SNAPSHOT release 2017-06-12 21:54:33 +01:00
Graham Triggs
2fe4d3b3a0 Beta version 2017-06-09 15:57:28 +01:00
Graham Triggs
40891dbb3a Move admin panel to top of content 2017-06-09 15:53:42 +01:00
Graham Triggs
4602c5ac27 Remove faded welcome message 2017-06-06 23:08:09 +01:00
Jim Blake
dad1ce83cc Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 2017-05-29 16:31:08 -04:00
Graham Triggs
c39680b04a Upgrade Jena from 3.1.1 to 3.3.0 2017-05-23 15:44:11 +01:00
Jim Blake
3829f48b0b VIVO-1319 Remove dependency on sourceforge.net JSON parser. (#60)
* 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.

* Ignore all /bin/ directories under eclipse

* First set of unit tests, along with enhancements to the stubs.

* Clean up the unit tests with more expressive power.

* VIVO-1319 Full tests on the controller output formats.

* Create a Jackson-based quote(), to replace the net.sf.json-based quote()

* Eliminate the use of net.sf.json.util.JSONUtils

* Use Jackson JSON library instead of net.sf.json

JSONNode, JSONArray, JSONObject become JsonNode, ArrayNode, and ObjectNode.
No direct replacement for HSONSerializer, so create JacksonUtils

Some of the message signatures are different, so adjust accordingly.
2017-05-22 19:42:10 +01:00
Graham Triggs
a8bd8829db Merge branch 'develop' into feature/theming
# Conflicts:
#	webapp/src/main/webapp/themes/vitro/templates/footer.ftl
#	webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl
#	webapp/src/main/webapp/themes/vitro/templates/head.ftl
2017-05-22 16:57:20 +01:00
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