[Treebase-guts] SF.net SVN: treebase:[398] trunk/treebase-core/src/main/java/org/cipres/ treebase/service/nexus/NexusServiceMesquite.java

[<rv...@us...>]

Revision: 398
          http://treebase.svn.sourceforge.net/treebase/?rev=398&view=rev
Author:   rvos
Date:     2009-12-16 17:57:12 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
Added assignments to MesquiteModule.mesquiteDirectory and MesquiteModule.mesquiteDirectoryPath, as per Wayne Maddison's suggestion. This solves the issue where mesquite can't find where it lives and so can't start up.

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceMesquite.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceMesquite.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceMesquite.java	2009-12-16 17:14:59 UTC (rev 397)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceMesquite.java	2009-12-16 17:57:12 UTC (rev 398)
@@ -5,6 +5,8 @@
 import java.util.Collection;
 import java.util.Properties;
 
+import mesquite.lib.MesquiteModule;
+
 import org.apache.log4j.Logger;
 
 import org.cipres.treebase.domain.DomainHome;
@@ -191,6 +193,8 @@
 	 */
 	public void setMesquiteFolderDir(String pMesquiteFolderDir) {
 		System.setProperty(MESQUITE_FOLDER_DIR_KEY, pMesquiteFolderDir);
+		MesquiteModule.mesquiteDirectory = new File(pMesquiteFolderDir);
+		MesquiteModule.mesquiteDirectoryPath = pMesquiteFolderDir;
 	}
 
 	@Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.