Index: trunk/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/grails-app/conf/BootStrap.groovy	(revision 608)
+++ trunk/grails-app/conf/BootStrap.groovy	(revision 622)
@@ -16,5 +16,5 @@
                 createDataService.createBaseData()
                 createDataService.createDemoData()
-                createDataService.startLucene()
+                createDataService.startSearchableIndex()
             }
             test {
@@ -22,5 +22,5 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
-                createDataService.startLucene(false)
+                createDataService.startSearchableIndex(false)
             }
             production {
@@ -28,5 +28,5 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
-                createDataService.startLucene()
+                createDataService.startSearchableIndex()
             }
         }
Index: trunk/grails-app/conf/Config.groovy
===================================================================
--- trunk/grails-app/conf/Config.groovy	(revision 608)
+++ trunk/grails-app/conf/Config.groovy	(revision 622)
@@ -49,4 +49,20 @@
 grails.spring.bean.packages = []
 
+/**
+* Internal searchable index config.
+*/
+// Is set true by createDataService.startSearchableIndex() once bootstrap completes.
+appSearchable.cascadeOnUpdate = false
+
+/**
+* Directory configuration.
+* Pickup the Tomcat/Catalina directory else use the target or current dir.
+*/
+def fs = File.separator // Local variable.
+globalDirs.targetDir = new File("target${fs}").isDirectory() ? "target${fs}" : ''
+globalDirs.catalinaBase = System.properties.getProperty('catalina.base')
+globalDirs.logDirectory = globalDirs.catalinaBase ? "${globalDirs.catalinaBase}${fs}logs${fs}" : globalDirs.targetDir
+globalDirs.workDirectory = globalDirs.catalinaBase ? "${globalDirs.catalinaBase}${fs}work${fs}" : globalDirs.targetDir
+globalDirs.searchableIndexDirectory = "${globalDirs.workDirectory}SearchableIndex${fs}${appName}${fs}"
 
 /**
@@ -58,8 +74,4 @@
  * Basic log levels are ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
  */
-// Pickup the Tomcat/Catalina work directory else use the current or temp dir.
-def catalinaBase = System.properties.getProperty('catalina.base')
-def fs = File.separator
-def logDirectory = catalinaBase ? "${catalinaBase}${fs}logs${fs}" : ''
 
 log4j = {
@@ -73,5 +85,5 @@
         // Custom log file.
         rollingFile name:"appLog",
-                        file:"${logDirectory}${appName}.log".toString(),
+                        file:"${globalDirs.logDirectory}${appName}.log".toString(),
                         maxFileSize:'300kB',
                         maxBackupIndex:1,
@@ -99,6 +111,8 @@
     error 'grails.app.service.NavigationService'
     error 'grails.app.service.com.zeddware.grails.plugins.filterpane.FilterService'
+    info 'org.codehaus.groovy.grails.plugins.searchable'
+    //info 'org.compass'
     error 'grails.app.task' // Quartz jobs.
-    info 'grails.app.task.InventoryReindexJob'
+    info 'grails.app.task.InventoryIndexJob'
 
     // Move anything that should behave differently into this section.
Index: trunk/grails-app/conf/Searchable.groovy
===================================================================
--- trunk/grails-app/conf/Searchable.groovy	(revision 608)
+++ trunk/grails-app/conf/Searchable.groovy	(revision 622)
@@ -1,2 +1,4 @@
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
+
 /**
  * This {@link groovy.util.ConfigObject} script provides Grails Searchable Plugin configuration.
@@ -26,16 +28,11 @@
 
     /**
-     * The location of the Compass index
-     *
-     * Examples: "/home/app/compassindex", "ram://app-index" or null to use the default
-     *
-     * The default is "${user.home}/.grails/projects/${app.name}/searchable-index/${grails.env}"
-     */
-    // Pickup the Tomcat/Catalina work directory else use the current or temp dir.
-    def catalinaBase = System.properties.getProperty('catalina.base')
-    def fs = File.separator
-    def indexDirectory = catalinaBase ? "${catalinaBase}${fs}work${fs}Lucene${fs}" : "Lucene${fs}"
-
-    compassConnection = new File("${indexDirectory}${appName}").absolutePath
+    * The location of the Compass index
+    *
+    * Examples: "/home/app/compassindex", "ram://app-index" or null to use the default
+    *
+    * The default is "${user.home}/.grails/projects/${app.name}/searchable-index/${grails.env}"
+    */
+    compassConnection = new File(ConfigurationHolder.config.globalDirs.searchableIndexDirectory).absolutePath
 
     /**