From 1c48dad58950acee8ce36350ac71cd9f8861dc53 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Tue, 9 Mar 2010 15:58:56 +0000
Subject: [PATCH] The LinkValidation service needs to be core

For some reason, when run under eclipse, the link validation service
context file isn't needed, and tests can run fine without it. However,
when run under ant, if it isn't included in the core context, then tests
using the minimal application context break. So, move it to the
core context.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/application-context-core.xml          | 1 +
 config/alfresco/application-context-highlevel.xml     | 1 -
 source/java/org/alfresco/RepositoryStartStopTest.java | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/config/alfresco/application-context-core.xml b/config/alfresco/application-context-core.xml
index 0214c9d9de..dfd28a0a5e 100644
--- a/config/alfresco/application-context-core.xml
+++ b/config/alfresco/application-context-core.xml
@@ -44,4 +44,5 @@
     <import resource="classpath:alfresco/tagging-services-context.xml"/>
     <import resource="classpath:alfresco/invitation-service-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
+    <import resource="classpath*:alfresco/linkvalidation-service-context.xml"/>
 </beans>
diff --git a/config/alfresco/application-context-highlevel.xml b/config/alfresco/application-context-highlevel.xml
index 87b719a815..978b0d6423 100644
--- a/config/alfresco/application-context-highlevel.xml
+++ b/config/alfresco/application-context-highlevel.xml
@@ -17,5 +17,4 @@
     <import resource="classpath:alfresco/cmis-api-context.xml" />
     <import resource="classpath:alfresco/period-type-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
-    <import resource="classpath*:alfresco/linkvalidation-service-context.xml"/>
 </beans>
diff --git a/source/java/org/alfresco/RepositoryStartStopTest.java b/source/java/org/alfresco/RepositoryStartStopTest.java
index f4015754ea..c95b60ab6e 100644
--- a/source/java/org/alfresco/RepositoryStartStopTest.java
+++ b/source/java/org/alfresco/RepositoryStartStopTest.java
@@ -167,9 +167,6 @@ public class RepositoryStartStopTest extends TestCase
      *  Test that we can bring up and close down
      *  a context twice without error, using it
      *  when running. 
-     *  
-     *  - the full context breaks
-     *  when you close and re-open it!
      */
     public void testOpenCloseOpenCloseFull() throws Exception
     {
@@ -209,9 +206,6 @@ public class RepositoryStartStopTest extends TestCase
      * Does this by opening and closing contexts
      *  4 different times, sometimes full ones,
      *  sometimes minimal ones with no autostart.
-     *  
-     *  - the full context breaks
-     *  when you close and re-open it!
      */
     public void testOpenCloseRepeatedly() throws Exception {
        assertNoCachedApplicationContext();