Changeset: f01ad7766651 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f01ad7766651 Modified Files: Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 342 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense -URL: http://monetdb.cwi.nl/ +URL: http://www.monetdb.org/ Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj @@ -576,13 +576,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB ODBC Driver" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB SQL ODBC" "ARPCOMMENTS" = "8:MonetDB ODBC Driver" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_14F4BC1A7F54458D91CFA4A0BD174604" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj b/NT/installer32/MonetDB5-Geom-Module.vdproj --- a/NT/installer32/MonetDB5-Geom-Module.vdproj +++ b/NT/installer32/MonetDB5-Geom-Module.vdproj @@ -402,7 +402,7 @@ "Name" = "8:Installation" "Condition" = "8:INSTALLPATH" "Message" = "8:MonetDB5-SQL needs to be installed first." - "InstallUrl" = "8:http://monetdb.cwi.nl/"; + "InstallUrl" = "8:http://www.monetdb.org/"; } } "Locator" @@ -435,13 +435,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB5/SQL/GIS" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB5 MonetDB SQL GIS Database" "ARPCOMMENTS" = "8:MonetDB5/SQL/GIS Module" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_0F19ACCC44674803BA72C7FE1408CD70" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -5006,13 +5006,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB5/SQL" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB5 MonetDB SQL Database" "ARPCOMMENTS" = "8:MonetDB5/SQL Server and Client" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_A5161550D63E435591E71610B1975E8C" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj b/NT/installer64/MonetDB-ODBC-Installer.vdproj --- a/NT/installer64/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj @@ -576,13 +576,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB ODBC Driver" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB SQL ODBC" "ARPCOMMENTS" = "8:MonetDB ODBC Driver" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_14F4BC1A7F54458D91CFA4A0BD174604" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj b/NT/installer64/MonetDB5-Geom-Module.vdproj --- a/NT/installer64/MonetDB5-Geom-Module.vdproj +++ b/NT/installer64/MonetDB5-Geom-Module.vdproj @@ -402,7 +402,7 @@ "Name" = "8:Installation" "Condition" = "8:INSTALLPATH" "Message" = "8:MonetDB5-SQL needs to be installed first." - "InstallUrl" = "8:http://monetdb.cwi.nl/"; + "InstallUrl" = "8:http://www.monetdb.org/"; } } "Locator" @@ -435,13 +435,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB5/SQL/GIS" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB5 MonetDB SQL GIS Database" "ARPCOMMENTS" = "8:MonetDB5/SQL/GIS Module" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_0F19ACCC44674803BA72C7FE1408CD70" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -5006,13 +5006,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB5/SQL" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB5 MonetDB SQL Database" "ARPCOMMENTS" = "8:MonetDB5/SQL Server and Client" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_A5161550D63E435591E71610B1975E8C" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/README b/README --- a/README +++ b/README @@ -2,10 +2,10 @@ =========================== The MonetDB database is developed by the CWI database research group -(see http://monetdb.cwi.nl). +(see http://www.monetdb.org/). Via the MonetDB project we have brought the MonetDB system in open source, -where it is accessible at http://monetdb.cwi.nl/Download/ +where it is accessible at http://www.monetdb.org/Downloads/ The MonetDB database system is a high-performance database kernel for query-intensive applications. The MonetDB kernel works together with an diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py +++ b/buildtools/autogen/setup.py @@ -24,7 +24,7 @@ description = "MonetDB autogen script", author = "MonetDB Team, CWI", author_email = "i...@monetdb.org", - url = "http://monetdb.cwi.nl/";, + url = "http://www.monetdb.org/";, maintainer = "Sjoerd Mullender", maintainer_email = "i...@monetdb.org", license = "MonetDB Public License", diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -21,7 +21,7 @@ <html> <head> <title>redirect</title> - <meta http-equiv="Refresh" content="0;URL=http://monetdb.cwi.nl/";> + <meta http-equiv="Refresh" content="0;URL=http://www.monetdb.org/";> </head> <body> diff --git a/clients/perl/DBD/README b/clients/perl/DBD/README --- a/clients/perl/DBD/README +++ b/clients/perl/DBD/README @@ -22,7 +22,7 @@ DBI MonetDB::CLI - MonetDB (http://monetdb.cwi.nl) + MonetDB (http://www.monetdb.org/) INSTALLATION diff --git a/clients/perl/DBD/monetdb.pm b/clients/perl/DBD/monetdb.pm --- a/clients/perl/DBD/monetdb.pm +++ b/clients/perl/DBD/monetdb.pm @@ -883,8 +883,7 @@ =head2 MonetDB - Homepage : http://monetdb.cwi.nl - SourceForge : http://sourceforge.net/projects/monetdb + Homepage : http://www.monetdb.org/ =head2 Perl modules diff --git a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README --- a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README +++ b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README @@ -26,7 +26,7 @@ IO::Socket::INET - MonetDB (http://monetdb.cwi.nl) + MonetDB (http://www.monetdb.org/) INSTALLATION diff --git a/clients/perl/MonetDB-CLI/MonetDB/CLI.pm b/clients/perl/MonetDB-CLI/MonetDB/CLI.pm --- a/clients/perl/MonetDB-CLI/MonetDB/CLI.pm +++ b/clients/perl/MonetDB-CLI/MonetDB/CLI.pm @@ -108,8 +108,7 @@ =head2 MonetDB - Homepage : http://monetdb.cwi.nl - SourceForge : http://sourceforge.net/projects/monetdb + Homepage : http://www.monetdb.org/ =head2 Perl modules diff --git a/clients/perl/MonetDB-CLI/MonetDB/README b/clients/perl/MonetDB-CLI/MonetDB/README --- a/clients/perl/MonetDB-CLI/MonetDB/README +++ b/clients/perl/MonetDB-CLI/MonetDB/README @@ -28,7 +28,7 @@ MonetDB::CLI::* (implementation modules) - MonetDB (http://monetdb.cwi.nl) + MonetDB (http://www.monetdb.org/) INSTALLATION diff --git a/clients/python/monetdb/sql/type_codes.py b/clients/python/monetdb/sql/type_codes.py --- a/clients/python/monetdb/sql/type_codes.py +++ b/clients/python/monetdb/sql/type_codes.py @@ -16,7 +16,7 @@ # All Rights Reserved. # definition of types, for more info: -# http://monetdb.cwi.nl/SQL/Documentation/Data-Types.html +# http://www.monetdb.org/Documentation/Manuals/SQLreference/Datatypes CHAR = 'char' # (L) character string with length L VARCHAR = 'varchar' # (L) string with atmost length L diff --git a/clients/python/setup.py b/clients/python/setup.py --- a/clients/python/setup.py +++ b/clients/python/setup.py @@ -33,7 +33,7 @@ ''', author='MonetDB BV', author_email='i...@monetdb.org', - url='http://monetdb.cwi.nl/', + url='http://www.monetdb.org/', packages=['monetdb', 'monetdb.sql'], download_url='<will be filled in before a release>/python-monetdb-11.6.0.tar.gz', ) diff --git a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec --- a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec +++ b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec @@ -6,7 +6,7 @@ s.authors = ["G Modena"] s.email = %q{g...@cwi.nl} s.summary = %q{ActiveRecord Connector for MonetDB} - s.homepage = %q{http://monetdb.cwi.nl/} + s.homepage = %q{http://www.monetdb.org/} s.description = %q{ActiveRecord Connector for MonetDB built on top of the pure Ruby database driver} s.files = [ "lib/active_record/connection_adapters/monetdb_adapter.rb" ] s.has_rdoc = true diff --git a/clients/ruby/ruby-monetdb-sql-0.1.gemspec b/clients/ruby/ruby-monetdb-sql-0.1.gemspec --- a/clients/ruby/ruby-monetdb-sql-0.1.gemspec +++ b/clients/ruby/ruby-monetdb-sql-0.1.gemspec @@ -7,7 +7,7 @@ s.authors = ["G Modena"] s.email = %q{g...@cwi.nl} s.summary = %q{Pure Ruby database driver for MonetDB/SQL} - s.homepage = %q{http://monetdb.cwi.nl/} + s.homepage = %q{http://www.monetdb.org/} s.description = %q{Pure Ruby database driver for the MonetDB/SQL columnar database management system} s.files = ["README", "lib/MonetDB.rb", "lib/MonetDBConnection.rb", "lib/MonetDBData.rb", "lib/MonetDBExceptions.rb", "lib/hasher.rb"] s.has_rdoc = true diff --git a/java/release.txt b/java/release.txt --- a/java/release.txt +++ b/java/release.txt @@ -6,7 +6,7 @@ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
