[Mapbender-commits] r6617 - in branches/2.6: . conf core

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-07-23 09:24:46 +0000 (Fri, 23 Jul 2010)
New Revision: 6617

Modified:
   branches/2.6/Changes.txt
   branches/2.6/Install.txt
   branches/2.6/conf/mapbender.conf-dist
   branches/2.6/core/system.php
Log:
latest updates for 2.6.2
* changelog, version number
* (hopefully) improved install.sh

Modified: branches/2.6/Changes.txt
===================================================================
--- branches/2.6/Changes.txt	2010-07-22 16:01:39 UTC (rev 6616)
+++ branches/2.6/Changes.txt	2010-07-23 09:24:46 UTC (rev 6617)
@@ -4,7 +4,21 @@
 
 Also have a look in the trac for detailed informations:
 
+Changelog 2.6.2
+http://trac.osgeo.org/mapbender/query?milestone=2.6.2+release&order=priority&col=id&col=summary&col=status&col=type&col=priority&col=milestone&col=component
 
+#645  	Missing folder development bundle in jQuery UI 1.7.2
+#647 	WFS-T fails when input field for numeric featuretype elements is empty
+#650 	Digitizing polygons with en- or exclaves
+#651 	Problems with digitizing using connectiontype curl
+#657 	map applications fail ungracefully when no WMS is loaded
+#658 	Login Gui List: New layout
+#659 	admin-applications use application and Anwendung instead of gui
+#660 	Integration of Mapbender in the OSGeoLive DVD project
+#662 	apostrophe in wms_abstract prevents editing wms_gui_settings
+#656 	JavaScript logging is on by default
+#663 	panning after load WMC
+
 Changelog 2.6.1
 http://trac.osgeo.org/mapbender/report/51
 
@@ -62,8 +76,8 @@
 #257	Digitize: Saving of attributes of digitize object fails when id of attribute field is a javascript keyword
 #307	balloon style popups with popup.js
 #392	load wmc fails
-#26	Titled GUIs (new zebra)
-#54	How to compress all relevant JS files?
+#26	    Titled GUIs (new zebra)
+#54	    How to compress all relevant JS files?
 #153	changing the php header (license)
 #174	Meta-Data-Search underruns security
 #203	OGC WFS 1.1 Support

Modified: branches/2.6/Install.txt
===================================================================
--- branches/2.6/Install.txt	2010-07-22 16:01:39 UTC (rev 6616)
+++ branches/2.6/Install.txt	2010-07-23 09:24:46 UTC (rev 6617)
@@ -69,9 +69,9 @@
 
 For example using Ubuntu edit: /etc/apache2/sites-available/default
 
-      Alias /mapbender /var/www/apache2-default/mapbender_2.6.1/http/
+      Alias /mapbender /var/www/apache2-default/mapbender_2.6.2/http/
 
-       <Directory /var/www/apache2-default/mapbender_2.6.1/http>
+       <Directory /var/www/apache2-default/mapbender_2.6.2/http>
           Options MultiViews
           DirectoryIndex index.php
           Order allow,deny
@@ -85,7 +85,7 @@
 ----
 For optimal performance, enable output compression of your web server. Here's an instruction for Apache (see http://httpd.apache.org/docs/2.0/mod/mod_deflate.html for more details). Just append the content in bold to your Directory settings
 
-       <Directory /var/www/apache2-default/mapbender_2.6.1/http>
+       <Directory /var/www/apache2-default/mapbender_2.6.2/http>
            Options Indexes MultiViews FollowSymLinks
            AllowOverride None
            Order deny,allow
@@ -198,6 +198,7 @@
     update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql 
     update_2.6rc1_to_2.6_pgsql_UTF-8.sql
     update_2.6_to_2.6.1_pgsql_UTF-8.sql 
+    update_2.6.1_to_2.6.2_pgsql_UTF-8.sql 
 
 -- How to load the sqls in PostgreSQL:
 psql -f pgsql_schema_2_5.sql <dbname>
@@ -210,6 +211,7 @@
 psql -f UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql
 psql -f UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
 psql -f UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql
+psql -f UTF-8/update/update_2.6.1_to_2.6.2_pgsql_UTF-8.sql
 
 ----
 -- 7. mapbender configuration

Modified: branches/2.6/conf/mapbender.conf-dist
===================================================================
--- branches/2.6/conf/mapbender.conf-dist	2010-07-22 16:01:39 UTC (rev 6616)
+++ branches/2.6/conf/mapbender.conf-dist	2010-07-23 09:24:46 UTC (rev 6617)
@@ -14,11 +14,11 @@
 # database information
 # --------------------------------------------
 
-define("DBSERVER", "<HOST>");
-define("PORT", "5432");
-define("DB", "<database>");
-define("OWNER", "<owner>");
-define("PW", "<password>");
+define("DBSERVER", "%%DBSERVER%%"); //default "localhost"
+define("PORT", "%%DBPORT%%"); //default "5432"
+define("DB", "%%DBNAME%%"); 
+define("OWNER", "%%DBOWNER%%");
+define("PW", "%%DBPASSWORD%%");
 
 # --------------------------------------------
 # prepared statements (PHP > 5.1.x, PostgreSQL > 7.4)
@@ -137,4 +137,4 @@
   $PW=PW;
   
 
-?>
+?>
\ No newline at end of file

Modified: branches/2.6/core/system.php
===================================================================
--- branches/2.6/core/system.php	2010-07-22 16:01:39 UTC (rev 6616)
+++ branches/2.6/core/system.php	2010-07-23 09:24:46 UTC (rev 6617)
@@ -21,7 +21,7 @@
 #
 define("MB_VERSION_NUMBER", "2.6.2");
 define("MB_VERSION_APPENDIX", "");
-define("MB_RELEASE_DATE", mktime(0,0,0,6,10,2010));//h, min,sec,month,day,year
+define("MB_RELEASE_DATE", mktime(0,0,0,7,23,2010));//h, min,sec,month,day,year
 
 #
 # constants from map.js