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

git-svn-id: http://scm.dspace.org/svn/repo/modules/dspace-services/trunk@4305 9c30dcfa-912a-0410-8fc2-9e0234be79fd

impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java

@@ -85,7 +85,7 @@ public class SpringServiceManager implements ServiceManagerSystem {
         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";
     /**
      * Spring does not actually allow us to add in new singletons which have bean definitions so we

impl/src/main/java/org/dspace/services/events/SystemEventService.java

@@ -324,10 +324,10 @@ public class SystemEventService implements EventService, ShutdownService {
         public void onEnd(String requestId, Session session, boolean succeeded, Exception failure) {
             if (succeeded) {
                 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 {
                 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+")");
             }
         }
 

impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java

@@ -213,7 +213,7 @@ public class SessionRequestServiceImpl implements SessionService, RequestService
             }
         } else {
             // 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;
     }