Changeset 622 for trunk/grails-app/conf/Searchable.groovy

Timestamp:

Jul 10, 2010, 10:48:50 PM (14 years ago)

Author:

gav

Message:

Apply bug fix for ticket #76.
Rename all instances of Lucene to Searchable.
Improved global directory config.
Add log levels for searchable plugin and compass.

File:

• trunk/grails-app/conf/Searchable.groovy (modified) (2 diffs)

trunk/grails-app/conf/Searchable.groovy

@@ +1 @@
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
+
 /**
  * This {@link groovy.util.ConfigObject} script provides Grails Searchable Plugin configuration.
@@ -26 +28 @@
 
     /**
-     * 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
 
     /**