hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 21:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from DSpace 2.0 core work provided by AZ to reduce conflicting applicationContext.xml files.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/modules/dspace-services/trunk@4305 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
2009-09-30 07:06:04 +00:00
parent 7f0a6a9c2d
commit 92110a17cf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
View File

@@ -85,7 +85,7 @@ public class SpringServiceManager implements ServiceManagerSystem {
this.configPaths = configPaths; this.configPaths = configPaths;
} }
public static final String configPath = "spring/applicationContext.xml"; public static final String configPath = "spring/spring-dspace-applicationContext.xml";
public static final String corePath = "spring/spring-dspace-core-services.xml"; public static final String corePath = "spring/spring-dspace-core-services.xml";
/** /**
* Spring does not actually allow us to add in new singletons which have bean definitions so we * Spring does not actually allow us to add in new singletons which have bean definitions so we

4
impl/src/main/java/org/dspace/services/events/SystemEventService.java
View File

@@ -324,10 +324,10 @@ public class SystemEventService implements EventService, ShutdownService {
public void onEnd(String requestId, Session session, boolean succeeded, Exception failure) { public void onEnd(String requestId, Session session, boolean succeeded, Exception failure) {
if (succeeded) { if (succeeded) {
int fired = fireQueuedEvents(); int fired = fireQueuedEvents();
log.info("Fired "+fired+" events at the end of the request ("+requestId+")"); log.debug("Fired "+fired+" events at the end of the request ("+requestId+")");
} else { } else {
int cleared = clearQueuedEvents(); int cleared = clearQueuedEvents();
log.info("Cleared/cancelled "+cleared+" events at the end of the failed request ("+requestId+")"); log.debug("Cleared/cancelled "+cleared+" events at the end of the failed request ("+requestId+")");
} }
} }

2
impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
View File

@@ -213,7 +213,7 @@ public class SessionRequestServiceImpl implements SessionService, RequestService
} }
} else { } else {
// request not found, just log a warning // request not found, just log a warning
log.warn("Attempting to end a request when none currently exists"); log.debug("Attempting to end a request when none currently exists");
} }
return requestId; return requestId;
} }

0
impl/src/main/resources/spring/applicationContext.xml → impl/src/main/resources/spring/spring-dspace-applicationContext.xml
View File