From 1e61b0aa05e2351e33d909f7503eaf936a2d9bb0 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 10 Jun 2006 14:29:11 +0000 Subject: [PATCH] Add LICENSE file and Refer to it from the source. Include license material in license chapter of the manual. --- LICENSE | 33 +++++++++++++++++ Makefile.am | 4 +- doc/book.xml | 74 +++++++++++++++++++++++++++---------- src/ex_filter_frontend_net.cpp | 4 +- src/ex_router_flexml.cpp | 4 +- src/factory_filter.cpp | 4 +- src/factory_filter.hpp | 4 +- src/factory_static.cpp | 4 +- src/factory_static.hpp | 4 +- src/filter.cpp | 4 +- src/filter.hpp | 4 +- src/filter_auth_simple.cpp | 4 +- src/filter_auth_simple.hpp | 4 +- src/filter_backend_test.cpp | 4 +- src/filter_backend_test.hpp | 4 +- src/filter_dl.cpp | 4 +- src/filter_frontend_net.cpp | 4 +- src/filter_frontend_net.hpp | 4 +- src/filter_http_file.cpp | 4 +- src/filter_http_file.hpp | 4 +- src/filter_log.cpp | 4 +- src/filter_log.hpp | 4 +- src/filter_multi.cpp | 4 +- src/filter_multi.hpp | 4 +- src/filter_query_rewrite.cpp | 4 +- src/filter_query_rewrite.hpp | 4 +- src/filter_session_shared.cpp | 4 +- src/filter_session_shared.hpp | 4 +- src/filter_template.cpp | 4 +- src/filter_template.hpp | 4 +- src/filter_virt_db.cpp | 4 +- src/filter_virt_db.hpp | 4 +- src/filter_z3950_client.cpp | 4 +- src/filter_z3950_client.hpp | 4 +- src/metaproxy_prog.cpp | 4 +- src/package.cpp | 4 +- src/package.hpp | 4 +- src/pipe.cpp | 4 +- src/pipe.hpp | 4 +- src/plainfile.cpp | 4 +- src/router.hpp | 4 +- src/router_chain.cpp | 4 +- src/router_chain.hpp | 4 +- src/router_flexml.cpp | 4 +- src/router_flexml.hpp | 4 +- src/session.cpp | 4 +- src/session.hpp | 4 +- src/test_boost_threads.cpp | 4 +- src/test_boost_time.cpp | 4 +- src/test_filter1.cpp | 4 +- src/test_filter2.cpp | 4 +- src/test_filter_auth_simple.cpp | 4 +- src/test_filter_backend_test.cpp | 4 +- src/test_filter_factory.cpp | 4 +- src/test_filter_frontend_net.cpp | 4 +- src/test_filter_log.cpp | 4 +- src/test_filter_multi.cpp | 4 +- src/test_filter_query_rewrite.cpp | 4 +- src/test_filter_virt_db.cpp | 4 +- src/test_filter_z3950_client.cpp | 4 +- src/test_package1.cpp | 4 +- src/test_pipe.cpp | 4 +- src/test_router_flexml.cpp | 4 +- src/test_ses_map.cpp | 4 +- src/test_session1.cpp | 4 +- src/test_session2.cpp | 4 +- src/test_thread_pool_observer.cpp | 24 +----------- src/thread_pool_observer.cpp | 5 +-- src/thread_pool_observer.hpp | 4 +- src/tstdl.cpp | 4 +- src/util.cpp | 4 +- src/util.hpp | 4 +- src/xmlutil.cpp | 4 +- src/xmlutil.hpp | 4 +- 74 files changed, 231 insertions(+), 185 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a272fe1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,33 @@ +METAPROXY EVALUATION LICENCE: + +1. You are allowed to download this software for evaluation purposes. + You can unpack it, build it, run it, see how it works and how it fits + your needs, all at zero cost. + +2. You may NOT deploy the software. For the purposes of this license, + deployment means running it for any purpose other than evaluation, + whether or not you or anyone else makes a profit from doing so. If + you wish to deploy the software, you must first contact Index Data and + arrange to purchase a DEPLOYMENT LICENCE. If you are unsure whether + or not your proposed use of the software constitutes deployment, email + us at info@indexdata.com for clarification. + +3. You may modify your copy of the software (fix bugs, add features) if + you need to. We encourage you to send your changes back to us for + integration into the master copy, but you are not obliged to do so. + You may NOT pass your changes on to any other party. + +4. There is NO WARRANTY for this software, to the extent permitted by + applicable law. We provide the software ``as is'' without warranty of + any kind, either expressed or implied, including, but not limited to, + the implied warranties of MERCHANTABILITY and FITNESS FOR A PARTICULAR + PURPOSE. The entire risk as to the quality and performance of the + software is with you. Should the software prove defective, you assume + the cost of all necessary servicing, repair or correction. In no event + unless required by applicable law will we be liable to you for damages, + arising out of the use of the software, including but not limited to + loss of data or data being rendered inaccurate. + +5. All rights to the software are reserved by Index Data except where this + license explicitly says otherwise. + diff --git a/Makefile.am b/Makefile.am index 56cc247..82981c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## This file is part of Metaproxy ## Copyright (C) 2005-2006, Index Data ApS -## $Id: Makefile.am,v 1.13 2006-04-27 17:01:00 adam Exp $ +## $Id: Makefile.am,v 1.14 2006-06-10 14:29:11 adam Exp $ SUBDIRS = src doc etc @@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = Doxyfile.in NEWS README m4/yazpp.m4 m4/yaz.m4 buildconf.sh +EXTRA_DIST = Doxyfile.in NEWS README LICENSE m4/yazpp.m4 m4/yaz.m4 buildconf.sh MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure diff --git a/doc/book.xml b/doc/book.xml index 41dfd01..08a3904 100644 --- a/doc/book.xml +++ b/doc/book.xml @@ -17,7 +17,7 @@ --> ]> - + Metaproxy - User's Guide and Reference @@ -125,26 +125,60 @@ - - - - The Metaproxy Licence - - - No decision has yet been made on the terms under which - Metaproxy will be distributed. - - It is possible that, unlike - other Index Data products, metaproxy may not be released under a - free-software licence such as the GNU GPL. Until a decision is - made and a public statement made, then, and unless it has been - delivered to you other specific terms, please treat Metaproxy as - though it were proprietary software. - The code should not be redistributed without explicit - written permission from the copyright holders, Index Data ApS. - + + The Metaproxy License + + + + You are allowed to download this software for evaluation purposes. + You can unpack it, build it, run it, see how it works and how it fits + your needs, all at zero cost. + + + + + You may NOT deploy the software. For the purposes of this license, + deployment means running it for any purpose other than evaluation, + whether or not you or anyone else makes a profit from doing so. If + you wish to deploy the software, you must first contact Index Data and + arrange to purchase a DEPLOYMENT LICENCE. If you are unsure + whether or not your proposed use of the software constitutes + deployment, email us at info@indexdata.com + for clarification. + + + + + You may modify your copy of the software (fix bugs, add features) + if you need to. We encourage you to send your changes back to us for + integration into the master copy, but you are not obliged to do so. You + may NOT pass your changes on to any other party. + + + + + There is NO WARRANTY for this software, to the extent permitted by + applicable law. We provide the software ``as is'' without warranty of + any kind, either expressed or implied, including, but not limited to, the + implied warranties of MERCHANTABILITY and FITNESS FOR A + PARTICULAR PURPOSE. The entire risk as to the quality and + performance of the software is with you. Should the software prove + defective, you assume the cost of all necessary servicing, repair or + correction. In no event unless required by applicable law will we be + liable to you for damages, arising out of the use of the software, + including but not limited to loss of data or data being rendered + inaccurate. + + + + + All rights to the software are reserved by Index Data except where + this license explicitly says otherwise. + + + - + Installation diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp index 038178d..0b856e3 100644 --- a/src/ex_filter_frontend_net.cpp +++ b/src/ex_filter_frontend_net.cpp @@ -1,7 +1,7 @@ -/* $Id: ex_filter_frontend_net.cpp,v 1.26 2006-03-16 10:40:59 adam Exp $ +/* $Id: ex_filter_frontend_net.cpp,v 1.27 2006-06-10 14:29:11 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/ex_router_flexml.cpp b/src/ex_router_flexml.cpp index 2e0605d..da9fd09 100644 --- a/src/ex_router_flexml.cpp +++ b/src/ex_router_flexml.cpp @@ -1,7 +1,7 @@ -/* $Id: ex_router_flexml.cpp,v 1.8 2006-03-16 10:40:59 adam Exp $ +/* $Id: ex_router_flexml.cpp,v 1.9 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/factory_filter.cpp b/src/factory_filter.cpp index 495321d..35d9f09 100644 --- a/src/factory_filter.cpp +++ b/src/factory_filter.cpp @@ -1,7 +1,7 @@ -/* $Id: factory_filter.cpp,v 1.5 2006-04-22 13:18:58 adam Exp $ +/* $Id: factory_filter.cpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/factory_filter.hpp b/src/factory_filter.hpp index b0b88a4..83715a8 100644 --- a/src/factory_filter.hpp +++ b/src/factory_filter.hpp @@ -1,7 +1,7 @@ -/* $Id: factory_filter.hpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: factory_filter.hpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FACTORY_FILTER_HPP diff --git a/src/factory_static.cpp b/src/factory_static.cpp index b49bf7f..55d24f8 100644 --- a/src/factory_static.cpp +++ b/src/factory_static.cpp @@ -1,7 +1,7 @@ -/* $Id: factory_static.cpp,v 1.9 2006-03-16 10:40:59 adam Exp $ +/* $Id: factory_static.cpp,v 1.10 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/factory_static.hpp b/src/factory_static.hpp index 40aac5c..a8eaae8 100644 --- a/src/factory_static.hpp +++ b/src/factory_static.hpp @@ -1,7 +1,7 @@ -/* $Id: factory_static.hpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: factory_static.hpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FACTORY_STATIC_HPP diff --git a/src/filter.cpp b/src/filter.cpp index 91977c6..d91e6bf 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -1,7 +1,7 @@ -/* $Id: filter.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/filter.hpp b/src/filter.hpp index b441284..f5b8c43 100644 --- a/src/filter.hpp +++ b/src/filter.hpp @@ -1,7 +1,7 @@ -/* $Id: filter.hpp,v 1.16 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter.hpp,v 1.17 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_HPP diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index 4b10cac..63356cf 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_auth_simple.cpp,v 1.19 2006-05-15 11:43:01 adam Exp $ +/* $Id: filter_auth_simple.cpp,v 1.20 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_auth_simple.hpp b/src/filter_auth_simple.hpp index f7b1a6e..72563b8 100644 --- a/src/filter_auth_simple.hpp +++ b/src/filter_auth_simple.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_auth_simple.hpp,v 1.6 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_auth_simple.hpp,v 1.7 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_AUTH_SIMPLE_HPP diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp index 5fe5338..90feab8 100644 --- a/src/filter_backend_test.cpp +++ b/src/filter_backend_test.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_backend_test.cpp,v 1.18 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_backend_test.cpp,v 1.19 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_backend_test.hpp b/src/filter_backend_test.hpp index b4909ad..239f34a 100644 --- a/src/filter_backend_test.hpp +++ b/src/filter_backend_test.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_backend_test.hpp,v 1.8 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_backend_test.hpp,v 1.9 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_BACKEND_TEST_HPP diff --git a/src/filter_dl.cpp b/src/filter_dl.cpp index d0d500a..0d95266 100644 --- a/src/filter_dl.cpp +++ b/src/filter_dl.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_dl.cpp,v 1.5 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_dl.cpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index 77263f9..8b0e711 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_frontend_net.cpp,v 1.18 2006-06-09 14:11:42 adam Exp $ +/* $Id: filter_frontend_net.cpp,v 1.19 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_frontend_net.hpp b/src/filter_frontend_net.hpp index 2b55ec5..ca1258a 100644 --- a/src/filter_frontend_net.hpp +++ b/src/filter_frontend_net.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_frontend_net.hpp,v 1.13 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_frontend_net.hpp,v 1.14 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_FRONTEND_NET_HPP diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index 1b9f0a4..27fcce4 100644 --- a/src/filter_http_file.cpp +++ b/src/filter_http_file.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_http_file.cpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_http_file.cpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_http_file.hpp b/src/filter_http_file.hpp index 6868d3e..a4322e6 100644 --- a/src/filter_http_file.hpp +++ b/src/filter_http_file.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_http_file.hpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_http_file.hpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_HTTP_FILE_HPP diff --git a/src/filter_log.cpp b/src/filter_log.cpp index bd5f862..c4ec3a3 100644 --- a/src/filter_log.cpp +++ b/src/filter_log.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_log.cpp,v 1.17 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_log.cpp,v 1.18 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_log.hpp b/src/filter_log.hpp index ad47803..6e048b6 100644 --- a/src/filter_log.hpp +++ b/src/filter_log.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_log.hpp,v 1.14 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_log.hpp,v 1.15 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_LOG_HPP diff --git a/src/filter_multi.cpp b/src/filter_multi.cpp index af9aee9..a4b1402 100644 --- a/src/filter_multi.cpp +++ b/src/filter_multi.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_multi.cpp,v 1.20 2006-05-16 11:53:53 adam Exp $ +/* $Id: filter_multi.cpp,v 1.21 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_multi.hpp b/src/filter_multi.hpp index 86ab144..738f347 100644 --- a/src/filter_multi.hpp +++ b/src/filter_multi.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_multi.hpp,v 1.5 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_multi.hpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_MULTI_HPP diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp index a69e580..fa50707 100644 --- a/src/filter_query_rewrite.cpp +++ b/src/filter_query_rewrite.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_query_rewrite.cpp,v 1.7 2006-03-27 12:53:05 adam Exp $ +/* $Id: filter_query_rewrite.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ diff --git a/src/filter_query_rewrite.hpp b/src/filter_query_rewrite.hpp index daefd2a..bbc34ff 100644 --- a/src/filter_query_rewrite.hpp +++ b/src/filter_query_rewrite.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_query_rewrite.hpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_query_rewrite.hpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ // Filter that rewrites RPN queries using Regular Expressions diff --git a/src/filter_session_shared.cpp b/src/filter_session_shared.cpp index 151fe77..a787c44 100644 --- a/src/filter_session_shared.cpp +++ b/src/filter_session_shared.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_session_shared.cpp,v 1.10 2006-06-09 14:12:13 adam Exp $ +/* $Id: filter_session_shared.cpp,v 1.11 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_session_shared.hpp b/src/filter_session_shared.hpp index 02bd878..a1bace0 100644 --- a/src/filter_session_shared.hpp +++ b/src/filter_session_shared.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_session_shared.hpp,v 1.5 2006-05-15 10:34:40 adam Exp $ +/* $Id: filter_session_shared.hpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_SESSION_SHARED_HPP diff --git a/src/filter_template.cpp b/src/filter_template.cpp index 59c9b1a..7031a0a 100644 --- a/src/filter_template.cpp +++ b/src/filter_template.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_template.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_template.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_template.hpp b/src/filter_template.hpp index e2941bb..7843cec 100644 --- a/src/filter_template.hpp +++ b/src/filter_template.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_template.hpp,v 1.5 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_template.hpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ // Filter that does nothing. Use as template for new filters diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index b05539e..9b7e7e9 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_virt_db.cpp,v 1.40 2006-05-16 11:53:54 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.41 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_virt_db.hpp b/src/filter_virt_db.hpp index 447b2eb..766d61e 100644 --- a/src/filter_virt_db.hpp +++ b/src/filter_virt_db.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_virt_db.hpp,v 1.15 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_virt_db.hpp,v 1.16 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_VIRT_DB_HPP diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index e78a76b..e4c7d33 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_z3950_client.cpp,v 1.25 2006-03-29 13:44:45 adam Exp $ +/* $Id: filter_z3950_client.cpp,v 1.26 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/filter_z3950_client.hpp b/src/filter_z3950_client.hpp index 8c94349..3767dae 100644 --- a/src/filter_z3950_client.hpp +++ b/src/filter_z3950_client.hpp @@ -1,7 +1,7 @@ -/* $Id: filter_z3950_client.hpp,v 1.9 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_z3950_client.hpp,v 1.10 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef FILTER_Z3950_CLIENT_HPP diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index 4ffcb6a..0bec077 100644 --- a/src/metaproxy_prog.cpp +++ b/src/metaproxy_prog.cpp @@ -1,7 +1,7 @@ -/* $Id: metaproxy_prog.cpp,v 1.5 2006-04-29 08:51:54 adam Exp $ +/* $Id: metaproxy_prog.cpp,v 1.6 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/package.cpp b/src/package.cpp index 1277b39..2684d0c 100644 --- a/src/package.cpp +++ b/src/package.cpp @@ -1,7 +1,7 @@ -/* $Id: package.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: package.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/package.hpp b/src/package.hpp index 7b6df58..1be3ed5 100644 --- a/src/package.hpp +++ b/src/package.hpp @@ -1,7 +1,7 @@ -/* $Id: package.hpp,v 1.16 2006-03-29 13:44:45 adam Exp $ +/* $Id: package.hpp,v 1.17 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef YP2_PACKAGE_HPP diff --git a/src/pipe.cpp b/src/pipe.cpp index eb4c4e2..2c11cd4 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -1,7 +1,7 @@ -/* $Id: pipe.cpp,v 1.7 2006-03-29 13:44:45 adam Exp $ +/* $Id: pipe.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/pipe.hpp b/src/pipe.hpp index 38f85fe..df824c8 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -1,7 +1,7 @@ -/* $Id: pipe.hpp,v 1.4 2006-03-16 10:40:59 adam Exp $ +/* $Id: pipe.hpp,v 1.5 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef YP2_PIPE_HPP diff --git a/src/plainfile.cpp b/src/plainfile.cpp index 38e2148..734ea04 100644 --- a/src/plainfile.cpp +++ b/src/plainfile.cpp @@ -1,7 +1,7 @@ -/* $Id: plainfile.cpp,v 1.2 2006-03-16 10:40:59 adam Exp $ +/* $Id: plainfile.cpp,v 1.3 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/router.hpp b/src/router.hpp index d59b741..34a4a35 100644 --- a/src/router.hpp +++ b/src/router.hpp @@ -1,7 +1,7 @@ -/* $Id: router.hpp,v 1.11 2006-03-16 10:40:59 adam Exp $ +/* $Id: router.hpp,v 1.12 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef ROUTER_HPP diff --git a/src/router_chain.cpp b/src/router_chain.cpp index b58b481..a4e1469 100644 --- a/src/router_chain.cpp +++ b/src/router_chain.cpp @@ -1,7 +1,7 @@ -/* $Id: router_chain.cpp,v 1.6 2006-03-16 10:40:59 adam Exp $ +/* $Id: router_chain.cpp,v 1.7 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. - %LICENSE% + See the LICENSE file for details */ #include "router_chain.hpp" diff --git a/src/router_chain.hpp b/src/router_chain.hpp index 21a423c..94ec94c 100644 --- a/src/router_chain.hpp +++ b/src/router_chain.hpp @@ -1,7 +1,7 @@ -/* $Id: router_chain.hpp,v 1.6 2006-03-16 10:40:59 adam Exp $ +/* $Id: router_chain.hpp,v 1.7 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef ROUTER_CHAIN_HPP diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp index c029fa2..2564aae 100644 --- a/src/router_flexml.cpp +++ b/src/router_flexml.cpp @@ -1,7 +1,7 @@ -/* $Id: router_flexml.cpp,v 1.17 2006-03-16 10:40:59 adam Exp $ +/* $Id: router_flexml.cpp,v 1.18 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp index 75b119f..1fbf228 100644 --- a/src/router_flexml.hpp +++ b/src/router_flexml.hpp @@ -1,7 +1,7 @@ -/* $Id: router_flexml.hpp,v 1.14 2006-03-16 10:40:59 adam Exp $ +/* $Id: router_flexml.hpp,v 1.15 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. - %LICENSE% + See the LICENSE file for details */ #ifndef ROUTER_FLEXML_HPP diff --git a/src/session.cpp b/src/session.cpp index f64e2da..69ce930 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -1,7 +1,7 @@ -/* $Id: session.cpp,v 1.3 2006-03-16 10:40:59 adam Exp $ +/* $Id: session.cpp,v 1.4 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/session.hpp b/src/session.hpp index eddd1b1..45f17c2 100644 --- a/src/session.hpp +++ b/src/session.hpp @@ -1,7 +1,7 @@ -/* $Id: session.hpp,v 1.12 2006-03-16 10:40:59 adam Exp $ +/* $Id: session.hpp,v 1.13 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef SESSION_HPP diff --git a/src/test_boost_threads.cpp b/src/test_boost_threads.cpp index f53dfe0..7af983d 100644 --- a/src/test_boost_threads.cpp +++ b/src/test_boost_threads.cpp @@ -1,7 +1,7 @@ -/* $Id: test_boost_threads.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_boost_threads.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_boost_time.cpp b/src/test_boost_time.cpp index af1db2a..d300b40 100644 --- a/src/test_boost_time.cpp +++ b/src/test_boost_time.cpp @@ -1,7 +1,7 @@ -/* $Id: test_boost_time.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_boost_time.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/test_filter1.cpp b/src/test_filter1.cpp index 2dd43aa..8cb4383 100644 --- a/src/test_filter1.cpp +++ b/src/test_filter1.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter1.cpp,v 1.15 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter1.cpp,v 1.16 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp index 6113d32..ddfe832 100644 --- a/src/test_filter2.cpp +++ b/src/test_filter2.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter2.cpp,v 1.19 2006-05-15 10:12:33 adam Exp $ +/* $Id: test_filter2.cpp,v 1.20 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/test_filter_auth_simple.cpp b/src/test_filter_auth_simple.cpp index 241e7af..e392c31 100644 --- a/src/test_filter_auth_simple.cpp +++ b/src/test_filter_auth_simple.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_auth_simple.cpp,v 1.2 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_auth_simple.cpp,v 1.3 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp index b209730..c3719c3 100644 --- a/src/test_filter_backend_test.cpp +++ b/src/test_filter_backend_test.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_backend_test.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_backend_test.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp index 2aee42e..9fc5987 100644 --- a/src/test_filter_factory.cpp +++ b/src/test_filter_factory.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_factory.cpp,v 1.12 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_factory.cpp,v 1.13 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp index 9eaf40a..c5500e0 100644 --- a/src/test_filter_frontend_net.cpp +++ b/src/test_filter_frontend_net.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_frontend_net.cpp,v 1.15 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_frontend_net.cpp,v 1.16 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp index b5c1eaf..a6f71b1 100644 --- a/src/test_filter_log.cpp +++ b/src/test_filter_log.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_log.cpp,v 1.9 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_log.cpp,v 1.10 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_multi.cpp b/src/test_filter_multi.cpp index a43e199..574fc1d 100644 --- a/src/test_filter_multi.cpp +++ b/src/test_filter_multi.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_multi.cpp,v 1.2 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_multi.cpp,v 1.3 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_query_rewrite.cpp b/src/test_filter_query_rewrite.cpp index 43efca1..484bac5 100644 --- a/src/test_filter_query_rewrite.cpp +++ b/src/test_filter_query_rewrite.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_query_rewrite.cpp,v 1.9 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_query_rewrite.cpp,v 1.10 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_virt_db.cpp b/src/test_filter_virt_db.cpp index d2828d2..f61f8a2 100644 --- a/src/test_filter_virt_db.cpp +++ b/src/test_filter_virt_db.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_virt_db.cpp,v 1.12 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_virt_db.cpp,v 1.13 2006-06-10 14:29:12 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp index 3ccdfcc..018c97c 100644 --- a/src/test_filter_z3950_client.cpp +++ b/src/test_filter_z3950_client.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter_z3950_client.cpp,v 1.8 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter_z3950_client.cpp,v 1.9 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_package1.cpp b/src/test_package1.cpp index 1607faa..d2adf0d 100644 --- a/src/test_package1.cpp +++ b/src/test_package1.cpp @@ -1,7 +1,7 @@ -/* $Id: test_package1.cpp,v 1.5 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_package1.cpp,v 1.6 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp index 15e03d1..9dcba67 100644 --- a/src/test_pipe.cpp +++ b/src/test_pipe.cpp @@ -1,7 +1,7 @@ -/* $Id: test_pipe.cpp,v 1.6 2006-03-29 13:44:45 adam Exp $ +/* $Id: test_pipe.cpp,v 1.7 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp index c81bef7..95b05ef 100644 --- a/src/test_router_flexml.cpp +++ b/src/test_router_flexml.cpp @@ -1,7 +1,7 @@ -/* $Id: test_router_flexml.cpp,v 1.16 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_router_flexml.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_ses_map.cpp b/src/test_ses_map.cpp index a481b7f..26820af 100644 --- a/src/test_ses_map.cpp +++ b/src/test_ses_map.cpp @@ -1,7 +1,7 @@ -/* $Id: test_ses_map.cpp,v 1.3 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_ses_map.cpp,v 1.4 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/test_session1.cpp b/src/test_session1.cpp index de838f5..aa07a6a 100644 --- a/src/test_session1.cpp +++ b/src/test_session1.cpp @@ -1,7 +1,7 @@ -/* $Id: test_session1.cpp,v 1.10 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_session1.cpp,v 1.11 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" #include "session.hpp" diff --git a/src/test_session2.cpp b/src/test_session2.cpp index e4a8161..4d18258 100644 --- a/src/test_session2.cpp +++ b/src/test_session2.cpp @@ -1,7 +1,7 @@ -/* $Id: test_session2.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_session2.cpp,v 1.8 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" #include "session.hpp" diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp index 799a8d1..5a72c29 100644 --- a/src/test_thread_pool_observer.cpp +++ b/src/test_thread_pool_observer.cpp @@ -1,27 +1,7 @@ -/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $ +/* $Id: test_thread_pool_observer.cpp,v 1.11 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% - */ -/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $ - Copyright (c) 1998-2005-2006, Index Data. - -This file is part of the yaz-proxy. - -YAZ proxy is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -YAZ proxy is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with YAZ proxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp index 061ec8f..6bbe84b 100644 --- a/src/thread_pool_observer.cpp +++ b/src/thread_pool_observer.cpp @@ -1,8 +1,7 @@ - -/* $Id: thread_pool_observer.cpp,v 1.16 2006-06-09 14:12:13 adam Exp $ +/* $Id: thread_pool_observer.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/thread_pool_observer.hpp b/src/thread_pool_observer.hpp index 1a906af..f8ce75a 100644 --- a/src/thread_pool_observer.hpp +++ b/src/thread_pool_observer.hpp @@ -1,7 +1,7 @@ -/* $Id: thread_pool_observer.hpp,v 1.9 2006-03-29 13:44:45 adam Exp $ +/* $Id: thread_pool_observer.hpp,v 1.10 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef YP2_THREAD_POOL_OBSERVER_HPP diff --git a/src/tstdl.cpp b/src/tstdl.cpp index a56e123..78dd1bb 100644 --- a/src/tstdl.cpp +++ b/src/tstdl.cpp @@ -1,7 +1,7 @@ -/* $Id: tstdl.cpp,v 1.3 2006-03-16 10:40:59 adam Exp $ +/* $Id: tstdl.cpp,v 1.4 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/util.cpp b/src/util.cpp index 941effc..dcd751b 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,7 +1,7 @@ -/* $Id: util.cpp,v 1.16 2006-06-09 14:12:13 adam Exp $ +/* $Id: util.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" diff --git a/src/util.hpp b/src/util.hpp index 3a32cc9..35eb733 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,7 +1,7 @@ -/* $Id: util.hpp,v 1.15 2006-06-09 14:12:13 adam Exp $ +/* $Id: util.hpp,v 1.16 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef YP2_UTIL_HPP diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp index 5c95d83..d85ba16 100644 --- a/src/xmlutil.cpp +++ b/src/xmlutil.cpp @@ -1,7 +1,7 @@ -/* $Id: xmlutil.cpp,v 1.6 2006-06-09 14:12:13 adam Exp $ +/* $Id: xmlutil.cpp,v 1.7 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "xmlutil.hpp" diff --git a/src/xmlutil.hpp b/src/xmlutil.hpp index 571161c..c5680ed 100644 --- a/src/xmlutil.hpp +++ b/src/xmlutil.hpp @@ -1,7 +1,7 @@ -/* $Id: xmlutil.hpp,v 1.5 2006-03-16 10:40:59 adam Exp $ +/* $Id: xmlutil.hpp,v 1.6 2006-06-10 14:29:13 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #ifndef XML_UTIL_HPP -- 1.7.10.4