Commit Graph

5 Commits

Author SHA1 Message Date
Dave Ward
a2c2e215a8 Merged DEV/BELARUS/HEAD-2010_02_10 to HEAD
19151: SAIL-298: Implemented subsystem changes.
      - We didn't remove the cifs.serverName property because it is independent of host/port/context/protocol.
   Applied following corrections
      - Removed the email 'chain'. OutboundSMTP and InboundSMTP are separate subsystems and don't need to be chained
      - Added the ability for multiple Spring-initialized subsystems to share the same category
      - No need to expose mailService outside of the OutboundSMTP subsystem as far as I can tell
      - GlobalDeskTopActionConfigBean doesn't need dependencies and no longer exposes the webpath property
      - Fixed construction of contexts in ContentDiskDriver.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-12 18:41:09 +00:00
Nick Burch
1c48dad589 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
2010-03-09 15:58:56 +00:00
Neil McErlean
0e3bf5e13a Tweak to previous interim fix: CHK-11504.
I've moved the context.xml import I added from application-context-core.xml to minimal-context.xml.
The net effect is that I have not changed application-context-core.xml which is used in running the server and I have added a context import to minimal-context.xml which is used in running some unit tests.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 12:56:23 +00:00
Neil McErlean
d53ffe352a This is a quick fix for the 2 test failures in RepositoryStartStopTest.
The failure seemed to be due to there being no linkValidationService bean available in the minimal-context.
So I have added the linkvalidation-service-context as an imported context to application-context-core.xml.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 11:25:02 +00:00
Nick Burch
d50128ea25 Split the large block of includes at the top of application-context.xml out into two parts, the core bit that is the minimum required to satisfy inter-file dependencies, and the optional higher level includes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-24 16:33:03 +00:00