Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java
===================================================================
diff -u -rc2832a80af353cc0d1dfcbec1683e009c23f3a1a -r1f93624009089d9d6559361b0061709ecf9f49b6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	(.../IRepositoryService.java)	(revision c2832a80af353cc0d1dfcbec1683e009c23f3a1a)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	(.../IRepositoryService.java)	(revision 1f93624009089d9d6559361b0061709ecf9f49b6)
@@ -59,18 +59,17 @@
 
 	/** String used to define service in Spring context */
 	public static final String REPOSITORY_SERVICE_ID = "repositoryService";
-	/** String used to define the path to the content repository context file. */
-	public static final String REPOSITORY_CONTEXT_PATH = 
-		"/org/lamsfoundation/lams/contentrepository/applicationContext.xml";
-	/** String used to define the path to the local datasource version of the 
-	 * lams.jar context file*/
-	public static final String CORE_CONTEXT_PATH = 
-		"/org/lamsfoundation/lams/applicationContext.xml";
-	/** String used to define the path to the local datasource version of the 
-	 * lams.jar context file*/
-	public static final String CORE_LOCAL_CONTEXT_PATH = 
-		"/org/lamsfoundation/lams/localApplicationContext.xml";
-	
+	/** Context files, using the JNDI datasource. Use for JBOSS */
+	public static final String[] REPOSITORY_CONTEXT_PATH = new String[] { 
+		"/org/lamsfoundation/lams/contentrepository/applicationContext.xml",
+		"/org/lamsfoundation/lams/applicationContext.xml",
+		"/org/lamsfoundation/lams/toolApplicationContext.xml"};
+	/** Context files, using a local datasource. Use for junit testing */
+	public static final String[] REPOSITORY_LOCAL_CONTEXT_PATH = new String[] { 
+		"/org/lamsfoundation/lams/contentrepository/applicationContext.xml",
+		"/org/lamsfoundation/lams/localApplicationContext.xml",
+		"/org/lamsfoundation/lams/toolApplicationContext.xml"};
+
     /**
      * Login, creating a new ticket for the given credentials and specified
      * workspace. If login fails, a LoginException is thrown and
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java
===================================================================
diff -u -r41de4a8b5ff40c43e8eaadc76a33ebce112d6801 -r1f93624009089d9d6559361b0061709ecf9f49b6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java	(.../RepositoryProxy.java)	(revision 41de4a8b5ff40c43e8eaadc76a33ebce112d6801)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java	(.../RepositoryProxy.java)	(revision 1f93624009089d9d6559361b0061709ecf9f49b6)
@@ -51,8 +51,7 @@
 	
 	public static IRepositoryService getRepositoryService()  {
     	
-		String[] contextPaths = new String[] {IRepositoryService.CORE_CONTEXT_PATH,
-			IRepositoryService.REPOSITORY_CONTEXT_PATH};
+		String[] contextPaths = IRepositoryService.REPOSITORY_CONTEXT_PATH;
 		
 		ApplicationContext context = new ClassPathXmlApplicationContext(contextPaths);
 		if ( context == null ) 
@@ -70,8 +69,7 @@
 	 */
 	public static IRepositoryService getLocalRepositoryService()  {
     	
-		String[] contextPaths = new String[] {IRepositoryService.CORE_LOCAL_CONTEXT_PATH,
-				IRepositoryService.REPOSITORY_CONTEXT_PATH};
+		String[] contextPaths = IRepositoryService.REPOSITORY_LOCAL_CONTEXT_PATH;
 
 		ApplicationContext context = new ClassPathXmlApplicationContext(contextPaths);
 		if ( context == null )