Changeset 598 for trunk/grails-app/conf

Timestamp:

Jun 17, 2010, 10:52:06 PM (14 years ago)

Author:

gav

Message:

Replace '/' with File.separator in config files.

Location:

trunk/grails-app/conf

Files:

• Config.groovy (modified) (2 diffs)
• Searchable.groovy (modified) (1 diff)

trunk/grails-app/conf/Config.groovy

@@ -58 +58 @@
  * Basic log levels are ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
  */
-// Pickup the Tomcat/Catalina logDirectory else use the current dir.
+// Pickup the Tomcat/Catalina work directory else use the current or temp dir.
 def catalinaBase = System.properties.getProperty('catalina.base')
-def logDirectory = catalinaBase ? "${catalinaBase}/logs" : '.'
+def fs = File.separator
+def logDirectory = catalinaBase ? "${catalinaBase}${fs}logs${fs}" : ''
 
 log4j = {
@@ -72 +73 @@
         // Custom log file.
         rollingFile name:"appLog",
-                        file:"${logDirectory}/${appName}.log".toString(),
+                        file:"${logDirectory}${appName}.log".toString(),
                         maxFileSize:'300kB',
                         maxBackupIndex:1,

trunk/grails-app/conf/Searchable.groovy

@@ -32 +32 @@
      * The default is "${user.home}/.grails/projects/${app.name}/searchable-index/${grails.env}"
      */
-    // Pickup the Tomcat/Catalina work directory else use the current dir.
+    // Pickup the Tomcat/Catalina work directory else use the current or temp dir.
     def catalinaBase = System.properties.getProperty('catalina.base')
-    def indexDirectory = catalinaBase ? "${catalinaBase}/work/lucene/${appName}" : './target/lucene'
+    def fs = File.separator
+    def indexDirectory = catalinaBase ? "${catalinaBase}${fs}work${fs}Lucene${fs}" : "Lucene${fs}"
 
-    compassConnection = new File(indexDirectory).absolutePath
+    compassConnection = new File("${indexDirectory}${appName}").absolutePath
 
     /**