hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1675 from mwoodiupui/rest7

Browse Source 
[DS-3482] Fix test failure and update dependencies
This commit is contained in:
Tim Donohue
2017-03-10 10:40:04 -06:00
committed by GitHub
parent ce801dfac9 22987c10b2
commit 5a2fdabaaf
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/main/java/org/dspace/core/Context.java
View File

@@ -142,7 +142,8 @@ public class Context
if(dbConnection == null) if(dbConnection == null)
{ {
// Obtain a non-auto-committing connection // Obtain a non-auto-committing connection
dbConnection = new DSpace().getSingletonService(DBConnection.class); dbConnection = new DSpace().getServiceManager()
.getServiceByName(null, DBConnection.class);
if(dbConnection == null) if(dbConnection == null)
{ {
log.fatal("Cannot obtain the bean which provides a database connection. " + log.fatal("Cannot obtain the bean which provides a database connection. " +

2
dspace-services/pom.xml
View File

@@ -100,7 +100,7 @@
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.4.3</version> <version>2.6.11</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- for filters --> <!-- for filters -->

1
dspace-services/src/main/resources/spring/spring-dspace-core-services.xml
View File

@@ -49,6 +49,7 @@
</constructor-arg> </constructor-arg>
</bean> </bean>
</property> </property>
<property name="shared" value="true"/>
</bean> </bean>
<!-- CACHING end beans --> <!-- CACHING end beans -->

8
dspace-spring-rest/src/main/resources/i18n/messages.properties
View File

@@ -0,0 +1,8 @@
#
# The contents of this file are subject to the license and copyright
# detailed in the LICENSE and NOTICE files at the root of the source
# tree and available online at
#
# http://www.dspace.org/license/
#

9
dspace-spring-rest/src/main/webapp/index.html
View File

@@ -1,3 +1,12 @@
<!--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
-->
<!doctype html> <!doctype html>
<head> <head>

4
dspace/config/hibernate.cfg.xml
View File

@@ -22,7 +22,9 @@
<!--Second level cache configuration--> <!--Second level cache configuration-->
<property name="hibernate.cache.use_second_level_cache">true</property> <property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.use_query_cache">true</property> <property name="hibernate.cache.use_query_cache">true</property>
<property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</property> <property name="hibernate.cache.region.factory_class">
org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
</property>
<property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property> <property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>

7
pom.xml
View File

@@ -28,13 +28,8 @@
<solr.version>4.10.4</solr.version> <solr.version>4.10.4</solr.version>
<jena.version>2.13.0</jena.version> <jena.version>2.13.0</jena.version>
<slf4j.version>1.7.22</slf4j.version> <slf4j.version>1.7.22</slf4j.version>
<!-- <hibernate.version>5.2.8.Final</hibernate.version>
Hibernate version pinned to 4.2, 4.3 does not work with the spring version we are currently using
Upgrading the spring version will make the XMLUI crash
-->
<hibernate.version>5.0.11.Final</hibernate.version>
<spring.version>4.3.6.RELEASE</spring.version> <spring.version>4.3.6.RELEASE</spring.version>
<!-- <spring.version>4.2.4.RELEASE</spring.version> -->
<!-- 'root.basedir' is the path to the root [dspace-src] dir. It must be redefined by each child POM, <!-- 'root.basedir' is the path to the root [dspace-src] dir. It must be redefined by each child POM,
as it is used to reference the LICENSE_HEADER and *.properties file(s) in that directory. --> as it is used to reference the LICENSE_HEADER and *.properties file(s) in that directory. -->
<root.basedir>${basedir}</root.basedir> <root.basedir>${basedir}</root.basedir>