[fusion-commits] r1609 - in trunk: . text/en text/fr
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Mon Oct 27 10:22:33 EDT 2008
Author: madair
Date: 2008-10-27 10:22:33 -0400 (Mon, 27 Oct 2008)
New Revision: 1609
Added:
trunk/config_dist.json
Removed:
trunk/config.json
Modified:
trunk/INSTALLATION.TXT
trunk/text/en/strings.json
trunk/text/fr/strings.json
Log:
re #42: renaming config.json and adding more info to config load error message
Modified: trunk/INSTALLATION.TXT
===================================================================
--- trunk/INSTALLATION.TXT 2008-10-27 14:21:43 UTC (rev 1608)
+++ trunk/INSTALLATION.TXT 2008-10-27 14:22:33 UTC (rev 1609)
@@ -5,41 +5,46 @@
------------
Fusion is a toolkit for building web-mapping applications on top of
-MapGuide Open Source/Enterprise (MGOS/E).
+MapGuide Open Source/Enterprise (MGOS/E) and MapServer.
Pre-requisites
--------------
-You must first obtain and correctly install MGOS/E and one of the
+You must first obtain and correctly install MapServer or MGOS/E and one of the
Web Server Extension API languages. Currently, Fusion only supports
PHP.
-Once you have a working MapGuide OS/E installation with PHP API
+Once you have a working MapGuide OS/E or MapServer installation with PHP API
extensions, you can install Fusion.
Obtaining Fusion
----------------
-Fusion is available from .....
+The primary doucmentation for Fusion is available at http://trac.osgeo.org/fusion/
+and you can download Fusion from http://download.osgeo.org/fusion/
Installing Fusion
-----------------
NOTE: It is HIGHLY RECOMMENDED that you install Fusion inside the
-WebServerExtensions/www directory of your MGOS/E installation.
+WebServerExtensions/www directory of your MGOS/E installation or in a web
+accessible directory for MapServer (/apps using MS4W).
Fusion must be installed on the same server as your MGOS/E Web Server
Extensions because it uses the API included with the Web Server
-Extensions.
+Extensions.
To install Fusion, simply extract your Fusion source code package
-(either tar.gz or zip file). By default, Fusion is configured to be
-installed into the 'www' directory of your WebServerExtensions installation.
+(either tar.gz or zip file). Then copy the file fusion/config_dist.json to
+fusion/config.json and edit this new file for your system configuration.
+
+By default, Fusion is configured to be installed into the 'www' directory of
+your WebServerExtensions installation.
You may install Fusion into a different location, as long as you follow
the Configuring Fusion steps below.
-Configuring Fusion
-------------------
+Configuring Fusion for MapGuide
+-------------------------------
If you installed Fusion into the WebServerExtensions/www directory, and your
WebServerExtensions are installed in C:\Program Files, Fusion is ready to
@@ -52,8 +57,8 @@
At the beginning of this file are two lines as follows:
-$defaultInstallDir = "C:/Program Files/MapGuideOpenSource/";
-$defaultExtensionDir = $installDir . "WebServerExtensions/www/";
+$defaultInstallDir = dirname(__FILE__)."/../../../../../";
+$defaultExtensionDir = realpath($defaultInstallDir . "webserverextensions/www/");
Modify these lines to point to your actual installation path.
@@ -83,37 +88,46 @@
appropriately. It is configured to use localhost:8008, which will
work for local installations of MGOS/E
-* redirect.php
+* ApplicationDefinition.xml
- the sample applications use the Anonymous user by default. If you have
- modified MGOS/E default user configuration or would like to use a
- different user name and password (for instance, if you need a user
- that has the Author role), then you can modify the $username and
- $password variables near the top of this file. Note that these values
- are not accessible to the user of the application (see Fusion Developer's
- guide for more details on why redirect.php is needed and what it does).
-
-* WebLayout.xml
-
the sample applications are configured to load the Sheboygan sample
- map that is freely available with MGOS/E. If you do not have this
- sample data set installed, have installed it in a different location
- than the default, or simply wish to use a different map, you will need
- to edit this file. Look for the following block:
+ map that is freely available with MGOS/E and the GMAP dataset for MapServer.
+ If you do not have the sample data set installed, have installed it in a
+ different location than the default, or simply wish to use a different map,
+ you will need to edit this file. Look for the following block:
- <Command xsi:type="MapCommandType">
- <Name>Map</Name>
- <Label>Map</Label>
- <TargetViewer>All</TargetViewer>
- <Action>MGMap</Action>
- <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
- </Command>
+ <MapGroup id="sheboygan" xsi:type="MapType">
+ <Map xsi:type="MapGuideLayerType">
+ <Type>MapGuide</Type>
+ <SingleTile>true</SingleTile>
+ <Extension>
+ <ResourceId>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</ResourceId>
+ </Extension>
+ </Map>
+ </MapGroup>
Change the ResourceId tag to point to the appropriate MapDefinition.
+
+ or for MapServer:
+
+ <MapGroup id="gmap" xsi:type="MapType">
+ <Map xsi:type="MapLayerType">
+ <Type>MapServer</Type>
+ <SingleTile>true</SingleTile>
+ <Extension>
+ <MapFile>/ms4w/apps/gmap/htdocs/gmap75.map</MapFile>
+ </Extension>
+ </Map>
+ </MapGroup>
+ Change the MapFile tag to point to the appropriate Map file.
+
Getting Help
------------
-If you are having trouble getting fusion running ...
+If you are having trouble getting fusion running please see the documentation
+on the wiki at http://trac.osgeo.org/fusion/.
+You may also send questions to the Fusion mailing lists listed on the wiki.
+
$Id$
\ No newline at end of file
Deleted: trunk/config.json
===================================================================
--- trunk/config.json 2008-10-27 14:21:43 UTC (rev 1608)
+++ trunk/config.json 2008-10-27 14:22:33 UTC (rev 1609)
@@ -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": "/ms4w/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": "/ms4w/tmp/ms_tmp",
- /* The URL to the image path configured above. */
- "imageUrl": "http://localhost/ms_tmp",
- /* The file system path to where mapserver should put
- web-accessible temporary legend images. */
- "legendIconCacheDir":"/ms4w/tmp/ms_tmp"
- }
-}
\ No newline at end of file
Copied: trunk/config_dist.json (from rev 1607, trunk/config.json)
===================================================================
--- trunk/config_dist.json (rev 0)
+++ trunk/config_dist.json 2008-10-27 14:22:33 UTC (rev 1609)
@@ -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": "/ms4w/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": "/ms4w/tmp/ms_tmp",
+ /* The URL to the image path configured above. */
+ "imageUrl": "http://localhost/ms_tmp",
+ /* The file system path to where mapserver should put
+ web-accessible temporary legend images. */
+ "legendIconCacheDir":"/ms4w/tmp/ms_tmp"
+ }
+}
\ No newline at end of file
Property changes on: trunk/config_dist.json
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Modified: trunk/text/en/strings.json
===================================================================
--- trunk/text/en/strings.json 2008-10-27 14:21:43 UTC (rev 1608)
+++ trunk/text/en/strings.json 2008-10-27 14:22:33 UTC (rev 1609)
@@ -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: trunk/text/fr/strings.json
===================================================================
--- trunk/text/fr/strings.json 2008-10-27 14:21:43 UTC (rev 1608)
+++ trunk/text/fr/strings.json 2008-10-27 14:22:33 UTC (rev 1609)
@@ -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