[fusion-commits] r1607 - in branches/fusion-1.1: . text/en text/fr
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Mon Oct 27 10:04:31 EDT 2008
Author: madair
Date: 2008-10-27 10:04:31 -0400 (Mon, 27 Oct 2008)
New Revision: 1607
Added:
branches/fusion-1.1/config_dist.json
Removed:
branches/fusion-1.1/config.json
Modified:
branches/fusion-1.1/text/en/strings.json
branches/fusion-1.1/text/fr/strings.json
Log:
re #42: renaming config.json and adding more info to config load error message
Deleted: branches/fusion-1.1/config.json
===================================================================
--- branches/fusion-1.1/config.json 2008-10-24 19:42:02 UTC (rev 1606)
+++ branches/fusion-1.1/config.json 2008-10-27 14:04:31 UTC (rev 1607)
@@ -1,37 +0,0 @@
-/* This is the fusion configuration file. Adjust as necessary. */
-{
- /* The general section contains settings that are general to
- fusion as a whole. */
- "general": {
- /* PHP is the default and only script language supported.
- Don"t change this. */
- "scriptLanguage": "php",
-
- /* A directory on this system that fusion can use for
- temporary files. */
- "temporaryDirectory": "/tmp"
- },
- /* The MapGuide section is required if you are installing
- fusion for MapGuide. */
- "mapguide": {
- /* The WebTierURL is the url to mapguide, it should start
- with http and end with /mapguide. If you have installed
- fusion inside the www directory of MapGuide, then you can
- leave this empty as it will be automatically calculated. */
- "webTierUrl": ""
- },
- /* The MapServer section is required if you are installing fusion
- for MapServer. */
- "mapserver": {
- /* The URL of the mapserver CGI that you want to use. */
- "cgi": "/cgi-bin/mapserv",
- /* The file system path to where mapserver should put
- web-accessible temporary images. */
- "imagePath": "/tmp/ms_tmp",
- /* The URL to the image path configured above. */
- "imageUrl": "http://localhost/tmp/ms_tmp",
- /* The file system path to where mapserver should put
- web-accessible temporary legend images. */
- "legendIconCacheDir":"/tmp/ms_tmp"
- }
-}
\ No newline at end of file
Copied: branches/fusion-1.1/config_dist.json (from rev 1575, branches/fusion-1.1/config.json)
===================================================================
--- branches/fusion-1.1/config_dist.json (rev 0)
+++ branches/fusion-1.1/config_dist.json 2008-10-27 14:04:31 UTC (rev 1607)
@@ -0,0 +1,37 @@
+/* This is the fusion configuration file. Adjust as necessary. */
+{
+ /* The general section contains settings that are general to
+ fusion as a whole. */
+ "general": {
+ /* PHP is the default and only script language supported.
+ Don"t change this. */
+ "scriptLanguage": "php",
+
+ /* A directory on this system that fusion can use for
+ temporary files. */
+ "temporaryDirectory": "/tmp"
+ },
+ /* The MapGuide section is required if you are installing
+ fusion for MapGuide. */
+ "mapguide": {
+ /* The WebTierURL is the url to mapguide, it should start
+ with http and end with /mapguide. If you have installed
+ fusion inside the www directory of MapGuide, then you can
+ leave this empty as it will be automatically calculated. */
+ "webTierUrl": ""
+ },
+ /* The MapServer section is required if you are installing fusion
+ for MapServer. */
+ "mapserver": {
+ /* The URL of the mapserver CGI that you want to use. */
+ "cgi": "/cgi-bin/mapserv",
+ /* The file system path to where mapserver should put
+ web-accessible temporary images. */
+ "imagePath": "/tmp/ms_tmp",
+ /* The URL to the image path configured above. */
+ "imageUrl": "http://localhost/tmp/ms_tmp",
+ /* The file system path to where mapserver should put
+ web-accessible temporary legend images. */
+ "legendIconCacheDir":"/tmp/ms_tmp"
+ }
+}
\ No newline at end of file
Property changes on: branches/fusion-1.1/config_dist.json
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Modified: branches/fusion-1.1/text/en/strings.json
===================================================================
--- branches/fusion-1.1/text/en/strings.json 2008-10-24 19:42:02 UTC (rev 1606)
+++ branches/fusion-1.1/text/en/strings.json 2008-10-27 14:04:31 UTC (rev 1607)
@@ -1,7 +1,9 @@
Fusion.Strings.en = {
'scriptFailed': 'failed to load script: ${script}',
'configParseError': 'Error parsing fusion configuration file, initialization aborted',
-'configLoadError': 'Error loading fusion configuration file, initialization aborted',
+'configLoadError': 'Error loading fusion configuration file, initialization aborted.' +
+ 'Make sure that you have copied config_dist.json to config.json ' +
+ 'and have configured the settings for your system',
'ajaxError': 'Exception occurred in AJAX callback.\nMessage: ${exception}\nLocation: ${filename} (${line})\nResponse: ${response}',
'importFailed': 'failed to import stylesheet: ${url}',
'registerEventError': 'Error registering eventID, invalid (empty) eventID.',
Modified: branches/fusion-1.1/text/fr/strings.json
===================================================================
--- branches/fusion-1.1/text/fr/strings.json 2008-10-24 19:42:02 UTC (rev 1606)
+++ branches/fusion-1.1/text/fr/strings.json 2008-10-27 14:04:31 UTC (rev 1607)
@@ -1,7 +1,9 @@
Fusion.Strings.fr = {
'scriptFailed': 'failed to load script: ${script}',
'configParseError': 'Error parsing fusion configuration file, initialization aborted',
-'configLoadError': 'Error loading fusion configuration file, initialization aborted',
+'configLoadError': 'Error loading fusion configuration file, initialization aborted.' +
+ 'Make sure that you have copied config_dist.json to config.json ' +
+ 'and have configured the settings for your system',
'ajaxError': 'Exception occurred in AJAX callback.\n${exception}\nLocation: ${file} (${line}))',
'importFailed': 'failed to import stylesheet: ${url}',
'registerEventError': 'Error registering eventID, invalid (empty) eventID.',
More information about the fusion-commits
mailing list