7 files changed, 65 insertions, 23 deletions
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 55b3a323b83b..42d273fe39c8 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\
 	$(gb_UWINAPI) \
 ))
 
+ifeq ($(WITH_WEBDAV),neon)
+
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	libxml2 \
@@ -55,6 +57,59 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 	ucb/source/ucp/webdav-neon/webdavservices \
 ))
 
+else # WITH_WEBDAV == serf
+
+$(eval $(call gb_Library_set_warnings_not_errors,ucpdav1))
+
+$(eval $(call gb_Library_use_externals,ucpdav1,\
+	boost_headers \
+	apr \
+	openssl \
+	serf \
+	zlib \
+))
+
+$(eval $(call gb_Library_add_libs,ucpdav1,\
+	$(if $(filter $(OS),LINUX),-lpthread) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpdav1,\
+	ucb/source/ucp/webdav/AprEnv \
+	ucb/source/ucp/webdav/ContentProperties \
+	ucb/source/ucp/webdav/DAVProperties \
+	ucb/source/ucp/webdav/DAVResourceAccess \
+	ucb/source/ucp/webdav/DAVSessionFactory \
+	ucb/source/ucp/webdav/DateTimeHelper \
+	ucb/source/ucp/webdav/SerfCallbacks \
+	ucb/source/ucp/webdav/SerfCopyReqProcImpl \
+	ucb/source/ucp/webdav/SerfDeleteReqProcImpl \
+	ucb/source/ucp/webdav/SerfGetReqProcImpl \
+	ucb/source/ucp/webdav/SerfHeadReqProcImpl \
+	ucb/source/ucp/webdav/SerfInputStream \
+	ucb/source/ucp/webdav/SerfMkColReqProcImpl \
+	ucb/source/ucp/webdav/SerfMoveReqProcImpl \
+	ucb/source/ucp/webdav/SerfPostReqProcImpl \
+	ucb/source/ucp/webdav/SerfPropFindReqProcImpl \
+	ucb/source/ucp/webdav/SerfPropPatchReqProcImpl \
+	ucb/source/ucp/webdav/SerfPutReqProcImpl \
+	ucb/source/ucp/webdav/SerfRequestProcessor \
+	ucb/source/ucp/webdav/SerfRequestProcessorImpl \
+	ucb/source/ucp/webdav/SerfRequestProcessorImplFac \
+	ucb/source/ucp/webdav/SerfSession \
+	ucb/source/ucp/webdav/SerfUri \
+	ucb/source/ucp/webdav/UCBDeadPropertyValue \
+	ucb/source/ucp/webdav/webdavcontent \
+	ucb/source/ucp/webdav/webdavcontentcaps \
+	ucb/source/ucp/webdav/webdavdatasupplier \
+	ucb/source/ucp/webdav/webdavprovider \
+	ucb/source/ucp/webdav/webdavresponseparser \
+	ucb/source/ucp/webdav/webdavresultset \
+	ucb/source/ucp/webdav/webdavservices \
+ ))
+	#ucb/source/ucp/webdav/SerfLockStore
+
+endif # WITH_WEBDAV
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,ucpdav1,\
 	ws2_32 \
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 1e64c2498bee..c07d751014a0 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,ucb,\
 	Library_srtrs1 \
 	Library_ucb1 \
 	$(if $(ENABLE_CMIS),Library_ucpcmis1) \
+	$(if $(WITH_WEBDAV),Library_ucpdav1) \
 	Library_ucpexpand1 \
 	Library_ucpext \
 	Library_ucpfile1 \
@@ -23,12 +24,6 @@ $(eval $(call gb_Module_add_targets,ucb,\
 	Library_ucptdoc1 \
 ))
 
-ifneq ($(DISABLE_NEON),TRUE)
-$(eval $(call gb_Module_add_targets,ucb,\
-	Library_ucpdav1 \
-))
-endif
-
 ifeq ($(ENABLE_GIO),TRUE)
 $(eval $(call gb_Module_add_targets,ucb,\
 	Library_ucpgio1 \
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 286a699d9fc3..374ad4652748 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 #include <vector>
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -82,7 +82,7 @@ public:
 
 };
 
-typedef std::unordered_map
+typedef boost::unordered_map
 <
     OUString,
     PropertyValue,
diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index c1ec9828eeec..bc61ebfb8831 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -22,7 +22,7 @@
 #ifndef _WEBDAV_UCP_PROPERTYMAP_HXX
 #define _WEBDAV_UCP_PROPERTYMAP_HXX
 
-#include <unordered_set>
+#include <boost/unordered_set.hpp>
 #include <com/sun/star/beans/Property.hpp>
 
 namespace http_dav_ucp {
@@ -46,7 +46,7 @@ struct hashPropertyName
     }
 };
 
-typedef std::unordered_set
+typedef boost::unordered_set
 <
     ::com::sun::star::beans::Property,
     hashPropertyName,
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 8c1b5269ab7b..ad60a93900b1 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -285,7 +285,7 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     // Note: isFolder may require network activities! So call it only
     //       if it is really necessary!!!
@@ -341,7 +341,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     sal_Bool bFolder = sal_False;
     try
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index 8be333a1be34..cb9535b544ca 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/ucb/LockScope.hpp>
 #include <com/sun/star/ucb/LockType.hpp>
 #include <map>
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
 
 
 
@@ -94,7 +94,7 @@ namespace
 
     WebDAVName StrToWebDAVName(const OUString& rStr)
     {
-        typedef std::unordered_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper;
+        typedef boost::unordered_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper;
         typedef std::pair< OUString, WebDAVName > WebDAVNameValueType;
         static WebDAVNameMapper aWebDAVNameMapperList;
 
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 4b85a977d73f..47509dd326fe 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -25,15 +25,7 @@
 
 using namespace com::sun::star;
 
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;