couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r687123 - in /incubator/couchdb/branches/runtimeconfig: ./ CHANGES Makefile.am NOTICE README bin/couchdb.tpl.in bin/couchjs.tpl.in etc/couchdb/conf/ etc/default/couchdb.tpl.in etc/init/couchdb.tpl.in etc/launchd/org.apache.couchdb.plist.tpl.in
Date Tue, 19 Aug 2008 18:51:53 GMT
Author: jan
Date: Tue Aug 19 11:51:52 2008
New Revision: 687123

URL: http://svn.apache.org/viewvc?rev=687123&view=rev
Log:
Merged revisions 686712-686713,686715-686716,686718-686719,686725,686773,686778,686781 via
svnmerge from 
https://svn.apache.org/repos/asf/incubator/couchdb/trunk


Removed:
    incubator/couchdb/branches/runtimeconfig/etc/couchdb/conf/
Modified:
    incubator/couchdb/branches/runtimeconfig/   (props changed)
    incubator/couchdb/branches/runtimeconfig/CHANGES
    incubator/couchdb/branches/runtimeconfig/Makefile.am
    incubator/couchdb/branches/runtimeconfig/NOTICE
    incubator/couchdb/branches/runtimeconfig/README
    incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
    incubator/couchdb/branches/runtimeconfig/bin/couchjs.tpl.in
    incubator/couchdb/branches/runtimeconfig/etc/default/couchdb.tpl.in
    incubator/couchdb/branches/runtimeconfig/etc/init/couchdb.tpl.in
    incubator/couchdb/branches/runtimeconfig/etc/launchd/org.apache.couchdb.plist.tpl.in

Propchange: incubator/couchdb/branches/runtimeconfig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 19 11:51:52 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-686559
+/incubator/couchdb/trunk:1-687122

Modified: incubator/couchdb/branches/runtimeconfig/CHANGES
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/CHANGES?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/CHANGES (original)
+++ incubator/couchdb/branches/runtimeconfig/CHANGES Tue Aug 19 11:51:52 2008
@@ -6,8 +6,9 @@
 
 Packaging and System Integration:
 
- * Manually linked `libm` for portability with FreeBSD 7.0.
- * Extended default library paths in `configure.ac` file.
+ * Updated `configure.ac` to manually link `libm` for portability.
+ * Updated `configure.ac` to extended default library paths.
+ * Removed inets configuration files.
 
 Version 0.8.1-incubating
 ------------------------
@@ -31,9 +32,9 @@
  * Fix for connections not getting closed after rejecting a chunked request.
    (COUCHDB-55)
  * CouchDB can now be bound to IPv6 addresses.
- * The HTTP Server header now contains the versions of CouchDB and Erlang.
+ * The HTTP `Server` header now contains the versions of CouchDB and Erlang.
 
-Javascript View Server:
+JavaScript View Server:
 
  * Sealing of documents has been disabled due to an incompatibility with
    SpiderMonkey 1.9.
@@ -102,13 +103,13 @@
  * The status code of responses to `DELETE` requests is now 200 to reflect that
    that the deletion is performed synchronously.
 
-Javascript View Server:
+JavaScript View Server:
 
  * SpiderMonkey is no longer included with CouchDB, but rather treated as a
    normal external dependency. A simple C program (`_couchjs`) is provided that
    links against an existing SpiderMonkey installation and uses the interpreter
    embedding API.
- * View functions using the default Javascript view server can now do logging
+ * View functions using the default JavaScript view server can now do logging
    using the global `log(message)` function. Log messages are directed into the
    CouchDB log at `INFO` level. (COUCHDB-59)
  * The global `map(key, value)` function made available to view code has been
@@ -145,4 +146,4 @@
  * Fixed portential double encoding of document IDs and other URI segments in
    many instances. (COUCHDB-39)
  * Improved display of attachments.
- * The Javascript Shell has been removed due to unresolved licensing issues.
+ * The JavaScript Shell has been removed due to unresolved licensing issues.

Modified: incubator/couchdb/branches/runtimeconfig/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/Makefile.am?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/Makefile.am Tue Aug 19 11:51:52 2008
@@ -40,21 +40,23 @@
 local-clean: maintainer-clean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may need special tools to rebuild."
-	-rm -f INSTALL
-	-rm -f acinclude.m4
-	-rm -f aclocal.m4
-	-rm -f config.h.in
-	-rm -f configure
-	-rm -f *.tar.gz
-	-rm -f *.tar.gz.asc
-	-rm -f *.tar.gz.md5
-	-rm -f *.tar.gz.sha
-	-rm -fr build-aux
-	-rm -fr m4
-	-find $(top_srcdir) -name Makefile.in | xargs rm
+	rm -f $(top_srcdir)/INSTALL
+	rm -f $(top_srcdir)/acinclude.m4
+	rm -f $(top_srcdir)/aclocal.m4
+	rm -f $(top_srcdir)/config.h.in
+	rm -f $(top_srcdir)/configure
+	rm -f $(top_srcdir)/*.tar.gz
+	rm -f $(top_srcdir)/*.tar.gz.*
+	rm -fr $(top_srcdir)/build-aux
+	rm -fr $(top_srcdir)/m4
+	find $(top_srcdir) -name Makefile.in -exec rm {} \;
 
 .PHONY: distsign
 distsign: distcheck
-	gpg --armor --detach-sig < $(distdir).tar.gz > $(distdir).tar.gz.asc
-	md5sum $(distdir).tar.gz > $(distdir).tar.gz.md5
-	sha1sum $(distdir).tar.gz > $(distdir).tar.gz.sha
+	gpg --armor --detach-sig \
+	    < $(top_srcdir)/$(distdir).tar.gz \
+	    > $(top_srcdir)/$(distdir).tar.gz.asc
+	md5sum $(top_srcdir)/$(distdir).tar.gz \
+	    > $(top_srcdir)/$(distdir).tar.gz.md5
+	sha1sum $(top_srcdir)/$(distdir).tar.gz \
+	    > $(top_srcdir)/$(distdir).tar.gz.sha

Modified: incubator/couchdb/branches/runtimeconfig/NOTICE
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/NOTICE?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/NOTICE (original)
+++ incubator/couchdb/branches/runtimeconfig/NOTICE Tue Aug 19 11:51:52 2008
@@ -6,18 +6,18 @@
 
 This product also includes the following third-party components:
 
-ac_check_icu.m4 (http://autoconf-archive.cryp.to/ac_check_icu.html)
+ * ac_check_icu.m4 (http://autoconf-archive.cryp.to/ac_check_icu.html)
 
-  Copyright 2005, Akos Maroy <darkeye@tyrell.hu>
+   Copyright 2005, Akos Maroy <darkeye@tyrell.hu>
 
-jQuery (http://jquery.com/)
+ * jQuery (http://jquery.com/)
 
-  Copyright 2008, John Resig
+   Copyright 2008, John Resig
 
-json2.js (http://www.json.org/)
+ * json2.js (http://www.json.org/)
 
-  In the public domain
+   In the public domain
 
-MochiWeb (http://code.google.com/p/mochiweb/)
+ * MochiWeb (http://code.google.com/p/mochiweb/)
 
-  Copyright 2007, Mochi Media Coporation
+   Copyright 2007, Mochi Media Coporation

Modified: incubator/couchdb/branches/runtimeconfig/README
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/README?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/README (original)
+++ incubator/couchdb/branches/runtimeconfig/README Tue Aug 19 11:51:52 2008
@@ -18,14 +18,15 @@
 
 You can skip this section if you are installing from a release tarball.
 
-### Dependencies ###
+Dependencies
+~~~~~~~~~~~~
 
 To build Apache CouchDB from checkout you need some of the following installed:
 
- * [GNU Automake][01] (>=1.6.3) (required)
- * [GNU Autoconf][02] (>=2.59) (required)
- * [GNU Libtool][03] (required)
- * [help2man][04] (optional)
+ * GNU Automake (>=1.6.3) (required) (http://www.gnu.org/software/automake/)
+ * GNU Autoconf (>=2.59)  (required) (http://www.gnu.org/software/autoconf/)
+ * GNU Libtool (required) (http://www.gnu.org/software/libtool/)
+ * help2man (optional) (http://www.gnu.org/software/help2man/)
 
 If you are running a Debian GNU/Linux system (or a derivative such as Ubuntu
 GNU/Linux) you can install these dependencies using the `apt-get` command:
@@ -33,16 +34,17 @@
     apt-get install automake autoconf libtool help2man
 
 The OS X version of these dependencies may be out of date so it is recommended
-that you use [MacPorts][05] to install newer versions using the `port` command:
+that you use MacPorts (http://www.macports.org/) to install newer versions using
+the `port` command:
 
     port install automake autoconf libtool help2man
 
-### Bootstrapping ###
+Bootstrapping
+~~~~~~~~~~~~~
 
 Note: You must repeat this step every time you update your Subversion checkout.
 
-Follow the [check out instructions][06] and bootstrap the pristine source by
-running the following command:
+Bootstrap the pristine source by running the following command:
 
     ./bootstrap
 
@@ -51,18 +53,21 @@
 
 You will need the following installed:
 
- * [Erlang OTP][07] (>=R11B) (required)
- * [ICU][08] (required)
- * [OpenSSL][09] (required)
- * [Mozilla SpiderMonkey][10] (required)
- * [GNU Make][11] (required)
- * [GNU Compiler Collection][12] (required)
+ * Erlang OTP (>=R11B) (required) (http://erlang.org/)
+ * ICU (required) (http://icu.sourceforge.net/)
+ * OpenSSL (required) (http://www.openssl.org/)
+ * Mozilla SpiderMonkey (required) (http://www.mozilla.org/js/spidermonkey/)
+ * GNU Make (required) (http://www.gnu.org/software/make/)
+ * GNU Compiler Collection (required) (http://gcc.gnu.org/)
 
-### UNIX-like Operating Systems (inc. OS X) ###
+UNIX-like Operating Systems (inc. OS X)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#### Dependencies ####
+Dependencies
+^^^^^^^^^^^^
 
-##### Debian-based (inc. Ubuntu) Systems #####
+Debian-based (inc. Ubuntu) Systems
+++++++++++++++++++++++++++++++++++
 
 If you are running a Debian GNU/Linux system (or a derivative such as Ubuntu
 GNU/Linux) you can install the dependencies using the `apt-get` command:
@@ -73,7 +78,8 @@
 the version used by your distribution (using `apt-cache search libicu`) and
 install those packages instead.
 
-##### OS X #####
+OS X
+++++
 
 To install GNU Make and the GNU Compiler Collection on OS X you should install
 the Xcode Tools metapackage by running the following command:
@@ -93,7 +99,8 @@
 
     sudo /usr/libexec/locate.updatedb
 
-#### Installing ####
+Installing
+^^^^^^^^^^
 
 Once you have satisfied dependencies you should run the following command:
 
@@ -129,7 +136,8 @@
 
 More options can be found by reading the `INSTALL` file.
 
-#### Security Considerations ####
+Security Considerations
+^^^^^^^^^^^^^^^^^^^^^^^
 
 It is not advisable to run Apache CouchDB as the superuser. We strongly
 recommend that you create a specific user to run Apache CouchDB and own the
@@ -144,7 +152,9 @@
 
 OS X provides the standard Accounts option from the System Preferences
 application or you can optionally use the Workgroup Manager application which
-can be downloaded as part of the [Server Admin Tools][13].
+can be downloaded as part of the Server Admin Tools:
+
+  http://www.apple.com/support/downloads/serveradmintools1047.html
 
 You should make sure that the `couchdb` user has a working POSIX shell and set
 the home directory to `/usr/local/var/lib/couchdb` which is the Apache CouchDB
@@ -156,7 +166,8 @@
     chown -R couchdb /usr/local/var/lib/couchdb
     chown -R couchdb /usr/local/var/log/couchdb
 
-#### Running Manually ####
+Running Manually
+^^^^^^^^^^^^^^^^
 
 To start the Apache CouchDB server you should run the following command:
 
@@ -170,10 +181,14 @@
 
 Relax.
 
-To check that everything has worked point your web browser to
-[http://localhost:5984/_utils/index.html][14] and run the test suite.
+To check that everything has worked, point your web browser to:
+
+  http://localhost:5984/_utils/index.html
 
-##### OS X #####
+From here you should run the test suite.
+
+OS X
+++++
 
 If you get error when running Apache CouchDB that look like the following:
 
@@ -185,7 +200,8 @@
 
 This should have been added for you by MacPorts but may be missing.
 
-#### Running as a Daemon ####
+Running as a Daemon
+^^^^^^^^^^^^^^^^^^^
 
 Note: These instructions assume you have created the `couchdb` user. See the
 specific system information included below to learn how to reconfigure this.
@@ -196,7 +212,8 @@
 The `/usr/local/etc/logrotate.d/couchdb` file is provided as a logrotate
 configuration that you can use to rotate Apache CouchDB's logs.
 
-##### SysV/BSD-style Systems #####
+SysV/BSD-style Systems
+++++++++++++++++++++++
 
 Depending on your system the `couchdb` init script will be installed into a
 direcory called `init.d` (for SysV-style systems) or `rc.d` (for BSD-style
@@ -221,7 +238,8 @@
 
     sudo update-rc.d couchdb defaults
 
-##### OS X #####
+OS X
+++++
 
 You can use the `launchctl` command to control the Apache CouchDB daemon.
 
@@ -242,21 +260,7 @@
 copy the `/usr/local/Library/LaunchDaemons/org.apache.couchdb.plist` file into
 your system wide `/Library/LaunchDaemons` directory.
 
-### Windows ###
+Windows
+~~~~~~~
 
 Windows documentation is incomplete. Please submit suggestions.
-
-[01]: http://www.gnu.org/software/automake/
-[02]: http://www.gnu.org/software/autoconf/
-[03]: http://www.gnu.org/software/libtool/
-[04]: http://www.gnu.org/software/help2man/
-[05]: http://www.macports.org/
-[06]: http://incubator.apache.org/couchdb/community/code.html
-[07]: http://erlang.org/
-[08]: http://icu.sourceforge.net/
-[09]: http://www.openssl.org/
-[10]: http://www.mozilla.org/js/spidermonkey/
-[11]: http://www.gnu.org/software/make/
-[12]: http://gcc.gnu.org/
-[13]: http://www.apple.com/support/downloads/serveradmintools1047.html
-[14]: http://localhost:5984/_utils/index.html

Modified: incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in Tue Aug 19 11:51:52 2008
@@ -1,7 +1,5 @@
 #! /bin/sh -e
 
-# @configure_input@
-
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.  You may obtain a copy of
 # the License at

Modified: incubator/couchdb/branches/runtimeconfig/bin/couchjs.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/bin/couchjs.tpl.in?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/bin/couchjs.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/bin/couchjs.tpl.in Tue Aug 19 11:51:52 2008
@@ -1,7 +1,5 @@
 #! /bin/sh -e
 
-# @configure_input@
-
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.  You may obtain a copy of
 # the License at

Modified: incubator/couchdb/branches/runtimeconfig/etc/default/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/default/couchdb.tpl.in?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/default/couchdb.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/default/couchdb.tpl.in Tue Aug 19 11:51:52
2008
@@ -1,5 +1,3 @@
-# @configure_input@
-
 # Sourced by init script for configuration.
 
 COUCHDB_USER=couchdb

Modified: incubator/couchdb/branches/runtimeconfig/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/init/couchdb.tpl.in?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/init/couchdb.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/init/couchdb.tpl.in Tue Aug 19 11:51:52 2008
@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-# @configure_input@
-
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.  You may obtain a copy of
 # the License at

Modified: incubator/couchdb/branches/runtimeconfig/etc/launchd/org.apache.couchdb.plist.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/launchd/org.apache.couchdb.plist.tpl.in?rev=687123&r1=687122&r2=687123&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/launchd/org.apache.couchdb.plist.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/launchd/org.apache.couchdb.plist.tpl.in Tue
Aug 19 11:51:52 2008
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
   "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!-- @configure_input@ -->
 <plist version="1.0">
   <dict>
     <key>Label</key>



Mime
View raw message