Permalink
Browse files

Remove ibrowse library

This is not needed anymore, lhttpc is now used everywhere else.

Change-Id: I4cdd3a023a514e4495c8ce3cb7538e9b1fcb88ac
Reviewed-on: http://review.couchbase.org/14598
Reviewed-by: Damien Katz <damien@couchbase.com>
Tested-by: Damien Katz <damien@couchbase.com>
  • Loading branch information...
1 parent cf25a4b commit b852af09411b96631d2df4219a949ab6ed25dc46 @fdmanana fdmanana committed with Damien Katz Apr 5, 2012
View
@@ -66,7 +66,6 @@ src/couchdb/priv/couchjs
src/couchdb/priv/couchspawnkillable
src/couchdb/priv/stat_descriptions.cfg
src/erlang-oauth/oauth.app
-src/ibrowse/ibrowse.app
src/ejson/ejson.app
src/ejson/.deps/
src/ejson/.libs/
@@ -106,7 +105,6 @@ utils/run
tmp
src/couchdb/priv/stat_descriptions.cfg
src/erlang-oauth/oauth.app
-src/ibrowse/ibrowse.app
src/lhttpc/lhttpc.app
src/mochiweb/mochiweb.app
test/etap/run
View
@@ -320,34 +320,6 @@ For the src/mochiweb component:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-For the src/ibrowse component:
-
- Copyright (c) 2006, Chandrashekhar Mullaparthi
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the T-Mobile nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
For the src/erlang-oauth component:
Copyright (c) 2008-2009 Tim Fletcher <http://tfletcher.com/>
View
@@ -153,7 +153,7 @@ COUCHDB_PLT ?= couchdb.plt
$(COUCHDB_PLT):
$(MAKE) all
- dialyzer --output_plt $(COUCHDB_PLT) --build_plt -pa src/couchdb -pa src/couch_set_view -pa src/mapreduce --apps compiler crypto erts inets kernel os_mon sasl ssl stdlib xmerl syntax_tools public_key snmp tools hipe runtime_tools mnesia -c src/erlang-oauth src/etap src/ibrowse src/mochiweb src/snappy
+ dialyzer --output_plt $(COUCHDB_PLT) --build_plt -pa src/couchdb -pa src/couch_set_view -pa src/mapreduce --apps compiler crypto erts inets kernel os_mon sasl ssl stdlib xmerl syntax_tools public_key snmp tools hipe runtime_tools mnesia -c src/erlang-oauth src/etap src/mochiweb src/snappy
.PHONY: rebuild_plt
rebuild_plt:
View
@@ -30,10 +30,6 @@ This product also includes the following third-party components:
Copyright 2007, Mochi Media Coporation
- * ibrowse (http://github.com/cmullaparthi/ibrowse/tree/master)
-
- Copyright 2009, Chandrashekhar Mullaparthi
-
* Erlang OAuth (http://github.com/tim/erlang-oauth/tree/master)
Copyright 2009, Tim Fletcher <http://tfletcher.com/>
View
@@ -78,4 +78,4 @@ source code.
The following provides more details on the included cryptographic software:
-CouchDB includes a HTTP client (ibrowse) with SSL functionality.
+CouchDB includes a HTTP client (lhttpc) with SSL functionality.
View
@@ -505,7 +505,6 @@ AC_CONFIG_FILES([src/couchdb/Makefile])
AC_CONFIG_FILES([src/couchdb/priv/Makefile])
AC_CONFIG_FILES([src/erlang-oauth/Makefile])
AC_CONFIG_FILES([src/etap/Makefile])
-AC_CONFIG_FILES([src/ibrowse/Makefile])
AC_CONFIG_FILES([src/lhttpc/Makefile])
AC_CONFIG_FILES([src/mochiweb/Makefile])
AC_CONFIG_FILES([src/snappy/Makefile])
View
@@ -87,7 +87,6 @@
^src/erlang-oauth/*
^src/ejson/*
^src/etap/*
-^src/ibrowse/*
^src/lhttpc/*
^src/mapreduce/*
^src/mochiweb/*
View
@@ -22,7 +22,6 @@ SUBDIRS += \
ejson \
erlang-oauth \
etap \
- ibrowse \
lhttpc \
mochiweb \
snappy \
@@ -27,5 +27,5 @@
"%localconfdir%/@localini@"
]}},
{applications, [kernel, stdlib]},
- {included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb, os_mon]}
+ {included_applications, [crypto, sasl, inets, oauth, lhttpc, mochiweb, os_mon]}
]}.
@@ -22,7 +22,7 @@ start(_Type, DefaultIniFiles) ->
IniFiles = get_ini_files(DefaultIniFiles),
case start_apps([
crypto, public_key, sasl, inets, oauth, ssl, lhttpc,
- ibrowse, mochiweb, os_mon, couch_set_view, mapreduce
+ mochiweb, os_mon, couch_set_view, mapreduce
]) of
ok ->
couch_server_sup:start_link(IniFiles);
@@ -90,7 +90,6 @@ start_server(IniFiles) ->
]},
% ensure these applications are running
- application:start(ibrowse),
application:start(crypto),
ssl:start(),
application:start(lhttpc),
@@ -1,49 +0,0 @@
-## 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
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations under
-## the License.
-
-ibrowseebindir = $(localerlanglibdir)/ibrowse-2.2.0/ebin
-
-ibrowse_file_collection = \
- ibrowse.app.in \
- ibrowse.erl \
- ibrowse_app.erl \
- ibrowse_http_client.erl \
- ibrowse_lb.erl \
- ibrowse_lib.erl \
- ibrowse_sup.erl \
- ibrowse_test.erl
-
-ibrowseebin_make_generated_file_list = \
- ibrowse.app \
- ibrowse.beam \
- ibrowse_app.beam \
- ibrowse_http_client.beam \
- ibrowse_lb.beam \
- ibrowse_lib.beam \
- ibrowse_sup.beam \
- ibrowse_test.beam
-
-ibrowseebin_DATA = \
- $(ibrowseebin_make_generated_file_list)
-
-EXTRA_DIST = \
- $(ibrowse_file_collection) \
- ibrowse.hrl
-
-CLEANFILES = \
- $(ibrowseebin_make_generated_file_list)
-
-%.app: %.app.in
- cp $< $@
-
-%.beam: %.erl
- $(ERLC) $(ERLC_FLAGS) $<
@@ -1,13 +0,0 @@
-{application, ibrowse,
- [{description, "HTTP client application"},
- {vsn, "2.2.0"},
- {modules, [ ibrowse,
- ibrowse_http_client,
- ibrowse_app,
- ibrowse_sup,
- ibrowse_lib,
- ibrowse_lb ]},
- {registered, []},
- {applications, [kernel,stdlib,sasl]},
- {env, []},
- {mod, {ibrowse_app, []}}]}.
Oops, something went wrong.

0 comments on commit b852af0

Please sign in to comment.