Author: borisk
Date: Mon Jul 14 08:57:52 2008
New Revision: 676634
URL: http://svn.apache.org/viewvc?rev=676634&view=rev
Log:
Remove references to libwww net accessor which was moved to attic (not
maintained, number of problems).
Removed:
xerces/c/trunk/m4/xerces_libwww_prefix.m4
Modified:
xerces/c/trunk/doc/build-winunix.xml
xerces/c/trunk/doc/faq-distrib.xml
xerces/c/trunk/m4/xerces_netaccessor_selection.m4
xerces/c/trunk/scripts/packageBinaries.pl
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
Modified: xerces/c/trunk/doc/build-winunix.xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/doc/build-winunix.xml?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/doc/build-winunix.xml (original)
+++ xerces/c/trunk/doc/build-winunix.xml Mon Jul 14 08:57:52 2008
@@ -164,7 +164,6 @@
<p>Net Accessor (used to read data from HTTP sources):</p>
<ol>
<li><code>--enable-netaccessor-curl</code> Uses
curl</li>
- <li><code>--enable-netaccessor-libwww</code> Uses W3C's
libWWW</li>
<li><code>--enable-netaccessor-socket</code> Uses plain
BSD sockets</li>
<li><code>--enable-netaccessor-cfurl</code> Uses cfurl
(Mac-only)</li>
<li><code>--enable-netaccessor-winsock</code> Uses
WinSock (Windows-only, either Cygwin or MinGW)</li>
@@ -221,9 +220,7 @@
checking for gcc... gcc
[..snip..]
checking for libcurl...
-checking for libwww...
checking whether we can support the libcurl-based NetAccessor... no
-checking whether we can support the libwww-based NetAccessor... no
checking whether we can support the sockets-based NetAccessor... yes
checking for which NetAccessor to use (choices: -socket-)... socket
checking for icu... /usr/local
Modified: xerces/c/trunk/doc/faq-distrib.xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/doc/faq-distrib.xml?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/doc/faq-distrib.xml (original)
+++ xerces/c/trunk/doc/faq-distrib.xml Mon Jul 14 08:57:52 2008
@@ -111,7 +111,7 @@
-c <C compiler name> (e.g. gcc or xlc_r)
-x <C++ compiler name> (e.g. g++ or xlC_r)
-m <message loader> can be 'inmem', 'icu' or 'iconv'
- -n <net accessor> can be 'fileonly' or 'libwww'
+ -n <net accessor> can be 'fileonly' or 'libcurl'
-t <transcoder> can be 'icu' or 'native'
-r <thread option> can be 'pthread' or 'dce' (only used on
HP-11)
-h to get help on these commands
Modified: xerces/c/trunk/m4/xerces_netaccessor_selection.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_netaccessor_selection.m4?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_netaccessor_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_netaccessor_selection.m4 Mon Jul 14 08:57:52 2008
@@ -30,7 +30,6 @@
AC_CHECK_LIB([nsl], [gethostbyname])
XERCES_CURL_PREFIX
- XERCES_LIBWWW_PREFIX
######################################################
# Test for availability of each netaccessor on this host.
@@ -55,23 +54,6 @@
[AC_MSG_RESULT(no)]
)
- AC_REQUIRE([XERCES_LIBWWW_PREFIX])
- AC_MSG_CHECKING([whether we can support the libwww-based NetAccessor])
- list_add=
- AS_IF([test x"$xerces_cv_libwww_prefix" != x], [
- AC_ARG_ENABLE([netaccessor-libwww],
- AS_HELP_STRING([--enable-netaccessor-libwww],
- [Enable libwww-based NetAccessor support]),
- [AS_IF([test x"$enableval" = xyes],
- [list_add=LIBWWW])],
- [list_add=libwww])
- ])
- AS_IF([test x"$list_add" != x],
- [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
- )
-
-
AC_MSG_CHECKING([whether we can support the sockets-based NetAccessor])
list_add=
AS_IF([test x"$ac_cv_header_sys_socket_h" = xyes],
@@ -168,14 +150,6 @@
XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
break
;;
-
- *-libwww-*)
- netaccessor=libwww
- AC_DEFINE([XERCES_USE_NETACCESSOR_LIBWWW], 1, [Define
to use the libwww NetAccessor])
- LIBS="${LIBS}
`${xerces_cv_libwww_prefix}/bin/libwww-config
--prefix=${xerces_cv_libwww_prefix} --libs`"
- break
- ;;
-
*)
AS_IF([test $i -eq 2], [
AC_MSG_RESULT([none available; there will be no
network access!!!])
@@ -200,7 +174,6 @@
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_CFURL], [test
x"$netaccessor" = xcfurl])
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_WINSOCK], [test
x"$netaccessor" = xwinsock])
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_SOCKET], [test
x"$netaccessor" = xsocket])
- AM_CONDITIONAL([XERCES_USE_NETACCESSOR_LIBWWW], [test
x"$netaccessor" = xlibwww])
]
)
Modified: xerces/c/trunk/scripts/packageBinaries.pl
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/scripts/packageBinaries.pl?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/scripts/packageBinaries.pl (original)
+++ xerces/c/trunk/scripts/packageBinaries.pl Mon Jul 14 08:57:52 2008
@@ -800,7 +800,7 @@
if ($opt_m eq "iconv") {$cfg_m = "--enable-msgloader-iconv"; }
$cfg_n = "";
- if ($opt_n eq "fileonly") {$cfg_n = "--disable-netaccessor-socket
--disable-netaccessor-curl --disable-netaccessor-libwww
--disable-netaccessor-cfurl"; }
+ if ($opt_n eq "fileonly") {$cfg_n = "--disable-netaccessor-socket
--disable-netaccessor-curl --disable-netaccessor-cfurl"; }
if ($opt_n eq "socket") {$cfg_n = "--enable-netaccessor-socket"; }
$cfg_t = "";
@@ -1008,7 +1008,6 @@
util/MutexManagers
util/NetAccessors
util/NetAccessors/Curl
- util/NetAccessors/libWWW
util/NetAccessors/MacOSURLAccess
util/NetAccessors/MacOSURLAccessCF
util/NetAccessors/Socket
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Mon Jul 14 08:57:52 2008
@@ -72,19 +72,11 @@
if XERCES_USE_NETACCESSOR_SOCKET
libxerces_c_la_SOURCES += ${sockets_sources}
nobase_libxerces_c_la_HEADERS += ${sockets_headers}
-AM_CPPFLAGS += -I${CURL_PREFIX}/include/curl
-endif
-
-if XERCES_USE_NETACCESSOR_LIBWWW
-libxerces_c_la_SOURCES += ${libwww_sources}
-nobase_libxerces_c_la_HEADERS += ${libwww_headers}
-AM_CPPFLAGS += -I${LIBWWW_PREFIX}/include/w3c-libwww
endif
if XERCES_USE_NETACCESSOR_CFURL
libxerces_c_la_SOURCES += ${cfurl_sources}
nobase_libxerces_c_la_HEADERS += ${cfurl_headers}
-AM_CPPFLAGS += -I${LIBWWW_PREFIX}/include/w3c-libwww
endif
if XERCES_USE_NETACCESSOR_WINSOCK
@@ -1041,15 +1033,7 @@
xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp \
xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp \
xercesc/util/NetAccessors/BinHTTPInputStreamCommon.cpp
-
-libwww_headers = \
- xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp \
- xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
-
-libwww_sources = \
- xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp \
- xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
-
+
cfurl_headers = \
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp \
xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
Modified: xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp?rev=676634&r1=676633&r2=676634&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp Mon Jul 14 08:57:52 2008
@@ -76,9 +76,6 @@
#if XERCES_USE_NETACCESSOR_SOCKET
# include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
-#if XERCES_USE_NETACCESSOR_LIBWWW
-# include <xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp>
-#endif
#if XERCES_USE_NETACCESSOR_CFURL
# include
<xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp>
#endif
@@ -378,8 +375,6 @@
na = new CurlNetAccessor();
#elif defined (XERCES_USE_NETACCESSOR_SOCKET)
na = new SocketNetAccessor();
-#elif defined (XERCES_USE_NETACCESSOR_LIBWWW)
- na = new LibWWWNetAccessor();
#elif defined (XERCES_USE_NETACCESSOR_CFURL)
na = new MacOSURLAccessCF();
#elif defined (XERCES_USE_NETACCESSOR_WINSOCK)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
